Skip to content

Commit 1431b70

Browse files
committed
Merge branch 'pm/iis_dynbatching' into 'master'
IIS finder greedy: Dynamic batch sizing See merge request integer/scip!3811
2 parents 0528c3e + 70a68b2 commit 1431b70

File tree

4 files changed

+267
-88
lines changed

4 files changed

+267
-88
lines changed

CHANGELOG

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Features
1616
- added functionality to deal with hypergraphs by means of efficient access to vertices, edges and intersections edges.
1717
- added support for (transposed) network matrix detection in pub_network.h
1818
- added a new presolver presol_implint which detects implied integral variables by detecting (transposed) network submatrices in the problem. For now, this plugin is disabled by default.
19-
- added new plugin type for finding irreducible infeasible subsystems (IIS). Users can now include their own IIS algorithms. Basic addition and deletion based algorithm implemented in iisfinder_greedy.
19+
- added new plugin type for finding irreducible infeasible subsystems (IIS). Users can now include their own IIS algorithms. Greedy addition and deletion based algorithm with dynamic batch sizing implemented in iisfinder_greedy.
2020
- added a new data structure SCIP_DATATREE that holds serializable data and a method to export to a JSON file
2121
- added ability to collect statistics from tables in a SCIP_DATATREE and write out as JSON file;
2222
dialog write statistics now writes a JSON file if name of file to write ends with .json
@@ -207,7 +207,7 @@ Interface changes
207207
- new parameter "presolving/implint/convertintegers" to control whether implied integrality should also be detected for enforced integral variables
208208
- new parameter "presolving/implint/columnrowratio" indicates the ratio of rows/columns where the row-wise network matrix detection algorithm is used instead of the column-wise network matrix detection algorithm
209209
- new parameter "presolving/implint/numericslimit" determines the limit for absolute integral coefficients beyond which the corresponding rows and variables are excluded from implied integrality detection
210-
- iis/minimal, iis/nodes, iis/removedbounds, iis/removeunusedvars, iis/silent, iis/stopafterone, iis/time, iis/greedy/additive, iis/greedy/conservative, iis/greedy/delafteradd, iis/greedy/dynamicreordering, iis/greedy/maxbatchsize, iis/greedy/maxrelbatchsize, iis/greedy/nodelimperiter, iis/greedy/priority, iis/greedy/timelimperiter
210+
- iis/minimal, iis/nodes, iis/removedbounds, iis/removeunusedvars, iis/silent, iis/stopafterone, iis/time, iis/greedy/additive, iis/greedy/conservative, iis/greedy/delafteradd, iis/greedy/dynamicreordering, iis/greedy/initrelbatchsize, iis/greedy/initbatchsize, iis/greedy/maxrelbatchsize, iis/greedy/maxbatchsize, iis/greedy/batchupdateinterval, iis/greedy/batchingoffset, iis/greedy/batchingfactor, iis/greedy/nodelimperiter, iis/greedy/priority, iis/greedy/timelimperiter
211211
- new parameters "constraints/orbitope_full/forceconscopy" and "constraints/orbitope_pp/forceconscopy" to control whether non-model constraints of type full orbitope and packing/partitioning orbitope are copied to sub-SCIPs, respectively
212212
- new parameter "write/implintlevel" to control if integrality constraints should be written for implied integral variables (regarded by cip, mps, lp, rlp, pip, fzn, and gms writers)
213213
- new parameter "presolving/milp/enablecliquemerging" to enable clique merging in PaPILO

src/scip/iisfinder.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ SCIP_RETCODE SCIPiisGenerate(
411411
SCIPdebugMsg(iis->subscip, "----- STARTING GREEDY SINGLETON DELETION ALGORITHM. ATTEMPT TO ENSURE IRREDUCIBILITY -----\n");
412412

413413
SCIP_CALL( SCIPiisGreedyMinimize(iis) );
414+
assert( iis->infeasible );
414415
}
415416

416417
/* Remove redundant constraints that potentially are left over from indicator constraints,

0 commit comments

Comments
 (0)