HydroLevel

AntaresSimulatorTeam · Sep 18, 2023 · ed6ecbc · ed6ecbc
1 parent c5097de
commit ed6ecbc
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/src/solver/optimisation/AreaHydroLevel.cpp b/src/solver/optimisation/AreaHydroLevel.cpp
@@ -10,10 +10,10 @@ void AreaHydroLevel::add(int pays, int pdt)
       = problemeHebdo->ProblemeAResoudre->NombreDeContraintes;
     if (problemeHebdo->CaracteristiquesHydrauliques[pays].SuiviNiveauHoraire)
     {
-        builder.updateHourWithinWeek(pdt).include(Variable::HydroLevel(pays), 1.0);
+        builder.updateHourWithinWeek(pdt).HydroLevel(pays, 1.0);
         if (pdt > 0)
         {
-            builder.updateHourWithinWeek(pdt - 1).include(Variable::HydroLevel(pays), -1.0);
+            builder.updateHourWithinWeek(pdt - 1).HydroLevel(pays, -1.0);
         }
         ConstraintNamer namer(problemeHebdo->ProblemeAResoudre->NomDesContraintes,
                               problemeHebdo->NamedProblems);

diff --git a/src/solver/optimisation/FinalStockEquivalent.cpp b/src/solver/optimisation/FinalStockEquivalent.cpp
@@ -16,11 +16,11 @@ void FinalStockEquivalent::add(int pays)
         namer.UpdateTimeStep(problemeHebdo->weekInTheYear * 168 + pdt);
         namer.FinalStockEquivalent(problemeHebdo->ProblemeAResoudre->NombreDeContraintes);
 
-    builder.updateHourWithinWeek(pdt)
-      .include(Variable::FinalStorage(pays), 1.0)
-      .updateHourWithinWeek(problemeHebdo->NombreDePasDeTempsPourUneOptimisation - 1)
-      .include(Variable::HydroLevel(pays), -1.0)
-      .equalTo()
-      .build();
+        builder.updateHourWithinWeek(pdt)
+          .include(Variable::FinalStorage(pays), 1.0)
+          .updateHourWithinWeek(problemeHebdo->NombreDePasDeTempsPourUneOptimisation - 1)
+          .HydroLevel(pays, -1.0)
+          .equalTo()
+          .build();
     }
 }
diff --git a/src/solver/optimisation/constraint_builder.cpp b/src/solver/optimisation/constraint_builder.cpp
@@ -204,6 +204,16 @@ ConstraintBuilder& ConstraintBuilder::Pumping(unsigned int index,
     return *this;
 }
 
+ConstraintBuilder& ConstraintBuilder::HydroLevel(unsigned int index,
+                                                 double coeff,
+                                                 int shift,
+                                                 bool wrap,
+                                                 int delta)
+{
+    AddVariable(GetVariableManager(shift, wrap, delta).HydroLevel(index), coeff);
+    return *this;
+}
+
 int ConstraintBuilder::getVariableIndex(const Variable::Variables& variable,
                                         int shift,
                                         bool wrap,

diff --git a/src/solver/optimisation/constraint_builder.h b/src/solver/optimisation/constraint_builder.h
@@ -21,10 +21,6 @@ struct SingleIndex
     unsigned index;
 };
 
-struct HydroLevel : public SingleIndex
-{
-    using SingleIndex::SingleIndex;
-};
 struct Overflow : public SingleIndex
 {
     using SingleIndex::SingleIndex;
@@ -138,18 +134,19 @@ class VariableManager
         return nativeOptimVar.NumeroDeVariablesDePompage[index];
     }
 
+    int HydroLevel(unsigned int index) const
+    {
+        return nativeOptimVar.NumeroDeVariablesDeNiveau[index];
+    }
+
 private:
     const CORRESPONDANCES_DES_VARIABLES& nativeOptimVar;
     const std::vector<int>& NumeroDeVariableStockFinal;
     const std::vector<std::vector<int>>& NumeroDeVariableDeTrancheDeStock;
 };
 
-using Variables = std::variant<HydroLevel,
-                               Overflow,
-                               FinalStorage,
-                               LayerStorage,
-                               PositiveUnsuppliedEnergy,
-                               NegativeUnsuppliedEnergy>;
+using Variables = std::
+  variant<Overflow, FinalStorage, LayerStorage, PositiveUnsuppliedEnergy, NegativeUnsuppliedEnergy>;
 class ConstraintVisitor
 {
 public:
@@ -162,10 +159,6 @@ class ConstraintVisitor
     {
     }
 
-    int operator()(const HydroLevel& v) const
-    {
-        return nativeOptimVar.NumeroDeVariablesDeNiveau[v.index];
-    }
     int operator()(const Overflow& v) const
     {
         return nativeOptimVar.NumeroDeVariablesDeDebordement[v.index];
@@ -316,6 +309,12 @@ class ConstraintBuilder
                                bool wrap = false,
                                int delta = 0);
 
+    ConstraintBuilder& HydroLevel(unsigned int index,
+                                  double coeff,
+                                  int shift = 0,
+                                  bool wrap = false,
+                                  int delta = 0);
+
     class ConstraintBuilderInvalidOperator : public std::runtime_error
     {
     public: