Added highsVarTypeToString methods to HighsLpUtils for HighsVarType and HighsInt

Author: jajhall

highs/lp_data/Highs.cpp

@@ -464,15 +464,16 @@ HighsStatus Highs::passModel(
     for (HighsInt iCol = 0; iCol < num_col; iCol++) {
       HighsInt integrality_status = integrality[iCol];
       const bool legal_integrality_status =
-          integrality_status == (HighsInt)HighsVarType::kContinuous ||
-          integrality_status == (HighsInt)HighsVarType::kInteger ||
-          integrality_status == (HighsInt)HighsVarType::kSemiContinuous ||
-          integrality_status == (HighsInt)HighsVarType::kSemiInteger;
+	integrality_status == HighsInt(HighsVarType::kContinuous) ||
+	integrality_status == HighsInt(HighsVarType::kInteger) ||
+	integrality_status == HighsInt(HighsVarType::kSemiContinuous) ||
+	integrality_status == HighsInt(HighsVarType::kSemiInteger) ;
       if (!legal_integrality_status) {
-        highsLogDev(
+        highsLogUser(
             options_.log_options, HighsLogType::kError,
-            "Model has illegal integer value of %d for integrality[%d]\n",
-            (int)integrality_status, iCol);
+            "Model has illegal integer value of %d (type %s) for integrality[%d]\n",
+            int(integrality_status), highsIntVarTypeToString(integrality_status).c_str(),
+	    iCol);
         return HighsStatus::kError;
       }
       lp.integrality_[iCol] = (HighsVarType)integrality_status;

highs/lp_data/HighsLpUtils.cpp

@@ -3658,6 +3658,41 @@ void getSubVectorsTranspose(const HighsIndexCollection& index_collection,
   }
 }
 
+std::string highsVarTypeToString(const HighsVarType type) {
+  switch (type) {
+  case HighsVarType::kContinuous: {
+    return "continuous";
+    break;
+  }
+  case HighsVarType::kInteger: {
+    return "integer";
+    break;
+  }
+  case HighsVarType::kSemiContinuous: {
+    return "semi continuous";
+    break;
+  }
+  case HighsVarType::kSemiInteger: {
+    return "semi integer";
+    break;
+  }
+  case HighsVarType::kImplicitInteger: {
+    return "implicit integer";
+    break;
+  }
+  default: 
+    return "unknown";
+  }  
+}
+
+std::string highsVarTypeToString(const HighsInt type) {
+  if (type < HighsInt(HighsVarType::kContinuous) ||
+      type > HighsInt(HighsVarType::kImplicitInteger)) return "Unknown";
+  HighsVarType type_ = HighsVarType(uint8_t(type));
+  return highsVarTypeToString(type_);  
+}
+
+
 void initialiseUserScaleData(const HighsOptions& options,
                              HighsUserScaleData& user_scale_data) {
   user_scale_data.initialise(options.user_objective_scale,

highs/lp_data/HighsLpUtils.h

@@ -321,6 +321,10 @@ void getSubVectorsTranspose(const HighsIndexCollection& index_collection,
                             HighsInt* sub_matrix_index,
                             double* sub_matrix_value);
 
+std::string highsVarTypeToString(const HighsVarType type);
+std::string highsVarTypeToString(const HighsInt type);
+
 void initialiseUserScaleData(const HighsOptions& options,
                              HighsUserScaleData& user_scale_data);
+
 #endif  // LP_DATA_HIGHSLPUTILS_H_