Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
### Fixed
- all fundamental callbacks now raise an error if not implemented
- Fixed the type of MatrixExpr.sum(axis=...) result from MatrixVariable to MatrixExpr.
- Updated IIS result in PyiisfinderExec()
### Changed
- changed default value of enablepricing flag to True
### Removed
Expand Down
1 change: 1 addition & 0 deletions src/pyscipopt/iisfinder.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ cdef SCIP_RETCODE PyiisfinderExec (SCIP_IIS* iis, SCIP_IISFINDER* iisfinder, SCI
PyIIS.iis._iis = iis
result_dict = PyIIS.iisfinderexec()
assert isinstance(result_dict, dict), "iisfinderexec() must return a dictionary."
result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
return SCIP_OKAY
4 changes: 1 addition & 3 deletions tests/test_iis.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ def test_iisGreddyMakeIrreducible():
m.includeIISfinder(my_iis, "", "", priority=10000)

iis = m.generateIIS()
with pytest.raises(AssertionError):
assert not iis.isSubscipIrreducible() # this should not fail

assert not iis.isSubscipIrreducible()
assert iis.isSubscipInfeasible()

iis.greedyMakeIrreducible()
Expand Down
Loading