Release 8.6.9

.github/workflows/centos7.yml

@@ -17,6 +17,7 @@ env:
   GITHUB_TOKEN: ${{ github.token }}
   IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }}
   IS_PUSH: ${{ github.event_name == 'push' }}
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
 

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	      6)
-set(ANTARES_VERSION_REVISION  8)
+set(ANTARES_VERSION_REVISION  9)
 set(ANTARES_VERSION_YEAR      2024)
 
 project(antares

src/libs/antares/study/parts/short-term-storage/properties.cpp

@@ -26,6 +26,8 @@
 */
 
 #include <antares/logs.h>
+#include <boost/algorithm/string/case_conv.hpp>
+
 #include <stdexcept>
 
 #include "properties.h"
@@ -35,15 +37,15 @@
 namespace Antares::Data::ShortTermStorage
 {
 const std::map<std::string, enum Group> Properties::ST_STORAGE_PROPERTY_GROUP_ENUM
-  = {{"PSP_open", Group::PSP_open},
-     {"PSP_closed", Group::PSP_closed},
-     {"Pondage", Group::Pondage},
-     {"Battery", Group::Battery},
-     {"Other1", Group::Other1},
-     {"Other2", Group::Other2},
-     {"Other3", Group::Other3},
-     {"Other4", Group::Other4},
-     {"Other5", Group::Other5}};
+  = {{"PSP_OPEN", Group::PSP_open},
+     {"PSP_CLOSED", Group::PSP_closed},
+     {"PONDAGE", Group::Pondage},
+     {"BATTERY", Group::Battery},
+     {"OTHER1", Group::Other1},
+     {"OTHER2", Group::Other2},
+     {"OTHER3", Group::Other3},
+     {"OTHER4", Group::Other4},
+     {"OTHER5", Group::Other5}};
 
 unsigned int groupIndex(Group group)
 {
@@ -106,7 +108,9 @@ bool Properties::loadKey(const IniFile::Property* p)
 
     if (p->key == "group")
     {
-        if (auto it = Properties::ST_STORAGE_PROPERTY_GROUP_ENUM.find(p->value.c_str());
+        std::string groupUpper = p->value.c_str();
+        boost::to_upper(groupUpper);
+        if (auto it = Properties::ST_STORAGE_PROPERTY_GROUP_ENUM.find(groupUpper);
             it != Properties::ST_STORAGE_PROPERTY_GROUP_ENUM.end())
         {
             this->group = it->second;

src/solver/misc/options.cpp

@@ -54,20 +54,6 @@ using namespace Yuni;
 using namespace Antares;
 using namespace Antares::Data;
 
-static std::string availableOrToolsSolversString()
-{
-    const std::list<std::string> availableSolverList = getAvailableOrtoolsSolverName();
-    std::string availableSolverListStr;
-    for (auto it = availableSolverList.begin(); it != availableSolverList.end(); it++)
-    {
-        availableSolverListStr += *it + ";";
-    }
-    // Remove last semicolumn
-    if (!availableSolverListStr.empty())
-        availableSolverListStr.pop_back();
-    return availableSolverListStr;
-}
-
 std::unique_ptr<GetOpt::Parser> CreateParser(Settings& settings,
                                              Antares::Data::StudyLoadOptions& options)
 {

src/solver/optimisation/post_process_commands.cpp

@@ -263,9 +263,9 @@ double CurtailmentSharingPostProcessCmd::calculateDensNewAndTotalLmrViolation()
                 const auto& scratchpad = area_list_[Area]->scratchpad[thread_number_];
                 double dtgMrg = scratchpad.dispatchableGenerationMargin[hour];
                 // write down densNew values for all the hours
-                problemeHebdo_->ResultatsHoraires[Area].ValeursHorairesDENS[hour]
-                  = std::max(0.0, densNew - dtgMrg);
-                ;
+                problemeHebdo_->ResultatsHoraires[Area].ValeursHorairesDENS[hour] = std::max(
+                  0.0,
+                  densNew);
                 // copy spilled Energy values into spilled Energy values after CSR
                 problemeHebdo_->ResultatsHoraires[Area].ValeursHorairesSpilledEnergyAfterCSR[hour]
                   = problemeHebdo_->ResultatsHoraires[Area]

src/solver/utils/ortools_utils.cpp

@@ -401,6 +401,19 @@ std::list<std::string> getAvailableOrtoolsSolverName()
     return result;
 }
 
+std::string availableOrToolsSolversString()
+{
+    const std::list<std::string> availableSolverList = getAvailableOrtoolsSolverName();
+    std::ostringstream solvers;
+    for (const std::string& avail: availableSolverList)
+    {
+        bool last = &avail == &availableSolverList.back();
+        std::string sep = last ? "." : ", ";
+        solvers << avail << sep;
+    }
+    return solvers.str();
+}
+
 MPSolver* MPSolverFactory(const Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* probleme,
                           const std::string& solverName)
 {

src/solver/utils/ortools_utils.h

@@ -21,6 +21,13 @@ void ORTOOLS_EcrireJeuDeDonneesLineaireAuFormatMPS(MPSolver* solver,
  */
 std::list<std::string> getAvailableOrtoolsSolverName();
 
+/*!
+ *  \brief Return a single string containing all solvers available, separated by a ", " and ending
+ * with a ".".
+ *
+ */
+std::string availableOrToolsSolversString();
+
 /*!
  *  \brief Create a MPSolver with correct linear or mixed variant
  *

src/tools/batchrun/CMakeLists.txt

@@ -39,6 +39,7 @@ set(BATCHRUN_LIBS
 		libantares-core
 		libantares-core-calendar
 		yuni-static-core
+        utils
 		${CMAKE_THREADS_LIBS_INIT}
 )