update

src/io/inputs/yml-system/converter.cpp

@@ -101,10 +101,13 @@ static SystemModel::Component createComponent(const YmlSystem::Component& c,
 
     SystemModel::ComponentBuilder component_builder;
 
-    std::map<std::string, double> parameters;
+    std::map<std::string, Expressions::Visitors::ComponentParameter> parameters;
     for (const auto& p: c.parameters)
     {
-        parameters.try_emplace(p.id, p.value);
+        parameters.try_emplace(p.id,
+                               Expressions::Visitors::ComponentParameter{.id = p.id,
+                                                                         .type = p.type,
+                                                                         .value = p.value});
     }
 
     auto component = component_builder.withId(c.id)

src/io/inputs/yml-system/decoders.hxx

@@ -56,11 +56,11 @@ struct convert<Antares::IO::Inputs::YmlSystem::Parameter>
         }
         rhs.id = node["id"].as<std::string>();
         rhs.type = node["type"].as<std::string>();
-        rhs.value = node["value"].as<double>();
+        // value could be filename or double in which case it'll be converted later
+        rhs.value = node["value"].as<std::string>();
         return true;
     }
 };
-
 template<>
 struct convert<Antares::IO::Inputs::YmlSystem::Component>
 {

src/io/inputs/yml-system/include/antares/io/inputs/yml-system/system.h

@@ -31,7 +31,7 @@ struct Parameter
 {
     std::string id;
     std::string type;
-    double value;
+    std::string value;
 };
 
 struct Component

src/optimisation/linear-problem-api/include/antares/optimisation/linear-problem-api/ILinearProblemData.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 namespace Antares::Optimisation::LinearProblemApi
 {
@@ -13,6 +14,10 @@ class ILinearProblemData
                            const unsigned scenario,
                            const unsigned hour)
       = 0;
+    virtual std::vector<double> getData(const std::string& dataSetId,
+                                        const std::string& scenarioGroup,
+                                        const unsigned scenario)
+      = 0;
 };
 
 } // namespace Antares::Optimisation::LinearProblemApi

src/optimisation/linear-problem-data-impl/include/antares/optimisation/linear-problem-data-impl/dataSeries.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 namespace Antares::Optimisation::LinearProblemDataImpl
 {
@@ -15,6 +16,7 @@ class IDataSeries
     }
 
     virtual double getData(unsigned int rank, unsigned int hour) = 0;
+    virtual std::vector<double> getData(unsigned int rank) = 0;
 
     std::string name() const
     {

src/optimisation/linear-problem-data-impl/include/antares/optimisation/linear-problem-data-impl/linearProblemData.h

@@ -39,6 +39,10 @@ class LinearProblemData: public LinearProblemApi::ILinearProblemData
                    const unsigned scenario,
                    const unsigned hour) override;
 
+    std::vector<double> getData(const std::string& dataSetId,
+                                const std::string& scenarioGroup,
+                                const unsigned scenario) override;
+
     void addScenarioGroup(const std::string& groupId, std::pair<unsigned, unsigned> scenarioToRank);
     void addDataSeries(std::unique_ptr<IDataSeries> dataSeries);
 

src/optimisation/linear-problem-data-impl/include/antares/optimisation/linear-problem-data-impl/timeSeriesSet.h

@@ -12,6 +12,7 @@ class TimeSeriesSet: public IDataSeries
     explicit TimeSeriesSet(std::string name, unsigned height);
     void add(const std::vector<double>& ts);
     double getData(unsigned rank, unsigned hour) override;
+    std::vector<double> getData(unsigned int rank) override;
 
 private:
     unsigned height_ = 0;

src/optimisation/linear-problem-data-impl/linearProblemData.cpp

@@ -44,4 +44,12 @@ double LinearProblemData::getData(const std::string& dataSetId,
     return dataSeriesRepository_.getDataSeries(dataSetId).getData(rank, hour);
 }
 
+std::vector<double> LinearProblemData::getData(const std::string& dataSetId,
+                                               const std::string& scenarioGroup,
+                                               const unsigned scenario)
+{
+    unsigned rank = groupRepository_.getDataRank(scenarioGroup, scenario);
+    return dataSeriesRepository_.getDataSeries(dataSetId).getData(rank);
+}
+
 } // namespace Antares::Optimisation::LinearProblemDataImpl

