From 137a6ab20c11c8bcf72edd5ca04f5324f480414f Mon Sep 17 00:00:00 2001
From: andreaslundell <andreas.lundell@abo.fi>
Date: Thu, 2 Jan 2025 18:22:41 +0200
Subject: [PATCH] Changes

---
 src/Enums.h                             | 2 +-
 src/Solver.cpp                          | 2 +-
 src/Tasks/TaskAddPrimalReductionCut.cpp | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Enums.h b/src/Enums.h
index 20be1622..d261f15e 100644
--- 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
index 7589776c..a2446313 100644
--- 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
index 1f491f6b..44ed5b1e 100644
--- 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;