Now testing that the solution with rgn from an MPS file is feasible with rgn from its .lp file; formatted

Author: jajhall

check/TestCheckSolution.cpp

@@ -480,7 +480,7 @@ TEST_CASE("read-lp-file-solution", "[highs_check_solution]") {
   lp.integrality_ = {HighsVarType::kContinuous, HighsVarType::kContinuous,
                      HighsVarType::kInteger};
   Highs h;
-  // h.setOptionValue("output_flag", dev_run);
+  h.setOptionValue("output_flag", dev_run);
   REQUIRE(h.passModel(lp) == HighsStatus::kOk);
   h.run();
   h.writeModel(model_file_name);
@@ -529,9 +529,9 @@ TEST_CASE("read-lp-file-basis", "[highs_check_solution]") {
   // Variables now ordered y; z; x
   h.writeModel("");
   h.readBasis(basis_file_name);
-  // Initial basis: y - basic; z - lower; x - lower, using basis for
-  // original ordering with new ordering. Not optimal - in fact basis
-  // matrix B = [0] is singular!
+  // Old read basis yields initial basis: y - basic; z - lower; x -
+  // lower, using basis for original ordering with new ordering. Not
+  // optimal - in fact basis matrix B = [0] is singular!
   h.run();
   REQUIRE(h.getInfo().simplex_iteration_count == 0);
 
@@ -541,6 +541,36 @@ TEST_CASE("read-lp-file-basis", "[highs_check_solution]") {
   h.resetGlobalScheduler(true);
 }
 
+TEST_CASE("read-lp-file-rgn", "[highs_check_solution]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  const std::string filename =
+      std::string(HIGHS_DIR) + "/check/instances/rgn.mps";
+  const std::string model_file_name = test_name + ".lp";
+  const std::string solution_file_name = test_name + ".sol";
+  Highs h;
+  h.setOptionValue("output_flag", dev_run);
+  REQUIRE(h.readModel(filename) == HighsStatus::kOk);
+  REQUIRE(h.run() == HighsStatus::kOk);
+  REQUIRE(h.writeSolution(solution_file_name) == HighsStatus::kOk);
+  REQUIRE(h.writeModel(model_file_name) == HighsStatus::kOk);
+
+  REQUIRE(h.readModel(model_file_name) == HighsStatus::kOk);
+  REQUIRE(h.readSolution(solution_file_name) == HighsStatus::kOk);
+  bool valid;
+  bool integral;
+  bool feasible;
+  REQUIRE(h.assessPrimalSolution(valid, integral, feasible) ==
+          HighsStatus::kOk);
+  REQUIRE(valid);
+  REQUIRE(integral);
+  REQUIRE(feasible);
+
+  std::remove(model_file_name.c_str());
+  std::remove(solution_file_name.c_str());
+
+  h.resetGlobalScheduler(true);
+}
+
 void runWriteReadCheckSolution(Highs& highs, const std::string& test_name,
                                const std::string& model,
                                const HighsModelStatus require_model_status,

check/TestFilereader.cpp

@@ -525,10 +525,12 @@ TEST_CASE("handle-blank-space-names", "[highs_filereader]") {
   h.resetGlobalScheduler(true);
 }
 
-TEST_CASE("read-highs-lp-file", "[highs_filereader]") {
+TEST_CASE("read-highs-lp-file0", "[highs_filereader]") {
+  // Identified when fixing #2463 that LP file reader cannot handle
+  // case where row names are numeric constants
   const std::string test_name = Catch::getResultCapture().getCurrentTestName();
-  const std::string model_name0 = test_name + "-0.lp";
-  const std::string model_name1 = test_name + "-1.lp";
+  const std::string model_file_name0 = test_name + "-0.lp";
+  const std::string model_file_name1 = test_name + "-1.lp";
   HighsLp lp;
   lp.num_col_ = 1;
   lp.num_row_ = 3;
@@ -543,14 +545,33 @@ TEST_CASE("read-highs-lp-file", "[highs_filereader]") {
   lp.col_names_ = {"col"};
   lp.row_names_ = {"row", "55", "9.9"};
   Highs h;
-  //  h.setOptionValue("output_flag", dev_run);
+  h.setOptionValue("output_flag", dev_run);
   REQUIRE(h.passModel(lp) == HighsStatus::kOk);
-  REQUIRE(h.writeModel(model_name0) == HighsStatus::kOk);
-  REQUIRE(h.readModel(model_name0) == HighsStatus::kOk);
-  REQUIRE(h.writeModel(model_name1) == HighsStatus::kOk);
+  // Create a .lp file for this model - that has numeric constants as
+  // row names
+  REQUIRE(h.writeModel(model_file_name0) == HighsStatus::kOk);
+  // Make sure that the .lp file for this model can be read OK
+  REQUIRE(h.readModel(model_file_name0) == HighsStatus::kOk);
+  REQUIRE(h.writeModel(model_file_name1) == HighsStatus::kOk);
+
+  std::remove(model_file_name0.c_str());
+  std::remove(model_file_name1.c_str());
+
+  h.resetGlobalScheduler(true);
+}
+
+TEST_CASE("read-highs-lp-file1", "[highs_filereader]") {
+  const std::string test_name = Catch::getResultCapture().getCurrentTestName();
+  std::string filename;
+  filename = std::string(HIGHS_DIR) + "/check/instances/rgn.mps";
+  std::string model_file_name = test_name + ".lp";
+  Highs h;
+  h.setOptionValue("output_flag", dev_run);
+  REQUIRE(h.readModel(filename) == HighsStatus::kOk);
+  REQUIRE(h.writeModel(model_file_name) == HighsStatus::kOk);
+  REQUIRE(h.readModel(model_file_name) == HighsStatus::kOk);
 
-  //  std::remove(model_name0.c_str());
-  //  std::remove(model_name1.c_str());
+  std::remove(model_file_name.c_str());
 
   h.resetGlobalScheduler(true);
 }