Normalize simulation mode Expansion, fix logs

src/libs/antares/CMakeLists.txt

@@ -26,7 +26,6 @@ set(SRC
     config.h
     constants.h
 	constants.cpp
-    xpansion.h
 	# Misc
 
 	locale.h

src/libs/antares/constants.h

@@ -28,7 +28,6 @@
 #ifndef __ANTARES_LIBS_CONSTANTS_H__
 #define __ANTARES_LIBS_CONSTANTS_H__
 
-#include "xpansion.h"
 #include <array>
 
 /*! Name of the app to use into logs */

src/libs/antares/study/parameters.cpp

@@ -177,8 +177,9 @@ const char* StudyModeToCString(StudyMode mode)
         return "Economy";
     case stdmAdequacy:
         return "Adequacy";
-    case stdmMax:
     case stdmExpansion:
+        return "Expansion";
+    case stdmMax:
     case stdmUnknown:
         return "Unknown";
     }
@@ -231,8 +232,6 @@ void Parameters::reset()
 {
     // Mode
     mode = stdmEconomy;
-    // Expansion
-    expansion = false;
     // Calendar
     horizon.clear();
 
@@ -1039,25 +1038,12 @@ bool Parameters::loadFromINI(const IniFile& ini, uint version, const StudyLoadOp
     }
 
     // Simulation mode
-    // ... Expansion
-    if (mode == stdmExpansion)
-    {
-        mode = stdmEconomy;
-        expansion = true;
-    }
-
     // ... Enforcing simulation mode
     if (options.forceMode != stdmUnknown)
     {
-        if (options.forceMode == stdmExpansion)
-        {
-            mode = stdmEconomy;
-            expansion = true;
-        }
-        else
-            mode = options.forceMode;
-
+        mode = options.forceMode;
         logs.info() << "  forcing the simulation mode " << StudyModeToCString(mode);
+
         assert(mode != stdmMax && "Invalid simulation mode");
     }
     else
@@ -1359,14 +1345,14 @@ void Parameters::prepareForSimulation(const StudyLoadOptions& options)
     {
     case stdmEconomy:
     case stdmAdequacy:
+    case stdmExpansion:
     {
         // The year-by-year mode might have been requested from the command line
         if (options.forceYearByYear)
             yearByYear = true;
         break;
     }
     case stdmUnknown:
-    case stdmExpansion:
     case stdmMax:
     {
         // The mode year-by-year can not be enabled in adequacy
@@ -1437,7 +1423,7 @@ void Parameters::prepareForSimulation(const StudyLoadOptions& options)
         exportTimeSeriesInInput = 0;
     }
 
-    if (expansion)
+    if (mode == stdmExpansion)
         logs.info() << "  :: enabling expansion";
     if (yearByYear)
         logs.info() << "  :: enabling the 'year-by-year' mode";
@@ -1504,13 +1490,7 @@ void Parameters::saveToINI(IniFile& ini) const
         auto* section = ini.addSection("general");
 
         // Mode
-        if (expansion && mode == stdmEconomy)
-            section->add("mode", "Expansion");
-        else
-        {
-            section->add("mode", StudyModeToCString(mode));
-            expansion = false;
-        }
+        section->add("mode", StudyModeToCString(mode));
 
         // Calendar
         section->add("horizon", horizon);

src/libs/antares/study/parameters.h

@@ -204,11 +204,6 @@ class Parameters final
     StudyMode mode;
     //@}
 
-    //! \name Expansion
-    //@{
-    //! Expansion flag
-    mutable bool expansion;
-
     //! \name Horizon
     //@{
     //! Horizon year

src/libs/antares/study/study.cpp

@@ -644,8 +644,10 @@ YString StudyCreateOutputPath(StudyMode mode,
     case stdmAdequacy:
         folderOutput += "adq";
         break;
-    case stdmUnknown:
     case stdmExpansion:
+        folderOutput += "exp";
+        break;
+    case stdmUnknown:
     case stdmMax:
         break;
     }

src/solver/application.cpp

@@ -232,6 +232,7 @@ void Application::execute()
     switch (pStudy->runtime->mode)
     {
     case Data::stdmEconomy:
+    case Data::stdmExpansion:
         runSimulationInEconomicMode();
         break;
     case Data::stdmAdequacy:

src/solver/simulation/sim_calcul_economique.cpp

@@ -83,7 +83,7 @@ void SIM_InitialisationProblemeHebdo(Data::Study& study,
 
     auto& parameters = study.parameters;
 
-    problem.Expansion = parameters.expansion;
+    problem.Expansion = (parameters.mode == Data::stdmExpansion);
     problem.firstWeekOfSimulation = false;
 
     problem.hydroHotStart

src/solver/variable/state.hxx

@@ -76,20 +76,15 @@ inline void State::initFromAreaIndex(const unsigned int areaIndex, uint numSpace
 
     switch (studyMode)
     {
-    case Data::stdmEconomy:
-    {
-        hourlyResults = &problemeHebdo->ResultatsHoraires[areaIndex];
-        break;
-    }
     case Data::stdmAdequacy:
+    case Data::stdmEconomy:
+    case Data::stdmExpansion:
     {
         hourlyResults = &problemeHebdo->ResultatsHoraires[areaIndex];
         break;
     }
+
     case Data::stdmUnknown:
-        break;
-    case Data::stdmExpansion:
-        break;
     case Data::stdmMax:
         break;
     }

src/solver/variable/surveyresults/surveyresults.cpp

@@ -197,22 +197,17 @@ void SurveyResultsData::initialize(uint maxVariables)
 
     switch (study.parameters.mode)
     {
-    case Data::stdmEconomy:
-    {
-        matrix.resize(study.areas.size(), study.areas.size());
-        // The initialization will be done later
-        //::MatrixFill(&matrix, std::numeric_limits<double>::quiet_NaN());
-        break;
-    }
     case Data::stdmAdequacy:
+    case Data::stdmEconomy:
+    case Data::stdmExpansion:
     {
         matrix.resize(study.areas.size(), study.areas.size());
         // The initialization will be done later
         //::MatrixFill(&matrix, std::numeric_limits<double>::quiet_NaN());
         break;
     }
+
     case Data::stdmUnknown:
-    case Data::stdmExpansion:
     case Data::stdmMax:
         break;
     }

src/ui/simulator/windows/inspector/constants.cpp

@@ -1,4 +1,3 @@
-#include <antares/xpansion.h>
 #include "constants.h"
 
 namespace Antares
@@ -269,9 +268,7 @@ const wxChar* const calendarWeeks[] = {wxT("MON  -  SUN"),
 
 const wxChar* const studyMode[] = {wxT("Economy"),
                                    wxT("Adequacy"),
-#if STUDY_MODE_EXPANSION
                                    wxT("Expansion"),
-#endif
                                    nullptr};
 
 const wxChar* const adequacyPatchMode[] = {wxT("virtual area"),

src/ui/simulator/windows/output/panel/area-link.cpp

@@ -675,6 +675,8 @@ void Panel::loadDataFromFile()
         filename << output.path << SEP << "adequacy" << SEP;
         break;
     case Data::stdmExpansion:
+        filename << output.path << SEP << "expansion" << SEP;
+        break;
     case Data::stdmUnknown:
     case Data::stdmMax:
         filename << output.path << SEP << "unknown" << SEP;

src/ui/simulator/windows/output/provider/outputs.cpp

@@ -179,8 +179,10 @@ void Outputs::search(Spotlight::IItem::Vector& out,
             case Data::stdmAdequacy:
                 item->addTag("ADQ", 220, 192, 245);
                 break;
-            case Data::stdmUnknown:
             case Data::stdmExpansion:
+                item->addTag("EXP", 220, 192, 245);
+                break;
+            case Data::stdmUnknown:
             case Data::stdmMax:
                 item->addTag("...", 213, 213, 213);
             }