Pass globaldom to some lprelaxation functions

Author: Opt-Mucca

highs/mip/HighsLpRelaxation.cpp

@@ -137,30 +137,32 @@ double HighsLpRelaxation::LpRow::getMaxAbsVal(
   return 0.0;
 }
 
-double HighsLpRelaxation::slackLower(HighsInt row) const {
+double HighsLpRelaxation::slackLower(HighsInt row,
+                                     const HighsDomain& globaldom) const {
   switch (lprows[row].origin) {
     case LpRow::kCutPool:
       assert(lprows[row].cutpool <= mipsolver.mipdata_->cutpools.size());
-      return mipsolver.mipdata_->domain.getMinCutActivity(
+      return globaldom.getMinCutActivity(
           mipsolver.mipdata_->cutpools[lprows[row].cutpool], lprows[row].index);
     case LpRow::kModel:
       double rowlower = rowLower(row);
       if (rowlower != -kHighsInf) return rowlower;
-      return mipsolver.mipdata_->domain.getMinActivity(lprows[row].index);
+      return globaldom.getMinActivity(lprows[row].index);
   };
 
   assert(false);
   return -kHighsInf;
 }
 
-double HighsLpRelaxation::slackUpper(HighsInt row) const {
+double HighsLpRelaxation::slackUpper(HighsInt row,
+                                     const HighsDomain& globaldom) const {
   double rowupper = rowUpper(row);
   switch (lprows[row].origin) {
     case LpRow::kCutPool:
       return rowupper;
     case LpRow::kModel:
       if (rowupper != kHighsInf) return rowupper;
-      return mipsolver.mipdata_->domain.getMaxActivity(lprows[row].index);
+      return globaldom.getMaxActivity(lprows[row].index);
   };
 
   assert(false);

highs/mip/HighsLpRelaxation.h

@@ -187,9 +187,9 @@ class HighsLpRelaxation {
 
   const HighsSolution& getSolution() const { return lpsolver.getSolution(); }
 
-  double slackUpper(HighsInt row) const;
+  double slackUpper(HighsInt row, const HighsDomain& globaldom) const;
 
-  double slackLower(HighsInt row) const;
+  double slackLower(HighsInt row, const HighsDomain& globaldom) const;
 
   double rowLower(HighsInt row) const {
     return lpsolver.getLp().row_lower_[row];
@@ -199,16 +199,16 @@ class HighsLpRelaxation {
     return lpsolver.getLp().row_upper_[row];
   }
 
-  double colLower(HighsInt col) const {
+  double colLower(HighsInt col, const HighsDomain& globaldom) const {
     return col < lpsolver.getLp().num_col_
                ? lpsolver.getLp().col_lower_[col]
-               : slackLower(col - lpsolver.getLp().num_col_);
+               : slackLower(col - lpsolver.getLp().num_col_, globaldom);
   }
 
-  double colUpper(HighsInt col) const {
+  double colUpper(HighsInt col, const HighsDomain& globaldom) const {
     return col < lpsolver.getLp().num_col_
                ? lpsolver.getLp().col_upper_[col]
-               : slackUpper(col - lpsolver.getLp().num_col_);
+               : slackUpper(col - lpsolver.getLp().num_col_, globaldom);
   }
 
   bool isColIntegral(HighsInt col) const {

highs/mip/HighsTransformedLp.cpp

@@ -110,8 +110,8 @@ HighsTransformedLp::HighsTransformedLp(const HighsLpRelaxation& lprelaxation,
   HighsInt indexOffset = mipsolver.numCol();
   for (HighsInt row = 0; row != numLpRow; ++row) {
     HighsInt slackIndex = indexOffset + row;
-    double bestub = lprelaxation.slackUpper(row);
-    double bestlb = lprelaxation.slackLower(row);
+    double bestub = lprelaxation.slackUpper(row, globaldom_);
+    double bestlb = lprelaxation.slackLower(row, globaldom_);
 
     if (bestlb == bestub) continue;
 
@@ -145,13 +145,15 @@ bool HighsTransformedLp::transform(std::vector<double>& vals,
   HighsInt numNz = inds.size();
 
   auto getLb = [&](HighsInt col) {
-    return (col < slackOffset ? globaldom_.col_lower_[col]
-                              : lprelaxation.slackLower(col - slackOffset));
+    return (col < slackOffset
+                ? globaldom_.col_lower_[col]
+                : lprelaxation.slackLower(col - slackOffset, globaldom_));
   };
 
   auto getUb = [&](HighsInt col) {
-    return (col < slackOffset ? globaldom_.col_upper_[col]
-                              : lprelaxation.slackUpper(col - slackOffset));
+    return (col < slackOffset
+                ? globaldom_.col_upper_[col]
+                : lprelaxation.slackUpper(col - slackOffset, globaldom_));
   };
 
   auto remove = [&](HighsInt position) {
@@ -479,7 +481,7 @@ bool HighsTransformedLp::untransform(std::vector<double>& vals,
           vectorsum.add(col, vals[i]);
         } else {
           HighsInt row = col - slackOffset;
-          tmpRhs += vals[i] * lprelaxation.slackLower(row);
+          tmpRhs += vals[i] * lprelaxation.slackLower(row, globaldom_);
 
           HighsInt rowlen;
           const HighsInt* rowinds;
@@ -497,7 +499,7 @@ bool HighsTransformedLp::untransform(std::vector<double>& vals,
           vectorsum.add(col, -vals[i]);
         } else {
           HighsInt row = col - slackOffset;
-          tmpRhs -= vals[i] * lprelaxation.slackUpper(row);
+          tmpRhs -= vals[i] * lprelaxation.slackUpper(row, globaldom_);
           vals[i] = -vals[i];
 
           HighsInt rowlen;