use more general default selector

ginkgo-project · May 17, 2024 · d6946d4 · d6946d4
1 parent e8af940
commit d6946d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/core/solver/multigrid.cpp b/core/solver/multigrid.cpp
@@ -880,16 +880,12 @@ Multigrid::Multigrid(const Multigrid::Factory* factory,
           stop::combine(factory->get_parameters().criteria)},
       parameters_{factory->get_parameters()}
 {
+    this->validate();
     if (!parameters_.level_selector) {
-        if (parameters_.mg_level.size() == 1) {
-            level_selector_ = [](const size_type, const LinOp*) {
-                return size_type{0};
-            };
-        } else if (parameters_.mg_level.size() > 1) {
-            level_selector_ = [](const size_type level, const LinOp*) {
-                return level;
-            };
-        }
+        auto num = parameters_.mg_level.size();
+        level_selector_ = [num](const size_type level, const LinOp*) {
+            return (level < num) ? level : num - 1;
+        };
     } else {
         level_selector_ = parameters_.level_selector;
     }
@@ -903,7 +899,7 @@ Multigrid::Multigrid(const Multigrid::Factory* factory,
         solver_selector_ = parameters_.solver_selector;
     }
 
-    this->validate();
+
     this->set_default_initial_guess(parameters_.default_initial_guess);
     if (this->get_system_matrix()->get_size()[0] != 0) {
         // generate on the existed matrix

diff --git a/include/ginkgo/core/solver/multigrid.hpp b/include/ginkgo/core/solver/multigrid.hpp
@@ -222,9 +222,8 @@ class Multigrid : public EnableLinOp<Multigrid>,
          * >= 3 and the number of rows of fine matrix > 1024, or the 2-idx
          * elements otherwise.
          *
-         * default selector:
-         *     use the first factory when mg_level size = 1
-         *     use the level as the index when mg_level size > 1
+         * default selector: use the level as the index when the level <
+         *   #mg_level and reuse the last one when the level >= #mg_level
          */
         std::function<size_type(const size_type, const LinOp*)>
             GKO_FACTORY_PARAMETER_SCALAR(level_selector, nullptr);