Need to merge HiPO branch into this

Author: jajhall

highs/lp_data/HighsOptions.cpp

@@ -80,14 +80,16 @@ bool commandLineOffOnOk(const HighsLogOptions& report_log_options,
 bool commandLineSolverOk(const HighsLogOptions& report_log_options,
                          const string& value) {
   if (value == kSimplexString || value == kHighsChooseString ||
-      value == kIpmString || value == kPdlpString)
+      value == kIpmString || value == kPdlpString || value == kCuPdlpString || value == kHiPdlpString)
     return true;
   highsLogUser(report_log_options, HighsLogType::kWarning,
-               "Value \"%s\" for solver option is not one of \"%s\", \"%s\", "
+               "Value \"%s\" for solver option is not one of \"%s\", \"%s\", \"%s\", \"%s\", "
                "\"%s\" or \"%s\"\n",
                value.c_str(), kSimplexString.c_str(),
                kHighsChooseString.c_str(), kIpmString.c_str(),
-               kPdlpString.c_str());
+               kPdlpString.c_str(),
+               kCuPdlpString.c_str(),
+               kHiPdlpString.c_str());
   return false;
 }
 

highs/lp_data/HighsOptions.h

@@ -260,6 +260,8 @@ void reportOption(FILE* file, const HighsLogOptions& report_log_options,
 const string kSimplexString = "simplex";
 const string kIpmString = "ipm";
 const string kPdlpString = "pdlp";
+const string kCuPdlpString = "cupdlp";
+const string kHiPdlpString = "hipdlp";
 
 const HighsInt kKeepNRowsDeleteRows = -1;
 const HighsInt kKeepNRowsDeleteEntries = 0;
@@ -679,7 +681,7 @@ class HighsOptions : public HighsOptionsStruct {
     record_string = new OptionRecordString(
         kSolverString,
         "Solver option: \"simplex\", \"choose\", \"ipm\" or \"pdlp\". If "
-        "\"simplex\"/\"ipm\"/\"pdlp\" is chosen then, for a MIP (QP) the "
+        "\"simplex\"/\"ipm\"/\"pdlp\"/\"cupdlp\"/\"hipdlp\" is chosen then, for a MIP (QP) the "
         "integrality "
         "constraint (quadratic term) will be ignored",
         advanced, &solver, kHighsChooseString);