Removed unnecessare num_col and num_row from HighsScale

Author: jajhall

check/TestCAPI.c

@@ -734,8 +734,8 @@ void fullApiOptions() {
       &default_simplex_scale_strategy);
   assert(return_status == kHighsStatusOk);
   assert(check_simplex_scale_strategy == simplex_scale_strategy);
-  assert(min_simplex_scale_strategy == 0);
-  assert(max_simplex_scale_strategy == 4);
+  assert(min_simplex_scale_strategy == -1);
+  assert(max_simplex_scale_strategy == 5);
   assert(default_simplex_scale_strategy == 2);
 
   // There are some functions to check what type of option value you should

highs/lp_data/HStruct.h

@@ -95,8 +95,6 @@ struct HighsBasis {
 struct HighsScale {
   HighsInt strategy;
   bool has_scaling;
-  HighsInt num_col;
-  HighsInt num_row;
   double cost;
   std::vector<double> col;
   std::vector<double> row;

highs/lp_data/Highs.cpp

@@ -343,7 +343,7 @@ HighsStatus Highs::passModel(HighsModel model) {
   // scale factors to be passed
   assert(!lp.is_scaled_);
   assert(!lp.is_moved_);
-  lp.resetScale();
+  lp.clearScale();
   // Check that the LP array dimensions are valid
   if (!lpDimensionsOk("passModel", lp, options_.log_options))
     return HighsStatus::kError;

highs/lp_data/HighsInterface.cpp

@@ -487,7 +487,6 @@ HighsStatus Highs::addColsInterface(
     scale.col.resize(newNumCol);
     for (HighsInt iCol = 0; iCol < ext_num_new_col; iCol++)
       scale.col[lp.num_col_ + iCol] = 1.0;
-    scale.num_col = newNumCol;
     // Apply the existing row scaling to the new columns
     local_a_matrix.applyRowScale(scale);
     // Consider applying column scaling to the new columns.
@@ -617,7 +616,6 @@ HighsStatus Highs::addRowsInterface(HighsInt ext_num_new_row,
     scale.row.resize(newNumRow);
     for (HighsInt iRow = 0; iRow < ext_num_new_row; iRow++)
       scale.row[lp.num_row_ + iRow] = 1.0;
-    scale.num_row = newNumRow;
     // Apply the existing column scaling to the new rows
     local_ar_matrix.applyColScale(scale);
     // Consider applying row scaling to the new rows.
@@ -737,7 +735,6 @@ void Highs::deleteColsInterface(HighsIndexCollection& index_collection) {
   if (lp.scale_.has_scaling) {
     deleteScale(lp.scale_.col, index_collection);
     lp.scale_.col.resize(lp.num_col_);
-    lp.scale_.num_col = lp.num_col_;
   }
   // Deduce the consequences of deleting columns
   invalidateModelStatusSolutionAndInfo();
@@ -793,7 +790,6 @@ void Highs::deleteRowsInterface(HighsIndexCollection& index_collection) {
   if (lp.scale_.has_scaling) {
     deleteScale(lp.scale_.row, index_collection);
     lp.scale_.row.resize(lp.num_row_);
-    lp.scale_.num_row = lp.num_row_;
   }
   // Deduce the consequences of deleting rows
   invalidateModelStatusSolutionAndInfo();

highs/lp_data/HighsLp.cpp

@@ -110,8 +110,6 @@ bool HighsLp::equalScaling(const HighsLp& lp) const {
   bool equal = true;
   equal = this->scale_.strategy == lp.scale_.strategy && equal;
   equal = this->scale_.has_scaling == lp.scale_.has_scaling && equal;
-  equal = this->scale_.num_col == lp.scale_.num_col && equal;
-  equal = this->scale_.num_row == lp.scale_.num_row && equal;
   equal = this->scale_.cost == lp.scale_.cost && equal;
   equal = this->scale_.col == lp.scale_.col && equal;
   equal = this->scale_.row == lp.scale_.row && equal;
@@ -143,14 +141,6 @@ void HighsLp::setMatrixDimensions() {
   this->a_matrix_.num_row_ = this->num_row_;
 }
 
-void HighsLp::resetScale() {
-  // Should allow user-supplied scale to be retained
-  //  const bool dimensions_ok =
-  //    this->scale_.num_col_ == this->num_col_ &&
-  //    this->scale_.num_row_ == this->num_row_;
-  this->clearScale();
-}
-
 void HighsLp::setFormat(const MatrixFormat format) {
   this->a_matrix_.setFormat(format);
 }
@@ -231,8 +221,6 @@ void HighsLp::clear() {
 void HighsLp::clearScale() {
   this->scale_.strategy = kSimplexScaleStrategyOff;
   this->scale_.has_scaling = false;
-  this->scale_.num_col = 0;
-  this->scale_.num_row = 0;
   this->scale_.cost = 0;
   this->scale_.col.clear();
   this->scale_.row.clear();

highs/lp_data/HighsLp.h

@@ -75,7 +75,6 @@ class HighsLp {
   void ensureColwise() { this->a_matrix_.ensureColwise(); };
   void ensureRowwise() { this->a_matrix_.ensureRowwise(); };
   void clearScaling();
-  void resetScale();
   void clearScale();
   void applyScale();
   void unapplyScale();

highs/lp_data/HighsLpUtils.cpp

@@ -222,39 +222,19 @@ bool lpDimensionsOk(std::string message, const HighsLp& lp,
   bool legal_scale_col_size = false;
   if (lp.scale_.has_scaling) {
     if (scale_col_size) {
-      legal_scale_num_col = lp.scale_.num_col == num_col;
       legal_scale_col_size = scale_col_size >= num_col;
     } else {
-      legal_scale_num_col = lp.scale_.num_col == 0;
       legal_scale_col_size = true;  // Since scale_col_size = 0
     }
     if (scale_row_size) {
-      legal_scale_num_row = lp.scale_.num_row == num_row;
       legal_scale_row_size = scale_row_size >= num_row;
     } else {
-      legal_scale_num_row = lp.scale_.num_row == 0;
       legal_scale_row_size = true;  // Since scale_row_size = 0
     }
   } else {
-    legal_scale_num_col = lp.scale_.num_col == 0;
-    legal_scale_num_row = lp.scale_.num_row == 0;
     legal_scale_row_size = scale_row_size == 0;
     legal_scale_col_size = scale_col_size == 0;
   }
-  if (!legal_scale_num_col)
-    highsLogUser(
-        log_options, HighsLogType::kError,
-        "LP dimension validation (%s) fails on scale_.num_col = %d != %d\n",
-        message.c_str(), (int)lp.scale_.num_col,
-        (int)(lp.scale_.has_scaling ? num_col : 0));
-  ok = legal_scale_num_col && ok;
-  if (!legal_scale_num_row)
-    highsLogUser(
-        log_options, HighsLogType::kError,
-        "LP dimension validation (%s) fails on scale_.num_row = %d != %d\n",
-        message.c_str(), (int)lp.scale_.num_row,
-        (int)(lp.scale_.has_scaling ? num_row : 0));
-  ok = legal_scale_num_row && ok;
   if (!legal_scale_col_size)
     highsLogUser(
         log_options, HighsLogType::kError,

highs/simplex/HEkk.cpp

@@ -718,8 +718,6 @@ HighsStatus HEkk::dualize() {
       std::vector<double> temp_scale = lp_.scale_.row;
       lp_.scale_.row = lp_.scale_.col;
       lp_.scale_.col = temp_scale;
-      lp_.scale_.num_col = dual_num_col;
-      lp_.scale_.num_row = dual_num_row;
     }
   }
   // Change optimization sense
@@ -917,8 +915,6 @@ HighsStatus HEkk::undualize() {
       lp_.scale_.col = temp_scale;
       lp_.scale_.col.resize(original_num_col_);
       lp_.scale_.row.resize(original_num_row_);
-      lp_.scale_.num_col = original_num_col_;
-      lp_.scale_.num_row = original_num_row_;
     }
   }
   // Change optimization sense

highs/simplex/HSimplex.cpp

@@ -551,8 +551,6 @@ void simplexScaleLp(const HighsOptions& options, HighsLp& lp,
 	  rowUpper[iRow] *= scale.row[iRow];
 	}
 	scale.has_scaling = true;
-	scale.num_col = numCol;
-	scale.num_row = numRow;
 	scale.cost = 1.0;
 	lp.is_scaled_ = true;
       }
@@ -1128,8 +1126,6 @@ void simplexUnscaleSolution(HighsSolution& solution, const HighsScale& scale) {
   HighsInt num_col = solution.col_value.size();
   HighsInt num_row = solution.row_value.size();
   if (has_matrix_scaling) {
-    assert(scale.num_col == num_col);
-    assert(scale.num_row == num_row);
     assert(solution.col_value.size() == scale.col.size());
     assert(solution.row_value.size() == scale.row.size());
     assert(solution.col_dual.size() == scale.col.size());