Release v8.8.11 + ANT-2295 (#2497)

.github/workflows/ubuntu.yml

@@ -242,6 +242,14 @@ jobs:
         batch-name: valid-mps
         os: ${{ env.os }}
 
+    - name: Run tests on adequacy patch
+      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: adequacy-patch-CSR
+        os: ${{ env.test-platform }}
+
     - name: Run parallel tests
       if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests

.github/workflows/windows-vcpkg.yml

@@ -244,6 +244,15 @@ jobs:
         batch-name: valid-mps
         os: ${{ env.test-platform }}
 
+    - name: Run tests on adequacy patch
+      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: adequacy-patch-CSR
+        os: ${{ env.test-platform }}
+
+
     - name: Run parallel tests
       if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests

docs/CHANGELOG.md

@@ -1,6 +1,15 @@
 Antares Changelog
 =================
 
+## New features
+* Adding parameters for the used optimization solver [ANT-2280] (#2466)
+* Adequacy patch CSR : add out variables after DTG netting step [ANT-2295] (#2472)
+
+## Bugfix
+* Legacy GUI : Restore and fix grid statistics [ANT-2381] (#2478)
+* Don't apply reverse spinning if the cluster is no force gen [ANT-2293] (#2468)
+* Use "trigerred" criterion for mrg price [ANT-2294] (#2453)
+
 8.8.10 (09/2024)
 --------------------
 ## Bugfix (adequacy patch)

simtest.json

@@ -1,3 +1,3 @@
 {
-    "version": "v8.8.7"
+    "version": "v8.8.11a"
 }

src/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) # FetchContent_MakeAvailable
 # Version
 set(ANTARES_VERSION_HI	      8)
 set(ANTARES_VERSION_LO	      8)
-set(ANTARES_VERSION_REVISION  10)
+set(ANTARES_VERSION_REVISION  11)
 
 # Beta release
 set(ANTARES_BETA 0)

src/libs/antares/study/parameters/adq-patch-params.cpp

@@ -150,10 +150,13 @@ void AdqPatchParams::addExcludedVariables(std::vector<std::string>& out) const
         out.emplace_back("LMR VIOL.");
         out.emplace_back("UNSP. ENRG CSR");
         out.emplace_back("DTG MRG CSR");
+        out.emplace_back("LOLD CSR");
+        out.emplace_back("LOLP CSR");
+        out.emplace_back("MAX MRG CSR");
+        out.emplace_back("OV. COST CSR");
     }
 }
 
-
 bool AdqPatchParams::updateFromKeyValue(const Yuni::String& key, const Yuni::String& value)
 {
     if (key == "include-adq-patch")

src/solver/optimisation/CMakeLists.txt

@@ -50,12 +50,12 @@ set(RTESOLVER_OPT
 		adequacy_patch_csr/hourly_csr_problem.h
 		adequacy_patch_csr/adq_patch_post_process_list.h
 		adequacy_patch_csr/adq_patch_post_process_list.cpp
-		adequacy_patch_csr/post_processing.cpp
-		adequacy_patch_csr/post_processing.h
+
 		adequacy_patch_local_matching/adq_patch_local_matching.h
 		adequacy_patch_local_matching/adq_patch_local_matching.cpp
 		adequacy_patch_csr/adq_patch_curtailment_sharing.h
 		adequacy_patch_csr/adq_patch_curtailment_sharing.cpp
+		adequacy_patch_csr/solve_problem.h
 		adequacy_patch_csr/solve_problem.cpp
 		adequacy_patch_csr/set_variable_boundaries.cpp
 		adequacy_patch_csr/set_problem_cost_function.cpp
@@ -170,15 +170,9 @@ set(RTESOLVER_OPT
 		constraints/ExchangeBalance.h
 		constraints/ExchangeBalance.cpp
 		constraints/ExchangeBalanceGroup.h
-		constraints/ExchangeBalanceGroup.cpp
-
-	)
-
+		constraints/ExchangeBalanceGroup.cpp)
 
-
-set(SRC_MODEL
-	${RTESOLVER_OPT}
-)
+set(SRC_MODEL ${RTESOLVER_OPT})
 
 add_library(model_antares ${SRC_MODEL})
 if(NOT MSVC)

src/solver/optimisation/adequacy_patch_csr/adq_patch_curtailment_sharing.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "adq_patch_curtailment_sharing.h"
-#include "../opt_fonctions.h"
+#include "solve_problem.h"
 #include "csr_quadratic_problem.h"
 #include "count_constraints_variables.h"
 #include "../simulation/adequacy_patch_runtime_data.h"
@@ -138,7 +138,7 @@ void HourlyCSRProblem::calculateCsrParameters()
             double spillageInit
               = problemeHebdo_->ResultatsHoraires[Area].ValeursHorairesDeDefaillanceNegative[hour];
 
-            rhsAreaBalanceValues[Area] = ensInit + netPositionInit - spillageInit;
+            rhsAreaBalanceValues_[Area] = ensInit + netPositionInit - spillageInit;
         }
     }
 }

