Optimize iterative beam search 2

fontanf · May 18, 2024 · f571531 · f571531
1 parent e2e7f2a
commit f571531
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/include/treesearchsolver/common.hpp b/include/treesearchsolver/common.hpp
@@ -76,8 +76,9 @@ Depth depth(
             node,
             std::integral_constant<
                 bool,
-                HasDepthMethod<BranchingScheme,
-                Depth(const std::shared_ptr<typename BranchingScheme::Node>&)>::value>());
+                HasDepthMethod<
+                    BranchingScheme,
+                    Depth(const std::shared_ptr<typename BranchingScheme::Node>&)>::value>());
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/include/treesearchsolver/iterative_beam_search_2.hpp b/include/treesearchsolver/iterative_beam_search_2.hpp
@@ -155,25 +155,25 @@ inline const IterativeBeamSearch2Output<BranchingScheme> iterative_beam_search_2
                     continue;
                 }
 
+                // Check time.
+                if (parameters.timer.needs_to_end())
+                    goto ibsend;
+
+                // Check best known bound.
+                if (parameters.goal != nullptr
+                        && !branching_scheme.better(
+                            parameters.goal,
+                            output.solution_pool.best()))
+                    goto ibsend;
+
                 // Get next child.
                 auto children = branching_scheme.children(current_node);
                 output.number_of_nodes_expanded++;
 
-                for (auto child: children) {
+                for (const auto& child: children) {
 
                     output.number_of_nodes_generated++;
 
-                    // Check time.
-                    if (parameters.timer.needs_to_end())
-                        goto ibsend;
-
-                    // Check best known bound.
-                    if (parameters.goal != nullptr
-                            && !branching_scheme.better(
-                                parameters.goal,
-                                output.solution_pool.best()))
-                        goto ibsend;
-
                     // Get child depth.
                     Depth child_depth = depth(branching_scheme, child);
                     if (child_depth == -1)