src/optimisation/linear-problem-data-impl/timeSeriesSet.cpp

@@ -21,6 +21,16 @@ void TimeSeriesSet::add(const std::vector<double>& ts)
 }
 
 double TimeSeriesSet::getData(unsigned rank, unsigned hour)
+{
+    if (hour > height_ - 1)
+    {
+        throw HourTooBig(name(), hour);
+    }
+
+    return getData(rank)[hour];
+}
+
+std::vector<double> TimeSeriesSet::getData(unsigned int rank)
 {
     if (tsSet_.empty())
     {
@@ -32,11 +42,6 @@ double TimeSeriesSet::getData(unsigned rank, unsigned hour)
         throw RankTooBig(name(), rank);
     }
 
-    if (hour > height_ - 1)
-    {
-        throw HourTooBig(name(), hour);
-    }
-
-    return tsSet_[rank][hour];
+    return tsSet_[rank];
 }
 } // namespace Antares::Optimisation::LinearProblemDataImpl

src/solver/optim-model-filler/ComponentFiller.cpp

@@ -33,7 +33,7 @@ namespace Antares::Optimization
 
 ComponentFiller::ComponentFiller(const Study::SystemModel::Component& component):
     component_(component),
-    evaluationContext_(component_.getParameterValues(), {}),
+    /*evaluationContext_(component_.getParameterValues(), {}),*/
     modelVariable_(component.getModel()->Variables())
 
 {
@@ -53,7 +53,7 @@ void ComponentFiller::addVariables(Optimisation::LinearProblemApi::ILinearProble
         // exception?
         return;
     }
-
+    Expressions::Visitors::EvaluationContext;
     Expressions::Visitors::EvalVisitor evaluator(evaluationContext_);
     for (const auto& variable: component_.getModel()->Variables() | std::views::values)
     {

src/study/system-model/component.cpp

@@ -96,7 +96,7 @@ ComponentBuilder& ComponentBuilder::withModel(const Model* model)
  * \return Reference to the ComponentBuilder object.
  */
 ComponentBuilder& ComponentBuilder::withParameterValues(
-  std::map<std::string, double> parameter_values)
+  std::map<std::string, Expressions::Visitors::ComponentParameter> parameter_values)
 {
     data_.parameter_values = std::move(parameter_values);
     return *this;

src/study/system-model/include/antares/study/system-model/component.h

@@ -22,6 +22,8 @@
 
 #include <map>
 
+#include "antares/expressions/visitors/EvaluationContext.h"
+
 #include "model.h"
 
 namespace Antares::Study::SystemModel
@@ -36,7 +38,7 @@ class ComponentData
 public:
     std::string id;
     const Model* model = nullptr;
-    std::map<std::string, double> parameter_values;
+    std::map<std::string, Expressions::Visitors::ComponentParameter> parameter_values;
     std::string scenario_group_id;
 
     void reset()
@@ -67,12 +69,14 @@ class Component
         return data_.model;
     }
 
-    const std::map<std::string, double>& getParameterValues() const
+    const std::map<std::string, Expressions::Visitors::ComponentParameter>& getParameterValues()
+      const
     {
         return data_.parameter_values;
     }
 
-    double getParameterValue(const std::string& parameter_id) const
+    Expressions::Visitors::ComponentParameter getParameterValue(
+      const std::string& parameter_id) const
     {
         if (!data_.parameter_values.contains(parameter_id))
         {
@@ -99,7 +103,8 @@ class ComponentBuilder
 public:
     ComponentBuilder& withId(std::string_view id);
     ComponentBuilder& withModel(const Model* model);
-    ComponentBuilder& withParameterValues(std::map<std::string, double> parameter_values);
+    ComponentBuilder& withParameterValues(
+      std::map<std::string, Expressions::Visitors::ComponentParameter> parameter_values);
     ComponentBuilder& withScenarioGroupId(const std::string& scenario_group_id);
     Component build();