update

AntaresSimulatorTeam · Dec 16, 2024 · 8109806 · 8109806
1 parent 2f23076
commit 8109806
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 20 deletions.
diff --git a/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraint.h b/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraint.h
@@ -32,6 +32,8 @@ namespace Antares::Data::ShortTermStorage {
         std::vector<int> hours;
         double rhs;
 
+        unsigned int globalIndex = 0;
+
         bool validate() const;
     };
 } // namespace Antares::Data::ShortTermStorage
diff --git a/src/libs/antares/study/parts/short-term-storage/container.cpp b/src/libs/antares/study/parts/short-term-storage/container.cpp
@@ -80,8 +80,8 @@ bool STStorageInput::LoadConstraintsFromIniFile(const fs::path& parent_path)
     const auto pathIni = parent_path / "additional-constraints.ini";
     if (!ini.open(pathIni))
     {
-        logs.error() << "Failed to open INI file: " << pathIni;
-        return false;
+        logs.info() << "There is no: " << pathIni;
+        return true;
     }
 
     for (auto* section = ini.firstSection; section; section = section->next)

diff --git a/src/libs/antares/study/runtime/runtime.cpp b/src/libs/antares/study/runtime/runtime.cpp
@@ -365,6 +365,8 @@ bool StudyRuntimeInfos::loadFromStudy(Study& study)
     logs.info() << "     thermal clusters: " << thermalPlantTotalCount;
     logs.info() << "     thermal clusters (must-run): " << thermalPlantTotalCountMustRun;
     logs.info() << "     short-term storages: " << shortTermStorageCount;
+    logs.info() << "     short-term storage cumulative constraints count: " <<
+            shortTermStorageCumulativeConstraintCount;
     logs.info() << "     binding constraints: "
                 << study.bindingConstraints.activeConstraints().size();
     logs.info() << "     geographic trimming:" << (gd.geographicTrimming ? "true" : "false");

diff --git a/src/solver/optimisation/constraints/ShortTermStorageCumulation.cpp b/src/solver/optimisation/constraints/ShortTermStorageCumulation.cpp
@@ -39,18 +39,24 @@ void ShortTermStorageCumulation::Netting(unsigned int index,
     ShortTermStorageWithdrawal(index, -input.withdrawalEfficiency);
                                                        }
 auto getMemberFunction = [](const std::string& name)
--> void (ShortTermStorageCumulation::*)(unsigned int,
-                                              const ::ShortTermStorage::PROPERTIES& ) {
-            if (name == "withdrawal") {
-                return &ShortTermStorageCumulation::Withdrawal;
-            } else if (name == "injection") {
-                return &ShortTermStorageCumulation::Injection;
-            }
-            else if (name == "netting"){
-                return &ShortTermStorageCumulation::Netting;
-        }
-            return nullptr; // Return null if no match
-        };
+-> std::pair<std::string, void (ShortTermStorageCumulation::*)(unsigned int,
+                                                               const ::ShortTermStorage::PROPERTIES&
+                     )>
+{
+    if (name == "withdrawal")
+    {
+        return {"WithdrawalSum", &ShortTermStorageCumulation::Withdrawal};
+    }
+    else if (name == "injection")
+    {
+        return {"InjectionSum", &ShortTermStorageCumulation::Injection};
+    }
+    else if (name == "netting")
+    {
+        return {"NettingSum", &ShortTermStorageCumulation::Netting};
+    }
+    return {"", nullptr}; // Return null if no match
+};
 
 
 char ConvertSign(const std::string& sign){
@@ -76,15 +82,19 @@ void ShortTermStorageCumulation::add(int pays){
         for(const auto& constraint: storage.additional_constraints){
 
             //sum (var[h]) sign rhs, h in list provied by user
-
-            namer.ShortTermStorageLevel(builder.data.nombreDeContraintes, storage.name);
+            auto [constraintType,memberFunction] = getMemberFunction(constraint.variable);
+            namer.ShortTermStorageCumulation(constraintType,
+                                             builder.data.nombreDeContraintes,
+                                             storage.name,
+                                             constraint.name
+                    );
             const auto index = storage.clusterGlobalIndex;
             //TODO
-            data.CorrespondanceCntNativesCntOptimHebdomadaires.ShortTermStorageCumulation[index]
-              = builder.data.nombreDeContraintes;
-            auto memberFunction = getMemberFunction(constraint.variable);
+            data.CorrespondanceCntNativesCntOptimHebdomadaires.ShortTermStorageCumulation[constraint
+                        .globalIndex]
+                    = builder.data.nombreDeContraintes;
+
             for (const auto& hour: constraint.hours){
-                const int hourInTheYear = builder.data.weekInTheYear * 168 + hour-1;
         builder.updateHourWithinWeek(hour-1);
          (this->*memberFunction)(index, storage);
           builder.SetOperator(ConvertSign(constraint.operatorType))

diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp
@@ -39,6 +39,7 @@ static void importShortTermStorages(
   std::vector<::ShortTermStorage::AREA_INPUT>& ShortTermStorageOut)
 {
     int clusterGlobalIndex = 0;
+    int clusterCumulativeConstraintGlobalIndex = 0;
     for (uint areaIndex = 0; areaIndex != areas.size(); areaIndex++)
     {
         ShortTermStorageOut[areaIndex].resize(areas[areaIndex]->shortTermStorage.count());
@@ -60,6 +61,11 @@ static void importShortTermStorages(
             toInsert.penalizeVariationWithdrawal = st.properties.penalizeVariationWithdrawal;
             toInsert.name = st.properties.name;
             toInsert.additional_constraints = st.additional_constraints;
+            for (auto& constraint: toInsert.additional_constraints)
+            {
+                constraint.globalIndex = clusterCumulativeConstraintGlobalIndex;
+                ++clusterCumulativeConstraintGlobalIndex;
+            }
             toInsert.series = st.series;
 
             // TODO add missing properties, or use the same struct