Solution and basis files read by variable name matching, using generic method getIndexFromName

Author: jajhall

check/TestCheckSolution.cpp

@@ -466,20 +466,21 @@ TEST_CASE("read-lp-file-solution", "[highs_check_solution]") {
   const bool with_names = false;
   HighsLp lp;
   lp.num_col_ = 3;
-  lp.num_row_ = 1;
+  lp.num_row_ = 2;
   lp.col_cost_ = {0, 1, 1};
   lp.col_lower_ = {0, 10, 0};
   lp.col_upper_ = {kHighsInf, kHighsInf, kHighsInf};
   if (with_names) lp.col_names_ = {"x", "y", "z"};
-  lp.row_lower_ = {1};
-  lp.row_upper_ = {2};
-  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};
-  lp.integrality_ = {HighsVarType::kContinuous, HighsVarType::kContinuous, HighsVarType::kInteger};
+  lp.row_lower_ = {1, -kHighsInf};
+  lp.row_upper_ = {kHighsInf, 2};
+  if (with_names) lp.row_names_ = {"r-lo", "r-up"};
+  lp.a_matrix_.start_ = {0, 2, 2, 4};
+  lp.a_matrix_.index_ = {0, 1, 0, 1};
+  lp.a_matrix_.value_ = {1, 1, 1, 1};
+  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);
@@ -489,10 +490,10 @@ TEST_CASE("read-lp-file-solution", "[highs_check_solution]") {
   h.writeModel("");
   h.readSolution(solution_file_name);
   h.run();
-  
+
   std::remove(model_file_name.c_str());
   std::remove(solution_file_name.c_str());
-  
+
   h.resetGlobalScheduler(true);
 }
 
@@ -515,7 +516,7 @@ TEST_CASE("read-lp-file-basis", "[highs_check_solution]") {
   lp.a_matrix_.index_ = {0, 1, 0, 1};
   lp.a_matrix_.value_ = {1, 1, 1, 1};
   Highs h;
-  //  h.setOptionValue("output_flag", dev_run);
+  h.setOptionValue("output_flag", dev_run);
   REQUIRE(h.passModel(lp) == HighsStatus::kOk);
   h.run();
   // Optimally x - basic; y - lower; z - lower
@@ -532,11 +533,11 @@ TEST_CASE("read-lp-file-basis", "[highs_check_solution]") {
   // original ordering with new ordering. Not optimal - in fact basis
   // matrix B = [0] is singular!
   h.run();
-  //  REQUIRE(h.getInfo().simplex_iteration_count == 0);
-  
+  REQUIRE(h.getInfo().simplex_iteration_count == 0);
+
   std::remove(model_file_name.c_str());
-  // std::remove(basis_file_name.c_str());
-  
+  std::remove(basis_file_name.c_str());
+
   h.resetGlobalScheduler(true);
 }
 

check/TestRays.cpp

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

highs/io/FilereaderLp.cpp

@@ -299,9 +299,9 @@ HighsStatus FilereaderLp::writeModelToFile(const HighsOptions& options,
           if (iCol != iRow) coef *= 2;
           if (coef != 0.0) {
             this->writeToFileValue(file, coef);
-	    this->writeToFileVar(file, lp.col_names_[iCol]);
-	    this->writeToFile(file, " *");
-	    this->writeToFileVar(file, lp.col_names_[iRow]);
+            this->writeToFileVar(file, lp.col_names_[iCol]);
+            this->writeToFile(file, " *");
+            this->writeToFileVar(file, lp.col_names_[iRow]);
           }
         }
       }
