Add empty() function to deal.II/hp/collection.h and use it instead of size() == 0

This only changes files in the source directory

diff --git a/include/deal.II/hp/collection.h b/include/deal.II/hp/collection.h
index 0f65f10a9842849e04b16d4eb8e85f0e42d2b8e8..92431efcca655ff9dec77bb64e2efe4c8fb84f2c 100644 (file)
--- a/include/deal.II/hp/collection.h
+++ b/include/deal.II/hp/collection.h
@@ -252,6 +252,12 @@ namespace hp
     unsigned int
     size() const;
 
+    /**
+     * This is equivalent to <code>size() == 0</code>
+     */
+    bool
+    empty() const;
+
     /**
      * Determine an estimate for the memory consumption (in bytes) of this
      * object.
@@ -312,6 +318,15 @@ namespace hp
 
 
 
+  template <typename T>
+  inline bool
+  Collection<T>::empty() const
+  {
+    return this->size() == 0;
+  }
+
+
+
   template <typename T>
   inline const T &
   Collection<T>::operator[](const unsigned int index) const

diff --git a/source/distributed/cell_weights.cc b/source/distributed/cell_weights.cc
index 9707262e656ecaefd2c1915a8e0f4254cfbb30cc..16a88760f476aa84bd1cc5a6ab63f65b36410787 100644 (file)
--- a/source/distributed/cell_weights.cc
+++ b/source/distributed/cell_weights.cc
@@ -175,7 +175,7 @@ namespace parallel
     (void)triangulation;
 
     // Skip if the DoFHandler has not been initialized yet.
-    if (dof_handler.get_fe_collection().size() == 0)
+    if (dof_handler.get_fe_collection().empty())
       return 0;
 
     // Convert cell type from Triangulation to DoFHandler to be able

diff --git a/source/hp/fe_collection.cc b/source/hp/fe_collection.cc
index ca1e1342d8820d63413a9a9647943a23aa759434..2669f7e7e672427a5bf4d93a90132bec2e40bd78 100644 (file)
--- a/source/hp/fe_collection.cc
+++ b/source/hp/fe_collection.cc
@@ -67,7 +67,7 @@ namespace hp
     // check that the new element has the right number of components. only check
     // with the first element, since all the other elements have already passed
     // the test against the first element
-    Assert(this->size() == 0 ||
+    Assert(this->empty() ||
              new_fe.n_components() == this->operator[](0).n_components(),
            ExcMessage("All elements inside a collection need to have the "
                       "same number of vector components!"));

diff --git a/source/hp/refinement.cc b/source/hp/refinement.cc
index 8e57fd28dafce29a9691660d73f544c7a1d6c2ee..44199edb3f4808eceba172ede5fd2ad8bfbb6cec 100644 (file)
--- a/source/hp/refinement.cc
+++ b/source/hp/refinement.cc
@@ -48,7 +48,7 @@ namespace hp
     void
     full_p_adaptivity(const DoFHandler<dim, spacedim> &dof_handler)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -68,7 +68,7 @@ namespace hp
     p_adaptivity_from_flags(const DoFHandler<dim, spacedim> &dof_handler,
                             const std::vector<bool>         &p_flags)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -117,7 +117,7 @@ namespace hp
       const ComparisonFunction<std_cxx20::type_identity_t<Number>>
         &compare_coarsen)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -156,7 +156,7 @@ namespace hp
       const ComparisonFunction<std_cxx20::type_identity_t<Number>>
         &compare_coarsen)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -253,7 +253,7 @@ namespace hp
       const ComparisonFunction<std_cxx20::type_identity_t<Number>>
         &compare_coarsen)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -447,7 +447,7 @@ namespace hp
     p_adaptivity_from_regularity(const DoFHandler<dim, spacedim> &dof_handler,
                                  const Vector<Number> &sobolev_indices)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -509,7 +509,7 @@ namespace hp
       const ComparisonFunction<std_cxx20::type_identity_t<Number>>
         &compare_coarsen)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -550,7 +550,7 @@ namespace hp
                   const double                     gamma_h,
                   const double                     gamma_n)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -677,7 +677,7 @@ namespace hp
     void
     force_p_over_h(const DoFHandler<dim, spacedim> &dof_handler)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -698,7 +698,7 @@ namespace hp
     void
     choose_p_over_h(const DoFHandler<dim, spacedim> &dof_handler)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return;
 
@@ -811,7 +811,7 @@ namespace hp
                              const unsigned int               max_difference,
                              const unsigned int               contains_fe_index)
     {
-      if (dof_handler.get_fe_collection().size() == 0)
+      if (dof_handler.get_fe_collection().empty())
         // nothing to do
         return false;