Merge branch 'develop' into feature/csv-data-series

AntaresSimulatorTeam · Feb 6, 2025 · a006644 · a006644
2 parents ed197a3 + 38af6da
commit a006644
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 38 deletions.
diff --git a/src/expressions/visitors/CompareVisitor.cpp b/src/expressions/visitors/CompareVisitor.cpp
@@ -22,7 +22,9 @@
 #include <antares/expressions/visitors/CompareVisitor.h>
 
 template<class T, class V>
-static bool compareBinaryNode(V& visitor, const T* node, const Antares::Expressions::Nodes::Node* other)
+static bool compareBinaryNode(V& visitor,
+                              const T* node,
+                              const Antares::Expressions::Nodes::Node* other)
 {
     if (const T* other_node = dynamic_cast<const T*>(other))
     {

diff --git a/src/expressions/visitors/NodeVisitor.cpp b/src/expressions/visitors/NodeVisitor.cpp
@@ -19,8 +19,8 @@
 ** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
 */
 
-#include <antares/logs/logs.h>
 #include <antares/expressions/visitors/NodeVisitor.h>
+#include <antares/logs/logs.h>
 
 namespace Antares::Expressions::Visitors
 {

diff --git a/src/format-code.sh b/src/format-code.sh
@@ -3,7 +3,7 @@
 if [ $# -eq 0 ]
 then
     # No arguments: format all
-    SOURCE_DIRS="analyzer/ libs/ solver/ tools/ config/ tests/ packaging/ api/"
+    SOURCE_DIRS="analyzer/ libs/ solver/ tools/ config/ tests/ packaging/ api/ io/ optimisation/ expressions/ study/"
     SOURCE_FILES=$(find $SOURCE_DIRS -regextype egrep -regex ".*/*\.(c|cxx|cpp|cc|h|hxx|hpp)$" ! -path '*/antlr-interface/*')
 else
     # Format files provided as arguments

diff --git a/src/io/inputs/yml-system/decoders.hxx b/src/io/inputs/yml-system/decoders.hxx
@@ -73,8 +73,8 @@ struct convert<Antares::IO::Inputs::YmlSystem::Component>
         rhs.id = node["id"].as<std::string>();
         rhs.model = node["model"].as<std::string>();
         rhs.scenarioGroup = node["scenario-group"].as<std::string>();
-        rhs.parameters = as_fallback_default<std::vector<Antares::IO::Inputs::YmlSystem::Parameter>>(
-          node["parameters"]);
+        rhs.parameters = as_fallback_default<
+          std::vector<Antares::IO::Inputs::YmlSystem::Parameter>>(node["parameters"]);
         return true;
     }
 };
@@ -86,8 +86,8 @@ struct convert<Antares::IO::Inputs::YmlSystem::System>
     {
         rhs.id = node["id"].as<std::string>();
         rhs.libraries = as_fallback_default<std::vector<std::string>>(node["model-libraries"]);
-        rhs.components = as_fallback_default<std::vector<Antares::IO::Inputs::YmlSystem::Component>>(
-          node["components"]);
+        rhs.components = as_fallback_default<
+          std::vector<Antares::IO::Inputs::YmlSystem::Component>>(node["components"]);
         return true;
     }
 };

diff --git a/...m-mpsolver-impl/include/antares/optimisation/linear-problem-mpsolver-impl/linearProblem.h b/...m-mpsolver-impl/include/antares/optimisation/linear-problem-mpsolver-impl/linearProblem.h
@@ -44,38 +44,42 @@ class OrtoolsLinearProblem: public LinearProblemApi::ILinearProblem
 
     OrtoolsMipVariable* addNumVariable(double lb, double ub, const std::string& name) override;
 
-    std::vector<LinearProblemApi::IMipVariable*> addNumVariable(double lb,
-                                                   double ub,
-                                                   const std::string& name,
-                                                   unsigned int number_new_variables) override;
+    std::vector<LinearProblemApi::IMipVariable*> addNumVariable(
+      double lb,
+      double ub,
+      const std::string& name,
+      unsigned int number_new_variables) override;
 
     OrtoolsMipVariable* addIntVariable(double lb, double ub, const std::string& name) override;
 
-    std::vector<LinearProblemApi::IMipVariable*> addIntVariable(double lb,
-                                                   double ub,
-                                                   const std::string& name,
-                                                   unsigned int number_new_variables) override;
+    std::vector<LinearProblemApi::IMipVariable*> addIntVariable(
+      double lb,
+      double ub,
+      const std::string& name,
+      unsigned int number_new_variables) override;
 
     OrtoolsMipVariable* addVariable(double lb,
                                     double ub,
                                     bool integer,
                                     const std::string& name) override;
 
-    std::vector<LinearProblemApi::IMipVariable*> addVariable(double lb,
-                                                double ub,
-                                                bool integer,
-                                                const std::string& name,
-                                                unsigned int number_new_variables) override;
+    std::vector<LinearProblemApi::IMipVariable*> addVariable(
+      double lb,
+      double ub,
+      bool integer,
+      const std::string& name,
+      unsigned int number_new_variables) override;
 
     OrtoolsMipVariable* getVariable(const std::string& name) const override;
     int variableCount() const override;
 
     OrtoolsMipConstraint* addConstraint(double lb, double ub, const std::string& name) override;
 
-    std::vector<LinearProblemApi::IMipConstraint*> addConstraint(double lb,
-                                                    double ub,
-                                                    const std::string& name,
-                                                    unsigned int number_new_constraints) override;
+    std::vector<LinearProblemApi::IMipConstraint*> addConstraint(
+      double lb,
+      double ub,
+      const std::string& name,
+      unsigned int number_new_constraints) override;
 
     OrtoolsMipConstraint* getConstraint(const std::string& name) const override;
     int constraintCount() const override;

diff --git a/src/optimisation/linear-problem-mpsolver-impl/linearProblem.cpp b/src/optimisation/linear-problem-mpsolver-impl/linearProblem.cpp
@@ -68,11 +68,12 @@ OrtoolsMipVariable* OrtoolsLinearProblem::addVariable(double lb,
     return pair.first->second.get(); // <<name, var>, bool>
 }
 
-std::vector<LinearProblemApi::IMipVariable*> OrtoolsLinearProblem::addVariable(double lb,
-                                                                  double ub,
-                                                                  bool integer,
-                                                                  const std::string& name,
-                                                                  unsigned int number_new_variables)
+std::vector<LinearProblemApi::IMipVariable*> OrtoolsLinearProblem::addVariable(
+  double lb,
+  double ub,
+  bool integer,
+  const std::string& name,
+  unsigned int number_new_variables)
 {
     std::vector<LinearProblemApi::IMipVariable*> new_variables;
     for (unsigned int i = 0; i < number_new_variables; i++)
@@ -186,18 +187,21 @@ static const operations_research::MPVariable* getMpVar(const LinearProblemApi::I
     const auto* OrtoolsMipVar = dynamic_cast<const OrtoolsMipVariable*>(var);
     if (!OrtoolsMipVar)
     {
-        logs.error() << "Invalid cast, tried from LinearProblemApi::IMipVariable to OrtoolsMipVariable";
+        logs.error()
+          << "Invalid cast, tried from LinearProblemApi::IMipVariable to OrtoolsMipVariable";
         throw std::bad_cast();
     }
     return OrtoolsMipVar->getMpVar();
 }
 
-void OrtoolsLinearProblem::setObjectiveCoefficient(LinearProblemApi::IMipVariable* var, double coefficient)
+void OrtoolsLinearProblem::setObjectiveCoefficient(LinearProblemApi::IMipVariable* var,
+                                                   double coefficient)
 {
     objective_->SetCoefficient(getMpVar(var), coefficient);
 }
 
-double OrtoolsLinearProblem::getObjectiveCoefficient(const LinearProblemApi::IMipVariable* var) const
+double OrtoolsLinearProblem::getObjectiveCoefficient(
+  const LinearProblemApi::IMipVariable* var) const
 {
     return objective_->GetCoefficient(getMpVar(var));
 }

diff --git a/src/optimisation/linear-problem-mpsolver-impl/mipConstraint.cpp b/src/optimisation/linear-problem-mpsolver-impl/mipConstraint.cpp
@@ -63,7 +63,8 @@ void OrtoolsMipConstraint::setCoefficient(LinearProblemApi::IMipVariable* var, d
     auto* mpvar = dynamic_cast<OrtoolsMipVariable*>(var);
     if (!mpvar)
     {
-        logs.error() << "Invalid cast, tried from LinearProblemApi::IMipVariable to OrtoolsMipVariable";
+        logs.error()
+          << "Invalid cast, tried from LinearProblemApi::IMipVariable to OrtoolsMipVariable";
         throw std::bad_cast();
     }
 
@@ -75,7 +76,8 @@ double OrtoolsMipConstraint::getCoefficient(LinearProblemApi::IMipVariable* var)
     auto* mpvar = dynamic_cast<OrtoolsMipVariable*>(var);
     if (!mpvar)
     {
-        logs.error() << "Invalid cast, tried from LinearProblemApi::IMipVariable to OrtoolsMipVariable";
+        logs.error()
+          << "Invalid cast, tried from LinearProblemApi::IMipVariable to OrtoolsMipVariable";
         throw std::bad_cast();
     }
 

diff --git a/src/study/system-model/component.cpp b/src/study/system-model/component.cpp
@@ -52,7 +52,8 @@ static void checkComponentDataValidity(const ComponentData& data)
     {
         if (!data.parameter_values.contains(param))
         {
-            throw std::invalid_argument("The component \"" + data.id + "\" has no value for parameter '" + param + "'");
+            throw std::invalid_argument("The component \"" + data.id
+                                        + "\" has no value for parameter '" + param + "'");
         }
     }
 }

diff --git a/src/study/system-model/include/antares/study/system-model/parameter.h b/src/study/system-model/include/antares/study/system-model/parameter.h
@@ -22,8 +22,8 @@
 
 #include <string>
 
-#include "valueType.h"
 #include "timeAndScenarioType.h"
+#include "valueType.h"
 
 namespace Antares::Study::SystemModel
 {
@@ -36,8 +36,6 @@ namespace Antares::Study::SystemModel
 class Parameter
 {
 public:
-
-
     explicit Parameter(std::string id,
                        TimeDependent timeDependent,
                        ScenarioDependent scenarioDependent):