From d74f59574d50a37cfcf4ee7b47093dbfc1208b10 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 24 Dec 2024 12:29:17 +0100 Subject: [PATCH] fix tests --- src/solver/modeler/loadFiles/CMakeLists.txt | 1 + src/solver/modeler/main.cpp | 2 +- .../src/solver/modeler/parameters/testParametersParsing.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/solver/modeler/loadFiles/CMakeLists.txt b/src/solver/modeler/loadFiles/CMakeLists.txt index e332714917..7badae16f2 100644 --- a/src/solver/modeler/loadFiles/CMakeLists.txt +++ b/src/solver/modeler/loadFiles/CMakeLists.txt @@ -1,6 +1,7 @@ set(SOURCES readSystem.cpp readLibraries.cpp + readParameters.cpp include/antares/solver/modeler/loadFiles/loadFiles.h ) diff --git a/src/solver/modeler/main.cpp b/src/solver/modeler/main.cpp index e0e3ec1823..b557e04b5b 100644 --- a/src/solver/modeler/main.cpp +++ b/src/solver/modeler/main.cpp @@ -45,7 +45,7 @@ int main(int argc, const char** argv) try { - const auto parameters = LoadFiles::parseModelerParameters(studyPath); + const auto parameters = LoadFiles::loadParameters(studyPath); const auto libraries = LoadFiles::loadLibraries(studyPath); const auto system = LoadFiles::loadSystem(studyPath, libraries); } diff --git a/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp b/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp index 829bcfc82e..9a283cba76 100644 --- a/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp +++ b/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp @@ -46,7 +46,7 @@ solver-parameters: PRESOLVE 1 no-output: true)"; } - auto params = parseModelerParameters(working_tmp_dir); + auto params = parseModelerParameters(fileP); BOOST_CHECK_EQUAL(params.solver, "sirius"); BOOST_CHECK_EQUAL(params.solverLogs, false); BOOST_CHECK_EQUAL(params.solverParameters, "PRESOLVE 1"); @@ -66,7 +66,7 @@ solver-parameters: PRESOLVE 1 no-output: true)"; } - auto params = parseModelerParameters(working_tmp_dir); + auto params = parseModelerParameters(fileP); BOOST_CHECK_EQUAL(params.solver, "sirius"); BOOST_CHECK_EQUAL(params.solverLogs, false); BOOST_CHECK_EQUAL(params.solverParameters, "PRESOLVE 1");