Skip to content

Commit

Permalink
remove unused methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-zakir
a-zakir committed Feb 14, 2025
1 parent e2b288c commit d99c9c4
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 76 deletions.
18 changes: 0 additions & 18 deletions ...sation/linear-problem-api/include/antares/optimisation/linear-problem-api/linearProblem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,24 +138,6 @@ class ILinearProblem
/// Add a bounded constraint to the problem
virtual IMipConstraint* addConstraint(double lb, double ub, const std::string& name) = 0;

/// Add range of bounded constraints to the problem
virtual std::vector<IMipConstraint*> addConstraint(const std::vector<double>& lb,
const std::vector<double>& ub,
const std::string& name,
unsigned int number_new_constraints)
= 0;
/// Add range of bounded constraints to the problem
virtual std::vector<IMipConstraint*> addConstraint(const std::vector<double>& lb,
double ub,
const std::string& name,
unsigned int number_new_constraints)
= 0;
/// Add range of bounded constraints to the problem
virtual std::vector<IMipConstraint*> addConstraint(double lb,
const std::vector<double>& ub,
const std::string& name,
unsigned int number_new_constraints)
= 0;
/// Add range of bounded constraints to the problem
virtual std::vector<IMipConstraint*> addConstraint(double lb,
double ub,
Expand Down
15 changes: 0 additions & 15 deletions ...m-mpsolver-impl/include/antares/optimisation/linear-problem-mpsolver-impl/linearProblem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,26 +124,11 @@ class OrtoolsLinearProblem: public LinearProblemApi::ILinearProblem

OrtoolsMipConstraint* addConstraint(double lb, double ub, const std::string& name) override;

std::vector<LinearProblemApi::IMipConstraint*> addConstraint(
const std::vector<double>& lb,
const std::vector<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;
std::vector<LinearProblemApi::IMipConstraint*> addConstraint(
const std::vector<double>& lb,
double ub,
const std::string& name,
unsigned int number_new_constraints) override;
std::vector<LinearProblemApi::IMipConstraint*> addConstraint(
double lb,
const std::vector<double>& ub,
const std::string& name,
unsigned int number_new_constraints) override;

OrtoolsMipConstraint* getConstraint(const std::string& name) const override;
int constraintCount() const override;
Expand Down
40 changes: 0 additions & 40 deletions src/optimisation/linear-problem-mpsolver-impl/linearProblem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,19 +286,6 @@ OrtoolsMipConstraint* OrtoolsLinearProblem::addConstraint(double lb,
return pair.first->second.get(); // <<name, constraint>, bool>
}

std::vector<LinearProblemApi::IMipConstraint*> OrtoolsLinearProblem::addConstraint(
const std::vector<double>& lb,
const std::vector<double>& ub,
const std::string& name,
unsigned int number_new_constraints)
{
std::vector<LinearProblemApi::IMipConstraint*> new_constraints;
for (unsigned int i = 0; i < number_new_constraints; i++)
{
new_constraints.push_back(addConstraint(lb[i], ub[i], name + '_' + std::to_string(i)));
}
return new_constraints;
}

std::vector<LinearProblemApi::IMipConstraint*> OrtoolsLinearProblem::addConstraint(
double lb,
Expand All @@ -314,33 +301,6 @@ std::vector<LinearProblemApi::IMipConstraint*> OrtoolsLinearProblem::addConstrai
return new_constraints;
}

std::vector<LinearProblemApi::IMipConstraint*> OrtoolsLinearProblem::addConstraint(
const std::vector<double>& lb,
double ub,
const std::string& name,
unsigned int number_new_constraints)
{
std::vector<LinearProblemApi::IMipConstraint*> new_constraints;
for (unsigned int i = 0; i < number_new_constraints; i++)
{
new_constraints.push_back(addConstraint(lb[i], ub, name + '_' + std::to_string(i)));
}
return new_constraints;
}

std::vector<LinearProblemApi::IMipConstraint*> OrtoolsLinearProblem::addConstraint(
double lb,
const std::vector<double>& ub,
const std::string& name,
unsigned int number_new_constraints)
{
std::vector<LinearProblemApi::IMipConstraint*> new_constraints;
for (unsigned int i = 0; i < number_new_constraints; i++)
{
new_constraints.push_back(addConstraint(lb, ub[i], name + '_' + std::to_string(i)));
}
return new_constraints;
}

OrtoolsMipConstraint* OrtoolsLinearProblem::getConstraint(const std::string& name) const
{
Expand Down
6 changes: 3 additions & 3 deletions src/tests/src/optimisation/linear-problem/testLinearProblemMpsolverImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ BOOST_FIXTURE_TEST_CASE(add_constraint_to_problem___check_constraint_exists, Fix
BOOST_FIXTURE_TEST_CASE(add_constraints_to_problem___check_all_constraints_exist,
FixtureEmptyProblem)
{
auto constraints = pb->addConstraint({5, 5, 5}, {15, 15, 15}, "constraint", 3);
auto constraints = pb->addConstraint(5, 15, "constraint", 3);

BOOST_CHECK_EQUAL(constraints.size(), 3); // Check 3 constraints created

Expand Down Expand Up @@ -224,8 +224,8 @@ BOOST_FIXTURE_TEST_CASE(add_already_existing_constaint_to_problem_leads_to_excep
// Test bulk addition of constraints with duplicate names
BOOST_FIXTURE_TEST_CASE(add_duplicate_constraint_names_leads_to_exception, FixtureEmptyProblem)
{
pb->addConstraint({0}, {1}, "duplicate_constraint", 1);
BOOST_CHECK_EXCEPTION(pb->addConstraint({0}, {1}, "duplicate_constraint", 1),
pb->addConstraint(0, 1, "duplicate_constraint", 1);
BOOST_CHECK_EXCEPTION(pb->addConstraint(0, 1, "duplicate_constraint", 1),
std::exception,
expectedMessage);
}
Expand Down

0 comments on commit d99c9c4

Please sign in to comment.