Skip to content

Commit

Permalink
use only area file in Benders (#960)
Browse files Browse the repository at this point in the history
adequacy_criterion --> outerloop
area file -->Benders
  • Loading branch information
a-zakir authored Oct 30, 2024
1 parent 0612641 commit ed1ac1a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/cpp/benders/factories/BendersFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ BendersMainFactory::ProcessCriterionInput() {
const auto fpath = std::filesystem::path(options_.INPUTROOT) /
options_.OUTER_LOOP_OPTION_FILE;
// if adequacy_criterion.yml is provided read it
if (std::filesystem::exists(fpath)) {
if ((method_ == BENDERSMETHOD::BENDERS_OUTERLOOP ||
method_ == BENDERSMETHOD::BENDERS_BY_BATCH_OUTERLOOP) &&
std::filesystem::exists(fpath)) {
return Benders::Criterion::OuterLoopInputFromYaml().Read(fpath);
}
// else compute criterion for all areas!
Expand Down

0 comments on commit ed1ac1a

Please sign in to comment.