From d138bb0b69e5bbe530c9131e748692e79c223de6 Mon Sep 17 00:00:00 2001 From: andreaslundell Date: Fri, 3 Jan 2025 12:06:19 +0200 Subject: [PATCH] Remove unused setting --- src/Solver.cpp | 3 --- src/Tasks/TaskAddPrimalReductionCut.cpp | 17 ++++++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Solver.cpp b/src/Solver.cpp index a2446313..06b8fe93 100644 --- a/src/Solver.cpp +++ b/src/Solver.cpp @@ -1154,9 +1154,6 @@ void Solver::initializeSettings() "Which formulation to use in eigenvalue decomposition", enumEigenValueStrategy, 0); enumEigenValueStrategy.clear(); - env->settings->createSetting("Reformulation.Quadratics.EigenValueDecomposition.Method", "Model", false, - "Whether to use the eigen value decomposition of convex quadratic functions"); - env->settings->createSetting("Reformulation.Quadratics.EigenValueDecomposition.Tolerance", "Model", 1e-6, "Variables with eigenvalues smaller than this value will be ignored", 0.0, SHOT_DBL_MAX); diff --git a/src/Tasks/TaskAddPrimalReductionCut.cpp b/src/Tasks/TaskAddPrimalReductionCut.cpp index 44ed5b1e..426e8358 100644 --- a/src/Tasks/TaskAddPrimalReductionCut.cpp +++ b/src/Tasks/TaskAddPrimalReductionCut.cpp @@ -120,19 +120,16 @@ void TaskAddPrimalReductionCut::run() cutOffToUse = (1 - factor) * currentLowerBoundForReductionCut + factor * env->results->currentPrimalBound; - std::cout << " Cut off diff: " << std::abs(currentLowerBoundForReductionCut - cutOffToUse) << std::endl; - if(std::abs(currentLowerBoundForReductionCut - cutOffToUse) < 1e-4) + env->output->outputInfo(fmt::format( + " {} {}", "Cut off difference:", std::abs(currentLowerBoundForReductionCut - cutOffToUse))); + + if(std::abs(currentLowerBoundForReductionCut - cutOffToUse) < 1e-6) { env->tasks->setNextTask(taskIDIfFalse); return; } currentLowerBoundForReductionCut = cutOffToUse; - std::cout << " Cut off to use: " << cutOffToUse << std::endl; - std::cout << " Primal improv. after repair: " - << env->solutionStatistics.numberOfPrimalImprovementsAfterInfeasibilityRepair << std::endl; - std::cout << " Primal improv. after red. cut: " - << env->solutionStatistics.numberOfPrimalImprovementsAfterReductionCut << std::endl; } else { @@ -142,6 +139,12 @@ void TaskAddPrimalReductionCut::run() env->dualSolver->cutOffToUse = cutOffToUse; + env->output->outputInfo(fmt::format(" {} {}", "Cut off used:", cutOffToUse)); + env->output->outputInfo(fmt::format(" {} {}", "Primal improvements after repair:", + env->solutionStatistics.numberOfPrimalImprovementsAfterInfeasibilityRepair)); + env->output->outputInfo(fmt::format(" {} {}", "Primal improvements after reduction cut:", + env->solutionStatistics.numberOfPrimalImprovementsAfterReductionCut)); + if(env->reformulatedProblem->objectiveFunction->properties.isMinimize) { env->results->currentDualBound = SHOT_DBL_MIN;