Implement latest CSR comments

src/libs/antares/study/fwd.h

@@ -604,11 +604,6 @@ enum AdqPatchPTO
 
 }; // enum AdqPatchPTO
 
-//! A default threshold value for initiate curtailment sharing rule
-const float adqPatchDefaultValueThresholdInitiateCurtailmentSharingRule = 0.0;
-//! A default threshold value for display local matching rule violations
-const float adqPatchDefaultValueThresholdDisplayLocalMatchingRuleViolations = 0.0;
-
 } // namespace AdequacyPatch
 } // namespace Data
 } // namespace Antares

src/libs/antares/study/parameters.cpp

@@ -43,6 +43,7 @@
 #include <limits.h>
 #include <antares/study/memory-usage.h>
 #include "../solver/variable/economy/all.h"
+#include "../solver/optimisation/adequacy_patch.h"
 
 #include <antares/exception/AssertionError.hpp>
 #include <antares/Enum.hxx>
@@ -237,9 +238,9 @@ void Parameters::resetThresholdsAdqPatch()
 {
     // Initialize all thresholds values for adequacy patch
     adqPatch.curtailmentSharing.thresholdInitiate
-      = adqPatchDefaultValueThresholdInitiateCurtailmentSharingRule;
+      = defaultValueThresholdInitiateCurtailmentSharingRule;
     adqPatch.curtailmentSharing.thresholdDisplayViolations
-      = adqPatchDefaultValueThresholdDisplayLocalMatchingRuleViolations;
+      = defaultValueThresholdDisplayLocalMatchingRuleViolations;
 }
 
 void Parameters::resetAdqPatchParameters()

