Changes

coin-or · Jan 2, 2025 · 137a6ab · 137a6ab
1 parent d0ce461
commit 137a6ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/Enums.h b/src/Enums.h
@@ -375,7 +375,7 @@ enum class ES_PrimalNLPStrategy
 enum class ES_ReductionCutStrategy
 {
     Fraction,
-    GoldenSection
+    GoldenRatio
 };
 
 enum class ES_ReformulationBinaryMonomials

diff --git a/src/Solver.cpp b/src/Solver.cpp
@@ -901,7 +901,7 @@ void Solver::initializeSettings()
 
     VectorString enumReductionCutStrategy;
     enumReductionCutStrategy.push_back("Fraction");
-    enumReductionCutStrategy.push_back("GoldenSection");
+    enumReductionCutStrategy.push_back("GoldenRatio");
 
     ES_ReductionCutStrategy reductionCutStrategy;
 

diff --git a/src/Tasks/TaskAddPrimalReductionCut.cpp b/src/Tasks/TaskAddPrimalReductionCut.cpp
@@ -101,7 +101,7 @@ void TaskAddPrimalReductionCut::run()
         }
     }
     else if(env->settings->getSetting<int>("ReductionCut.Strategy", "Dual")
-        == (int)ES_ReductionCutStrategy::GoldenSection)
+        == (int)ES_ReductionCutStrategy::GoldenRatio)
     {
         double factor = 0.618;
 
@@ -134,6 +134,11 @@ void TaskAddPrimalReductionCut::run()
         std::cout << "        Primal improv. after red. cut: "
                   << env->solutionStatistics.numberOfPrimalImprovementsAfterReductionCut << std::endl;
     }
+    else
+    {
+        env->tasks->setNextTask(taskIDIfFalse);
+        return;
+    }
 
     env->dualSolver->cutOffToUse = cutOffToUse;