Rename option

Author: fwesselm

src/mip/HighsMipSolverData.cpp

@@ -48,7 +48,7 @@ std::string HighsMipSolverData::solutionSourceToString(
   } else if (solution_source == kSolutionSourceRandomizedRounding) {
     if (code) return "R";
     return "Randomized rounding";
-  } else if (solution_source == kSolutionSourceZIRound) {
+  } else if (solution_source == kSolutionSourceZiRound) {
     if (code) return "Z";
     return "ZI Round";
   } else if (solution_source == kSolutionSourceShifting) {
@@ -1917,9 +1917,9 @@ void HighsMipSolverData::evaluateRootNode() {
 
   if (mipsolver.options_mip_->mip_heuristic_run_zi_round)
     heuristics.ziRound(firstlpsol);
-  mipsolver.analysis_.mipTimerStart(kMipClockRandomizedRounding);
+  analysis.mipTimerStart(kMipClockRandomizedRounding);
   heuristics.randomizedRounding(firstlpsol);
-  mipsolver.analysis_.mipTimerStop(kMipClockRandomizedRounding);
+  analysis.mipTimerStop(kMipClockRandomizedRounding);
   if (mipsolver.options_mip_->mip_heuristic_run_shifting)
     heuristics.shifting(firstlpsol);
 

src/mip/HighsMipSolverData.h

@@ -50,7 +50,7 @@ enum MipSolutionSource : int {
   kSolutionSourceSubMip,
   kSolutionSourceEmptyMip,
   kSolutionSourceRandomizedRounding,
-  kSolutionSourceZIRound,
+  kSolutionSourceZiRound,
   kSolutionSourceShifting,
   kSolutionSourceSolveLp,
   kSolutionSourceEvaluateNode,

src/mip/HighsPrimalHeuristics.cpp

@@ -1417,7 +1417,7 @@ void HighsPrimalHeuristics::ziRound(const std::vector<double>& relaxationsol) {
     improvementInFeasibility = prev_ZI_total - ZI_total;
   }
   // re-check for feasibility and add incumbent
-  mipsolver.mipdata_->trySolution(currRelSol, kSolutionSourceZIRound);
+  mipsolver.mipdata_->trySolution(currRelSol, kSolutionSourceZiRound);
 }
 
 void HighsPrimalHeuristics::feasibilityPump() {