Skip to content

Commit

Permalink
clang
Browse files Browse the repository at this point in the history
  • Loading branch information
@pet-mit
pet-mit committed Feb 4, 2025
1 parent cdd2d8f commit 53f02f1
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 74 deletions.
51 changes: 24 additions & 27 deletions src/tests/io/yml-importers/testConvertorVisitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));

{
Expand All @@ -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),
Expand Down Expand Up @@ -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)";
Expand Down
77 changes: 38 additions & 39 deletions src/tests/io/yml-importers/testModelTranslator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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");
Expand Down Expand Up @@ -176,13 +176,13 @@ BOOST_AUTO_TEST_CASE(model_ports_properly_translated, *boost::unit_test::disable
YmlModel::Library library;
Antares::Expressions::Registry<Antares::Expressions::Nodes::Node> 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");
Expand All @@ -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");
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions src/tests/io/yml-importers/testSystemConverter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/tests/src/solver/optim-model-filler/test_componentFiller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ void LinearProblemBuildingFixture::buildLinearProblem(FillContext& time_scenario
{
fillers_ptr.push_back(component_filler.get());
}
pb = make_unique<Antares::Optimisation::LinearProblemMpsolverImpl::OrtoolsLinearProblem>(false, "sirius");
pb = make_unique<Antares::Optimisation::LinearProblemMpsolverImpl::OrtoolsLinearProblem>(
false,
"sirius");
LinearProblemBuilder linear_problem_builder(fillers_ptr);
LinearProblemData dummy_data;

Expand Down

0 comments on commit 53f02f1

Please sign in to comment.