@@ -333,7 +333,7 @@ HighsStatus FilereaderLp::writeModelToFile(const HighsOptions& options,
           lp.row_lower_[iRow] > -kHighsInf && lp.row_upper_[iRow] < kHighsInf;
       if (lp.row_lower_[iRow] > -kHighsInf) {
         // Has a lower bound
-	this->writeToFileVar(file, lp.row_names_[iRow]);
+        this->writeToFileVar(file, lp.row_names_[iRow]);
         if (boxed) {
           this->writeToFile(file, "lo:");
         } else {
@@ -346,7 +346,7 @@ HighsStatus FilereaderLp::writeModelToFile(const HighsOptions& options,
       }
       if (lp.row_upper_[iRow] < kHighsInf) {
         // Has an upper bound
-	this->writeToFileVar(file, lp.row_names_[iRow]);
+        this->writeToFileVar(file, lp.row_names_[iRow]);
         if (boxed) {
           this->writeToFile(file, "up:");
         } else {
@@ -400,7 +400,7 @@ HighsStatus FilereaderLp::writeModelToFile(const HighsOptions& options,
     for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++) {
       if (lp.integrality_[iCol] == HighsVarType::kInteger) {
         if (lp.col_lower_[iCol] == 0.0 && lp.col_upper_[iCol] == 1.0) {
-	  this->writeToFileVar(file, lp.col_names_[iCol]);
+          this->writeToFileVar(file, lp.col_names_[iCol]);
           this->writeToFileLineEnd(file);
         }
       }
@@ -412,7 +412,7 @@ HighsStatus FilereaderLp::writeModelToFile(const HighsOptions& options,
     for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++) {
       if (lp.integrality_[iCol] == HighsVarType::kInteger) {
         if (lp.col_lower_[iCol] != 0.0 || lp.col_upper_[iCol] != 1.0) {
-	  this->writeToFileVar(file, lp.col_names_[iCol]);
+          this->writeToFileVar(file, lp.col_names_[iCol]);
           this->writeToFileLineEnd(file);
         }
       }
@@ -424,7 +424,7 @@ HighsStatus FilereaderLp::writeModelToFile(const HighsOptions& options,
     for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++) {
       if (lp.integrality_[iCol] == HighsVarType::kSemiContinuous ||
           lp.integrality_[iCol] == HighsVarType::kSemiInteger) {
-	this->writeToFileVar(file, lp.col_names_[iCol]);
+        this->writeToFileVar(file, lp.col_names_[iCol]);
         this->writeToFileLineEnd(file);
       }
     }

highs/io/HMPSIO.cpp

@@ -617,8 +617,8 @@ HighsStatus writeMps(
   }
   highsLogDev(log_options, HighsLogType::kInfo, "writeMPS: Opened file  OK\n");
   // Check that the names are no longer than 8 characters for fixed format write
-  HighsInt max_name_length = std::max(maxNameLength(col_names),
-				      maxNameLength(row_names));
+  HighsInt max_name_length =
+      std::max(maxNameLength(col_names), maxNameLength(row_names));
   if (!use_free_format && max_name_length > 8) {
     highsLogUser(
         log_options, HighsLogType::kError,

highs/lp_data/HConst.h

@@ -144,7 +144,7 @@ enum BasisValidity {
   kBasisValidityMax = kBasisValidityValid
 };
 
-const std::string kHighsBasisFileV1 = "v1"; // Deprecated
+const std::string kHighsBasisFileV1 = "v1";  // Deprecated
 const std::string kHighsBasisFileV2 = "v2";
 
 enum SolutionStyle {

highs/lp_data/Highs.cpp

@@ -715,8 +715,8 @@ HighsStatus Highs::readBasis(const std::string& filename) {
   HighsBasis read_basis = basis_;
   return_status = interpretCallStatus(
       options_.log_options,
-      readBasisFile(options_.log_options, model_.lp_, read_basis, filename), return_status,
-      "readBasis");
+      readBasisFile(options_.log_options, model_.lp_, read_basis, filename),
+      return_status, "readBasis");
   if (return_status != HighsStatus::kOk) return return_status;
   // Basis read OK: check whether it's consistent with the LP
   if (!isBasisConsistent(model_.lp_, read_basis)) {
@@ -3081,20 +3081,10 @@ HighsStatus Highs::getColByName(const std::string& name, HighsInt& col) {
   HighsLp& lp = model_.lp_;
   if (!lp.col_names_.size()) return HighsStatus::kError;
   if (!lp.col_hash_.name2index.size()) lp.col_hash_.form(lp.col_names_);
-  auto search = lp.col_hash_.name2index.find(name);
-  if (search == lp.col_hash_.name2index.end()) {
-    highsLogUser(options_.log_options, HighsLogType::kError,
-                 "Highs::getColByName: name %s is not found\n", name.c_str());
-    return HighsStatus::kError;
-  }
-  if (search->second == kHashIsDuplicate) {
-    highsLogUser(options_.log_options, HighsLogType::kError,
-                 "Highs::getColByName: name %s is duplicated\n", name.c_str());
-    return HighsStatus::kError;
-  }
-  col = search->second;
-  assert(lp.col_names_[col] == name);
-  return HighsStatus::kOk;
+  std::string from_method = "Highs::getColByName";
+  const bool is_column = true;
+  return getIndexFromName(options_.log_options, from_method, is_column, name,
+                          lp.col_hash_.name2index, col, lp.col_names_);
 }
 
 HighsStatus Highs::getColIntegrality(const HighsInt col,
@@ -3196,20 +3186,10 @@ HighsStatus Highs::getRowByName(const std::string& name, HighsInt& row) {
   HighsLp& lp = model_.lp_;
   if (!lp.row_names_.size()) return HighsStatus::kError;
   if (!lp.row_hash_.name2index.size()) lp.row_hash_.form(lp.row_names_);
-  auto search = lp.row_hash_.name2index.find(name);
-  if (search == lp.row_hash_.name2index.end()) {
-    highsLogUser(options_.log_options, HighsLogType::kError,
-                 "Highs::getRowByName: name %s is not found\n", name.c_str());
-    return HighsStatus::kError;
-  }
-  if (search->second == kHashIsDuplicate) {
-    highsLogUser(options_.log_options, HighsLogType::kError,
-                 "Highs::getRowByName: name %s is duplicated\n", name.c_str());
-    return HighsStatus::kError;
-  }
-  row = search->second;
-  assert(lp.row_names_[row] == name);
-  return HighsStatus::kOk;
+  std::string from_method = "Highs::getRowByName";
+  const bool is_column = false;
+  return getIndexFromName(options_.log_options, from_method, is_column, name,
+                          lp.row_hash_.name2index, row, lp.row_names_);
 }
 
 HighsStatus Highs::getCoeff(const HighsInt row, const HighsInt col,

highs/lp_data/HighsLp.cpp

@@ -164,8 +164,10 @@ void HighsLp::exactResize() {
 }
 
 bool HighsLp::okNames() const {
-  if (this->col_names_.size() != static_cast<size_t>(this->num_col_)) return false;
-  if (this->row_names_.size() != static_cast<size_t>(this->num_row_)) return false;
+  if (this->col_names_.size() != static_cast<size_t>(this->num_col_))
+    return false;
+  if (this->row_names_.size() != static_cast<size_t>(this->num_row_))
+    return false;
   // Look for names that are empty or have spaces
   for (HighsInt iCol = 0; iCol < this->num_col_; iCol++) {
     const std::string& name = this->col_names_[iCol];
@@ -352,7 +354,8 @@ void HighsLp::addColNames(const std::string name, const HighsInt num_new_col) {
     this->col_hash_.form(this->col_names_);
   // Handle the addition of user-defined names later
   assert(name == "");
-  if (this->col_name_prefix_ == "") col_name_prefix_ = kHighsUniqueColNamePrefix;
+  if (this->col_name_prefix_ == "")
+    col_name_prefix_ = kHighsUniqueColNamePrefix;
   for (HighsInt iCol = this->num_col_; iCol < this->num_col_ + num_new_col;
        iCol++) {
     const std::string col_name =
@@ -397,7 +400,8 @@ void HighsLp::addRowNames(const std::string name, const HighsInt num_new_row) {
     this->row_hash_.form(this->row_names_);
   // Handle the addition of user-defined names later
   assert(name == "");
-  if (this->row_name_prefix_ == "") row_name_prefix_ = kHighsUniquerowNamePrefix;
+  if (this->row_name_prefix_ == "")
+    row_name_prefix_ = kHighsUniquerowNamePrefix;
   for (HighsInt iRow = this->num_row_; iRow < this->num_row_ + num_new_row;
        iRow++) {
     const std::string row_name =