scenario rules

src/libs/antares/study/include/antares/study/study.h

@@ -391,10 +391,6 @@ class Study: public Yuni::NonCopyable<Study>, public LayerData
     ** \brief Re-Initialize/Re-Load the scenario builder data
     */
     void scenarioRulesCreate();
-    /*!
-    ** \brief Re-Initialize/Re-Load the scenario builder data but consider a single ruleset only
-    */
-    void scenarioRulesCreate(const RulesScenarioName& thisoneonly);
 
     /*!
     ** \brief Release the scenario builder
@@ -586,7 +582,7 @@ class Study: public Yuni::NonCopyable<Study>, public LayerData
     //! \name Scenario Builder
     //@{
     //! Rules for building scenarios (can be null)
-    ScenarioBuilder::Sets* scenarioRules = nullptr;
+    std::shared_ptr<ScenarioBuilder::Sets> scenarioRules;
     //@}
 
     TimeSeries::TS scenarioInitialHydroLevels;

src/libs/antares/study/study.cpp

@@ -104,7 +104,7 @@ Study::~Study()
 
 void Study::clear()
 {
-    FreeAndNil(scenarioRules);
+    scenarioRules.reset();
     FreeAndNil(uiinfo);
 
     // areas

src/libs/antares/study/study.extra.cpp

@@ -35,40 +35,24 @@ String StudyIconFile;
 void Study::scenarioRulesCreate()
 {
     // releasing the previous instance of the scenario builder
-    delete scenarioRules;
+    scenarioRules.reset();
 
     // When ran from the solver, the scenario builder must be present
-    scenarioRules = new ScenarioBuilder::Sets();
-    scenarioRules->loadFromStudy(*this);
-}
-
-void Study::scenarioRulesCreate(const RulesScenarioName& /*thisoneonly*/)
-{
-    // releasing the previous instance of the scenario builder
-    delete scenarioRules;
-    // When ran from the solver, the scenario builder must be present
-    scenarioRules = new ScenarioBuilder::Sets();
+    scenarioRules = std::make_shared<ScenarioBuilder::Sets>();
     scenarioRules->loadFromStudy(*this);
 }
 
 void Study::scenarioRulesDestroy()
 {
-    if (scenarioRules)
-    {
-        // releasing the previous instance of the scenario builder
-        // safety dereferencing for the interface if running
-        ScenarioBuilder::Sets* sb = scenarioRules;
-        scenarioRules = nullptr;
-        delete sb;
-    }
+    scenarioRules.reset();
 }
 
 void Study::scenarioRulesLoadIfNotAvailable()
 {
     if (!scenarioRules)
     {
         // When ran from the solver, the scenario builder must be present
-        scenarioRules = new ScenarioBuilder::Sets();
+        scenarioRules = std::make_shared<ScenarioBuilder::Sets>();
         scenarioRules->loadFromStudy(*this);
     }
 }

src/tests/inmemory-study/in-memory-study.cpp

@@ -172,7 +172,7 @@ averageResults OutputRetriever::thermalNbUnitsON(ThermalCluster* cluster)
 ScenarioBuilderRule::ScenarioBuilderRule(Study& study)
 {
     study.scenarioRulesCreate();
-    ScenarioBuilder::Sets* sets = study.scenarioRules;
+    auto sets = study.scenarioRules;
     if (sets && !sets->empty())
     {
         rules_ = sets->createNew("Custom");

src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp

@@ -188,7 +188,7 @@ struct commonFixture
         study->bindingConstraintsGroups.add("group3");
 
         // Scenario builder initialization
-        study->scenarioRules = new ScenarioBuilder::Sets();
+        study->scenarioRules = std::make_shared<ScenarioBuilder::Sets>();
         study->scenarioRules->setStudy(*study);
         my_rule = study->scenarioRules->createNew("my rule name");
         BOOST_CHECK(my_rule->reset());

src/ui/simulator/application/main/main.cpp

@@ -702,7 +702,7 @@ void ApplWnd::onSectionNotebookPageChanging(Component::Notebook::Page& page)
             auto* job = new JobLoadScenarioBuilder(*study);
             wxTheApp->Yield();
             job->run();
-            study->scenarioRules = job->scenarioBuilder();
+            study->scenarioRules.reset(job->scenarioBuilder());
             job->Destroy();
         }