Now to fix 2463!

Author: jajhall

check/TestCheckSolution.cpp

@@ -463,16 +463,17 @@ TEST_CASE("read-lp-file-solution", "[highs_check_solution]") {
   const std::string test_name = Catch::getResultCapture().getCurrentTestName();
   const std::string model_file_name = test_name + ".lp";
   const std::string solution_file_name = test_name + ".sol";
+  const bool with_names = false;
   HighsLp lp;
   lp.num_col_ = 3;
   lp.num_row_ = 1;
   lp.col_cost_ = {0, 1, 1};
   lp.col_lower_ = {0, 10, 0};
   lp.col_upper_ = {kHighsInf, kHighsInf, kHighsInf};
-  lp.col_names_ = {"x", "y", "z"};
+  if (with_names) lp.col_names_ = {"x", "y", "z"};
   lp.row_lower_ = {1};
   lp.row_upper_ = {2};
-  lp.row_names_ = {"r"};
+  if (with_names) lp.row_names_ = {"r"};
   lp.a_matrix_.start_ = {0, 1, 1, 2};
   lp.a_matrix_.index_ = {0, 0};
   lp.a_matrix_.value_ = {1, 1};
@@ -485,11 +486,13 @@ TEST_CASE("read-lp-file-solution", "[highs_check_solution]") {
   h.writeSolution(solution_file_name);
 
   h.readModel(model_file_name);
+  h.writeModel("");
   h.readSolution(solution_file_name);
   h.run();
 
-  //  std::remove(model_file_name.c_str());
-  //  std::remove(solution_file_name.c_str());
+  std::remove(model_file_name.c_str());
+  std::remove(solution_file_name.c_str());
+  
   h.resetGlobalScheduler(true);
 }
 

check/TestFilereader.cpp

@@ -382,7 +382,7 @@ TEST_CASE("writeLocalModel", "[highs_filereader]") {
   h.setOptionValue("output_flag", dev_run);
   HighsModel model;
   HighsLp& lp = model.lp_;
-  ;
+
   lp.num_col_ = 2;
   lp.num_row_ = 3;
   lp.col_cost_ = {8, 10};
@@ -403,7 +403,7 @@ TEST_CASE("writeLocalModel", "[highs_filereader]") {
   // Model has no dimensions for a_matrix_, but these are set in
   // writeLocalModel.
   if (dev_run) printf("\nModel with no column or row names\n");
-  REQUIRE(h.writeLocalModel(model, write_model_file) == HighsStatus::kWarning);
+  REQUIRE(h.writeLocalModel(model, write_model_file) == HighsStatus::kOk);
   lp.col_names_ = {"C0", "C1"};
   lp.row_names_ = {"R0", "R1", "R2"};
 
@@ -477,3 +477,44 @@ TEST_CASE("mps-silly-names", "[highs_filereader]") {
   HighsStatus return_status = h.readModel(model_file);
   REQUIRE(return_status == HighsStatus::kOk);
 }
+
+TEST_CASE("handle-blank-space-names", "[highs_filereader]") {
+  HighsLp lp;
+  lp.num_col_ = 2;
+  lp.num_row_ = 2;
+  lp.col_cost_ = {8, 10};
+  lp.col_lower_ = {0, 0};
+  lp.col_upper_ = {inf, inf};
+  lp.row_lower_ = {7, 12};
+  lp.row_upper_ = {inf, inf};
+  lp.a_matrix_.start_ = {0, 2, 4};
+  lp.a_matrix_.index_ = {0, 1, 0, 1};
+  lp.a_matrix_.value_ = {1, 2, 2, 4};
+  Highs h;
+  REQUIRE(h.passModel(lp) == HighsStatus::kOk);
+  h.run();
+  REQUIRE(h.writeSolution("", 1) == HighsStatus::kOk);
+  REQUIRE(h.writeModel("") == HighsStatus::kOk);
+
+  lp.col_names_ = {"Column0", ""};
+  lp.row_names_ = {"Row0", "Row1"};
+  REQUIRE(h.passModel(lp) == HighsStatus::kOk);
+  h.run();
+  REQUIRE(h.writeSolution("") == HighsStatus::kOk);
+  REQUIRE(h.writeModel("") == HighsStatus::kOk);
+
+  std::vector<HighsInt> index = {0, 1};
+  std::vector<double> value = {2, 3};
+  REQUIRE(h.addRow(5, inf, 2, index.data(), value.data()) == HighsStatus::kOk);
+  h.run();
+  REQUIRE(h.writeSolution("", 1) == HighsStatus::kOk);
+  REQUIRE(h.writeModel("") == HighsStatus::kOk);
+
+  lp.row_names_[1] = "Row 1";
+  REQUIRE(h.passModel(lp) == HighsStatus::kOk);
+  h.run();
+  REQUIRE(h.writeSolution("", 1) == HighsStatus::kError);
+  REQUIRE(h.writeModel("") == HighsStatus::kError);
+
+  h.resetGlobalScheduler(true);
+}

check/TestRays.cpp

@@ -4,7 +4,7 @@
 #include "catch.hpp"
 #include "lp_data/HConst.h"
 
-const bool dev_run = true;  // false;
+const bool dev_run = false;//true;  // 
 const double zero_ray_value_tolerance = 1e-14;
 
 void reportRay(std::string message, HighsInt dim, double* computed,