Skip to content

Commit ebe985f

Browse files
committed
readSolution and readBasis don't require column and row names to exist, but always use them if they do
1 parent 74d5ebe commit ebe985f

File tree

4 files changed

+165
-113
lines changed

4 files changed

+165
-113
lines changed

check/TestCheckSolution.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ TEST_CASE("read-lp-file-rgn", "[highs_check_solution]") {
565565
REQUIRE(integral);
566566
REQUIRE(feasible);
567567

568-
// std::remove(model_file_name.c_str());
568+
std::remove(model_file_name.c_str());
569569
std::remove(solution_file_name.c_str());
570570

571571
h.resetGlobalScheduler(true);
@@ -689,7 +689,7 @@ void runSetLpSolution(const std::string model) {
689689

690690
highs.clear();
691691

692-
// std::remove(solution_file.c_str());
692+
std::remove(solution_file.c_str());
693693

694694
highs.resetGlobalScheduler(true);
695695
}

check/TestMipSolver.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,7 @@ TEST_CASE("issue-2409", "[highs_test_mip_solver]") {
946946
const HighsModelStatus require_model_status = HighsModelStatus::kOptimal;
947947
const double optimal_objective = 0.1;
948948
Highs highs;
949+
highs.setOptionValue("output_flag", dev_run);
949950
REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
950951
if (dev_run) printf("Testing that presolve reduces the problem to empty\n");
951952
REQUIRE(highs.presolve() == HighsStatus::kOk);
@@ -982,6 +983,7 @@ TEST_CASE("issue-2432", "[highs_test_mip_solver]") {
982983
const HighsModelStatus require_model_status = HighsModelStatus::kOptimal;
983984
const double optimal_objective = -3777.57124352;
984985
Highs highs;
986+
highs.setOptionValue("output_flag", dev_run);
985987
REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
986988
if (dev_run) printf("Testing that presolve reduces the problem\n");
987989
REQUIRE(highs.presolve() == HighsStatus::kOk);

0 commit comments

Comments
 (0)