Add NetPosition hourly variable

AntaresSimulatorTeam · Dec 30, 2024 · 24697e7 · 24697e7
1 parent f5f634c
commit 24697e7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 0 deletions.
diff --git a/src/solver/optimisation/constraints/ConstraintBuilder.cpp b/src/solver/optimisation/constraints/ConstraintBuilder.cpp
@@ -49,6 +49,12 @@ ConstraintBuilder& ConstraintBuilder::DispatchableProduction(unsigned int index,
     return *this;
 }
 
+ConstraintBuilder& ConstraintBuilder::NetPosition(unsigned int index, double coeff)
+{
+    AddVariable(variableManager_.NetPosition(index, hourInWeek_), coeff);
+    return *this;
+}
+
 ConstraintBuilder& ConstraintBuilder::NumberOfDispatchableUnits(unsigned int index, double coeff)
 {
     AddVariable(variableManager_.NumberOfDispatchableUnits(index, hourInWeek_), coeff);

diff --git a/src/solver/optimisation/include/antares/solver/optimisation/constraints/ConstraintBuilder.h b/src/solver/optimisation/include/antares/solver/optimisation/constraints/ConstraintBuilder.h
@@ -137,6 +137,8 @@ class ConstraintBuilder
                                                         int offset = 0,
                                                         int delta = 0);
 
+    ConstraintBuilder& NetPosition(unsigned int index, double coeff);
+
     ConstraintBuilder& HydProd(unsigned int index, double coeff);
 
     ConstraintBuilder& HydProdDown(unsigned int index, double coeff);

diff --git a/src/solver/optimisation/opt_construction_variables_optimisees_lineaire.cpp b/src/solver/optimisation/opt_construction_variables_optimisees_lineaire.cpp
@@ -86,6 +86,11 @@ void OPT_ConstruireLaListeDesVariablesOptimiseesDuProblemeLineaire(PROBLEME_HEBD
                 NombreDeVariables++;
             }
 
+            // NetPosition
+            ProblemeAResoudre->TypeDeVariable[NombreDeVariables] = VARIABLE_NON_BORNEE;
+            variableManager.NetPosition(pays, pdt) = NombreDeVariables;
+            NombreDeVariables++;
+
             for (const auto& storage: problemeHebdo->ShortTermStorage[pays])
             {
                 const int clusterGlobalIndex = storage.clusterGlobalIndex;

diff --git a/src/solver/optimisation/variables/VariableManagement.cpp b/src/solver/optimisation/variables/VariableManagement.cpp
@@ -156,6 +156,15 @@ int& VariableManager::ShortTermStorageCostVariationWithdrawal(unsigned int index
       .SIM_ShortTermStorage.CostVariationWithdrawal[index];
 }
 
+int& VariableManager::NetPosition(unsigned int index,
+                                  unsigned int hourInWeek,
+                                  int offset,
+                                  int delta)
+{
+    auto pdt = GetShiftedTimeStep(offset, delta, hourInWeek);
+    return CorrespondanceVarNativesVarOptim_[pdt].NumeroDeVariableNetPosition[index];
+}
+
 int& VariableManager::HydProd(unsigned int index, unsigned int hourInWeek, int offset, int delta)
 {
     auto pdt = GetShiftedTimeStep(offset, delta, hourInWeek);

diff --git a/src/solver/optimisation/variables/VariableManagement.h b/src/solver/optimisation/variables/VariableManagement.h
@@ -75,6 +75,8 @@ class VariableManager
                                                  int offset = 0,
                                                  int delta = 0);
 
+    int& NetPosition(unsigned int index, unsigned int hourInWeek, int offset = 0, int delta = 0);
+
     int& HydProd(unsigned int index, unsigned int hourInWeek, int offset = 0, int delta = 0);
 
     int& HydProdDown(unsigned int index, unsigned int hourInWeek, int offset = 0, int delta = 0);

diff --git a/src/solver/simulation/include/antares/solver/simulation/sim_structure_probleme_economique.h b/src/solver/simulation/include/antares/solver/simulation/sim_structure_probleme_economique.h
@@ -45,6 +45,7 @@ struct CORRESPONDANCES_DES_VARIABLES
 
     std::vector<int> NumeroDeVariableDuPalierThermique;
 
+    std::vector<int> NumeroDeVariableNetPosition;
     std::vector<int> NumeroDeVariablesDeLaProdHyd;
 
     std::vector<int> NumeroDeVariablesDePompage;

diff --git a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp
@@ -157,6 +157,7 @@ void SIM_AllocationProblemePasDeTemps(PROBLEME_HEBDO& problem,
 
         variablesMapping.NumeroDeVariableDuPalierThermique
           .assign(study.runtime.thermalPlantTotalCount, 0);
+        variablesMapping.NumeroDeVariableNetPosition.assign(nbPays, 0);
         variablesMapping.NumeroDeVariablesDeLaProdHyd.assign(nbPays, 0);
         variablesMapping.NumeroDeVariablesDePompage.assign(nbPays, 0);
         variablesMapping.NumeroDeVariablesDeNiveau.assign(nbPays, 0);