Modeler 4.7: Import connections and ports

src/io/inputs/model-converter/include/antares/io/inputs/model-converter/modelConverter.h

@@ -47,7 +47,49 @@ namespace Antares::IO::Inputs::ModelConverter
 class UnknownTypeException: public std::runtime_error
 {
 public:
-    explicit UnknownTypeException(YmlModel::ValueType type);
+    explicit UnknownTypeException(const std::string& type);
+};
+
+class PortWithThisIdAlreadyExists: public std::runtime_error
+{
+public:
+    explicit PortWithThisIdAlreadyExists(const std::string& id);
+};
+
+class PortTypeWithThisIdAlreadyExists: public std::runtime_error
+{
+public:
+    explicit PortTypeWithThisIdAlreadyExists(const std::string& id);
+};
+
+class ConstraintWithThisIdAlreadyExists: public std::runtime_error
+{
+public:
+    explicit ConstraintWithThisIdAlreadyExists(const std::string& id);
+};
+
+class PortTypeDoesntContainsFields: public std::runtime_error
+{
+public:
+    explicit PortTypeDoesntContainsFields(const std::string& id);
+};
+
+class PortTypeNotFound: public std::runtime_error
+{
+public:
+    explicit PortTypeNotFound(const std::string& portId, const std::string& portTypeId);
+};
+
+class PortNotFoundForDefinition: public std::runtime_error
+{
+public:
+    explicit PortNotFoundForDefinition(const std::string& portId);
+};
+
+class FieldNotFoundForDefinition: public std::runtime_error
+{
+public:
+    explicit FieldNotFoundForDefinition(const std::string& portId, const std::string& fieldId);
 };
 
 Study::SystemModel::Library convert(const YmlModel::Library& library);

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

@@ -134,6 +134,7 @@ struct convert<Antares::IO::Inputs::YmlModel::PortFieldDefinition>
     {
         if (!node.IsMap())
         {
+            // return true to avoid error ? port field definition not mandatory
             return false;
         }
         rhs.port = node["port"].as<std::string>();

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

@@ -28,6 +28,7 @@
 #include "constraint.h"
 #include "parameter.h"
 #include "port.h"
+#include "portFieldDefinition.h"
 #include "variable.h"
 
 namespace Antares::Study::SystemModel
@@ -80,6 +81,11 @@ class Model
         return ports_;
     }
 
+    const std::map<std::string, PortFieldDefinition>& PortFieldDefinitions() const
+    {
+        return portFieldDefinitions_;
+    }
+
 private:
     friend class ModelBuilder;
     std::string id_;
@@ -89,6 +95,7 @@ class Model
     std::map<std::string, Variable> variables_;
     std::map<std::string, Constraint> constraints_;
     std::map<std::string, Port> ports_;
+    std::map<std::string, PortFieldDefinition> portFieldDefinitions_;
 };
 
 class ModelBuilder
@@ -102,6 +109,7 @@ class ModelBuilder
     Model build();
 
     ModelBuilder& withConstraints(std::vector<Constraint>&& constraints);
+    ModelBuilder& withPortFieldDefinitions(std::vector<PortFieldDefinition>&& portFieldDefinitions);
 
 private:
     Model model_;

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

@@ -30,6 +30,12 @@ namespace Antares::Study::SystemModel
 class Port
 {
 public:
+    Port(const std::string& id, const PortType& type):
+        id_(id),
+        type_(type)
+    {
+    }
+
     const std::string& Id() const
     {
         return id_;

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

@@ -28,8 +28,28 @@ namespace Antares::Study::SystemModel
 
 class PortFieldDefinition
 {
-    PortFieldDefinition();
-    ~PortFieldDefinition() = default;
+public:
+    PortFieldDefinition(Port port, PortField field, Expression definition):
+        port_(std::move(port)),
+        field_(std::move(field)),
+        definition_(std::move(definition))
+    {
+    }
+
+    const Port& getPort() const
+    {
+        return port_;
+    }
+
+    const PortField& Field() const
+    {
+        return field_;
+    }
+
+    const Expression& Definition() const
+    {
+        return definition_;
+    }
 
 private:
     Port port_;

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

@@ -31,11 +31,8 @@ namespace Antares::Study::SystemModel
 class PortType
 {
 public:
-    PortType(const std::string& id,
-             const std::string& description,
-             std::vector<PortField>&& fields):
+    PortType(const std::string& id, std::vector<PortField>&& fields):
         id_(id),
-        description_(description),
         fields_(std::move(fields))
     {
     }
@@ -45,19 +42,13 @@ class PortType
         return id_;
     }
 
-    const std::string& Description() const
-    {
-        return description_;
-    }
-
     const std::vector<PortField>& Fields() const
     {
         return fields_;
     }
 
 private:
     std::string id_;
-    std::string description_;
 
     std::vector<PortField> fields_;
 };

src/study/system-model/model.cpp

@@ -38,7 +38,7 @@ Model ModelBuilder::build()
 {
     Model model = std::move(model_);
     model_ = Model(); // makes ModelBuilder re-usable
-    return std::move(model);
+    return model;
 }
 
 /**
@@ -136,4 +136,23 @@ ModelBuilder& ModelBuilder::withConstraints(std::vector<Constraint>&& constraint
     return *this;
 }
 
+/**
+ * \brief Sets the ports of the model.
+ *
+ * \param ports A vector of Port objects to set.
+ * \return Reference to the ModelBuilder object.
+ *
+ * inputs it not garanteed to be valid after the call
+ */
+ModelBuilder& ModelBuilder::withPortFieldDefinitions(
+  std::vector<PortFieldDefinition>&& portFieldDefinitions)
+{
+    std::transform(portFieldDefinitions.begin(),
+                   portFieldDefinitions.end(),
+                   std::inserter(model_.portFieldDefinitions_, model_.portFieldDefinitions_.end()),
+                   [](/*Non const to prevent copy*/ PortFieldDefinition& pfd)
+                   { return std::make_pair(pfd.getPort().Id(), std::move(pfd)); });
+    return *this;
+}
+
 } // namespace Antares::Study::SystemModel