Feature/ramping model scalian

.github/workflows/centos7.yml

@@ -5,6 +5,7 @@ on:
     types: [ created ]
   push:
     branches:
+      - feature/ramping_model_scalian
       - develop
       - dependabot/*
   schedule:

.github/workflows/doxygen.yml

@@ -27,7 +27,7 @@ jobs:
              git apply ../docs/antares-simulator-doxygen.patch
 
       - name: Doxygen
-        uses: mattnotmitt/doxygen-action@v1.9.8
+        uses: mattnotmitt/doxygen-action@v1.12.0
         with:
           doxyfile-path:  docs/Doxyfile
 

.github/workflows/ubuntu.yml

@@ -204,15 +204,6 @@ jobs:
           batch-name: adequacy-patch-CSR
           os: ${{ env.os }}
 
-      - name: Run parallel tests
-        if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
-        uses: ./.github/workflows/run-tests
-        with:
-          simtest-tag: ${{ env.SIMTEST }}
-          batch-name: valid-parallel
-          os: ${{ env.os }}
-          variant: "parallel"
-
       - name: Run tests introduced in 8.6.0
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
         uses: ./.github/workflows/run-tests
@@ -256,7 +247,7 @@ jobs:
       - name: Run cucumber on short-tests
         uses: ./.github/workflows/cucumber-tests
         with:
-          feature: "features/short_tests.feature"
+          feature: "features/solver-features/short_tests.feature"
 
       - name: Run mps tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
@@ -295,7 +286,7 @@ jobs:
       - name: Run cucumber on medium-tests
         uses: ./.github/workflows/cucumber-tests
         with:
-          feature: "features/medium_tests.feature"
+          feature: "features/solver-features/medium_tests.feature"
 
       - name: Run long-tests-1
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' && !cancelled() }}
@@ -321,6 +312,11 @@ jobs:
           batch-name: long-tests-3
           os: ${{ env.os }}
 
+      - name: Run cucumber on modeler
+        uses: ./.github/workflows/cucumber-tests
+        with:
+          feature: "features/modeler-features"
+
       - name: Barrier
         if: ${{ !success() }}
         run: exit 1

.github/workflows/windows-vcpkg.yml

@@ -248,7 +248,7 @@ jobs:
       - name: Run cucumber on short-tests
         uses: ./.github/workflows/cucumber-tests
         with:
-          feature: "features/short_tests.feature"
+          feature: "features/solver-features/short_tests.feature"
 
       - name: Run mps tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
@@ -287,7 +287,7 @@ jobs:
       - name: Run cucumber on medium-tests
         uses: ./.github/workflows/cucumber-tests
         with:
-          feature: "features/medium_tests.feature"
+          feature: "features/solver-features/medium_tests.feature"
 
       - name: Run long-tests-1
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' && !cancelled() }}
@@ -313,6 +313,11 @@ jobs:
           batch-name: long-tests-3
           os: ${{ env.os }}
 
+      - name: Run cucumber on modeler
+        uses: ./.github/workflows/cucumber-tests
+        with:
+          feature: "features/modeler-features"
+
       - name: Barrier
         if: ${{ !success() }}
         run: exit 1

docs/developer-guide/6-Contributing.md

@@ -270,8 +270,8 @@ v = w * (x + z);
 ## Logging functions:
 
 - Use `Antares::logs.[level]() << message` for logging, below is more detailed description for level:
-  - `logs.info() << msg` - always prints log message
-  - `logs.debug() << msg` - logs only in DEBUG
-  - `logs.warning() << msg` - the same as `logs.info()` but catches your attention
-  - `logs.error()` - the same as `logs.warning()`, but triggers an error when loading a study, with exceptions
-  - `logs.fatal()` - same as `logs.error()`
+  - `logs.fatal()`: indicates an error that causes a sudden shutdown of the application (e.g. null pointer exception, stack overflow, etc.). **Must not be used in antares-simulator** (use `error()` instead)
+  - `logs.error()`: indicates an error that causes unexpected processing behavior or interruption. Use it for anything that causes the simulation to stop (missing or malformed data, optimization error, etc.)
+  - `logs.warning() << msg`: indicates undesired behavior that is not an error, and that does not interrupt processing or the application. Use if for issues that do not interrupt simulation (obsolete parameter ignored, input data ignored, etc.).
+  - `logs.info() << msg`: information message explaining how the simulator works, intended for the person or application using it
+  - `logs.debug() << msg`: information message to facilitate debugging, intended for developers

docs/user-guide/solver/static-modeler/04-parameters.md

@@ -433,6 +433,18 @@ _**This section is under construction**_
 
 > _**Note:**_ You can find more information on this parameter [here](../03-appendix.md#details-on-the-include-exportmps-parameter).
 
+---
+#### include-export-solutions
+- **Expected value:** `true` or `false`
+- **Required:** no
+- **Default value:** `false`
+- **Usage:** set to `true` to activate writing the raw optimization results, that is
+  - For each variable, optimal values (saved in output/output-name/optimal-values-y-w--optim-nb-z.txt) and reduced costs (saved in output/output-name/reduced-costs-y-w--optim-nb-z.txt) 
+  - each constraint, the marginal cost is saved in output/output-name/marinal-costs-y-w--optim-nb-z.txt
+where y is the year number (starting from 1), w is the week number (starting from 1) and z is the optimization index (1 or 2).
+
+This is an advanced option intended to help developers and advanced users better understand their simulation results.
+
 ---
 #### include-split-exported-mps
 [//]: # (TODO: document this parameter, seems to belong to another category)

simtest.json

@@ -1,3 +1,3 @@
 {
-    "version": "v9.2.0h"
+    "version": "v9.2.0i"
 }

src/CMakeLists.txt

@@ -7,7 +7,7 @@ set(ANTARES_VERSION_REVISION  0)
 
 # Beta release
 set(ANTARES_BETA 0)
-set(ANTARES_RC 8)
+set(ANTARES_RC 9)
 
 set(ANTARES_VERSION_YEAR      2024)
 

src/analyzer/atsp/atsp.cpp

@@ -45,11 +45,6 @@ ATSP::ATSP():
 
 ATSP::~ATSP()
 {
-    for (uint i = 0; i != pArea.size(); ++i)
-    {
-        delete pArea[i];
-    }
-
     if (pAutoClean)
     {
         logs.info() << "Cleaning...";
@@ -116,7 +111,7 @@ void ATSP::printSummary() const
 
     for (uint i = 0; i != pArea.size(); ++i)
     {
-        const AreaInfo& info = *pArea[i];
+        const AreaInfo& info = pArea[i];
         if (info.rawData)
         {
             logs.info() << "  " << info.name << ": law '"
@@ -163,7 +158,7 @@ bool ATSP::writeMoments() const
 
     for (uint i = 0; i < pArea.size(); ++i)
     {
-        const AreaInfo& info = *(pArea[i]);
+        const AreaInfo& info = pArea[i];
         if (!info.enabled)
         {
             continue;

src/analyzer/atsp/atsp.h

@@ -67,7 +67,7 @@ class ATSP final
     {
     public:
         //! Vector
-        using Vector = std::vector<AreaInfo*>;
+        using Vector = std::vector<AreaInfo>;
 
     public:
         bool enabled;
@@ -200,7 +200,6 @@ class ATSP final
     bool writeMoments() const;
 
     void cacheCreate();
-    void cacheDestroy();
     void cacheClear();
     bool cacheFetch(uint index, Matrix<>& out) const;
 
@@ -289,7 +288,7 @@ class ATSP final
     uint64_t pLimitMemory;
     uint64_t pCacheMemoryUsed;
     uint pCacheLastValidIndex;
-    Matrix<>* pCacheMatrix;
+    std::vector<Matrix<>> pCacheMatrix;
 
     Yuni::String::Vector folderPerArea;
     //! Temporary string mainly used for filename manipulation

src/analyzer/atsp/cache.cpp

@@ -25,17 +25,11 @@ namespace Antares
 {
 void ATSP::cacheCreate()
 {
-    pCacheMatrix = new Matrix<>[pArea.size()];
+    pCacheMatrix.resize(pArea.size());
     pCacheMemoryUsed = sizeof(Matrix<>) * pArea.size();
     pCacheLastValidIndex = 0;
 }
 
-void ATSP::cacheDestroy()
-{
-    delete[] pCacheMatrix;
-    pCacheMatrix = nullptr;
-}
-
 void ATSP::cacheClear()
 {
     for (uint i = 0; i != pCacheLastValidIndex; ++i)

src/analyzer/atsp/correlations.cpp

@@ -75,13 +75,13 @@ bool ATSP::computeMonthlyCorrelations()
 
     // Initialize mapping, to skip areas which has been disabled
     // the real number of items is `realAreaCount`
-    uint* mapping = new uint[pArea.size()];
+    std::vector<uint> mapping(pArea.size());
     {
         uint z = 0;
         for (uint i = 0; i != pArea.size(); ++i)
         {
             mapping[i] = (uint)-1;
-            if (pArea[i]->enabled)
+            if (pArea[i].enabled)
             {
                 mapping[z] = i;
                 ++z;
@@ -168,8 +168,8 @@ bool ATSP::computeMonthlyCorrelations()
 
                 logs.info() << "Correlation: month: " << Antares::Date::MonthToString(m)
                             << ", area " << (1 + iZ) << '/' << realAreaCount << ": "
-                            << pArea[i]->name << " with area " << (1 + jZ) << '/' << realAreaCount
-                            << ": " << pArea[j]->name;
+                            << pArea[i].name << " with area " << (1 + jZ) << '/' << realAreaCount
+                            << ": " << pArea[j].name;
 
                 if (!cacheFetch(j, SERIE_P))
                 {
@@ -442,7 +442,6 @@ bool ATSP::computeMonthlyCorrelations()
     moments_centr_net.clear();
     moments_centr_raw.clear();
     hidden_hours.clear();
-    cacheDestroy();
 
     // Rounding annual correlation coefficients -zero excluded
     for (uint i = 1; i < CORR_YNP.width; ++i)
@@ -614,7 +613,7 @@ bool ATSP::computeMonthlyCorrelations()
                     if (!Utils::isZero(col[jZ]))
                     {
                         const uint j = mapping[jZ];
-                        f << pArea[i]->name << '%' << pArea[j]->name << " = " << col[jZ] << '\n';
+                        f << pArea[i].name << '%' << pArea[j].name << " = " << col[jZ] << '\n';
                     }
                 }
             }
@@ -650,8 +649,7 @@ bool ATSP::computeMonthlyCorrelations()
                         if (!Utils::isZero(col[jZ]))
                         {
                             const uint j = mapping[jZ];
-                            f << pArea[i]->name << '%' << pArea[j]->name << " = " << col[jZ]
-                              << '\n';
+                            f << pArea[i].name << '%' << pArea[j].name << " = " << col[jZ] << '\n';
                         }
                     }
                 }
@@ -669,7 +667,7 @@ bool ATSP::computeMonthlyCorrelations()
             for (uint iZ = 0; iZ != realAreaCount; ++iZ)
             {
                 const uint i = mapping[iZ];
-                f << pArea[i]->name << '\n';
+                f << pArea[i].name << '\n';
             }
         }
         else
@@ -678,9 +676,6 @@ bool ATSP::computeMonthlyCorrelations()
         }
     }
 
-    // removing the mapping list
-    delete[] mapping;
-
     return true;
 }
 

src/analyzer/atsp/load.cpp

@@ -173,11 +173,11 @@ bool ATSP::loadFromINIFile(const String& filename)
             }
             else
             {
-                AreaInfo* info = new AreaInfo();
-                info->name = section->name;
-                info->name.toLower();
-                info->enabled = true;
-                info->distribution = Data::XCast::dtBeta;
+                AreaInfo info;
+                info.name = section->name;
+                info.name.toLower();
+                info.enabled = true;
+                info.distribution = Data::XCast::dtBeta;
 
                 IniFile::Property* p = section->firstProperty;
                 for (; p; p = p->next)
@@ -187,30 +187,30 @@ bool ATSP::loadFromINIFile(const String& filename)
 
                     if (key == "file")
                     {
-                        info->filename = p->value;
+                        info.filename = p->value;
                         continue;
                     }
                     if (key == "data")
                     {
                         key = p->value;
                         key.toLower();
-                        info->rawData = (key == "raw");
+                        info.rawData = (key == "raw");
                         continue;
                     }
                     if (key == "distribution")
                     {
-                        info->distribution = Data::XCast::StringToDistribution(p->value);
-                        if (info->distribution == Data::XCast::dtNone)
+                        info.distribution = Data::XCast::StringToDistribution(p->value);
+                        if (info.distribution == Data::XCast::dtNone)
                         {
                             logs.error() << "invalid distribution for " << section->name
                                          << " ('beta' will be used)";
-                            info->distribution = Data::XCast::dtBeta;
+                            info.distribution = Data::XCast::dtBeta;
                         }
                         continue;
                     }
                 }
 
-                pArea.push_back(info);
+                pArea.push_back(std::move(info));
             }
         }
 

src/analyzer/atsp/preflight.cpp

@@ -43,7 +43,7 @@ bool ATSP::preflight()
         for (uint i = 0; i != pArea.size(); ++i)
         {
             String& folder = folderPerArea[i];
-            folder.clear() << pTemp << SEP << tsName << SEP << (i / 256) << SEP << pArea[i]->name;
+            folder.clear() << pTemp << SEP << tsName << SEP << (i / 256) << SEP << pArea[i].name;
             if (!IO::Directory::Create(folder))
             {
                 logs.error() << "impossible to create the directory " << folder;
@@ -67,8 +67,8 @@ bool ATSP::preflight()
     {
         if (!preflight(i))
         {
-            pArea[i]->enabled = false;
-            logs.info() << " The area '" << pArea[i]->name << "' has been removed";
+            pArea[i].enabled = false;
+            logs.info() << " The area '" << pArea[i].name << "' has been removed";
         }
         else
         {
@@ -102,7 +102,7 @@ bool ATSP::preflight()
 bool ATSP::preflight(const uint areaIndex)
 {
     // Alias to the current area info
-    const AreaInfo& info = *(pArea[areaIndex]);
+    const AreaInfo& info = pArea[areaIndex];
     // The folder for the current area
     const String& folder = folderPerArea[areaIndex];
 

src/format-code.sh

@@ -20,5 +20,5 @@ fi
 if ! [ -x "$(command -v clang-format)" ]; then
     echo 'Warning: clang-format is not installed. Skipping' >&2
 else
-    echo "$SOURCE_FILES" | xargs clang-format -i --verbose
+    echo "$SOURCE_FILES" | xargs clang-format  -style=file:../.clang-format -i --verbose
 fi

src/libs/antares/study/area/area.cpp

@@ -40,7 +40,7 @@ void Area::internalInitialize()
     // Make sure we have
     if (JIT::usedFromGUI)
     {
-        ui = new AreaUI();
+        ui = std::make_unique<AreaUI>();
     }
 }
 
@@ -76,9 +76,6 @@ Area::~Area()
 
     reserves.clear();
     miscGen.clear();
-
-    delete ui;
-    ui = nullptr;
 }
 
 void Area::clearAllLinks()