Merge branch 'develop' into feature/add-tests-for-named-mps

.github/workflows/centos7.yml

@@ -36,7 +36,7 @@ jobs:
 
     - name: Init submodule
       run: |
-          git submodule update --init --recursive src/antares-deps src/tests/resources/Antares_Simulator_Tests
+          git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests
 
     - name: Download & extract precompiled deps at root
       run: |
@@ -68,6 +68,8 @@ jobs:
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON \
            -DBUILD_not_system=OFF \
+           -DBUILD_TOOLS=OFF \
+           -DBUILD_UI=OFF \
            -DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \
 
     - name: Build

.github/workflows/oracle8.yml

@@ -37,7 +37,7 @@ jobs:
 
     - name: Install libraries
       run: |
-           dnf install -y epel-release git cmake wget rpm-build
+           dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core
            dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain
 
     - name: Checkout
@@ -47,7 +47,7 @@ jobs:
     - name: Init submodule
       run: |
            git config --global safe.directory '*'
-           git submodule update --init --recursive src/antares-deps src/tests/resources/Antares_Simulator_Tests
+           git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests
 
     - name: Install dependencies
       run: |
@@ -59,6 +59,7 @@ jobs:
            cmake -B _build -S src \
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON \
+           -DBUILD_TOOLS=OFF \
            -DBUILD_UI=OFF \
 
 

.github/workflows/ubuntu.yml

@@ -85,7 +85,7 @@ jobs:
     - name: Init submodule
       run: |
           git submodule update --init src/antares-deps
-          git submodule update --init src/tests/resources/Antares_Simulator_Tests
+          git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests
 
     - name: Configure push
       run: |
@@ -96,6 +96,7 @@ jobs:
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON \
            -DBUILD_not_system=OFF \
+           -DBUILD_TOOLS=ON \
            -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \
 
     - name: Build

.github/workflows/windows-release.yml

@@ -98,6 +98,7 @@ jobs:
            -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON  \
+           -DBUILD_TOOLS=ON \
            -DBUILD_not_system=OFF
 
     - name: Build

.github/workflows/windows-vcpkg.yml

@@ -108,6 +108,7 @@ jobs:
            -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON  \
+           -DBUILD_TOOLS=ON \
            -DBUILD_not_system=OFF
 
     - name: Build

.gitmodules

@@ -1,10 +1,11 @@
 [submodule "src/antares-deps"]
 	path = src/antares-deps
 	url = https://github.com/AntaresSimulatorTeam/antares-deps.git
-	branch = v2.0.2
+	branch = v2.0.2b
 [submodule "src/tests/resources/Antares_Simulator_Tests"]
 	path = src/tests/resources/Antares_Simulator_Tests
 	url = https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests.git
+	branch = master
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git

docker/oraclelinux

@@ -1,12 +1,13 @@
 FROM oraclelinux:8
 
 # update repo
-RUN dnf update -y
+RUN dnf update -y && \
+    dnf install redhat-lsb-core
 
 # install python & modules
-RUN dnf install -y python3 python3-pip
-RUN pip3 install --user pandas numpy pytest
+RUN dnf install -y python3 python3-pip && \
+    pip3 install --user pandas numpy pytest
 
 # Install build tools
-RUN dnf install -y epel-release git cmake wget rpm-build
-RUN dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain
+RUN dnf install -y epel-release git cmake wget rpm-build && \
+    dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain

docs/CHANGELOG.md

@@ -1,6 +1,35 @@
 Antares Changelog
 =================
 
