Merge pull request #2451 from fwesselm/moreConstAgain

jajhall · web-flow · commit 9d021c8215fb · 2025-07-02T13:08:15.000+01:00
Make some more methods const
diff --git a/highs/mip/HighsDomain.cpp b/highs/mip/HighsDomain.cpp
@@ -1243,7 +1243,7 @@ void HighsDomain::ObjectivePropagation::propagate() {
 void HighsDomain::computeMinActivity(HighsInt start, HighsInt end,
                                      const HighsInt* ARindex,
                                      const double* ARvalue, HighsInt& ninfmin,
-                                     HighsCDouble& activitymin) {
+                                     HighsCDouble& activitymin) const {
   if (infeasible_) {
     activitymin = 0.0;
     ninfmin = 0;
@@ -1288,7 +1288,7 @@ void HighsDomain::computeMinActivity(HighsInt start, HighsInt end,
 void HighsDomain::computeMaxActivity(HighsInt start, HighsInt end,
                                      const HighsInt* ARindex,
                                      const double* ARvalue, HighsInt& ninfmax,
-                                     HighsCDouble& activitymax) {
+                                     HighsCDouble& activitymax) const {
   if (infeasible_) {
     activitymax = 0.0;
     ninfmax = 0;
@@ -1398,7 +1398,7 @@ HighsInt HighsDomain::propagateRowUpper(const HighsInt* Rindex,
                                         double Rupper,
                                         const HighsCDouble& minactivity,
                                         HighsInt ninfmin,
-                                        HighsDomainChange* boundchgs) {
+                                        HighsDomainChange* boundchgs) const {
   assert(std::isfinite(double(minactivity)));
   if (ninfmin > 1) return 0;
   HighsInt numchgs = 0;
@@ -1442,7 +1442,7 @@ HighsInt HighsDomain::propagateRowLower(const HighsInt* Rindex,
                                         double Rlower,
                                         const HighsCDouble& maxactivity,
                                         HighsInt ninfmax,
-                                        HighsDomainChange* boundchgs) {
+                                        HighsDomainChange* boundchgs) const {
   assert(std::isfinite(double(maxactivity)));
   if (ninfmax > 1) return 0;
   HighsInt numchgs = 0;
@@ -1481,7 +1481,7 @@ HighsInt HighsDomain::propagateRowLower(const HighsInt* Rindex,
 }
 
 void HighsDomain::updateThresholdLbChange(HighsInt col, double newbound,
-                                          double val, double& threshold) {
+                                          double val, double& threshold) const {
   if (newbound != col_upper_[col]) {
     double thresholdNew =
         std::fabs(val) * boundRange(col_upper_[col], newbound,
@@ -1496,7 +1496,7 @@ void HighsDomain::updateThresholdLbChange(HighsInt col, double newbound,
 }
 
 void HighsDomain::updateThresholdUbChange(HighsInt col, double newbound,
-                                          double val, double& threshold) {
+                                          double val, double& threshold) const {
   if (newbound != col_lower_[col]) {
     double thresholdNew =
         std::fabs(val) * boundRange(newbound, col_lower_[col],
@@ -3617,9 +3617,11 @@ HighsDomain::ConflictSet::popQueue() {
 
 void HighsDomain::ConflictSet::clearQueue() { resolveQueue.clear(); }
 
-HighsInt HighsDomain::ConflictSet::queueSize() { return resolveQueue.size(); }
+HighsInt HighsDomain::ConflictSet::queueSize() const {
+  return resolveQueue.size();
+}
 
-bool HighsDomain::ConflictSet::resolvable(HighsInt domChgPos) {
+bool HighsDomain::ConflictSet::resolvable(HighsInt domChgPos) const {
   assert(domChgPos >= 0);
   assert(domChgPos < (HighsInt)localdom.domchgreason_.size());
   // printf("domchgPos: %d\n", domChgPos);
diff --git a/highs/mip/HighsDomain.h b/highs/mip/HighsDomain.h
@@ -104,8 +104,8 @@ class HighsDomain {
     void pushQueue(std::set<LocalDomChg>::iterator domchgPos);
     std::set<LocalDomChg>::iterator popQueue();
     void clearQueue();
-    HighsInt queueSize();
-    bool resolvable(HighsInt domChgPos);
+    HighsInt queueSize() const;
+    bool resolvable(HighsInt domChgPos) const;
 
     HighsInt resolveDepth(std::set<LocalDomChg>& frontier, HighsInt depthLevel,
                           HighsInt stopSize, HighsInt minResolve = 0,
@@ -317,10 +317,10 @@ class HighsDomain {
   void updateActivityUbChange(HighsInt col, double oldbound, double newbound);
 
   void updateThresholdLbChange(HighsInt col, double newbound, double val,
-                               double& threshold);
+                               double& threshold) const;
 
   void updateThresholdUbChange(HighsInt col, double newbound, double val,
-                               double& threshold);
+                               double& threshold) const;
 
   void recomputeCapacityThreshold(HighsInt row);
 
@@ -407,11 +407,11 @@ class HighsDomain {
 
   void computeMinActivity(HighsInt start, HighsInt end, const HighsInt* ARindex,
                           const double* ARvalue, HighsInt& ninfmin,
-                          HighsCDouble& activitymin);
+                          HighsCDouble& activitymin) const;
 
   void computeMaxActivity(HighsInt start, HighsInt end, const HighsInt* ARindex,
                           const double* ARvalue, HighsInt& ninfmax,
-                          HighsCDouble& activitymax);
+                          HighsCDouble& activitymax) const;
 
   double adjustedUb(HighsInt col, HighsCDouble boundVal, bool& accept) const;
 
@@ -420,12 +420,12 @@ class HighsDomain {
   HighsInt propagateRowUpper(const HighsInt* Rindex, const double* Rvalue,
                              HighsInt Rlen, double Rupper,
                              const HighsCDouble& minactivity, HighsInt ninfmin,
-                             HighsDomainChange* boundchgs);
+                             HighsDomainChange* boundchgs) const;
 
   HighsInt propagateRowLower(const HighsInt* Rindex, const double* Rvalue,
                              HighsInt Rlen, double Rlower,
                              const HighsCDouble& maxactivity, HighsInt ninfmax,
-                             HighsDomainChange* boundchgs);
+                             HighsDomainChange* boundchgs) const;
 
   const std::vector<HighsInt>& getChangedCols() const { return changedcols_; }
 
diff --git a/highs/mip/HighsLpRelaxation.cpp b/highs/mip/HighsLpRelaxation.cpp
@@ -1019,7 +1019,7 @@ bool HighsLpRelaxation::checkDualProof() const {
 bool HighsLpRelaxation::computeDualInfProof(const HighsDomain& globaldomain,
                                             std::vector<HighsInt>& inds,
                                             std::vector<double>& vals,
-                                            double& rhs) {
+                                            double& rhs) const {
   if (!hasdualproof) return false;
 
   assert(std::isfinite(dualproofrhs));
diff --git a/highs/mip/HighsLpRelaxation.h b/highs/mip/HighsLpRelaxation.h
@@ -329,7 +329,7 @@ class HighsLpRelaxation {
 
   bool computeDualInfProof(const HighsDomain& globaldomain,
                            std::vector<HighsInt>& inds,
-                           std::vector<double>& vals, double& rhs);
+                           std::vector<double>& vals, double& rhs) const;
 
   Status resolveLp(HighsDomain* domain = nullptr);
 
diff --git a/highs/mip/HighsMipSolver.cpp b/highs/mip/HighsMipSolver.cpp
@@ -895,10 +895,13 @@ void HighsMipSolver::callbackGetCutPool() const {
                            callback_->user_callback_data);
 }
 
-bool HighsMipSolver::solutionFeasible(
-    const HighsLp* lp, const std::vector<double>& col_value,
-    const std::vector<double>* pass_row_value, double& bound_violation,
-    double& row_violation, double& integrality_violation, HighsCDouble& obj) {
+bool HighsMipSolver::solutionFeasible(const HighsLp* lp,
+                                      const std::vector<double>& col_value,
+                                      const std::vector<double>* pass_row_value,
+                                      double& bound_violation,
+                                      double& row_violation,
+                                      double& integrality_violation,
+                                      HighsCDouble& obj) const {
   bound_violation = 0;
   row_violation = 0;
   integrality_violation = 0;
diff --git a/highs/mip/HighsMipSolver.h b/highs/mip/HighsMipSolver.h
@@ -106,7 +106,7 @@ class HighsMipSolver {
   bool solutionFeasible(const HighsLp* lp, const std::vector<double>& col_value,
                         const std::vector<double>* pass_row_value,
                         double& bound_violation, double& row_violation,
-                        double& integrality_violation, HighsCDouble& obj);
+                        double& integrality_violation, HighsCDouble& obj) const;
 };
 
 #endif
diff --git a/highs/mip/HighsMipSolverData.cpp b/highs/mip/HighsMipSolverData.cpp
@@ -20,7 +20,7 @@
 #include "util/HighsIntegers.h"
 
 std::string HighsMipSolverData::solutionSourceToString(
-    const int solution_source, const bool code) {
+    const int solution_source, const bool code) const {
   if (solution_source == kSolutionSourceNone) {
     if (code) return " ";
     return "None";
@@ -1179,9 +1179,10 @@ double HighsMipSolverData::transformNewIntegerFeasibleSolution(
 }
 
 double HighsMipSolverData::percentageInactiveIntegers() const {
-  return 100.0 * (1.0 - double(integer_cols.size() -
-                               cliquetable.getSubstitutions().size()) /
-                            numintegercols);
+  return 100.0 *
+         (1.0 - static_cast<double>(integer_cols.size() -
+                                    cliquetable.getSubstitutions().size()) /
+                    numintegercols);
 }
 
 void HighsMipSolverData::performRestart() {
@@ -1498,7 +1499,7 @@ static std::array<char, 22> convertToPrintString(double val,
   return printString;
 }
 
-void HighsMipSolverData::printSolutionSourceKey() {
+void HighsMipSolverData::printSolutionSourceKey() const {
   std::stringstream ss;
   // Last MipSolutionSource enum is kSolutionSourceCleanup - which is
   // not a solution source, but used to force the last logging line to
diff --git a/highs/mip/HighsMipSolverData.h b/highs/mip/HighsMipSolverData.h
@@ -277,8 +277,8 @@ struct HighsMipSolverData {
   const std::vector<double>& getSolution() const;
 
   std::string solutionSourceToString(const int solution_source,
-                                     const bool code = true);
-  void printSolutionSourceKey();
+                                     const bool code = true) const;
+  void printSolutionSourceKey() const;
   void printDisplayLine(const int solution_source = kSolutionSourceNone);
 
   void getRow(HighsInt row, HighsInt& rowlen, const HighsInt*& rowinds,
diff --git a/highs/presolve/HighsSymmetry.cpp b/highs/presolve/HighsSymmetry.cpp
@@ -984,7 +984,7 @@ bool HighsSymmetryDetection::partitionRefinement() {
   return true;
 }
 
-HighsInt HighsSymmetryDetection::selectTargetCell() {
+HighsInt HighsSymmetryDetection::selectTargetCell() const {
   HighsInt i = 0;
   if (nodeStack.size() > 1) i = nodeStack[nodeStack.size() - 2].targetCell;
 
@@ -997,7 +997,7 @@ HighsInt HighsSymmetryDetection::selectTargetCell() {
   return -1;
 }
 
-bool HighsSymmetryDetection::checkStoredAutomorphism(HighsInt vertex) {
+bool HighsSymmetryDetection::checkStoredAutomorphism(HighsInt vertex) const {
   HighsInt numCheck = std::min(numAutomorphisms, (HighsInt)64);
 
   for (HighsInt i = 0; i < numCheck; ++i) {
@@ -1363,7 +1363,7 @@ void HighsSymmetryDetection::switchToNextNode(HighsInt backtrackDepth) {
 
 bool HighsSymmetryDetection::compareCurrentGraph(
     const HighsHashTable<std::tuple<HighsInt, HighsInt, HighsUInt>>& otherGraph,
-    HighsInt& wrongCell) {
+    HighsInt& wrongCell) const {
   for (HighsInt i = 0; i < numCol; ++i) {
     HighsInt colCell = vertexToCell[i];
 
diff --git a/highs/presolve/HighsSymmetry.h b/highs/presolve/HighsSymmetry.h
@@ -207,7 +207,7 @@ class HighsSymmetryDetection {
   bool compareCurrentGraph(
       const HighsHashTable<std::tuple<HighsInt, HighsInt, HighsUInt>>&
           otherGraph,
-      HighsInt& wrongCell);
+      HighsInt& wrongCell) const;
 
   void removeFixPoints();
   void initializeGroundSet();
@@ -218,9 +218,9 @@ class HighsSymmetryDetection {
   void initializeHashValues();
   bool isomorphicToFirstLeave();
   bool partitionRefinement();
-  bool checkStoredAutomorphism(HighsInt vertex);
+  bool checkStoredAutomorphism(HighsInt vertex) const;
   u32 getVertexHash(HighsInt vertex);
-  HighsInt selectTargetCell();
+  HighsInt selectTargetCell() const;
 
   bool updateCellMembership(HighsInt vertex, HighsInt cell,
                             bool markForRefinement = true);
