parameters.yml in class, correct extension: yml and not yaml

AntaresSimulatorTeam · Dec 20, 2024 · b5a44c7 · b5a44c7
1 parent 0b3794a
commit b5a44c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...ver/modeler/parameters/include/antares/solver/modeler/parameters/parseModelerParameters.h b/...ver/modeler/parameters/include/antares/solver/modeler/parameters/parseModelerParameters.h
@@ -28,6 +28,6 @@
 namespace Antares::Solver
 {
 
-ModelerParameters parseModelerParameters(const std::filesystem::path& path);
+ModelerParameters parseModelerParameters(const std::filesystem::path& studyPath);
 
 } // namespace Antares::Solver
diff --git a/src/solver/modeler/parameters/parseModelerParameters.cpp b/src/solver/modeler/parameters/parseModelerParameters.cpp
@@ -29,9 +29,9 @@
 
 namespace Antares::Solver
 {
-ModelerParameters parseModelerParameters(const std::filesystem::path& path)
+ModelerParameters parseModelerParameters(const std::filesystem::path& studyPath)
 {
-    const auto contents = Antares::IO::readFile(path);
+    const auto contents = Antares::IO::readFile(studyPath / "parameters.yml");
     YAML::Node root = YAML::Load(contents);
     return root.as<ModelerParameters>();
 }

diff --git a/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp b/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp
@@ -34,7 +34,7 @@ BOOST_AUTO_TEST_SUITE(read_modeler_parameters)
 BOOST_AUTO_TEST_CASE(all_properties_set)
 {
     const auto working_tmp_dir = CREATE_TMP_DIR_BASED_ON_TEST_NAME();
-    const auto fileP = working_tmp_dir / "parameters.yaml";
+    const auto fileP = working_tmp_dir / "parameters.yml";
     {
         std::ofstream param(fileP);
         param << R"(
@@ -44,7 +44,7 @@ solver-parameters: PRESOLVE 1
 no-output: true)";
     }
 
-    auto params = Antares::Solver::parseModelerParameters(fileP);
+    auto params = Antares::Solver::parseModelerParameters(working_tmp_dir);
     BOOST_CHECK_EQUAL(params.solver, "sirius");
     BOOST_CHECK_EQUAL(params.solverLogs, false);
     BOOST_CHECK_EQUAL(params.solverParameters, "PRESOLVE 1");
@@ -54,7 +54,7 @@ no-output: true)";
 BOOST_AUTO_TEST_CASE(all_properties_set_out_of_order)
 {
     const auto working_tmp_dir = CREATE_TMP_DIR_BASED_ON_TEST_NAME();
-    const auto fileP = working_tmp_dir / "parameters.yaml";
+    const auto fileP = working_tmp_dir / "parameters.yml";
     {
         std::ofstream param(fileP);
         param << R"(
@@ -64,7 +64,7 @@ solver-parameters: PRESOLVE 1
 no-output: true)";
     }
 
-    auto params = Antares::Solver::parseModelerParameters(fileP);
+    auto params = Antares::Solver::parseModelerParameters(working_tmp_dir);
     BOOST_CHECK_EQUAL(params.solver, "sirius");
     BOOST_CHECK_EQUAL(params.solverLogs, false);
     BOOST_CHECK_EQUAL(params.solverParameters, "PRESOLVE 1");