Validate hipo_ordering

Author: filikat

highs/ipm/hipo/ipm/Solver.cpp

@@ -50,19 +50,7 @@ Int Solver::setOptions(const HighsOptions& highs_options) {
   options_.parallel = highs_options.parallel;
   options_.parallel_type = highs_options.hipo_parallel_type;
   options_.nla = highs_options.hipo_system;
-
-  // Reordering heuristic
-  if (highs_options.hipo_ordering != kHipoMetisString &&
-      highs_options.hipo_ordering != kHipoAmdString &&
-      highs_options.hipo_ordering != kHipoRcmString &&
-      highs_options.hipo_ordering != kHighsChooseString) {
-    highsLogUser(highs_options.log_options, HighsLogType::kError,
-                 "Unknown value of option %s\n", kHipoOrderingString.c_str());
-    return kStatusError;
-  }
   options_.ordering = highs_options.hipo_ordering;
-
-  // block size option
   options_.block_size = highs_options.hipo_block_size;
 
   options_orig_ = options_;

highs/lp_data/HighsOptions.cpp

@@ -211,6 +211,20 @@ bool optionHipoSystemOk(const HighsLogOptions& report_log_options,
   return false;
 }
 
+bool optionHipoOrderingOk(const HighsLogOptions& report_log_options,
+                          const string& value) {
+  if (value == kHipoAmdString || value == kHipoMetisString ||
+      value == kHipoRcmString || value == kHighsChooseString)
+    return true;
+  highsLogUser(report_log_options, HighsLogType::kError,
+               "Value \"%s\" for %s option is not one of \"%s\", \"%s\", "
+               "\"%s\" or \"%s\"\n",
+               value.c_str(), kHipoOrderingString.c_str(),
+               kHipoAmdString.c_str(), kHipoMetisString.c_str(),
+               kHipoRcmString.c_str(), kHighsChooseString.c_str());
+  return false;
+}
+
 bool boolFromString(std::string value, bool& bool_value) {
   std::transform(value.begin(), value.end(), value.begin(),
                  [](unsigned char c) { return std::tolower(c); });
@@ -496,6 +510,9 @@ OptionStatus checkOptionValue(const HighsLogOptions& report_log_options,
   } else if (option.name == kHipoSystemString) {
     if (!optionHipoSystemOk(report_log_options, value))
       return OptionStatus::kIllegalValue;
+  } else if (option.name == kHipoOrderingString) {
+    if (!optionHipoOrderingOk(report_log_options, value))
+      return OptionStatus::kIllegalValue;
   }
   return OptionStatus::kOk;
 }

highs/lp_data/HighsOptions.h

@@ -142,6 +142,8 @@ bool optionHipoParallelTypeOk(const HighsLogOptions& report_log_options,
                               const string& value);
 bool optionHipoSystemOk(const HighsLogOptions& report_log_options,
                         const string& value);
+bool optionHipoOrderingOk(const HighsLogOptions& report_log_options,
+                          const string& value);
 
 bool boolFromString(std::string value, bool& bool_value);