Written feasibleWrtBounds

Author: jajhall

highs/Highs.h

@@ -1639,7 +1639,8 @@ class Highs {
 
   bool feasibleWrtBounds(const bool columns,
                          const HighsIndexCollection& index_collection,
-                         const double* lower, const double* upper) const;
+                         const std::vector<double>& lower,
+			 const std::vector<double>& upper) const;
   HighsStatus changeColBoundsInterface(HighsIndexCollection& index_collection,
                                        const double* usr_col_lower,
                                        const double* usr_col_upper);

highs/lp_data/HighsInterface.cpp

@@ -987,7 +987,8 @@ HighsStatus Highs::changeCostsInterface(HighsIndexCollection& index_collection,
 
 bool Highs::feasibleWrtBounds(const bool columns,
                               const HighsIndexCollection& index_collection,
-                              const double* lower, const double* upper) const {
+                              const std::vector<double>& lower,
+                              const std::vector<double>& upper) const {
   if (this->info_.primal_solution_status != kSolutionStatusFeasible)
     return false;
   const HighsLp& lp = model_.lp_;
@@ -997,31 +998,38 @@ bool Highs::feasibleWrtBounds(const bool columns,
   HighsInt from_k;
   HighsInt to_k;
   limits(index_collection, from_k, to_k);
-  HighsInt ix_dim;
-  if (columns) {
-    ix_dim = lp.num_col_;
-  } else {
-    ix_dim = lp.num_row_;
-  }
+  if (from_k > to_k) return true;
+
+  const bool& interval = index_collection.is_interval_;
+  const bool& mask = index_collection.is_mask_;
+  const vector<HighsInt>& ix_set = index_collection.set_;
+  const vector<HighsInt>& ix_mask = index_collection.mask_;
+
+  std::vector<double> value = columns ?
+    this->solution_.col_value :
+    this->solution_.row_value;
+
+  HighsInt lp_ix;
+  HighsInt usr_ix = -1;
+  HighsInt ix_dim = value.size();
   // Surely this is checked elsewhere
   assert(0 <= from_k && to_k < ix_dim);
   assert(from_k <= to_k);
-  HighsInt set_from_ix;
-  HighsInt set_to_ix;
-  HighsInt ignore_from_ix;
-  HighsInt ignore_to_ix = -1;
-  HighsInt current_set_entry = 0;
-  for (HighsInt k = from_k; k <= to_k; k++) {
-    updateOutInIndex(index_collection, set_from_ix, set_to_ix, ignore_from_ix,
-                     ignore_to_ix, current_set_entry);
-    assert(set_to_ix < ix_dim);
-    assert(ignore_to_ix < ix_dim);
-    for (HighsInt iX = set_from_ix; iX <= set_to_ix; iX++) {
-      double value = columns ? this->solution_.col_value[iX]
-                             : this->solution_.row_value[iX];
-      if (value < lower[iX] - primal_feasibility_tolerance) return false;
-      if (value > upper[iX] + primal_feasibility_tolerance) return false;
+  for (HighsInt k = from_k; k < to_k + 1; k++) {
+    if (interval || mask) {
+      lp_ix = k;
+    } else {
+      lp_ix = ix_set[k];
+    }
+    HighsInt ix = lp_ix;
+    if (interval) {
+      usr_ix++;
+    } else {
+      usr_ix = k;
     }
+    if (mask && !ix_mask[ix]) continue;
+    if (value[ix] < lower[usr_ix] - primal_feasibility_tolerance) return false;
+    if (value[ix] > upper[usr_ix] + primal_feasibility_tolerance) return false;
   }
   return true;
 }
@@ -1078,13 +1086,18 @@ HighsStatus Highs::changeColBoundsInterface(
   // nonbasic variables whose bounds have changed
   setNonbasicStatusInterface(index_collection, true);
   // Deduce the consequences of new col bounds
-  /*
-  const bool columns = true;
-  const bool feasible = feasibleWrtBounds(columns, index_collection,
-  local_colLower.data(), local_colUpper.data());
-  highsLogUser(options_.log_options, HighsLogType::kInfo,
-               "feasibleWrtBounds is %s\n", feasible ? "True" : "False");
-  */
+  if (!this->basis_.useful) {
+    const bool columns = true;
+    const bool feasible = feasibleWrtBounds(columns, index_collection,
+					    local_colLower, local_colUpper);
+    //    highsLogUser(options_.log_options, HighsLogType::kInfo,
+    printf(
+		 "feasibleWrtBounds is %s\n", feasible ? "True" : "False");
+    if (feasible) {
+      feasibleWrtBounds(columns, index_collection,
+			local_colLower, local_colUpper);
+    }
+  }
   invalidateModelStatusSolutionAndInfo();
   // Determine any implications for simplex data
   ekk_instance_.updateStatus(LpAction::kNewBounds);