From c4b9373aa47613b79f00d390e161e16de5861550 Mon Sep 17 00:00:00 2001 From: guilpier-code <62292552+guilpier-code@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:45:53 +0200 Subject: [PATCH] Headers files : remove useless inclusions in OPT (#2411) --- .../solver/hydro/management/management.h | 5 +--- src/solver/hydro/management/daily.cpp | 25 ++++++---------- src/solver/hydro/management/management.cpp | 3 -- src/solver/hydro/management/monthly.cpp | 29 +++++++------------ .../solver/optimisation/opt_fonctions.h | 1 - .../opt_alloc_probleme_a_optimiser.cpp | 3 +- .../opt_appel_solveur_lineaire.cpp | 29 +++++-------------- .../opt_appel_solveur_quadratique.cpp | 12 ++++---- .../opt_calcul_des_pmin_MUT_MDT.cpp | 7 +---- .../optimisation/opt_chainage_intercos.cpp | 3 +- ...onstruction_variables_couts_demarrages.cpp | 6 ++-- ...truction_variables_optimisees_lineaire.cpp | 6 ++-- ...ction_variables_optimisees_quadratique.cpp | 5 +--- .../opt_decompte_variables_et_contraintes.cpp | 7 ++--- ...riables_et_contraintes_couts_demarrage.cpp | 4 --- .../optimisation/opt_export_structure.cpp | 2 +- .../opt_gestion_des_bornes_cas_lineaire.cpp | 15 +++------- ...opt_gestion_des_bornes_cas_quadratique.cpp | 10 ++----- ...opt_gestion_des_bornes_couts_demarrage.cpp | 6 ---- .../opt_gestion_des_couts_cas_lineaire.cpp | 11 ++----- .../opt_gestion_des_couts_couts_demarrage.cpp | 5 +--- .../optimisation/opt_gestion_des_pmin.cpp | 5 ++-- ...opt_gestion_second_membre_cas_lineaire.cpp | 8 ++--- ..._gestion_second_membre_cas_quadratique.cpp | 4 +-- ..._gestion_second_membre_couts_demarrage.cpp | 11 +------ .../opt_init_contraintes_hydrauliques.cpp | 6 +--- ...pt_init_minmax_groupes_couts_demarrage.cpp | 6 +--- .../opt_liberation_problemes_simplexe.cpp | 17 ++++------- ...e_min_groupes_demarres_couts_demarrage.cpp | 15 ++-------- .../opt_numero_de_jour_du_pas_de_temps.cpp | 7 +---- .../optimisation/opt_optimisation_hebdo.cpp | 16 +++++----- .../opt_optimisation_lineaire.cpp | 6 ++-- .../opt_pilotage_optimisation_lineaire.cpp | 2 +- .../opt_pilotage_optimisation_quadratique.cpp | 6 ---- .../optimisation/opt_rename_problem.cpp | 2 +- .../opt_restaurer_les_donnees.cpp | 7 +---- ..._verification_presence_reserve_jmoins1.cpp | 9 +----- .../variables/VariableManagement.h | 1 - .../variables/VariableManagerUtils.h | 2 +- .../simulation/sim_calcul_economique.cpp | 4 +-- src/tools/ts-generator/main.cpp | 1 - 41 files changed, 90 insertions(+), 239 deletions(-) diff --git a/src/solver/hydro/include/antares/solver/hydro/management/management.h b/src/solver/hydro/include/antares/solver/hydro/management/management.h index 8f4cf12d01..63c20bd263 100644 --- a/src/solver/hydro/include/antares/solver/hydro/management/management.h +++ b/src/solver/hydro/include/antares/solver/hydro/management/management.h @@ -23,13 +23,11 @@ #include -#include - #include #include #include +#include #include "antares/date/date.h" -#include "antares/solver/simulation/sim_structure_donnees.h" #include "antares/writer/i_writer.h" namespace Antares @@ -113,7 +111,6 @@ class HydroManagement final const Data::AreaList& areas_; const Date::Calendar& calendar_; const Data::Parameters& parameters_; - unsigned int maxNbYearsInParallel_ = 0; Solver::IResultWriter& resultWriter_; HYDRO_VENTILATION_RESULTS ventilationResults_; diff --git a/src/solver/hydro/management/daily.cpp b/src/solver/hydro/management/daily.cpp index d8b94d2cf4..8bf59df763 100644 --- a/src/solver/hydro/management/daily.cpp +++ b/src/solver/hydro/management/daily.cpp @@ -21,17 +21,12 @@ #include #include +#include #include #include -#include -#include -#include - #include #include -#include -#include #include #include "antares/solver/hydro/daily/h2o_j_donnees_mensuelles.h" #include "antares/solver/hydro/daily/h2o_j_fonctions.h" @@ -39,9 +34,7 @@ #include "antares/solver/hydro/daily2/h2o2_j_fonctions.h" #include "antares/solver/hydro/management/management.h" -using namespace Yuni; - -#define SEP IO::Separator +namespace fs = std::filesystem; namespace { @@ -135,8 +128,8 @@ struct DebugData void writeTurb(const std::string filename, uint y) const { - std::ostringstream buffer, path; - path << "debug" << SEP << "solver" << SEP << (1 + y) << SEP << filename; + std::ostringstream buffer; + auto path = fs::path("debug") / "solver" / std::to_string(1 + y) / filename; buffer << "\tTurbine\t\t\tOPP\t\t\t\tTurbine Cible\tDLE\t\t\t\tDLN\n"; for (uint day = 0; day != 365; ++day) @@ -148,7 +141,7 @@ struct DebugData buffer << '\n'; } auto buffer_str = buffer.str(); - pWriter.addEntryFromBuffer(path.str(), buffer_str); + pWriter.addEntryFromBuffer(path.string(), buffer_str); } void writeDailyDebugData(const Date::Calendar& calendar, @@ -156,9 +149,9 @@ struct DebugData uint y, const Data::AreaName& areaName) const { - std::ostringstream buffer, path; - path << "debug" << SEP << "solver" << SEP << (1 + y) << SEP << "daily." << areaName.c_str() - << ".txt"; + std::ostringstream buffer; + auto path = fs::path("debug") / "solver" / std::to_string(1 + y) / "daily." + / areaName.c_str() / ".txt"; buffer << "\tNiveau init : " << hydro_specific.monthly[initReservoirLvlMonth].MOL << "\n"; for (uint month = 0; month != MONTHS_PER_YEAR; ++month) @@ -217,7 +210,7 @@ struct DebugData } } auto buffer_str = buffer.str(); - pWriter.addEntryFromBuffer(path.str(), buffer_str); + pWriter.addEntryFromBuffer(path.string(), buffer_str); } }; diff --git a/src/solver/hydro/management/management.cpp b/src/solver/hydro/management/management.cpp index c4e716e0c4..b4327deee3 100644 --- a/src/solver/hydro/management/management.cpp +++ b/src/solver/hydro/management/management.cpp @@ -24,10 +24,7 @@ #include #include -#include #include -#include -#include namespace Antares { diff --git a/src/solver/hydro/management/monthly.cpp b/src/solver/hydro/management/monthly.cpp index b60235dd97..62658e277d 100644 --- a/src/solver/hydro/management/monthly.cpp +++ b/src/solver/hydro/management/monthly.cpp @@ -18,30 +18,22 @@ ** You should have received a copy of the Mozilla Public Licence 2.0 ** along with Antares_Simulator. If not, see . */ +#include #include #include #include -#include -#include -#include - #include -#include -#include #include "antares/solver/hydro/management/management.h" #include "antares/solver/hydro/monthly/h2o_m_donnees_annuelles.h" #include "antares/solver/hydro/monthly/h2o_m_fonctions.h" -using namespace Yuni; - -#define SEP IO::Separator +namespace fs = std::filesystem; namespace Antares { -template static void CheckHydroAllocationProblem(Data::Area& area, - ProblemT& problem, + DONNEES_ANNUELLES& problem, int initLevelMonth, double lvi) { @@ -206,10 +198,9 @@ void HydroManagement::prepareMonthlyOptimalGenerations(const double* random_rese { case OUI: { - if (Logs::Verbosity::Debug::enabled) - { - CheckHydroAllocationProblem(area, problem, initReservoirLvlMonth, lvi); - } +#ifndef NDEBUG + CheckHydroAllocationProblem(area, problem, initReservoirLvlMonth, lvi); +#endif for (uint month = 0; month != MONTHS_PER_YEAR; ++month) { @@ -269,9 +260,9 @@ void HydroManagement::prepareMonthlyOptimalGenerations(const double* random_rese #endif if (parameters_.hydroDebug) { - std::ostringstream buffer, path; - path << "debug" << SEP << "solver" << SEP << (1 + y) << SEP << "monthly." << area.name - << ".txt"; + std::ostringstream buffer; + auto path = fs::path("debug") / "solver" / std::to_string(1 + y) / "monthly." + / area.name.c_str() / ".txt"; if (area.hydro.reservoirManagement) buffer << "Initial Reservoir Level\t" << lvi << "\n"; @@ -313,7 +304,7 @@ void HydroManagement::prepareMonthlyOptimalGenerations(const double* random_rese buffer << '\n'; } auto content = buffer.str(); - resultWriter_.addEntryFromBuffer(path.str(), content); + resultWriter_.addEntryFromBuffer(path.string(), content); } indexArea++; }); diff --git a/src/solver/optimisation/include/antares/solver/optimisation/opt_fonctions.h b/src/solver/optimisation/include/antares/solver/optimisation/opt_fonctions.h index 5a2aead56f..f215ae5dd1 100644 --- a/src/solver/optimisation/include/antares/solver/optimisation/opt_fonctions.h +++ b/src/solver/optimisation/include/antares/solver/optimisation/opt_fonctions.h @@ -54,7 +54,6 @@ void OPT_InitialiserLeSecondMembreDuProblemeLineaire(PROBLEME_HEBDO*, int, int, void OPT_InitialiserLeSecondMembreDuProblemeQuadratique(PROBLEME_HEBDO*, int); void OPT_InitialiserLesCoutsLineaire(PROBLEME_HEBDO*, const int, const int); void OPT_InitialiserLesCoutsQuadratiques(PROBLEME_HEBDO*, int); -void OPT_ControleDesPminPmaxThermiques(PROBLEME_HEBDO*); bool OPT_AppelDuSolveurQuadratique(PROBLEME_ANTARES_A_RESOUDRE*, const int); using namespace Antares::Data::AdequacyPatch; diff --git a/src/solver/optimisation/opt_alloc_probleme_a_optimiser.cpp b/src/solver/optimisation/opt_alloc_probleme_a_optimiser.cpp index f041b2471e..20b448bde7 100644 --- a/src/solver/optimisation/opt_alloc_probleme_a_optimiser.cpp +++ b/src/solver/optimisation/opt_alloc_probleme_a_optimiser.cpp @@ -20,11 +20,10 @@ */ #include -#include "antares/solver/optimisation/opt_fonctions.h" #include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" #include "antares/solver/simulation/sim_structure_probleme_economique.h" -using namespace Antares; +int OPT_DecompteDesVariablesEtDesContraintesDuProblemeAOptimiser(PROBLEME_HEBDO*); void OPT_AllocateFromNumberOfVariableConstraints(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre, int NbTermes) diff --git a/src/solver/optimisation/opt_appel_solveur_lineaire.cpp b/src/solver/optimisation/opt_appel_solveur_lineaire.cpp index 2dd81809da..94eae39fc8 100644 --- a/src/solver/optimisation/opt_appel_solveur_lineaire.cpp +++ b/src/solver/optimisation/opt_appel_solveur_lineaire.cpp @@ -19,35 +19,23 @@ * along with Antares_Simulator. If not, see . */ -#include - -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_probleme_economique.h" -#include "antares/solver/simulation/simulation.h" -#include "antares/solver/utils/basis_status.h" - -extern "C" -{ -#include "spx_definition_arguments.h" -#include "spx_fonctions.h" -#include "srs_api.h" -} - #include +#include +#include #include #include +#include "antares/optimization-options/options.h" #include "antares/solver/infeasible-problem-analysis/unfeasible-pb-analyzer.h" +#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "antares/solver/utils/filename.h" #include "antares/solver/utils/mps_utils.h" using namespace operations_research; -using namespace Antares; -using namespace Antares::Data; -using namespace Yuni; using Antares::Solver::IResultWriter; +using Antares::Solver::Optimization::OptimizationOptions; class TimeMeasurement { @@ -267,11 +255,8 @@ static SimplexResult OPT_TryToCallSimplex(const OptimizationOptions& options, logs.info() << " Solver: Standard resolution failed"; logs.info() << " Solver: Retry in safe mode"; // second trial w/o scaling + logs.debug() << " solver: resetting"; - if (Logs::Verbosity::Debug::enabled) - { - logs.info() << " solver: resetting"; - } return {.success = false, .timeMeasure = timeMeasure, .mps_writer_factory = mps_writer_factory}; diff --git a/src/solver/optimisation/opt_appel_solveur_quadratique.cpp b/src/solver/optimisation/opt_appel_solveur_quadratique.cpp index a491294a06..d59c6d8779 100644 --- a/src/solver/optimisation/opt_appel_solveur_quadratique.cpp +++ b/src/solver/optimisation/opt_appel_solveur_quadratique.cpp @@ -21,24 +21,22 @@ #include -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" - /* pi_define.h doesn't include this header, yet it uses struct jmp_buf. It would be nice to remove this include, but would require to change pi_define.h, which isn't part of Antares */ -#include +#include extern "C" { -#include "pi_define.h" -#include "pi_definition_arguments.h" -#include "pi_fonctions.h" +#include +#include +#include } #include +#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" using namespace Antares; diff --git a/src/solver/optimisation/opt_calcul_des_pmin_MUT_MDT.cpp b/src/solver/optimisation/opt_calcul_des_pmin_MUT_MDT.cpp index 7ec46fb34f..1e07bbcbd7 100644 --- a/src/solver/optimisation/opt_calcul_des_pmin_MUT_MDT.cpp +++ b/src/solver/optimisation/opt_calcul_des_pmin_MUT_MDT.cpp @@ -19,12 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include - -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" constexpr double ZERO_PMIN = 1.e-2; diff --git a/src/solver/optimisation/opt_chainage_intercos.cpp b/src/solver/optimisation/opt_chainage_intercos.cpp index 6052091e12..d7298d77dd 100644 --- a/src/solver/optimisation/opt_chainage_intercos.cpp +++ b/src/solver/optimisation/opt_chainage_intercos.cpp @@ -19,8 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_ChainagesDesIntercoPartantDUnNoeud(PROBLEME_HEBDO* problemeHebdo) { diff --git a/src/solver/optimisation/opt_construction_variables_couts_demarrages.cpp b/src/solver/optimisation/opt_construction_variables_couts_demarrages.cpp index d9a8ab2ff6..35fa3faa2e 100644 --- a/src/solver/optimisation/opt_construction_variables_couts_demarrages.cpp +++ b/src/solver/optimisation/opt_construction_variables_couts_demarrages.cpp @@ -19,11 +19,11 @@ * along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" +#include + #include "antares/solver/optimisation/opt_rename_problem.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" -#include "spx_constantes_externes.h" #include "variables/VariableManagerUtils.h" void OPT_ConstruireLaListeDesVariablesOptimiseesDuProblemeLineaireCoutsDeDemarrage( diff --git a/src/solver/optimisation/opt_construction_variables_optimisees_lineaire.cpp b/src/solver/optimisation/opt_construction_variables_optimisees_lineaire.cpp index aee0553b58..c1aa0e2991 100644 --- a/src/solver/optimisation/opt_construction_variables_optimisees_lineaire.cpp +++ b/src/solver/optimisation/opt_construction_variables_optimisees_lineaire.cpp @@ -20,12 +20,14 @@ */ #include -#include "antares/solver/optimisation/opt_fonctions.h" #include "antares/solver/optimisation/opt_rename_problem.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "variables/VariableManagerUtils.h" +void OPT_ConstruireLaListeDesVariablesOptimiseesDuProblemeLineaireCoutsDeDemarrage(PROBLEME_HEBDO*, + bool); + void OPT_ConstruireLaListeDesVariablesOptimiseesDuProblemeLineaire(PROBLEME_HEBDO* problemeHebdo) { const auto& ProblemeAResoudre = problemeHebdo->ProblemeAResoudre; diff --git a/src/solver/optimisation/opt_construction_variables_optimisees_quadratique.cpp b/src/solver/optimisation/opt_construction_variables_optimisees_quadratique.cpp index 3552081dd8..068ca7d878 100644 --- a/src/solver/optimisation/opt_construction_variables_optimisees_quadratique.cpp +++ b/src/solver/optimisation/opt_construction_variables_optimisees_quadratique.cpp @@ -19,10 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "pi_constantes_externes.h" #include "variables/VariableManagerUtils.h" diff --git a/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp b/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp index 1eebc32619..1df4f0b3df 100644 --- a/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp +++ b/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp @@ -20,13 +20,12 @@ */ #include -#include -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" using namespace Antares; +void OPT_DecompteDesVariablesEtDesContraintesCoutsDeDemarrage(PROBLEME_HEBDO*); + int OPT_DecompteDesVariablesEtDesContraintesDuProblemeAOptimiser(PROBLEME_HEBDO* problemeHebdo) { const auto& ProblemeAResoudre = problemeHebdo->ProblemeAResoudre; diff --git a/src/solver/optimisation/opt_decompte_variables_et_contraintes_couts_demarrage.cpp b/src/solver/optimisation/opt_decompte_variables_et_contraintes_couts_demarrage.cpp index 894358b4d0..22b10d3440 100644 --- a/src/solver/optimisation/opt_decompte_variables_et_contraintes_couts_demarrage.cpp +++ b/src/solver/optimisation/opt_decompte_variables_et_contraintes_couts_demarrage.cpp @@ -21,8 +21,6 @@ #include "antares/solver/optimisation/LinearProblemMatrixStartUpCosts.h" #include "antares/solver/optimisation/constraints/constraint_builder_utils.h" -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/simulation/simulation.h" void OPT_DecompteDesVariablesEtDesContraintesCoutsDeDemarrage(PROBLEME_HEBDO* problemeHebdo) { @@ -37,6 +35,4 @@ void OPT_DecompteDesVariablesEtDesContraintesCoutsDeDemarrage(PROBLEME_HEBDO* pr OPT_ConstruireLaListeDesVariablesOptimiseesDuProblemeLineaireCoutsDeDemarrage(problemeHebdo, true); - - return; } diff --git a/src/solver/optimisation/opt_export_structure.cpp b/src/solver/optimisation/opt_export_structure.cpp index 78f39cca47..c0f5a14b4c 100644 --- a/src/solver/optimisation/opt_export_structure.cpp +++ b/src/solver/optimisation/opt_export_structure.cpp @@ -21,7 +21,7 @@ #include "antares/solver/optimisation/opt_export_structure.h" -#include +#include #include "antares/solver/simulation/sim_structure_probleme_economique.h" diff --git a/src/solver/optimisation/opt_gestion_des_bornes_cas_lineaire.cpp b/src/solver/optimisation/opt_gestion_des_bornes_cas_lineaire.cpp index 3b9eb9132a..50c63133fc 100644 --- a/src/solver/optimisation/opt_gestion_des_bornes_cas_lineaire.cpp +++ b/src/solver/optimisation/opt_gestion_des_bornes_cas_lineaire.cpp @@ -20,20 +20,17 @@ */ #include +#include -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" #include "antares/solver/simulation/adequacy_patch_runtime_data.h" #include "antares/solver/simulation/sim_structure_probleme_economique.h" -#include "spx_constantes_externes.h" #include "variables/VariableManagement.h" #include "variables/VariableManagerUtils.h" -using namespace Antares; -using namespace Antares::Data; - -using namespace Yuni; +void OPT_InitialiserLesBornesDesVariablesDuProblemeLineaireCoutsDeDemarrage(PROBLEME_HEBDO*, + const int, + const int); void OPT_MaxDesPmaxHydrauliques(PROBLEME_HEBDO* problemeHebdo) { @@ -57,8 +54,6 @@ void OPT_MaxDesPmaxHydrauliques(PROBLEME_HEBDO* problemeHebdo) problemeHebdo->CaracteristiquesHydrauliques[pays].MaxDesPmaxHydrauliques = pmaxHyd; } - - return; } double OPT_SommeDesPminThermiques(const PROBLEME_HEBDO* problemeHebdo, int Pays, uint pdtHebdo) @@ -505,6 +500,4 @@ void OPT_InitialiserLesBornesDesVariablesDuProblemeLineaire(PROBLEME_HEBDO* prob PremierPdtDeLIntervalle, DernierPdtDeLIntervalle); } - - return; } diff --git a/src/solver/optimisation/opt_gestion_des_bornes_cas_quadratique.cpp b/src/solver/optimisation/opt_gestion_des_bornes_cas_quadratique.cpp index debfb77cfb..6cdafb3638 100644 --- a/src/solver/optimisation/opt_gestion_des_bornes_cas_quadratique.cpp +++ b/src/solver/optimisation/opt_gestion_des_bornes_cas_quadratique.cpp @@ -18,20 +18,14 @@ ** You should have received a copy of the Mozilla Public Licence 2.0 ** along with Antares_Simulator. If not, see . */ +#include -#include +#include "antares/solver/simulation/sim_structure_probleme_economique.h" -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/simulation.h" - -#include "pi_constantes_externes.h" #include "variables/VariableManagerUtils.h" #define ZERO_POUR_LES_VARIABLES_FIXES 1.e-6 -using namespace Yuni; - void OPT_InitialiserLesBornesDesVariablesDuProblemeQuadratique(PROBLEME_HEBDO* problemeHebdo, int PdtHebdo) { diff --git a/src/solver/optimisation/opt_gestion_des_bornes_couts_demarrage.cpp b/src/solver/optimisation/opt_gestion_des_bornes_couts_demarrage.cpp index e73cb62779..04359e1109 100644 --- a/src/solver/optimisation/opt_gestion_des_bornes_couts_demarrage.cpp +++ b/src/solver/optimisation/opt_gestion_des_bornes_couts_demarrage.cpp @@ -19,17 +19,11 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" #include "antares/solver/simulation/sim_structure_probleme_economique.h" -#include "antares/solver/simulation/simulation.h" #include "variables/VariableManagement.h" #include "variables/VariableManagerUtils.h" -using namespace Yuni; - void OPT_InitialiserLesBornesDesVariablesDuProblemeLineaireCoutsDeDemarrage( PROBLEME_HEBDO* problemeHebdo, const int PremierPdtDeLIntervalle, diff --git a/src/solver/optimisation/opt_gestion_des_couts_cas_lineaire.cpp b/src/solver/optimisation/opt_gestion_des_couts_cas_lineaire.cpp index 945c4cff46..893575110d 100644 --- a/src/solver/optimisation/opt_gestion_des_couts_cas_lineaire.cpp +++ b/src/solver/optimisation/opt_gestion_des_couts_cas_lineaire.cpp @@ -19,15 +19,12 @@ ** along with Antares_Simulator. If not, see . */ -#include - -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "variables/VariableManagerUtils.h" +void OPT_InitialiserLesCoutsLineaireCoutsDeDemarrage(PROBLEME_HEBDO*, const int, const int); + static void shortTermStorageCost( int PremierPdtDeLIntervalle, int DernierPdtDeLIntervalle, @@ -343,6 +340,4 @@ void OPT_InitialiserLesCoutsLineaire(PROBLEME_HEBDO* problemeHebdo, PremierPdtDeLIntervalle, DernierPdtDeLIntervalle); } - - return; } diff --git a/src/solver/optimisation/opt_gestion_des_couts_couts_demarrage.cpp b/src/solver/optimisation/opt_gestion_des_couts_couts_demarrage.cpp index ddd82a5439..7d1d128a4a 100644 --- a/src/solver/optimisation/opt_gestion_des_couts_couts_demarrage.cpp +++ b/src/solver/optimisation/opt_gestion_des_couts_couts_demarrage.cpp @@ -19,10 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "variables/VariableManagerUtils.h" diff --git a/src/solver/optimisation/opt_gestion_des_pmin.cpp b/src/solver/optimisation/opt_gestion_des_pmin.cpp index 3545863475..4989520e28 100644 --- a/src/solver/optimisation/opt_gestion_des_pmin.cpp +++ b/src/solver/optimisation/opt_gestion_des_pmin.cpp @@ -18,9 +18,8 @@ ** You should have received a copy of the Mozilla Public Licence 2.0 ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" + +#include "antares/solver/simulation/sim_structure_probleme_economique.h" #define ZERO 1.e-2 diff --git a/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp b/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp index 44e95a917c..a824066209 100644 --- a/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp +++ b/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp @@ -19,12 +19,10 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" -using namespace Antares; -using namespace Antares::Data; -using namespace Yuni; +double OPT_SommeDesPminThermiques(const PROBLEME_HEBDO*, int, uint); +void OPT_InitialiserLeSecondMembreDuProblemeLineaireCoutsDeDemarrage(PROBLEME_HEBDO*, int, int); static void shortTermStorageLevelsRHS( const std::vector<::ShortTermStorage::AREA_INPUT>& shortTermStorageInput, diff --git a/src/solver/optimisation/opt_gestion_second_membre_cas_quadratique.cpp b/src/solver/optimisation/opt_gestion_second_membre_cas_quadratique.cpp index dd56778c3f..b9b0b19162 100644 --- a/src/solver/optimisation/opt_gestion_second_membre_cas_quadratique.cpp +++ b/src/solver/optimisation/opt_gestion_second_membre_cas_quadratique.cpp @@ -19,9 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_InitialiserLeSecondMembreDuProblemeQuadratique(PROBLEME_HEBDO* problemeHebdo, int PdtHebdo) { diff --git a/src/solver/optimisation/opt_gestion_second_membre_couts_demarrage.cpp b/src/solver/optimisation/opt_gestion_second_membre_couts_demarrage.cpp index 101badf675..48003b697d 100644 --- a/src/solver/optimisation/opt_gestion_second_membre_couts_demarrage.cpp +++ b/src/solver/optimisation/opt_gestion_second_membre_couts_demarrage.cpp @@ -19,14 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" - -using namespace Antares; -using namespace Antares::Data; -using namespace Yuni; +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_InitialiserLeSecondMembreDuProblemeLineaireCoutsDeDemarrage(PROBLEME_HEBDO* problemeHebdo, int PremierPdtDeLIntervalle, @@ -104,6 +97,4 @@ void OPT_InitialiserLeSecondMembreDuProblemeLineaireCoutsDeDemarrage(PROBLEME_HE } } } - - return; } diff --git a/src/solver/optimisation/opt_init_contraintes_hydrauliques.cpp b/src/solver/optimisation/opt_init_contraintes_hydrauliques.cpp index 49773e3e18..13a780192b 100644 --- a/src/solver/optimisation/opt_init_contraintes_hydrauliques.cpp +++ b/src/solver/optimisation/opt_init_contraintes_hydrauliques.cpp @@ -19,9 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_InitialiserLesContrainteDEnergieHydrauliqueParIntervalleOptimise( PROBLEME_HEBDO* problemeHebdo) @@ -138,6 +136,4 @@ void OPT_InitialiserLesContrainteDEnergieHydrauliqueParIntervalleOptimise( InflowForTimeInterval[intervalle] = InflowSum; } } - - return; } diff --git a/src/solver/optimisation/opt_init_minmax_groupes_couts_demarrage.cpp b/src/solver/optimisation/opt_init_minmax_groupes_couts_demarrage.cpp index 2d47676ae4..1ec2ddcc2e 100644 --- a/src/solver/optimisation/opt_init_minmax_groupes_couts_demarrage.cpp +++ b/src/solver/optimisation/opt_init_minmax_groupes_couts_demarrage.cpp @@ -19,9 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_InitialiserNombreMinEtMaxDeGroupesCoutsDeDemarrage(PROBLEME_HEBDO* problemeHebdo) { @@ -70,6 +68,4 @@ void OPT_InitialiserNombreMinEtMaxDeGroupesCoutsDeDemarrage(PROBLEME_HEBDO* prob } } } - - return; } diff --git a/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp b/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp index ff5ed8b393..b1df3a06c9 100644 --- a/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp +++ b/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp @@ -19,18 +19,13 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" -#include "antares/solver/utils/ortools_utils.h" +#include -extern "C" -{ -#include "spx_fonctions.h" -} +#include "antares/optimization-options/options.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" +#include "antares/solver/utils/ortools_utils.h" -using namespace Antares; +using namespace Antares::Solver::Optimization; void OPT_LiberationProblemesSimplexe(const OptimizationOptions& options, const PROBLEME_HEBDO* problemeHebdo) @@ -72,6 +67,4 @@ void OPT_LiberationProblemesSimplexe(const OptimizationOptions& options, } } } - - return; } diff --git a/src/solver/optimisation/opt_nombre_min_groupes_demarres_couts_demarrage.cpp b/src/solver/optimisation/opt_nombre_min_groupes_demarres_couts_demarrage.cpp index c1e013a3c8..ec0e7e9bd2 100644 --- a/src/solver/optimisation/opt_nombre_min_groupes_demarres_couts_demarrage.cpp +++ b/src/solver/optimisation/opt_nombre_min_groupes_demarres_couts_demarrage.cpp @@ -19,18 +19,9 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" +#include -extern "C" -{ -#include "spx_definition_arguments.h" -#include "spx_fonctions.h" -} - -using namespace Antares; -using namespace Antares::Data; +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_PbLineairePourAjusterLeNombreMinDeGroupesDemarresCoutsDeDemarrage(PROBLEME_HEBDO*, std::vector&, @@ -649,6 +640,4 @@ void OPT_PbLineairePourAjusterLeNombreMinDeGroupesDemarresCoutsDeDemarrage( printf("Pas de solution au probleme auxiliaire\n"); #endif } - - return; } diff --git a/src/solver/optimisation/opt_numero_de_jour_du_pas_de_temps.cpp b/src/solver/optimisation/opt_numero_de_jour_du_pas_de_temps.cpp index 64c2d55a37..95e5ed50ad 100644 --- a/src/solver/optimisation/opt_numero_de_jour_du_pas_de_temps.cpp +++ b/src/solver/optimisation/opt_numero_de_jour_du_pas_de_temps.cpp @@ -19,10 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include - -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_NumeroDeJourDuPasDeTemps(PROBLEME_HEBDO* problemeHebdo) { @@ -33,7 +30,6 @@ void OPT_NumeroDeJourDuPasDeTemps(PROBLEME_HEBDO* problemeHebdo) double X = pdtHebdo / problemeHebdo->NombreDePasDeTempsDUneJournee; problemeHebdo->NumeroDeJourDuPasDeTemps[pdtHebdo] = (int)floor(X); } - return; } void OPT_NumeroDIntervalleOptimiseDuPasDeTemps(PROBLEME_HEBDO* problemeHebdo) @@ -43,5 +39,4 @@ void OPT_NumeroDIntervalleOptimiseDuPasDeTemps(PROBLEME_HEBDO* problemeHebdo) double X = pdtHebdo / problemeHebdo->NombreDePasDeTempsPourUneOptimisation; problemeHebdo->NumeroDIntervalleOptimiseDuPasDeTemps[pdtHebdo] = (int)floor(X); } - return; } diff --git a/src/solver/optimisation/opt_optimisation_hebdo.cpp b/src/solver/optimisation/opt_optimisation_hebdo.cpp index 67fe13faca..8317514098 100644 --- a/src/solver/optimisation/opt_optimisation_hebdo.cpp +++ b/src/solver/optimisation/opt_optimisation_hebdo.cpp @@ -22,20 +22,20 @@ #include #include #include -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" #include "antares/solver/simulation/ISimulationObserver.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" -extern "C" -{ -#include "spx_fonctions.h" -} - -using namespace Antares; using namespace Antares::Data; using Antares::Solver::Optimization::OptimizationOptions; +bool OPT_PilotageOptimisationLineaire(const OptimizationOptions&, + PROBLEME_HEBDO*, + Solver::IResultWriter&, + Solver::Simulation::ISimulationObserver&); +bool OPT_PilotageOptimisationQuadratique(PROBLEME_HEBDO*); +void OPT_LiberationProblemesSimplexe(const OptimizationOptions&, const PROBLEME_HEBDO*); + void OPT_OptimisationHebdomadaire(const OptimizationOptions& options, PROBLEME_HEBDO* pProblemeHebdo, Solver::IResultWriter& writer, diff --git a/src/solver/optimisation/opt_optimisation_lineaire.cpp b/src/solver/optimisation/opt_optimisation_lineaire.cpp index 8ff621b612..99669ad1ea 100644 --- a/src/solver/optimisation/opt_optimisation_lineaire.cpp +++ b/src/solver/optimisation/opt_optimisation_lineaire.cpp @@ -20,8 +20,6 @@ */ #include -#include "antares/solver/lps/LpsFromAntares.h" -#include "antares/solver/optimisation/HebdoProblemToLpsTranslator.h" #include "antares/solver/optimisation/LinearProblemMatrix.h" #include "antares/solver/optimisation/constraints/constraint_builder_utils.h" #include "antares/solver/optimisation/opt_export_structure.h" @@ -29,8 +27,8 @@ #include "antares/solver/simulation/ISimulationObserver.h" #include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "antares/solver/utils/filename.h" -using namespace Antares; -using namespace Yuni; + +using namespace Antares::Solver; using Antares::Solver::Optimization::OptimizationOptions; namespace diff --git a/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp b/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp index 06e1909126..8c95462332 100644 --- a/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp +++ b/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp @@ -21,8 +21,8 @@ #include "antares/optimization-options/options.h" #include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" #include "antares/solver/simulation/ISimulationObserver.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" using Antares::Solver::Optimization::OptimizationOptions; diff --git a/src/solver/optimisation/opt_pilotage_optimisation_quadratique.cpp b/src/solver/optimisation/opt_pilotage_optimisation_quadratique.cpp index 4da985a2b7..1337fb763b 100644 --- a/src/solver/optimisation/opt_pilotage_optimisation_quadratique.cpp +++ b/src/solver/optimisation/opt_pilotage_optimisation_quadratique.cpp @@ -19,15 +19,9 @@ ** along with Antares_Simulator. If not, see . */ -#include - #include "antares/solver/optimisation/QuadraticProblemMatrix.h" #include "antares/solver/optimisation/constraints/constraint_builder_utils.h" #include "antares/solver/optimisation/opt_fonctions.h" -extern "C" -{ -#include "spx_fonctions.h" -} bool OPT_PilotageOptimisationQuadratique(PROBLEME_HEBDO* problemeHebdo) { diff --git a/src/solver/optimisation/opt_rename_problem.cpp b/src/solver/optimisation/opt_rename_problem.cpp index 85edf581b8..1324c54fd8 100644 --- a/src/solver/optimisation/opt_rename_problem.cpp +++ b/src/solver/optimisation/opt_rename_problem.cpp @@ -22,7 +22,7 @@ #include "antares/solver/optimisation/opt_rename_problem.h" #include -#include +#include const std::string HOUR("hour"); const std::string DAY("day"); diff --git a/src/solver/optimisation/opt_restaurer_les_donnees.cpp b/src/solver/optimisation/opt_restaurer_les_donnees.cpp index ace1e645c5..bd058e88d2 100644 --- a/src/solver/optimisation/opt_restaurer_les_donnees.cpp +++ b/src/solver/optimisation/opt_restaurer_les_donnees.cpp @@ -19,10 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* problemeHebdo) { @@ -132,6 +129,4 @@ void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* problemeHebdo) } } } - - return; } diff --git a/src/solver/optimisation/opt_verification_presence_reserve_jmoins1.cpp b/src/solver/optimisation/opt_verification_presence_reserve_jmoins1.cpp index e696c08bd7..6216b6fa1d 100644 --- a/src/solver/optimisation/opt_verification_presence_reserve_jmoins1.cpp +++ b/src/solver/optimisation/opt_verification_presence_reserve_jmoins1.cpp @@ -19,12 +19,7 @@ ** along with Antares_Simulator. If not, see . */ -#include "antares/solver/optimisation/opt_fonctions.h" -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" -#include "antares/solver/simulation/sim_structure_donnees.h" -#include "antares/solver/simulation/simulation.h" - -#include "spx_fonctions.h" +#include "antares/solver/simulation/sim_structure_probleme_economique.h" void OPT_VerifierPresenceReserveJmoins1(PROBLEME_HEBDO* problemeHebdo) { @@ -45,6 +40,4 @@ void OPT_VerifierPresenceReserveJmoins1(PROBLEME_HEBDO* problemeHebdo) } } } - - return; } diff --git a/src/solver/optimisation/variables/VariableManagement.h b/src/solver/optimisation/variables/VariableManagement.h index 1c3144aa0a..b5054a121c 100644 --- a/src/solver/optimisation/variables/VariableManagement.h +++ b/src/solver/optimisation/variables/VariableManagement.h @@ -1,6 +1,5 @@ #pragma once -#include "antares/solver/optimisation/opt_structure_probleme_a_resoudre.h" #include "antares/solver/simulation/sim_structure_probleme_economique.h" namespace VariableManagement diff --git a/src/solver/optimisation/variables/VariableManagerUtils.h b/src/solver/optimisation/variables/VariableManagerUtils.h index 1597fac34b..7c06f72a43 100644 --- a/src/solver/optimisation/variables/VariableManagerUtils.h +++ b/src/solver/optimisation/variables/VariableManagerUtils.h @@ -2,4 +2,4 @@ #include "VariableManagement.h" -VariableManagement::VariableManager VariableManagerFromProblemHebdo(PROBLEME_HEBDO* problemeHebdo); +VariableManagement::VariableManager VariableManagerFromProblemHebdo(PROBLEME_HEBDO*); diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp index 193b4b9ddd..79e6635613 100644 --- a/src/solver/simulation/sim_calcul_economique.cpp +++ b/src/solver/simulation/sim_calcul_economique.cpp @@ -19,11 +19,10 @@ ** along with Antares_Simulator. If not, see . */ -#include +#include #include #include -#include #include #include #include @@ -31,7 +30,6 @@ #include "antares/solver/simulation/sim_structure_probleme_economique.h" #include "antares/solver/simulation/simulation.h" #include "antares/study/fwd.h" -#include "antares/study/simulation.h" using namespace Antares; using namespace Antares::Data; diff --git a/src/tools/ts-generator/main.cpp b/src/tools/ts-generator/main.cpp index 3c883a078b..baece8ca45 100644 --- a/src/tools/ts-generator/main.cpp +++ b/src/tools/ts-generator/main.cpp @@ -28,7 +28,6 @@ #include #include "antares/tools/ts-generator/linksTSgenerator.h" #include "antares/tools/ts-generator/tsGenerationOptions.h" -using namespace Antares::TSGenerator; using namespace Antares::TSGenerator;