-
Notifications
You must be signed in to change notification settings - Fork 3
Add basic support for IISs #41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
hedtke
wants to merge
8
commits into
main
Choose a base branch
from
ivhedtke-iis
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+115
−0
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1c3b79a
Add new IIS data structure
hedtke 3514e24
Implement Model::generateIIS
hedtke 6c1f2ab
Add test cases
hedtke 16fdfe6
Also check if conss is not null
hedtke 4658312
Make generateIIS nodiscard
hedtke 8df6823
Update changelog
hedtke 5993592
Enhance wording in changelog
hedtke 69cb3b7
Use auto instead of SCIP_CONS
hedtke File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #pragma once | ||
|
|
||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| namespace scippp { | ||
|
|
||
| /** | ||
| * A data structure to hold an %IIS (%Irreducible %Infeasible %Subsystem). | ||
| * @since 1.4.0 | ||
| */ | ||
| struct IIS { | ||
| //! Ids of the constraints in the %IIS. | ||
| std::vector<std::string> consIds; | ||
| }; | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #include <boost/test/unit_test.hpp> | ||
|
|
||
| #include "scippp/model.hpp" | ||
| #include "scippp/parameters.hpp" | ||
|
|
||
| #include <algorithm> | ||
|
|
||
| using namespace scippp; | ||
| using namespace std; | ||
|
|
||
| BOOST_AUTO_TEST_SUITE(IIS) | ||
|
|
||
| BOOST_AUTO_TEST_CASE(CanBeCreated) | ||
| { | ||
| Model model("Simple"); | ||
| const auto& [x1, x2] = model.addVars<2>("x_"); | ||
| model.addConstr(x1 + x2 >= 2, "lower"); | ||
| model.addConstr(x1 + x2 <= 1, "upper"); | ||
| model.addConstr(x1 + x2 >= 0, "useless"); | ||
| model.setObjsense(Sense::MINIMIZE); | ||
|
|
||
| model.setParam(params::IIS::SILENT, true); // to avoid output during testing | ||
| model.solve(); | ||
| BOOST_REQUIRE(model.getStatus() == SCIP_STATUS_INFEASIBLE); | ||
| auto iis { model.generateIIS() }; | ||
wienkamp marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| BOOST_TEST(model.getLastReturnCode() == SCIP_OKAY); | ||
|
|
||
| const auto& icons { iis.consIds }; | ||
| BOOST_TEST(icons.size() == 2); | ||
| BOOST_TEST((std::find(icons.begin(), icons.end(), "lower") != iis.consIds.end())); | ||
| BOOST_TEST((std::find(icons.begin(), icons.end(), "upper") != iis.consIds.end())); | ||
| BOOST_TEST((std::find(icons.begin(), icons.end(), "useless") == iis.consIds.end())); | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_CASE(WorksOnEmptyProblem) | ||
| { | ||
| Model model("Simple"); | ||
| model.solve(); | ||
| auto iis { model.generateIIS() }; | ||
| BOOST_TEST(model.getLastReturnCode() == SCIP_OKAY); | ||
| BOOST_TEST(iis.consIds.size() == 0); | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_CASE(WorksWithoutSolving) | ||
| { | ||
| Model model("Simple"); | ||
| auto iis { model.generateIIS() }; | ||
| BOOST_TEST(model.getLastReturnCode() == SCIP_OKAY); | ||
| BOOST_TEST(iis.consIds.size() == 0); | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_SUITE_END() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.