Use reference for variable `NbTermesContraintesPourLesCoutsDeDemarrag…

…e` (#1881) Instead of a raw pointer that ignores the constness of `PROBLEME_HEBDO`.
AntaresSimulatorTeam · Jan 19, 2024 · b774fdc · b774fdc
1 parent 34b868c
commit b774fdc
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 25 deletions.
diff --git a/src/solver/optimisation/adequacy_patch_csr/csr_quadratic_problem.h b/src/solver/optimisation/adequacy_patch_csr/csr_quadratic_problem.h
@@ -36,15 +36,15 @@ namespace Antares::Solver::Optimization
 class CsrQuadraticProblem
 {
 public:
-    CsrQuadraticProblem(const PROBLEME_HEBDO* p, PROBLEME_ANTARES_A_RESOUDRE& pa, HourlyCSRProblem& hourly) :
+    CsrQuadraticProblem(PROBLEME_HEBDO* p, PROBLEME_ANTARES_A_RESOUDRE& pa, HourlyCSRProblem& hourly) :
       problemeHebdo_(p), problemeAResoudre_(pa), hourlyCsrProblem_(hourly)
     {
     }
 
     void buildConstraintMatrix();
 
 private:
-    const PROBLEME_HEBDO* problemeHebdo_;
+    PROBLEME_HEBDO* problemeHebdo_;
     PROBLEME_ANTARES_A_RESOUDRE& problemeAResoudre_;
     HourlyCSRProblem& hourlyCsrProblem_;
 

diff --git a/src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.cpp b/src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.cpp
@@ -37,7 +37,7 @@ void ConsistenceNumberOfDispatchableUnits::add(int pays, int index, int pdt)
     }
     else
     {
-        *builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 4;
+        builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 4;
         builder.data.nombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/ConstraintBuilder.h b/src/solver/optimisation/constraints/ConstraintBuilder.h
@@ -165,7 +165,7 @@ class ConstraintBuilderData
     const std::vector<const char*>& NomsDesPays;
     const uint32_t& weekInTheYear;
     const uint32_t& NombreDePasDeTemps;
-    uint32_t* NbTermesContraintesPourLesCoutsDeDemarrage = nullptr;
+    uint32_t& NbTermesContraintesPourLesCoutsDeDemarrage;
 };
 
 /*! \verbatim

diff --git a/src/solver/optimisation/constraints/MinDownTime.cpp b/src/solver/optimisation/constraints/MinDownTime.cpp
@@ -43,7 +43,7 @@ void MinDownTime::add(int pays, int index, int pdt)
     }
     else
     {
-        *builder.data.NbTermesContraintesPourLesCoutsDeDemarrage
+        builder.data.NbTermesContraintesPourLesCoutsDeDemarrage
           += 1 + DureeMinimaleDArretDUnGroupeDuPalierThermique;
         builder.data.nombreDeContraintes++;
     }

diff --git a/src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.cpp b/src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.cpp
@@ -47,7 +47,7 @@ void NbDispUnitsMinBoundSinceMinUpTime::add(int pays, int index, int pdt)
     }
     else
     {
-        *builder.data.NbTermesContraintesPourLesCoutsDeDemarrage
+        builder.data.NbTermesContraintesPourLesCoutsDeDemarrage
           += 1 + 2 * DureeMinimaleDeMarcheDUnGroupeDuPalierThermique;
         builder.data.nombreDeContraintes++;
     }

diff --git a/src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.cpp b/src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.cpp
@@ -29,7 +29,7 @@ void NbUnitsOutageLessThanNbUnitsStop::add(int pays, int index, int pdt)
     }
     else
     {
-        *builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 2;
+        builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 2;
         builder.data.nombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/PMaxDispatchableGeneration.cpp b/src/solver/optimisation/constraints/PMaxDispatchableGeneration.cpp
@@ -27,7 +27,7 @@ void PMaxDispatchableGeneration::add(int pays, int index, int pdt)
     }
     else
     {
-        *builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 2;
+        builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 2;
         builder.data.nombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/PMinDispatchableGeneration.cpp b/src/solver/optimisation/constraints/PMinDispatchableGeneration.cpp
@@ -28,7 +28,7 @@ void PMinDispatchableGeneration::add(int pays, int index, int pdt)
     }
     else
     {
-        *builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 2;
+        builder.data.NbTermesContraintesPourLesCoutsDeDemarrage += 2;
         builder.data.nombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/constraint_builder_utils.cpp b/src/solver/optimisation/constraints/constraint_builder_utils.cpp
@@ -1,8 +1,7 @@
 #include "constraint_builder_utils.h"
 
-ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(
-  const PROBLEME_HEBDO* problemeHebdo,
-  PROBLEME_ANTARES_A_RESOUDRE& ProblemeAResoudre)
+ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(PROBLEME_HEBDO* problemeHebdo,
+                                                                                 PROBLEME_ANTARES_A_RESOUDRE& ProblemeAResoudre)
 {
     return {ProblemeAResoudre.Pi,
             ProblemeAResoudre.Colonne,
@@ -24,5 +23,5 @@ ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre
             problemeHebdo->NomsDesPays,
             problemeHebdo->weekInTheYear,
             problemeHebdo->NombreDePasDeTemps,
-            nullptr};
-}
+            problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage};
+}
diff --git a/src/solver/optimisation/constraints/constraint_builder_utils.h b/src/solver/optimisation/constraints/constraint_builder_utils.h
@@ -2,13 +2,11 @@
 #include "ConstraintBuilder.h"
 #include <memory>
 
-ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(
-  const PROBLEME_HEBDO* problemeHebdo,
-  PROBLEME_ANTARES_A_RESOUDRE& ProblemeAResoudre);
+ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(PROBLEME_HEBDO* problemeHebdo,
+                                                                                 PROBLEME_ANTARES_A_RESOUDRE& ProblemeAResoudre);
 
-inline ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(
-  const PROBLEME_HEBDO* problemeHebdo,
-  std::unique_ptr<PROBLEME_ANTARES_A_RESOUDRE>& ProblemeAResoudre)
+inline ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(PROBLEME_HEBDO* problemeHebdo,
+                                                                                        std::unique_ptr<PROBLEME_ANTARES_A_RESOUDRE>& ProblemeAResoudre)
 {
     /* not good!!!!!!!!!!*/
     auto& problemAResoudreRef = *ProblemeAResoudre.get();
@@ -19,9 +17,6 @@ inline ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdoAndProblemAR
 inline ConstraintBuilderData NewGetConstraintBuilderFromProblemHebdo(PROBLEME_HEBDO* problemeHebdo)
 {
     auto& ProblemeAResoudre = problemeHebdo->ProblemeAResoudre;
-    auto data = NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(problemeHebdo,
-                                                                           ProblemeAResoudre);
-    data.NbTermesContraintesPourLesCoutsDeDemarrage
-      = &problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage;
-    return data;
+    return NewGetConstraintBuilderFromProblemHebdoAndProblemAResoudre(problemeHebdo,
+                                                                      ProblemeAResoudre);
 }