Review fixes

Author: chris-maes

cpp/src/dual_simplex/branch_and_bound.cpp

@@ -131,7 +131,7 @@ void set_uninitialized_steepest_edge_norms(const lp_problem_t<i_t, f_t>& lp,
   if (edge_norms.size() != lp.num_cols) { edge_norms.resize(lp.num_cols, -1.0); }
   for (i_t k = 0; k < lp.num_rows; k++) {
     const i_t j = basic_list[k];
-    if (edge_norms[j] < 0.0) { edge_norms[j] = 1e-4; }
+    if (edge_norms[j] <= 0.0) { edge_norms[j] = 1e-4; }
   }
 }
 
@@ -2035,9 +2035,7 @@ mip_status_t branch_and_bound_t<i_t, f_t>::solve(mip_solution_t<i_t, f_t>& solut
       f_t rel_gap = user_relative_gap(original_lp_, upper_bound_.load(), root_objective_);
       f_t abs_gap = upper_bound_.load() - root_objective_;
       if (rel_gap < settings_.relative_mip_gap_tol || abs_gap < settings_.absolute_mip_gap_tol) {
-        if (settings_.solution_callback != nullptr) {
-          settings_.solution_callback(root_relax_soln_.x, root_objective_);
-        }
+        set_solution_at_root(solution, cut_info);
         set_final_solution(solution, root_objective_);
         return mip_status_t::OPTIMAL;
       }

cpp/tests/mip/cuts_test.cu

@@ -20,6 +20,7 @@
 
 #include <cstdint>
 #include <filesystem>
+#include <limits>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -89,7 +90,7 @@ TEST(cuts, test_cuts_1)
   EXPECT_EQ(solution.get_termination_status(), mip_termination_status_t::Optimal);
 
   double obj_val = solution.get_objective_value();
-  // Expected objective value from documentation example is approximately 303.5
+  // Expected objective value from documentation example is approximately -28
   EXPECT_NEAR(-28, obj_val, 1e-3);
 
   EXPECT_EQ(solution.get_num_nodes(), 0);
@@ -158,7 +159,7 @@ TEST(cuts, test_cuts_2)
   EXPECT_EQ(solution.get_termination_status(), mip_termination_status_t::Optimal);
 
   double obj_val = solution.get_objective_value();
-  // Expected objective value from documentation example is approximately 303.5
+  // Expected objective value from documentation example is approximately -126
   EXPECT_NEAR(-126, obj_val, 1e-3);
 
   EXPECT_EQ(solution.get_num_nodes(), 0);