active cumulation constraints

AntaresSimulatorTeam · Dec 16, 2024 · 8c49f56 · 8c49f56
1 parent af38876
commit 8c49f56
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/solver/optimisation/constraints/Group1.cpp b/src/solver/optimisation/constraints/Group1.cpp
@@ -22,6 +22,7 @@
 #include "antares/solver/optimisation/constraints/Group1.h"
 
 #include "antares/solver/optimisation/constraints/ShortTermStorageCostVariation.h"
+#include "antares/solver/optimisation/constraints/ShortTermStorageCumulation.h"
 
 AreaBalanceData Group1::GetAreaBalanceData()
 {
@@ -49,6 +50,15 @@ ShortTermStorageData Group1::GetShortTermStorageData()
     };
 }
 
+ShortTermStorageCumulativeConstraintData Group1::ShortTermStorageCumulativeConstraintData()
+{
+    return {
+            problemeHebdo_->CorrespondanceCntNativesCntOptim,
+            problemeHebdo_->ShortTermStorage,
+            problemeHebdo_->CorrespondanceCntNativesCntOptimHebdomadaires
+    };
+}
+
 FlowDissociationData Group1::GetFlowDissociationData()
 {
     return {.CorrespondanceCntNativesCntOptim = problemeHebdo_->CorrespondanceCntNativesCntOptim,
@@ -89,6 +99,11 @@ void Group1::BuildConstraints()
     ShortTermStorageCostVariationWithdrawalForward shortTermStorageCostVariationWithdrawalForward(
       builder_,
       shortTermStorageData);
+
+    auto shortTermStorageCumulativeConstraintData = GetShortTermStorageCumulativeConstraintData();
+    ShortTermStorageCumulation shortTermStorageCumulation(builder_,
+                                                          shortTermStorageCumulativeConstraintData);
+
     auto flowDissociationData = GetFlowDissociationData();
     FlowDissociation flowDissociation(builder_, flowDissociationData);
 
@@ -123,4 +138,9 @@ void Group1::BuildConstraints()
             bindingConstraintHour.add(pdt, cntCouplante);
         }
     }
+
+    for (uint32_t pays = 0; pays < problemeHebdo_->NombreDePays; pays++)
+    {
+        shortTermStorageCumulation.add(pays);
+    }
 }
diff --git a/src/solver/optimisation/include/antares/solver/optimisation/constraints/ConstraintBuilder.h b/src/solver/optimisation/include/antares/solver/optimisation/constraints/ConstraintBuilder.h
@@ -308,5 +308,5 @@ struct ShortTermStorageData
 
 struct ShortTermStorageCumulativeConstraintData: ShortTermStorageData
 {
-    CORRESPONDANCES_DES_CONTRAINTES_HEBDOMADAIRES CorrespondanceCntNativesCntOptimHebdomadaires;
+    CORRESPONDANCES_DES_CONTRAINTES_HEBDOMADAIRES& CorrespondanceCntNativesCntOptimHebdomadaires;
 };