Skip to content

Commit 7205bed

Browse files
author
Christopher Hojny
committed
Merge branch 'ensure-varlocks-from-symmetry-conss' into 'v90-bugfix'
check symmetry constraints See merge request integer/scip!3314
2 parents c667552 + 611fe62 commit 7205bed

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ Fixed bugs
271271
- sort constraints in checkSolOrig() to keep the logic of constraint handlers intact
272272
- fixed make install when SHARED=no and make uninstall
273273
- check absolute coefficients relative to extremal average to avoid invalid unifications in normalizeCons()
274+
- enforce and check symmetry-based constraints to take their locks (in dual reductions) into account
274275

275276
Miscellaneous
276277
-------------

src/scip/prop_symmetry.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3136,7 +3136,7 @@ SCIP_RETCODE addStrongSBCsSubgroup(
31363136

31373137
SCIP_CALL( SCIPcreateConsLinear(scip, &cons, name, 2, vars, vals, 0.0,
31383138
SCIPinfinity(scip), propdata->conssaddlp, propdata->conssaddlp, TRUE,
3139-
FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) );
3139+
TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) );
31403140

31413141
SCIP_CALL( SCIPaddCons(scip, cons) );
31423142

@@ -3318,7 +3318,7 @@ SCIP_RETCODE addWeakSBCsSubgroup(
33183318

33193319
SCIP_CALL( SCIPcreateConsLinear(scip, &cons, name, 2, vars, vals, 0.0,
33203320
SCIPinfinity(scip), propdata->conssaddlp, propdata->conssaddlp, TRUE,
3321-
FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) );
3321+
TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) );
33223322

33233323
SCIP_CALL( SCIPaddCons(scip, cons) );
33243324

@@ -5282,7 +5282,7 @@ SCIP_RETCODE addOrbitopesDynamic(
52825282

52835283
/* enforce, but do not check */
52845284
SCIP_CALL( SCIPcreateConsLinear(scip, &cons, name, 2, consvars, conscoefs, -SCIPinfinity(scip), 0.0,
5285-
propdata->conssaddlp, propdata->conssaddlp, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE ) );
5285+
propdata->conssaddlp, propdata->conssaddlp, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE ) );
52865286

52875287
SCIP_CALL( SCIPaddCons(scip, cons) );
52885288
propdata->genlinconss[propdata->ngenlinconss++] = cons;

0 commit comments

Comments
 (0)