diff --git a/src/tests/io/yml-importers/testConvertorVisitor.cpp b/src/tests/io/yml-importers/testConvertorVisitor.cpp index 6e7b22ff75..f9115ddde2 100644 --- a/src/tests/io/yml-importers/testConvertorVisitor.cpp +++ b/src/tests/io/yml-importers/testConvertorVisitor.cpp @@ -73,15 +73,14 @@ BOOST_FIXTURE_TEST_CASE(negation, ExpressionToNodeConvertorEmptyModel) BOOST_AUTO_TEST_CASE(identifier) { - YmlModel::Model model{ - .id = "model0", - .description = "description", - .parameters = {{"param1", true, false}, {"param2", false, false}}, - .variables = {{"varP", "7", "pmin", YmlModel::ValueType::CONTINUOUS}}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {}, - .objective = "objectives"}; + YmlModel::Model model{.id = "model0", + .description = "description", + .parameters = {{"param1", true, false}, {"param2", false, false}}, + .variables = {{"varP", "7", "pmin", YmlModel::ValueType::CONTINUOUS}}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {}, + .objective = "objectives"}; ExpressionToNodeConvertorEmptyModel converter(std::move(model)); { @@ -106,15 +105,14 @@ bool expectedMessage(const std::runtime_error& ex) BOOST_AUTO_TEST_CASE(identifierNotFound) { - YmlModel::Model model{ - .id = "model0", - .description = "description", - .parameters = {{"param1", true, false}}, - .variables = {{"varP", "7", "pmin", YmlModel::ValueType::CONTINUOUS}}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {}, - .objective = "objectives"}; + YmlModel::Model model{.id = "model0", + .description = "description", + .parameters = {{"param1", true, false}}, + .variables = {{"varP", "7", "pmin", YmlModel::ValueType::CONTINUOUS}}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {}, + .objective = "objectives"}; std::string expression = "abc"; // not a param or var BOOST_CHECK_EXCEPTION(ModelConverter::convertExpressionToNode(expression, model), @@ -193,15 +191,14 @@ BOOST_FIXTURE_TEST_CASE(comparison, ExpressionToNodeConvertorEmptyModel) BOOST_AUTO_TEST_CASE(medium_expression) { - YmlModel::Model model{ - .id = "model0", - .description = "description", - .parameters = {{"param1", true, false}, {"param2", false, false}}, - .variables = {{"varP", "7", "param1", YmlModel::ValueType::CONTINUOUS}}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {}, - .objective = "objectives"}; + YmlModel::Model model{.id = "model0", + .description = "description", + .parameters = {{"param1", true, false}, {"param2", false, false}}, + .variables = {{"varP", "7", "param1", YmlModel::ValueType::CONTINUOUS}}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {}, + .objective = "objectives"}; ExpressionToNodeConvertorEmptyModel converter(std::move(model)); std::string expression = "(12 * (4 - 1) + param1) / -(42 + 3 + varP)"; diff --git a/src/tests/io/yml-importers/testModelTranslator.cpp b/src/tests/io/yml-importers/testModelTranslator.cpp index 5b14bff4da..b80f3b0a34 100644 --- a/src/tests/io/yml-importers/testModelTranslator.cpp +++ b/src/tests/io/yml-importers/testModelTranslator.cpp @@ -102,13 +102,13 @@ BOOST_FIXTURE_TEST_CASE(portType_with_fields_properly_translated, Fixture) BOOST_FIXTURE_TEST_CASE(empty_model_properly_translated, Fixture) { YmlModel::Model model1{.id = "model1", - .description = "description", - .parameters = {{"param1", true, false}}, - .variables = {}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {}, - .objective = "param1"}; + .description = "description", + .parameters = {{"param1", true, false}}, + .variables = {}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {}, + .objective = "param1"}; library.models = {model1}; SystemModel::Library lib = ModelConverter::convert(library); BOOST_REQUIRE_EQUAL(lib.Models().size(), 1); @@ -120,13 +120,13 @@ BOOST_FIXTURE_TEST_CASE(empty_model_properly_translated, Fixture) BOOST_FIXTURE_TEST_CASE(model_parameters_properly_translated, Fixture) { YmlModel::Model model1{.id = "model1", - .description = "description", - .parameters = {{"param1", true, false}, {"param2", false, false}}, - .variables = {}, - .ports = {}, - .port_field_definitions{}, - .constraints{}, - .objective = ""}; + .description = "description", + .parameters = {{"param1", true, false}, {"param2", false, false}}, + .variables = {}, + .ports = {}, + .port_field_definitions{}, + .constraints{}, + .objective = ""}; library.models = {model1}; SystemModel::Library lib = ModelConverter::convert(library); auto& model = lib.Models().at("model1"); @@ -176,13 +176,13 @@ BOOST_AUTO_TEST_CASE(model_ports_properly_translated, *boost::unit_test::disable YmlModel::Library library; Antares::Expressions::Registry registry; YmlModel::Model model1{.id = "model1", - .description = "description", - .parameters = {}, - .variables = {}, - .ports = {{"port1", "flow"}, {"port2", "impedance"}}, - .port_field_definitions = {}, - .constraints = {}, - .objective = ""}; + .description = "description", + .parameters = {}, + .variables = {}, + .ports = {{"port1", "flow"}, {"port2", "impedance"}}, + .port_field_definitions = {}, + .constraints = {}, + .objective = ""}; library.models = {model1}; SystemModel::Library lib = ModelConverter::convert(library); [[maybe_unused]] auto& model = lib.Models().at("model1"); @@ -199,15 +199,15 @@ BOOST_AUTO_TEST_CASE(model_ports_properly_translated, *boost::unit_test::disable BOOST_FIXTURE_TEST_CASE(model_constraints_properly_translated, Fixture) { YmlModel::Model model1{.id = "model1", - .description = "description", - .parameters = {{"expression1", true, false}, - {"expression2", true, false}}, - .variables = {}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {{"constraint1", "expression1"}, - {"constraint2", "expression2"}}, - .objective = ""}; + .description = "description", + .parameters = {{"expression1", true, false}, + {"expression2", true, false}}, + .variables = {}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {{"constraint1", "expression1"}, + {"constraint2", "expression2"}}, + .objective = ""}; library.models = {model1}; SystemModel::Library lib = ModelConverter::convert(library); auto& model = lib.Models().at("model1"); @@ -223,15 +223,14 @@ BOOST_FIXTURE_TEST_CASE(model_constraints_properly_translated, Fixture) // Test with 2 models BOOST_FIXTURE_TEST_CASE(multiple_models_properly_translated, Fixture) { - YmlModel::Model model1{ - .id = "model1", - .description = "description", - .parameters = {{"param1", true, false}, {"param2", false, false}}, - .variables = {{"varP", "7", "param2", YmlModel::ValueType::CONTINUOUS}}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {}, - .objective = ""}; + YmlModel::Model model1{.id = "model1", + .description = "description", + .parameters = {{"param1", true, false}, {"param2", false, false}}, + .variables = {{"varP", "7", "param2", YmlModel::ValueType::CONTINUOUS}}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {}, + .objective = ""}; YmlModel::Model model2{ .id = "model2", .description = "description", diff --git a/src/tests/io/yml-importers/testSystemConverter.cpp b/src/tests/io/yml-importers/testSystemConverter.cpp index aed5f809f4..6950d97ab3 100644 --- a/src/tests/io/yml-importers/testSystemConverter.cpp +++ b/src/tests/io/yml-importers/testSystemConverter.cpp @@ -37,13 +37,13 @@ using namespace Antares::Study; struct LibraryObjects { YmlModel::Model model1{.id = "node", - .description = "description", - .parameters = {{"cost", true, false}}, - .variables = {}, - .ports = {}, - .port_field_definitions = {}, - .constraints = {{"constraint1", "cost"}}, - .objective = ""}; + .description = "description", + .parameters = {{"cost", true, false}}, + .variables = {}, + .ports = {}, + .port_field_definitions = {}, + .constraints = {{"constraint1", "cost"}}, + .objective = ""}; YmlSystem::Parser parser; YmlModel::Library library; diff --git a/src/tests/src/solver/optim-model-filler/test_componentFiller.cpp b/src/tests/src/solver/optim-model-filler/test_componentFiller.cpp index d1856c178c..94d1ac9abc 100644 --- a/src/tests/src/solver/optim-model-filler/test_componentFiller.cpp +++ b/src/tests/src/solver/optim-model-filler/test_componentFiller.cpp @@ -203,7 +203,9 @@ void LinearProblemBuildingFixture::buildLinearProblem(FillContext& time_scenario { fillers_ptr.push_back(component_filler.get()); } - pb = make_unique(false, "sirius"); + pb = make_unique( + false, + "sirius"); LinearProblemBuilder linear_problem_builder(fillers_ptr); LinearProblemData dummy_data;