+
+8.7.0-rc1 (07/2023)
+--------------------
+## Features
+* Implement --mps-export command-line option (#1404)
+
+## Bugfixes
+* Fix segfault, add !skipped to enabled constraints (#1441)
+* Use local index for thermal cluster instead of global one (#1448)
+* Only add "active" thermal clusters in binding constraints (#1447)
+* Add cluster name for 6 constraints associated to unit-commitment = accurate (#1426)
+* Fix size for assign / resize - too much memory was allocated (#1443)
+
+## Packages
+* Give Oracle Linux 8 assets a proper name instead of "unknown" (#1438)
+* Don't build tools (study-updater, etc.) by default (#1442)
+
+## For developers
+* Clarify logs & code in case of "failed year" (#1450)
+* Remove two static functions (#1440)
+* Avoid copies using std::move (#1445)
+* Memory allocation, use std::vector (#1402)
+* Fix critical code smells (#1412)
+* Named MPS: factorize variable & constraint namers (#1409)
+* Array, logs jit and correlation in makefile (#1410)
+
+## Tests
+* Tests for CR20: thermal price definition (#1364)
+
 8.7.0-beta3 (07/2023)
 --------------------
 ## Bugfixes

docs/reference-guide/13-file-format.md

@@ -41,7 +41,7 @@ Add directory **bindingconstraints** to output directory **ts-numbers**. For eve
 * For each area, add directory **input/st-storage/clusters/<area id>/list.ini**
 * This file contains the multiple sections whose name is ignored. Each section contains these properties:
     * `name` [str]
-    * `group` [str]. Possible values: "PSP_open", "PSP_closed", "Pondage", "Battery", "Other_1", ... , "Other_5". Default Other_1
+    * `group` [str]. Possible values: "PSP_open", "PSP_closed", "Pondage", "Battery", "Other1", ... , "Other5". Default Other1
     * `efficiency` [double] in range 0-1
     * `reservoircapacity` [double] > 0
     * `initiallevel` [double] in range 0-1

src/CMakeLists.txt

@@ -6,8 +6,8 @@ set(ANTARES_VERSION_LO	      7)
 set(ANTARES_VERSION_REVISION  0)
 
 # Beta release
-set(ANTARES_BETA 3)
-set(ANTARES_RC 0)
+set(ANTARES_BETA 0)
+set(ANTARES_RC 1)
 
 set(ANTARES_VERSION_YEAR      2023)
 
@@ -178,11 +178,14 @@ endif ()
 option(BUILD_UI "Build antares ui simulator" ON)
 message(STATUS "Build antares ui simulator: ${BUILD_UI}")
 
+option(BUILD_TOOLS "Build antares tools" OFF)
+message(STATUS "Build antares tools: ${BUILD_TOOLS}")
+
 option(BUILD_ORTOOLS "Build OR-Tools" OFF)
-message(STATUS "Build OR-Tools ${BUILD_ORTOOLS}")
+message(STATUS "Build OR-Tools: ${BUILD_ORTOOLS}")
 
 option(BUILD_MINIZIP "Build minizip" OFF)
-message(STATUS "Build minizip ${BUILD_MINIZIP}")
+message(STATUS "Build minizip: ${BUILD_MINIZIP}")
 
 #Define install directory
 if (NOT DEPS_INSTALL_DIR)
@@ -326,7 +329,9 @@ add_subdirectory(solver)	#antares solver and all associated libs
 add_subdirectory(analyzer)	#antares analyser
 
 # Tools
+if (BUILD_TOOLS)
 add_subdirectory(tools)	#All antares tools
+endif()
 
 # Tests
 # 	Not setting BUILD_TESTING as a command line argument is equivalent to use -DBUILD_TESTING=OFF

src/libs/antares/benchmarking/info_collectors.cpp

@@ -72,15 +72,15 @@ void StudyInfoCollector::enabledThermalClustersCountToFileContent(FileContent& f
 
 void StudyInfoCollector::enabledBindingConstraintsCountToFileContent(FileContent& file_content)
 {
-    auto enabledBindingConstraints = study_.bindingConstraints.enabled();
-    auto nbEnabledBC = enabledBindingConstraints.size();
+    auto activeContraints = study_.bindingConstraints.activeContraints();
+    auto nbEnabledBC = activeContraints.size();
     unsigned nbEnabledHourlyBC(0);
     unsigned nbEnabledDailyBC(0);
     unsigned nbEnabledWeeklyBC(0);
 
     for (uint i = 0; i < nbEnabledBC; i++)
     {
-        switch (enabledBindingConstraints[i]->type())
+        switch (activeContraints[i]->type())
         {
         case BindingConstraint::Type::typeHourly:
             nbEnabledHourlyBC++;

src/libs/antares/study/binding_constraint/BindingConstraint.cpp

@@ -153,17 +153,17 @@ void BindingConstraint::weight(const AreaLink* lnk, double w)
     }
 }
 
-void BindingConstraint::weight(const ThermalCluster* clstr, double w)
+void BindingConstraint::weight(const ThermalCluster* cluster, double w)
 {
-    if (clstr)
+    if (cluster && cluster->isActive())
     {
         if (Math::Zero(w))
         {
-            auto i = pClusterWeights.find(clstr);
+            auto i = pClusterWeights.find(cluster);
             if (i != pClusterWeights.end())
                 pClusterWeights.erase(i);
         } else {
-            pClusterWeights[clstr] = w;
+            pClusterWeights[cluster] = w;
         }
     }
 }
@@ -189,29 +189,21 @@ void BindingConstraint::offset(const AreaLink* lnk, int o)
     }
 }
 
-void BindingConstraint::offset(const ThermalCluster* clstr, int o)
+void BindingConstraint::offset(const ThermalCluster* cluster, int o)
 {
-    if (clstr)
+    if (cluster && cluster->isActive())
     {
         if (Math::Zero(o))
         {
-            auto i = pClusterOffsets.find(clstr);
+            auto i = pClusterOffsets.find(cluster);
             if (i != pClusterOffsets.end())
                 pClusterOffsets.erase(i);
         }
         else
-            pClusterOffsets[clstr] = o;
+            pClusterOffsets[cluster] = o;
     }
 }
 
-    uint Antares::Data::BindingConstraint::enabledClusterCount() const
-{
-    return static_cast<uint>(std::count_if(
-            pClusterWeights.begin(), pClusterWeights.end(), [](const clusterWeightMap::value_type &i) {
-                return i.first->enabled && !i.first->mustrun;
-            }));
-}
-
 void BindingConstraint::resetToDefaultValues()
 {
     pEnabled = true;
@@ -436,7 +428,7 @@ void BindingConstraint::buildFormula(String& s) const
                 s << " x (t - " << Math::Abs(pClusterOffsets.find(i->first)->second) << ')';
         }
 
-        if (!(i->first)->enabled || (i->first)->mustrun)
+        if (!i->first->isActive())
             s << " x N/A";
 
         s << ')';
@@ -472,9 +464,9 @@ bool BindingConstraint::contains(const AreaLink* lnk) const
     return (i != pLinkWeights.end());
 }
 
-bool BindingConstraint::contains(const ThermalCluster* clstr) const
+bool BindingConstraint::contains(const ThermalCluster* cluster) const
 {
-    const auto i = pClusterWeights.find(clstr);
+    const auto i = pClusterWeights.find(cluster);
     return (i != pClusterWeights.end());
 }
 
@@ -528,11 +520,11 @@ bool BindingConstraint::hasAllWeightedClustersOnLayer(size_t layerID)
 
     for (auto j = pClusterWeights.begin(); j != endWeights; ++j)
     {
-        auto *clstr = j->first;
-        if (!clstr)
+        auto *cluster = j->first;
+        if (!cluster)
             continue;
 
-        if (!clstr->isVisibleOnLayer(layerID) || j->second == 0)
+        if (!cluster->isVisibleOnLayer(layerID) || j->second == 0)
         {
             return false;
         }
@@ -546,9 +538,9 @@ double BindingConstraint::weight(const AreaLink* lnk) const
     return (i != pLinkWeights.end()) ? i->second : 0.;
 }
 
-double BindingConstraint::weight(const ThermalCluster* clstr) const
+double BindingConstraint::weight(const ThermalCluster* cluster) const
 {
-    auto i = pClusterWeights.find(clstr);
+    auto i = pClusterWeights.find(cluster);
     return (i != pClusterWeights.end()) ? i->second : 0.;
 }
 
@@ -600,7 +592,7 @@ BindingConstraintStructures BindingConstraint::initLinkArrays() const
     off = 0;
     auto cEnd = pClusterWeights.end();
     for (auto i = pClusterWeights.begin(); i != cEnd; ++i) {
-        if (i->first->enabled && !i->first->mustrun) {
+        if (i->first->isActive()) {
             clusterIndex[off] = (i->first)->index;
             clustersAreaIndex[off] = (i->first)->parentArea->index;
             clusterWeight[off] = i->second;

src/libs/antares/study/binding_constraint/BindingConstraint.h

@@ -190,6 +190,7 @@ class BindingConstraint final : public Yuni::NonCopyable<BindingConstraint>
     //@}
 
     bool skipped() const;
+    bool isActive() const;
 
     //Ref to prevent copy. const ref to prevent modification.
     const Matrix<>& RHSTimeSeries() const;
@@ -282,14 +283,6 @@ class BindingConstraint final : public Yuni::NonCopyable<BindingConstraint>
     ** \brief Get how many thermal clusters the binding constraint contains
     */
     uint clusterCount() const;
-
-    /*!
-    ** \brief Get how many thermal clusters the binding constraint contains
-    */
-    uint enabledClusterCount() const;
-
-    //@}
-
     //@}
 
     //! \name Type of the binding constraint
@@ -419,6 +412,7 @@ class BindingConstraint final : public Yuni::NonCopyable<BindingConstraint>
     void clear();
 
     void copyFrom(BindingConstraint const *original);
+
 }; // class BindingConstraint
 
 // class BindConstList
@@ -433,4 +427,4 @@ struct CompareBindingConstraintName final
 
 } // namespace Antares::Data
 
-#include "BindingConstraint.hxx"
+#include "BindingConstraint.hxx"

src/libs/antares/study/binding_constraint/BindingConstraint.hxx

@@ -81,9 +81,13 @@ inline void BindingConstraint::mutateTypeWithoutCheck(Type t)
         pType = t;
 }
 
-        inline bool BindingConstraint::skipped() const
+inline bool BindingConstraint::skipped() const
 {
-    return linkCount() == 0 && enabledClusterCount() == 0;
+    return linkCount() == 0 && clusterCount() == 0;
+}
+
+inline bool BindingConstraint::isActive() const {
+    return enabled() && !skipped();
 }
 
 inline BindingConstraint::iterator BindingConstraint::begin() {
@@ -117,4 +121,4 @@ inline std::string BindingConstraint::timeSeriesFileName(const Env &env) const {
     }
 }
 
-} // namespace Antares
+} // namespace Antares