Now saving the string corresponding to the double in Reader::readnexttoken and using the string if the double precedes a colon so is actually a constraint name

Author: jajhall

check/TestFilereader.cpp

@@ -491,6 +491,7 @@ TEST_CASE("handle-blank-space-names", "[highs_filereader]") {
   lp.a_matrix_.index_ = {0, 1, 0, 1};
   lp.a_matrix_.value_ = {1, 2, 2, 4};
   Highs h;
+  h.setOptionValue("output_flag", dev_run);
   REQUIRE(h.passModel(lp) == HighsStatus::kOk);
   h.run();
   REQUIRE(h.writeSolution("", 1) == HighsStatus::kOk);
@@ -523,3 +524,33 @@ TEST_CASE("handle-blank-space-names", "[highs_filereader]") {
 
   h.resetGlobalScheduler(true);
 }
+
+TEST_CASE("read-highs-lp-file", "[highs_filereader]") {
+  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";
+  HighsLp lp;
+  lp.num_col_ = 1;
+  lp.num_row_ = 3;
+  lp.col_cost_ = {8};
+  lp.col_lower_ = {0};
+  lp.col_upper_ = {inf};
+  lp.row_lower_ = {-21, 31, 43};
+  lp.row_upper_ = {inf, inf, inf};
+  lp.a_matrix_.start_ = {0, 3};
+  lp.a_matrix_.index_ = {0, 1, 2};
+  lp.a_matrix_.value_ = {2, -3, 7};
+  lp.col_names_ = {"col"};
+  lp.row_names_ = {"row", "55", "9.9"};
+  Highs h;
+  //  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);
+  
+  //  std::remove(model_name0.c_str());
+  //  std::remove(model_name1.c_str());
+
+  h.resetGlobalScheduler(true);
+}

extern/filereaderlp/reader.cpp

@@ -71,11 +71,19 @@ struct RawToken {
     type = RawTokenType::STR;
     return *this;
   }
+  /*
   RawToken& operator=(const double v) {
     dvalue = v;
     type = RawTokenType::CONS;
     return *this;
   }
+  */
+  RawToken& operator=(const std::pair<double, std::string> vs) {
+    dvalue = vs.first;
+    svalue = vs.second;
+    type = RawTokenType::CONS;
+    return *this;
+  }
 };
 
 enum class ProcessedTokenType {
@@ -875,7 +883,32 @@ void Reader::splittokens() {
 
 void Reader::processtokens() {
   std::string svalue_lc;
+  int pass_n = 0;
+  const bool report_tokens = true;
+  printf("RawTokenType::NONE = %d\n", int(RawTokenType::NONE));
+  printf("RawTokenType::STR = %d\n", int(RawTokenType::STR));
+  printf("RawTokenType::CONS = %d\n", int(RawTokenType::CONS));
   while (!rawtokens[0].istype(RawTokenType::FLEND)) {
+    if (report_tokens) {
+      pass_n++;
+      if (pass_n == 9) {
+	printf("pass_n = 9\n");
+      }
+      printf("\nPass %d\n", pass_n);
+      /*
+      if (rawtokens[2].dvalue == 55) {
+	rawtokens[2].type = RawTokenType(1);
+	rawtokens[2].dvalue = 0;
+	rawtokens[2].svalue = "55";
+      }
+      */
+      for (int i = 0; i < NRAWTOKEN; i++) {
+	printf("Token %d: type = %2d; dvalue = %d; svalue = %s\n", i,
+	       int(rawtokens[i].type),
+	       int(rawtokens[i].dvalue),
+	       rawtokens[i].svalue.c_str());
+      }
+    }
     fflush(stdout);
 
     // Slash + asterisk: comment, skip everything up to next asterisk + slash
@@ -954,6 +987,17 @@ void Reader::processtokens() {
       continue;
     }
 
+    // constraint identifier - with numeric constant value as name?
+    if (rawtokens[0].istype(RawTokenType::CONS) &&
+        rawtokens[1].istype(RawTokenType::COLON)) {
+      printf("rawtokens[0] - CONS; rawtokens[1] - COLON; rawtokens[0].dvalue = %g; rawtokens[0].svalue = %s\n", rawtokens[0].dvalue, rawtokens[0].svalue.c_str());
+      //      rawtokens[0].svalue = std::to_string(rawtokens[0].dvalue);
+      processedtokens.emplace_back(ProcessedTokenType::CONID,
+                                   rawtokens[0].svalue);
+      nextrawtoken(2);
+      continue;
+    }
+
     // check if free
     if (rawtokens[0].istype(RawTokenType::STR) &&
         iskeyword(svalue_lc, LP_KEYWORD_FREE, LP_KEYWORD_FREE_N)) {
@@ -1113,6 +1157,14 @@ void Reader::processtokens() {
     // FILEEND should have been handled in condition of while()
     assert(!rawtokens[0].istype(RawTokenType::FLEND));
 
+    if (report_tokens) {
+      for (int i = 0; i < NRAWTOKEN; i++) {
+	printf("Token %d: type = %2d; dvalue = %d; svalue = %s\n", i,
+	       int(rawtokens[i].type),
+	       int(rawtokens[i].dvalue),
+	       rawtokens[i].svalue.c_str());
+      }
+    }
     // catch all unknown symbols
     lpassert(false);
     break;
@@ -1184,7 +1236,12 @@ bool Reader::readnexttoken(RawToken& t) {
 
   // check single character tokens
   char nextchar = this->linebuffer[this->linebufferpos];
-
+  printf("Reader::readnexttoken: nextchar = %c\n", nextchar);
+  char char_1 = '1';
+  char char_r = 'r';
+  if (nextchar == char_1 || nextchar == char_r) {
+    printf("Reader::readnexttoken: nextchar = %c!\n", nextchar);
+  }
   switch (nextchar) {
     // check for comment
     case '\\':
@@ -1280,7 +1337,13 @@ bool Reader::readnexttoken(RawToken& t) {
   char* endptr;
   double constant = strtod(startptr, &endptr);
   if (endptr != startptr) {
-    t = constant;
+    // Extract the string corresponding to the double, in case the
+    // double is a constraint name
+    size_t double_len = endptr - startptr;
+    std::string double_name = this->linebuffer.substr(this->linebufferpos, double_len);
+    printf("double_len = %d; double_name = %s\n", int(double_len), double_name.c_str());
+    //    t = constant;
+    t = std::make_pair(constant, double_name);
     this->linebufferpos += endptr - startptr;
     return true;
   }