src/solver/optimisation/adequacy_patch_csr/adq_patch_post_process_list.cpp

@@ -21,9 +21,11 @@ AdqPatchPostProcessList::AdqPatchPostProcessList(const AdqPatchParams& adqPatchP
       problemeHebdo_, areas, sheddingPolicy, splxOptimization, thread_number));
     post_process_list.push_back(std::make_unique<CurtailmentSharingPostProcessCmd>(
       adqPatchParams, problemeHebdo_, areas, thread_number_));
-    // Here a post process particular to adq patch
-    post_process_list.push_back(std::make_unique<DTGmarginForAdqPatchPostProcessCmd>(
-      adqPatchParams, problemeHebdo_, areas, thread_number));
+    post_process_list.push_back(std::make_unique<UpdateMrgPriceAfterCSRcmd>(problemeHebdo_,
+                                                                            areas,
+                                                                            thread_number));
+    post_process_list.push_back(std::make_unique<DTGnettingAfterCSRcmd>(
+      problemeHebdo_, areas, thread_number));
     post_process_list.push_back(
       std::make_unique<HydroLevelsUpdatePostProcessCmd>(problemeHebdo_, areas, true, false));
     post_process_list.push_back(

src/solver/optimisation/adequacy_patch_csr/construct_problem_constraints_RHS.cpp

@@ -71,7 +71,7 @@ void HourlyCSRProblem::setRHSnodeBalanceValue()
             if (it != numberOfConstraintCsrAreaBalance.end())
             {
                 int Cnt = it->second;
-                problemeAResoudre_.SecondMembre[Cnt] = rhsAreaBalanceValues[Area];
+                problemeAResoudre_.SecondMembre[Cnt] = rhsAreaBalanceValues_[Area];
                 logs.debug() << Cnt << ": Area Balance: RHS[" << Cnt
                              << "] = " << problemeAResoudre_.SecondMembre[Cnt]
                              << " (Area = " << Area << ")";

src/solver/optimisation/adequacy_patch_csr/hourly_csr_problem.h

@@ -34,9 +34,68 @@
 #include <antares/study/parameters/adq-patch-params.h>
 #include "../opt_structure_probleme_a_resoudre.h"
 
+
+
+struct LinkVariable
+{
+    LinkVariable() : directVar(-1), indirectVar(-1)
+    {
+    }
+    LinkVariable(int direct, int indirect) : directVar(direct), indirectVar(indirect)
+    {
+    }
+    inline bool check() const
+    {
+        if (directVar < 0)
+            Antares::logs.warning() << "directVar < 0 detected, this should not happen";
+        if (indirectVar < 0)
+            Antares::logs.warning() << "indirectVar < 0 detected, this should not happen";
+
+        return (directVar >= 0) && (indirectVar >= 0);
+    }
+    int directVar;
+    int indirectVar;
+};
+
 struct PROBLEME_HEBDO;
 class HourlyCSRProblem
 {
+    using AdqPatchParams = Antares::Data::AdequacyPatch::AdqPatchParams;
+public:
+    ~HourlyCSRProblem() = default;
+
+    HourlyCSRProblem(const HourlyCSRProblem&) = delete;
+    HourlyCSRProblem& operator=(const HourlyCSRProblem&) = delete;
+    explicit HourlyCSRProblem(const AdqPatchParams& adqPatchParams,PROBLEME_HEBDO* p) :
+            adqPatchParams_(adqPatchParams),
+            problemeHebdo_(p)
+    {
+        double temp = pow(10, -adqPatchParams.curtailmentSharing.thresholdVarBoundsRelaxation);
+        belowThisThresholdSetToZero = std::min(temp, 0.1);
+
+        allocateProblem();
+    }
+
+    inline void setHour(int hour)
+    {
+        triggeredHour = hour;
+    }
+
+    void run(uint week, uint year);
+
+public:
+    // TODO [gp] : try to make these members private
+    double belowThisThresholdSetToZero;
+    std::set<int> varToBeSetToZeroIfBelowThreshold; // place inside only ENS and Spillage variable
+    int triggeredHour;
+    std::set<int> ensVariablesInsideAdqPatch;       // place inside only ENS inside adq-patch
+    // links between two areas inside the adq-patch domain
+    std::map<int, LinkVariable> linkInsideAdqPatch;
+    std::map<int, int> numberOfConstraintCsrAreaBalance;
+    std::map<int, int> numberOfConstraintCsrFlowDissociation;
+    std::map<int, int> numberOfConstraintCsrHourlyBinding; // length is number of binding constraint
+                                                           // contains interco 2-2
+
 private:
     void calculateCsrParameters();
 
@@ -68,69 +127,10 @@ class HourlyCSRProblem
     void setLinearCost();
 
 private:
-    using AdqPatchParams = Antares::Data::AdequacyPatch::AdqPatchParams;
     const AdqPatchParams& adqPatchParams_;
 
-public:
-    void run(uint week, uint year);
-
-    // TODO[FOM] Make these members private
-    int triggeredHour;
-    double belowThisThresholdSetToZero;
     PROBLEME_HEBDO* problemeHebdo_;
     PROBLEME_ANTARES_A_RESOUDRE problemeAResoudre_;
 
-    explicit HourlyCSRProblem(const AdqPatchParams& adqPatchParams,PROBLEME_HEBDO* p) :
-        adqPatchParams_(adqPatchParams),
-        problemeHebdo_(p)
-    {
-        double temp = pow(10, -adqPatchParams.curtailmentSharing.thresholdVarBoundsRelaxation);
-        belowThisThresholdSetToZero = std::min(temp, 0.1);
-
-        allocateProblem();
-    }
-
-    ~HourlyCSRProblem() = default;
-
-    HourlyCSRProblem(const HourlyCSRProblem&) = delete;
-    HourlyCSRProblem& operator=(const HourlyCSRProblem&) = delete;
-
-    inline void setHour(int hour)
-    {
-        triggeredHour = hour;
-    }
-
-    std::map<int, int> numberOfConstraintCsrEns;
-    std::map<int, int> numberOfConstraintCsrAreaBalance;
-    std::map<int, int> numberOfConstraintCsrFlowDissociation;
-    std::map<int, int> numberOfConstraintCsrHourlyBinding; // length is number of binding constraint
-                                                           // contains interco 2-2
-
-    std::map<int, double> rhsAreaBalanceValues;
-    std::set<int> varToBeSetToZeroIfBelowThreshold; // place inside only ENS and Spillage variable
-    std::set<int> ensVariablesInsideAdqPatch;       // place inside only ENS inside adq-patch
-
-    struct LinkVariable
-    {
-        LinkVariable() : directVar(-1), indirectVar(-1)
-        {
-        }
-        LinkVariable(int direct, int indirect) : directVar(direct), indirectVar(indirect)
-        {
-        }
-        inline bool check() const
-        {
-            if (directVar < 0)
-                Antares::logs.warning() << "directVar < 0 detected, this should not happen";
-            if (indirectVar < 0)
-                Antares::logs.warning() << "indirectVar < 0 detected, this should not happen";
-
-            return (directVar >= 0) && (indirectVar >= 0);
-        }
-        int directVar;
-        int indirectVar;
-    };
-
-    // links between two areas inside the adq-patch domain
-    std::map<int, LinkVariable> linkInsideAdqPatch;
+    std::map<int, double> rhsAreaBalanceValues_;
 };

src/solver/optimisation/adequacy_patch_csr/set_problem_cost_function.cpp

@@ -27,8 +27,7 @@
 
 #include "../solver/optimisation/opt_structure_probleme_a_resoudre.h"
 #include "../simulation/adequacy_patch_runtime_data.h"
-
-#include "../solver/optimisation/opt_fonctions.h"
+#include "hourly_csr_problem.h"
 #include "sim_structure_probleme_economique.h"
 
 namespace