Not performing inward integer rounding if solving relaxation, so Rays…

…-gams10am passes
ERGO-Code · Dec 5, 2024 · 071b313 · 071b313
1 parent 0560b8c
commit 071b313
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/check/TestCheckSolution.cpp b/check/TestCheckSolution.cpp
@@ -107,7 +107,8 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
 
     highs.run();
     if (dev_run) printf("Num nodes = %d\n", int(info.mip_node_count));
-    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
     highs.clear();
   }
 
@@ -126,7 +127,7 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
 
     highs.run();
     if (dev_run) printf("Num nodes = %d\n", int(info.mip_node_count));
-    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
     highs.clear();
   }
 
@@ -156,7 +157,7 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
 
     highs.run();
     if (dev_run) printf("Num nodes = %d\n", int(info.mip_node_count));
-    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
     highs.clear();
   }
 
@@ -179,7 +180,7 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
 
     highs.run();
     if (dev_run) printf("Num nodes = %d\n", int(info.mip_node_count));
-    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
     highs.clear();
   }
 
@@ -226,7 +227,7 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
     return_status = highs.setSolution(starting_solution);
     REQUIRE(return_status == HighsStatus::kOk);
     highs.run();
-    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
     highs.clear();
   }
 
@@ -277,7 +278,7 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
     return_status = highs.setSolution(num_entries, index.data(), value.data());
     REQUIRE(return_status == HighsStatus::kOk);
     highs.run();
-    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    REQUIRE(info.mip_node_count != scratch_num_nodes);
     highs.clear();
   }
   assert(other_tests);

diff --git a/check/TestMipSolver.cpp b/check/TestMipSolver.cpp
@@ -389,7 +389,6 @@ TEST_CASE("MIP-unbounded", "[highs_test_mip_solver]") {
   model_status = highs.getModelStatus();
   REQUIRE(model_status == HighsModelStatus::kUnboundedOrInfeasible);
   //  REQUIRE(model_status == HighsModelStatus::kInfeasible);
-
 }
 
 TEST_CASE("MIP-od", "[highs_test_mip_solver]") {

diff --git a/src/lp_data/HighsInterface.cpp b/src/lp_data/HighsInterface.cpp
@@ -3557,7 +3557,8 @@ bool Highs::infeasibleBoundsOk() {
     return false;
   };
 
-  const bool perform_inward_integer_rounding = false;
+  const bool perform_inward_integer_rounding =
+      !this->options_.solve_relaxation && false;
   if (!perform_inward_integer_rounding)
     printf(
         "Highs::infeasibleBoundsOk() Not performing inward integer rounding of "