From 472ddb0be28a99b72942d102b75388b53391ce81 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Thu, 7 Nov 2024 17:02:44 +0100 Subject: [PATCH] comment 2 --- src/solver/misc/options.cpp | 2 +- .../utils/include/antares/solver/utils/named_problem.h | 6 ------ src/solver/utils/named_problem.cpp | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/solver/misc/options.cpp b/src/solver/misc/options.cpp index 5a04d56484..3d0f998659 100644 --- a/src/solver/misc/options.cpp +++ b/src/solver/misc/options.cpp @@ -104,7 +104,7 @@ std::unique_ptr CreateParser(Settings& settings, "solver-parameters", "Set solver-specific parameters, for instance --solver-parameters=\"THREADS 1 PRESOLVE 1\"" "for XPRESS or --solver-parameters=\"parallel/maxnthreads 1, lp/presolving TRUE\" for SCIP." - "Syntax is solver-dependent, and only supported for SCIP & XPRESS." + "Syntax is solver-dependent, and only supported for SCIP & XPRESS."); parser->addParagraph("\nParameters"); // --name diff --git a/src/solver/utils/include/antares/solver/utils/named_problem.h b/src/solver/utils/include/antares/solver/utils/named_problem.h index 5db945fe8e..ae34c992ef 100644 --- a/src/solver/utils/include/antares/solver/utils/named_problem.h +++ b/src/solver/utils/include/antares/solver/utils/named_problem.h @@ -30,7 +30,6 @@ struct PROBLEME_SIMPLEXE_NOMME : public PROBLEME_SIMPLEXE const std::vector& NomDesVariables; const std::vector& NomDesContraintes; bool useNamedProblems_; - bool solverLogs_; public: std::vector& StatutDesVariables; @@ -60,11 +59,6 @@ struct PROBLEME_SIMPLEXE_NOMME : public PROBLEME_SIMPLEXE return NomDesContraintes; } - bool SolverLogs() const - { - return solverLogs_; - } - bool IntegerVariable(size_t idx) const { return VariablesEntieres[idx]; diff --git a/src/solver/utils/named_problem.cpp b/src/solver/utils/named_problem.cpp index 59b2c486ad..86f6e1be58 100644 --- a/src/solver/utils/named_problem.cpp +++ b/src/solver/utils/named_problem.cpp @@ -16,7 +16,6 @@ PROBLEME_SIMPLEXE_NOMME::PROBLEME_SIMPLEXE_NOMME(const std::vector& NomDesVariables(NomDesVariables), NomDesContraintes(NomDesContraintes), useNamedProblems_(UseNamedProblems), - solverLogs_(SolverLogs), StatutDesVariables(StatutDesVariables), StatutDesContraintes(StatutDesContraintes), VariablesEntieres(VariablesEntieres)