Skip to content

Commit

Permalink
cherry pick c3ef845
Browse files Browse the repository at this point in the history
  • Loading branch information
flomnes authored and payetvin committed Mar 20, 2024
1 parent 60b18b6 commit bfd290e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions src/libs/antares/study/parameters/adq-patch-params.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,12 @@ bool AdqPatchParams::checkAdqPatchParams(const StudyMode studyMode,
checkAdqPatchStudyModeEconomyOnly(studyMode);
checkAdqPatchContainsAdqPatchArea(areas);
checkAdqPatchIncludeHurdleCost(includeHurdleCostParameters);
checkAdqPatchDisabledLocalMatching();

return true;
}

// Adequacy Patch can only be used with Economy Study/Simulation Mode.
void AdqPatchParams::checkAdqPatchStudyModeEconomyOnly(const StudyMode studyMode) const
void AdqPatchParams::checkAdqPatchSimulationModeEconomyOnly(const StudyMode studyMode) const
{
if (studyMode != StudyMode::stdmEconomy)
throw Error::IncompatibleStudyModeForAdqPatch();
Expand Down
1 change: 0 additions & 1 deletion src/tests/src/solver/optimisation/adequacy_patch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,6 @@ BOOST_AUTO_TEST_CASE(check_valid_adq_param)
auto p = createParams();
BOOST_CHECK_NO_THROW(p.checkAdqPatchStudyModeEconomyOnly(Antares::Data::stdmEconomy));
BOOST_CHECK_NO_THROW(p.checkAdqPatchIncludeHurdleCost(true));
BOOST_CHECK_NO_THROW(p.checkAdqPatchDisabledLocalMatching());
}

BOOST_AUTO_TEST_CASE(check_adq_param_wrong_mode)
Expand Down

0 comments on commit bfd290e

Please sign in to comment.