src/solver/optimisation/adequacy_patch.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **
@@ -136,7 +136,7 @@ void setNTCbounds(double& Xmax,
 
 double checkLocalMatchingRuleViolations(PROBLEME_HEBDO* ProblemeHebdo, uint weekNb)
 {
-    float threshold = ProblemeHebdo->adqPatchParams->ThresholdDisplayLocalMatchingRuleViolations;
+    double threshold = ProblemeHebdo->adqPatchParams->ThresholdDisplayLocalMatchingRuleViolations;
     double netPositionInit;
     double densNew;
     double ensInit;
@@ -222,9 +222,9 @@ std::pair<double, double> calculateAreaFlowBalance(PROBLEME_HEBDO* ProblemeHebdo
     return std::make_pair(netPositionInit, densNew);
 }
 
-void addArray(std::vector<double>& A, double* B, int num)
+void addArray(std::vector<double>& A, double* B)
 {
-    for (uint i = 0; i < num; ++i)
+    for (uint i = 0; i < A.size(); ++i)
         A[i] += B[i];
 }
 

src/solver/optimisation/adequacy_patch.h

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **
@@ -37,6 +37,10 @@ namespace Data
 {
 namespace AdequacyPatch
 {
+//! A default threshold value for initiate curtailment sharing rule
+const double defaultValueThresholdInitiateCurtailmentSharingRule = 0.0;
+//! A default threshold value for display local matching rule violations
+const double defaultValueThresholdDisplayLocalMatchingRuleViolations = 0.0;
 /*!
  * Determines restriction type for transmission links for first step of adequacy patch.
  *
@@ -107,10 +111,9 @@ double checkLocalMatchingRuleViolations(PROBLEME_HEBDO* ProblemeHebdo, uint week
 ** **
 ** ** \param A A vector
 ** ** \param B An array
-** ** \param num An integer
 ** ** \return
 ** */
-void addArray(std::vector<double>& A, double* B, int num);
+void addArray(std::vector<double>& A, double* B);
 
 } // end namespace Antares
 } // end namespace Data

src/solver/optimisation/adequacy_patch_csr/construct_problem_constraints_LHS.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **

src/solver/optimisation/adequacy_patch_csr/construct_problem_constraints_RHS.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **
@@ -131,9 +131,6 @@ void setRHSbindingConstraintsValue(PROBLEME_HEBDO* ProblemeHebdo,
             // 1. The original RHS of bingding constraint
             SecondMembre[Cnt]
               = MatriceDesContraintesCouplantes->SecondMembreDeLaContrainteCouplante[hour];
-            // logs.debug() << Cnt << ": Hourly bc: Existing-RHS[" << Cnt
-            //              << "] = " << SecondMembre[Cnt] << " (CntCouplante = " << CntCouplante
-            //              << ")";
 
             // 2. RHS part 2: flow other than 2<->2
             NbInterco
@@ -150,17 +147,6 @@ void setRHSbindingConstraintsValue(PROBLEME_HEBDO* ProblemeHebdo,
                 {
                     ValueOfFlow = ProblemeHebdo->ValeursDeNTC[hour]->ValeurDuFlux[Interco];
                     SecondMembre[Cnt] -= ValueOfFlow * Poids;
-                    // logs.debug()
-                    //   << Cnt << ": Hourly bc: IntercoFlow-RHS[" << Cnt
-                    //   << "] = " << SecondMembre[Cnt] << " (CntCouplante = " << CntCouplante << ")"
-                    //   << ". Interco;" + std::to_string(Interco) << ". Between:["
-                    //   << ProblemeHebdo
-                    //        ->NomsDesPays[ProblemeHebdo->PaysOrigineDeLInterconnexion[Interco]]
-                    //   << "]-["
-                    //   << ProblemeHebdo
-                    //        ->NomsDesPays[ProblemeHebdo->PaysExtremiteDeLInterconnexion[Interco]]
-                    //   << "]"
-                    //   << ". ValueOfFlow: " << ValueOfFlow << ". Poids: " << Poids;
                 }
             }
 
@@ -190,11 +176,6 @@ void setRHSbindingConstraintsValue(PROBLEME_HEBDO* ProblemeHebdo,
                                ->ProductionThermiqueDuPalier[IndexNumeroDuPalierDispatch];
 
                 SecondMembre[Cnt] -= ValueOfVar * Poids;
-                // logs.debug() << Cnt << ": Hourly bc: ThermalCluster-RHS[" << Cnt
-                //              << "] = " << SecondMembre[Cnt] << " (CntCouplante = " << CntCouplante
-                //              << ")"
-                //              << ". Area:" << Area << ", Palier:" << Palier << ", Poids" << Poids
-                //              << ", ValueOfVar:" << ValueOfVar;
             }
             if (MatriceDesContraintesCouplantes->SensDeLaContrainteCouplante == '<')
             {

src/solver/optimisation/adequacy_patch_csr/construct_problem_variables.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **
@@ -37,10 +37,11 @@
 
 void constructVariableENS(PROBLEME_HEBDO* ProblemeHebdo, HOURLY_CSR_PROBLEM& hourlyCsrProblem)
 {
-    int NumberOfVariables = 0;
     int hour = hourlyCsrProblem.hourInWeekTriggeredCsr;
     PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre;
     ProblemeAResoudre = ProblemeHebdo->ProblemeAResoudre;
+    int& NumberOfVariables = ProblemeAResoudre->NombreDeVariables;
+    NumberOfVariables = 0;
     CORRESPONDANCES_DES_VARIABLES* CorrespondanceVarNativesVarOptim;
     CorrespondanceVarNativesVarOptim = ProblemeHebdo->CorrespondanceVarNativesVarOptim[hour];
 
@@ -62,7 +63,6 @@ void constructVariableENS(PROBLEME_HEBDO* ProblemeHebdo, HOURLY_CSR_PROBLEM& hou
             NumberOfVariables++;
         }
     }
-    ProblemeAResoudre->NombreDeVariables = NumberOfVariables;
 }
 
 void constructVariableSpilledEnergy(PROBLEME_HEBDO* ProblemeHebdo,

src/solver/optimisation/adequacy_patch_csr/set_problem_cost_function.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **

src/solver/optimisation/adequacy_patch_csr/set_variable_boundaries.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **

src/solver/optimisation/adequacy_patch_csr/solve_problem.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2007-2018 RTE
-** Authors: Antares_Simulator Team
+** Copyright 2007-2022 RTE
+** Authors: RTE-international / Redstork / Antares_Simulator Team
 **
 ** This file is part of Antares_Simulator.
 **
@@ -55,9 +55,10 @@ extern "C"
 
 using namespace Antares;
 
-void setInteriorPointProblem(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
-                             PROBLEME_POINT_INTERIEUR& Probleme)
+std::unique_ptr<PROBLEME_POINT_INTERIEUR> buildInteriorPointProblem(
+  PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre)
 {
+    std::unique_ptr<PROBLEME_POINT_INTERIEUR> Probleme(new PROBLEME_POINT_INTERIEUR());
     int ChoixToleranceParDefautSurLAdmissibilite;
     int ChoixToleranceParDefautSurLaStationnarite;
     int ChoixToleranceParDefautSurLaComplementarite;
@@ -66,40 +67,42 @@ void setInteriorPointProblem(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
     ChoixToleranceParDefautSurLaStationnarite = OUI_PI;
     ChoixToleranceParDefautSurLaComplementarite = OUI_PI;
 
-    Probleme.NombreMaxDIterations = -1;
-    Probleme.CoutQuadratique = ProblemeAResoudre->CoutQuadratique;
-    Probleme.CoutLineaire = ProblemeAResoudre->CoutLineaire;
-    Probleme.X = ProblemeAResoudre->X;
-    Probleme.Xmin = ProblemeAResoudre->Xmin;
-    Probleme.Xmax = ProblemeAResoudre->Xmax;
-    Probleme.NombreDeVariables = ProblemeAResoudre->NombreDeVariables;
-    Probleme.TypeDeVariable = ProblemeAResoudre->TypeDeVariable;
-
-    Probleme.VariableBinaire = (char*)ProblemeAResoudre->CoutsReduits;
-
-    Probleme.NombreDeContraintes = ProblemeAResoudre->NombreDeContraintes;
-    Probleme.IndicesDebutDeLigne = ProblemeAResoudre->IndicesDebutDeLigne;
-    Probleme.NombreDeTermesDesLignes = ProblemeAResoudre->NombreDeTermesDesLignes;
-    Probleme.IndicesColonnes = ProblemeAResoudre->IndicesColonnes;
-    Probleme.CoefficientsDeLaMatriceDesContraintes
+    Probleme->NombreMaxDIterations = -1;
+    Probleme->CoutQuadratique = ProblemeAResoudre->CoutQuadratique;
+    Probleme->CoutLineaire = ProblemeAResoudre->CoutLineaire;
+    Probleme->X = ProblemeAResoudre->X;
+    Probleme->Xmin = ProblemeAResoudre->Xmin;
+    Probleme->Xmax = ProblemeAResoudre->Xmax;
+    Probleme->NombreDeVariables = ProblemeAResoudre->NombreDeVariables;
+    Probleme->TypeDeVariable = ProblemeAResoudre->TypeDeVariable;
+
+    Probleme->VariableBinaire = (char*)ProblemeAResoudre->CoutsReduits;
+
+    Probleme->NombreDeContraintes = ProblemeAResoudre->NombreDeContraintes;
+    Probleme->IndicesDebutDeLigne = ProblemeAResoudre->IndicesDebutDeLigne;
+    Probleme->NombreDeTermesDesLignes = ProblemeAResoudre->NombreDeTermesDesLignes;
+    Probleme->IndicesColonnes = ProblemeAResoudre->IndicesColonnes;
+    Probleme->CoefficientsDeLaMatriceDesContraintes
       = ProblemeAResoudre->CoefficientsDeLaMatriceDesContraintes;
-    Probleme.Sens = ProblemeAResoudre->Sens;
-    Probleme.SecondMembre = ProblemeAResoudre->SecondMembre;
+    Probleme->Sens = ProblemeAResoudre->Sens;
+    Probleme->SecondMembre = ProblemeAResoudre->SecondMembre;
 
-    Probleme.AffichageDesTraces = NON_PI;
+    Probleme->AffichageDesTraces = NON_PI;
 
-    Probleme.UtiliserLaToleranceDAdmissibiliteParDefaut = ChoixToleranceParDefautSurLAdmissibilite;
+    Probleme->UtiliserLaToleranceDAdmissibiliteParDefaut = ChoixToleranceParDefautSurLAdmissibilite;
 
-    Probleme.UtiliserLaToleranceDeStationnariteParDefaut
+    Probleme->UtiliserLaToleranceDeStationnariteParDefaut
       = ChoixToleranceParDefautSurLaStationnarite;
 
-    Probleme.UtiliserLaToleranceDeComplementariteParDefaut
+    Probleme->UtiliserLaToleranceDeComplementariteParDefaut
       = ChoixToleranceParDefautSurLaComplementarite;
 
-    Probleme.CoutsMarginauxDesContraintes = ProblemeAResoudre->CoutsMarginauxDesContraintes;
+    Probleme->CoutsMarginauxDesContraintes = ProblemeAResoudre->CoutsMarginauxDesContraintes;
 
-    Probleme.CoutsMarginauxDesContraintesDeBorneInf = ProblemeAResoudre->CoutsReduits;
-    Probleme.CoutsMarginauxDesContraintesDeBorneSup = ProblemeAResoudre->CoutsReduits;
+    Probleme->CoutsMarginauxDesContraintesDeBorneInf = ProblemeAResoudre->CoutsReduits;
+    Probleme->CoutsMarginauxDesContraintesDeBorneSup = ProblemeAResoudre->CoutsReduits;
+
+    return Probleme;
 }
 
 void setToZeroIfBelowThreshold(double* pt, int Var, HOURLY_CSR_PROBLEM& hourlyCsrProblem)
@@ -128,7 +131,7 @@ void storeInteriorPointResults(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
     }
 }
 
-void CSR_DEBUG_BLAH(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre)
+void CSR_DEBUG_HANDLE(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre)
 {
     int Var;
 
@@ -177,7 +180,7 @@ void handleInteriorPointError(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
       << ". hour: " << weekNb * hoursInWeek + hourlyCsrProblem.hourInWeekTriggeredCsr + 1;
 
 #ifndef NDEBUG
-    CSR_DEBUG_BLAH(ProblemeAResoudre);
+    CSR_DEBUG_HANDLE(ProblemeAResoudre);
 #endif
 }
 
@@ -186,11 +189,10 @@ bool ADQ_PATCH_CSR(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
                    uint weekNb,
                    int yearNb)
 {
-    PROBLEME_POINT_INTERIEUR Probleme;
-    setInteriorPointProblem(ProblemeAResoudre, Probleme);
-    PI_Quamin(&Probleme); // resolution
-    ProblemeAResoudre->ExistenceDUneSolution = Probleme.ExistenceDUneSolution;
-    if (ProblemeAResoudre->ExistenceDUneSolution == OUI_PI)
+    std::unique_ptr<PROBLEME_POINT_INTERIEUR> Probleme
+      = buildInteriorPointProblem(ProblemeAResoudre);
+    PI_Quamin(Probleme.get()); // resolution
+    if (Probleme->ExistenceDUneSolution == OUI_PI)
     {
         storeInteriorPointResults(ProblemeAResoudre, hourlyCsrProblem);
         return true;

src/solver/optimisation/opt_gestion_second_membre_cas_quadratique.cpp

@@ -25,8 +25,6 @@
 ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
 */
 
-const double csrSolverRelaxationRHS = 1e-3;
-
 #include "opt_structure_probleme_a_resoudre.h"
 
 #include "../simulation/simulation.h"