Now casting 1 to HighsInt in std::max

Author: jajhall

check/TestQpSolver.cpp

@@ -812,7 +812,7 @@ TEST_CASE("test-qp-delete-col", "[qpsolver]") {
   std::vector<double> hessian_col(dim);
   for (HighsInt iCol = 0; iCol < dim; iCol++) {
     hessian_col.assign(dim, 0);
-    HighsInt kmax = std::max(1, (dim - iCol) / 3);
+    HighsInt kmax = std::max(HighsInt(1), (dim - iCol) / 3);
     hessian_col[iCol] = dim * iCol + iCol;
     if (iCol < dim - 1) {
       for (HighsInt k = 0; k < kmax; k++) {
@@ -842,7 +842,7 @@ TEST_CASE("test-qp-delete-col", "[qpsolver]") {
   std::vector<HighsInt> mask;
   mask.assign(dim, 0);
 
-  HighsInt kmax = std::max(1, dim / 3);
+  HighsInt kmax = std::max(HighsInt(1), dim / 3);
   for (HighsInt k = 0; k < kmax; k++) {
     HighsInt iRow = random.integer(dim);
     assert(iRow >= 0);

src/lp_data/HighsInterface.cpp

@@ -366,7 +366,7 @@ void Highs::deleteColsInterface(HighsIndexCollection& index_collection) {
   // any columns have been removed, and if there is mask to be updated
   HighsInt original_num_col = lp.num_col_;
 
-  deleteLpCols(lp, index_collection);
+  lp.deleteCols(index_collection);
   model_.hessian_.deleteCols(index_collection);
   assert(lp.num_col_ <= original_num_col);
   if (lp.num_col_ < original_num_col) {

src/lp_data/HighsLp.cpp

@@ -393,6 +393,62 @@ void HighsLp::addRowNames(const std::string name, const HighsInt num_new_row) {
   }
 }
 
+void HighsLp::deleteColsFromVectors(
+    HighsInt& new_num_col, const HighsIndexCollection& index_collection) {
+  assert(ok(index_collection));
+  HighsInt from_k;
+  HighsInt to_k;
+  limits(index_collection, from_k, to_k);
+  // Initialise new_num_col in case none is removed due to from_k > to_k
+  new_num_col = this->num_col_;
+  if (from_k > to_k) return;
+
+  HighsInt delete_from_col;
+  HighsInt delete_to_col;
+  HighsInt keep_from_col;
+  HighsInt keep_to_col = -1;
+  HighsInt current_set_entry = 0;
+
+  HighsInt col_dim = this->num_col_;
+  new_num_col = 0;
+  bool have_names = (this->col_names_.size() != 0);
+  bool have_integrality = (this->integrality_.size() != 0);
+  for (HighsInt k = from_k; k <= to_k; k++) {
+    updateOutInIndex(index_collection, delete_from_col, delete_to_col,
+                     keep_from_col, keep_to_col, current_set_entry);
+    // Account for the initial columns being kept
+    if (k == from_k) new_num_col = delete_from_col;
+    if (delete_to_col >= col_dim - 1) break;
+    assert(delete_to_col < col_dim);
+    for (HighsInt col = keep_from_col; col <= keep_to_col; col++) {
+      this->col_cost_[new_num_col] = this->col_cost_[col];
+      this->col_lower_[new_num_col] = this->col_lower_[col];
+      this->col_upper_[new_num_col] = this->col_upper_[col];
+      if (have_names) this->col_names_[new_num_col] = this->col_names_[col];
+      if (have_integrality)
+        this->integrality_[new_num_col] = this->integrality_[col];
+      new_num_col++;
+    }
+    if (keep_to_col >= col_dim - 1) break;
+  }
+  this->col_cost_.resize(new_num_col);
+  this->col_lower_.resize(new_num_col);
+  this->col_upper_.resize(new_num_col);
+  if (have_names) this->col_names_.resize(new_num_col);
+}
+
+void HighsLp::deleteRowsFromVectors(
+    HighsInt& new_num_row, const HighsIndexCollection& index_collection) {}
+
+void HighsLp::deleteCols(const HighsIndexCollection& index_collection) {
+  HighsInt new_num_col;
+  this->deleteColsFromVectors(new_num_col, index_collection);
+  this->a_matrix_.deleteCols(index_collection);
+  this->num_col_ = new_num_col;
+}
+
+void HighsLp::deleteRows(const HighsIndexCollection& index_collection) {}
+
 void HighsLp::unapplyMods() {
   // Restore any non-semi types
   const HighsInt num_non_semi = this->mods_.save_non_semi_variable_index.size();

src/lp_data/HighsLp.h

@@ -88,6 +88,12 @@ class HighsLp {
   void exactResize();
   void addColNames(const std::string name, const HighsInt num_new_col = 1);
   void addRowNames(const std::string name, const HighsInt num_new_row = 1);
+  void deleteColsFromVectors(HighsInt& new_num_col,
+                             const HighsIndexCollection& index_collection);
+  void deleteRowsFromVectors(HighsInt& new_num_row,
+                             const HighsIndexCollection& index_collection);
+  void deleteCols(const HighsIndexCollection& index_collection);
+  void deleteRows(const HighsIndexCollection& index_collection);
   void unapplyMods();
   void clear();
 };

src/lp_data/HighsLpUtils.cpp

@@ -1495,13 +1495,6 @@ void appendRowsToLpVectors(HighsLp& lp, const HighsInt num_new_row,
   }
 }
 
-void deleteLpCols(HighsLp& lp, const HighsIndexCollection& index_collection) {
-  HighsInt new_num_col;
-  deleteColsFromLpVectors(lp, new_num_col, index_collection);
-  lp.a_matrix_.deleteCols(index_collection);
-  lp.num_col_ = new_num_col;
-}
-
 void deleteColsFromLpVectors(HighsLp& lp, HighsInt& new_num_col,
                              const HighsIndexCollection& index_collection) {
   assert(ok(index_collection));

src/lp_data/HighsLpUtils.h

@@ -96,8 +96,6 @@ void appendRowsToLpVectors(HighsLp& lp, const HighsInt num_new_row,
                            const vector<double>& rowLower,
                            const vector<double>& rowUpper);
 
-void deleteLpCols(HighsLp& lp, const HighsIndexCollection& index_collection);
-
 void deleteColsFromLpVectors(HighsLp& lp, HighsInt& new_num_col,
                              const HighsIndexCollection& index_collection);