Upgrade some HighsCDoubles. Only relax out non-zeros

Author: Opt-Mucca

highs/mip/HighsCliqueTable.cpp

@@ -1107,16 +1107,16 @@ void HighsCliqueTable::extractCliquesFromCut(const HighsMipSolver& mipsolver,
   for (HighsInt i = 0; i != len; ++i) {
     if (mipsolver.isColContinuous(inds[i])) continue;
 
-    double boundVal = static_cast<double>((rhs - minact) / vals[i]);
+    HighsCDouble impliedBound = (rhs - minact) / vals[i];
     if (vals[i] > 0) {
-      boundVal = std::floor(boundVal + globaldom.col_lower_[inds[i]] +
-                            globaldom.feastol());
+      const double boundVal = std::floor(static_cast<double>(
+          impliedBound + globaldom.col_lower_[inds[i]] + globaldom.feastol()));
       globaldom.changeBound(HighsBoundType::kUpper, inds[i], boundVal,
                             HighsDomain::Reason::unspecified());
       if (globaldom.infeasible()) return;
     } else {
-      boundVal = std::ceil(boundVal + globaldom.col_upper_[inds[i]] -
-                           globaldom.feastol());
+      const double boundVal = std::ceil(static_cast<double>(
+          impliedBound + globaldom.col_upper_[inds[i]] - globaldom.feastol()));
       globaldom.changeBound(HighsBoundType::kLower, inds[i], boundVal,
                             HighsDomain::Reason::unspecified());
       if (globaldom.infeasible()) return;
@@ -1147,10 +1147,9 @@ void HighsCliqueTable::extractCliquesFromCut(const HighsMipSolver& mipsolver,
         if (globaldom.isFixed(col)) continue;
 
         if (vals[perm[j]] > 0) {
-          double implcolub =
-              static_cast<double>(impliedActivity +
-                                  vals[perm[j]] * globaldom.col_lower_[col]) /
-              vals[perm[j]];
+          double implcolub = static_cast<double>(
+              (impliedActivity + vals[perm[j]] * globaldom.col_lower_[col]) /
+              vals[perm[j]]);
           if (mipsolver.isColIntegral(col))
             implcolub = std::floor(implcolub + mipsolver.mipdata_->feastol);
 
@@ -1173,10 +1172,9 @@ void HighsCliqueTable::extractCliquesFromCut(const HighsMipSolver& mipsolver,
             implics.addVUB(col, bincol, coef, constant);
           }
         } else {
-          double implcollb =
-              static_cast<double>(impliedActivity +
-                                  vals[perm[j]] * globaldom.col_upper_[col]) /
-              vals[perm[j]];
+          double implcollb = static_cast<double>(
+              (impliedActivity + vals[perm[j]] * globaldom.col_upper_[col]) /
+              vals[perm[j]]);
           if (mipsolver.isColIntegral(col))
             implcollb = std::ceil(implcollb - mipsolver.mipdata_->feastol);
 

highs/mip/HighsLpRelaxation.cpp

@@ -867,15 +867,15 @@ bool HighsLpRelaxation::computeDualProof(const HighsDomain& globaldomain,
     HighsInt start = lp.a_matrix_.start_[i];
     HighsInt end = lp.a_matrix_.start_[i + 1];
 
-    HighsCDouble sum = lp.col_cost_[i];
+    HighsCDouble exactVal = lp.col_cost_[i];
 
     for (HighsInt j = start; j != end; ++j) {
       if (row_dual[lp.a_matrix_.index_[j]] == 0) continue;
       // @FlipRowDual += became -=
-      sum -= lp.a_matrix_.value_[j] * row_dual[lp.a_matrix_.index_[j]];
+      exactVal -= lp.a_matrix_.value_[j] * row_dual[lp.a_matrix_.index_[j]];
     }
 
-    double val = double(sum);
+    double val = double(exactVal);
 
     if (std::fabs(val) <= mipsolver.options_mip_->small_matrix_value) continue;
 
@@ -897,11 +897,11 @@ bool HighsLpRelaxation::computeDualProof(const HighsDomain& globaldomain,
     if (removeValue) {
       if (val < 0) {
         if (globaldomain.col_upper_[i] == kHighsInf) return false;
-        upper -= val * globaldomain.col_upper_[i];
+        upper -= exactVal * globaldomain.col_upper_[i];
       } else {
         if (globaldomain.col_lower_[i] == -kHighsInf) return false;
 
-        upper -= val * globaldomain.col_lower_[i];
+        upper -= exactVal * globaldomain.col_lower_[i];
       }
 
       continue;
@@ -990,7 +990,10 @@ void HighsLpRelaxation::storeDualInfProof() {
   for (HighsInt i : row_ap.getNonzeros()) {
     double val = row_ap.getValue(i);
 
-    if (std::fabs(val) <= mipsolver.mipdata_->epsilon) continue;
+    if (std::fabs(val) <= mipsolver.mipdata_->epsilon &&
+        ((val < 0 && globaldomain.col_upper_[i] <= 0) ||
+         (val > 0 && globaldomain.col_lower_[i] >= 0)))
+      continue;
 
     bool removeValue = std::abs(val) <= mipsolver.mipdata_->feastol;
 
@@ -1013,13 +1016,13 @@ void HighsLpRelaxation::storeDualInfProof() {
           hasdualproof = false;
           return;
         }
-        upper -= val * globaldomain.col_upper_[i];
+        upper -= val * static_cast<HighsCDouble>(globaldomain.col_upper_[i]);
       } else {
         if (globaldomain.col_lower_[i] == -kHighsInf) {
           hasdualproof = false;
           return;
         }
-        upper -= val * globaldomain.col_lower_[i];
+        upper -= val * static_cast<HighsCDouble>(globaldomain.col_lower_[i]);
       }
 
       continue;