Skip to content

Commit

Permalink
clean pr #789 (#836)
Browse files Browse the repository at this point in the history
Co-authored-by: Jason Maréchal <[email protected]>
  • Loading branch information
a-zakir and JasonMarechal25 authored Jul 2, 2024
1 parent e9e1570 commit e9d0fa4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/cpp/benders/benders_core/OuterLoopBiLevel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ OuterLoopBiLevel::OuterLoopBiLevel(const Outerloop::OuterLoopInputData &outer_l

bool OuterLoopBiLevel::Update_bilevel_data_if_feasible(
const Point &x, const std::vector<double> &outer_loop_criterion,
double overall_cost, double invest_cost_at_x, double lambda_min) {
double overall_cost, double invest_cost_at_x, double lambda) {
if (found_feasible_ =
Check_bilevel_feasibility(outer_loop_criterion, overall_cost);
found_feasible_) {
Update(x, overall_cost, invest_cost_at_x);
} else {
lambda_min_ = lambda_min;
lambda_min_ = lambda;
}

return found_feasible_;
Expand Down
6 changes: 2 additions & 4 deletions src/cpp/benders/benders_core/include/OuterLoopBiLevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ class OuterLoopBiLevel {
explicit OuterLoopBiLevel(const Outerloop::OuterLoopInputData &outer_loop_input_data);
OuterLoopBiLevel() = default;
bool Update_bilevel_data_if_feasible(
const Point &x,
const std::vector<double> &outer_loop_criterion, double overall_cost,
double invest_cost_at_x, double lambda_min);
const Point &x, const std::vector<double> &outer_loop_criterion,
double overall_cost, double invest_cost_at_x, double lambda);
bool Check_bilevel_feasibility(
const std::vector<double> &outer_loop_criterion, double overall_cost);
// double LambdaMax() const { return lambda_max_; }
void Init(const std::vector<double> &obj, const Point &max_invest,
const VariableMap &master_variable);
double LambdaMax() const { return lambda_max_; }
Expand Down

0 comments on commit e9d0fa4

Please sign in to comment.