Introduced num_infinite_hessian_values to HighsUserScaleData

Author: jajhall

highs/lp_data/HStruct.h

@@ -191,6 +191,7 @@ struct HighsUserScaleData {
   double small_matrix_value;
   double large_matrix_value;
   HighsInt num_infinite_costs;
+  HighsInt num_infinite_hessian_values;
   HighsInt num_infinite_col_bounds;
   HighsInt num_infinite_row_bounds;
   HighsInt num_small_matrix_values;
@@ -200,7 +201,6 @@ struct HighsUserScaleData {
                   const double& infinite_cost_, const double& infinite_bound_,
                   const double& small_matrix_value_,
                   const double& large_matrix_value_);
-  bool scaleError() const;
   bool scaleError(std::string& message) const;
   bool scaleWarning(std::string& message) const;
 };

highs/lp_data/HighsLpUtils.cpp

@@ -3716,20 +3716,15 @@ void HighsUserScaleData::initialise(const HighsInt& user_cost_scale_,
   this->small_matrix_value = small_matrix_value_;
   this->large_matrix_value = large_matrix_value_;
   this->num_infinite_costs = 0;
+  this->num_infinite_hessian_values = 0;
   this->num_infinite_col_bounds = 0;
   this->num_infinite_row_bounds = 0;
   this->num_small_matrix_values = 0;
   this->num_large_matrix_values = 0;
 }
 
-bool HighsUserScaleData::scaleError() const {
-  return this->num_infinite_costs + this->num_infinite_col_bounds +
-             this->num_infinite_row_bounds + this->num_large_matrix_values >
-         0;
-}
-
 bool HighsUserScaleData::scaleError(std::string& message) const {
-  if (this->num_infinite_costs + this->num_infinite_col_bounds +
+  if (this->num_infinite_costs + this->num_infinite_hessian_values + this->num_infinite_col_bounds +
           this->num_infinite_row_bounds + this->num_large_matrix_values ==
       0)
     return false;
@@ -3749,8 +3744,21 @@ bool HighsUserScaleData::scaleError(std::string& message) const {
     ss << " " << this->num_infinite_costs << " infinite cost";
     if (this->num_infinite_costs > 1) ss << "s";
   }
-  if (this->num_infinite_col_bounds) {
+  if (this->num_infinite_hessian_values) {
     if (this->num_infinite_costs) {
+      if (this->num_infinite_col_bounds ||
+	  this->num_infinite_row_bounds) {
+        ss << ",";
+      } else {
+        ss << " and";
+      }
+    }
+    ss << " " << this->num_infinite_hessian_values << " infinite Hessian values";
+    if (this->num_infinite_hessian_values > 1) ss << "s";
+  }
+  if (this->num_infinite_col_bounds) {
+    if (this->num_infinite_costs ||
+	this->num_infinite_hessian_values) {
       if (this->num_infinite_row_bounds) {
         ss << ",";
       } else {
@@ -3761,13 +3769,17 @@ bool HighsUserScaleData::scaleError(std::string& message) const {
     if (this->num_infinite_col_bounds > 1) ss << "s";
   }
   if (this->num_infinite_row_bounds) {
-    if (this->num_infinite_costs || this->num_infinite_col_bounds) ss << " and";
+    if (this->num_infinite_costs ||
+	this->num_infinite_hessian_values ||
+	this->num_infinite_col_bounds) ss << " and";
     ss << " " << this->num_infinite_row_bounds << " infinite row bound";
     if (this->num_infinite_row_bounds > 1) ss << "s";
   }
   if (this->num_large_matrix_values) {
-    if (this->num_infinite_costs + this->num_infinite_col_bounds +
-            this->num_infinite_row_bounds >
+    if (this->num_infinite_costs +
+	this->num_infinite_hessian_values +
+	this->num_infinite_col_bounds +
+	this->num_infinite_row_bounds >
         0)
       ss << ", and";
     ss << " " << this->num_large_matrix_values << " large matrix value";

highs/model/HighsHessianUtils.cpp

@@ -522,14 +522,14 @@ void reportHessian(const HighsLogOptions& log_options, const HighsInt dim,
 
 void userScaleHessian(HighsHessian hessian, HighsUserScaleData& data,
                       const bool apply) {
-  data.num_infinite_costs = 0;
+  data.num_infinite_hessian_values = 0;
   if (!hessian.dim_) return;
   const HighsInt user_cost_scale = data.user_cost_scale;
   if (!user_cost_scale) return;
   double cost_scale_value = std::pow(2, user_cost_scale);
   for (HighsInt iEl = 0; iEl < hessian.start_[hessian.dim_]; iEl++) {
     double value = hessian.value_[iEl] *= cost_scale_value;
-    if (std::abs(value) > data.infinite_cost) data.num_infinite_costs++;
+    if (std::abs(value) > data.infinite_cost) data.num_infinite_hessian_values++;
     if (apply) hessian.value_[iEl] = value;
   }
 }