Skip to content

Commit

Permalink
Merge branch 'ensure-varlocks-from-symmetry-conss' into 'v90-bugfix'
Browse files Browse the repository at this point in the history
check symmetry constraints

See merge request integer/scip!3314
  • Loading branch information
Christopher Hojny committed Feb 7, 2024
2 parents c667552 + 611fe62 commit 7205bed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ Fixed bugs
- sort constraints in checkSolOrig() to keep the logic of constraint handlers intact
- fixed make install when SHARED=no and make uninstall
- check absolute coefficients relative to extremal average to avoid invalid unifications in normalizeCons()
- enforce and check symmetry-based constraints to take their locks (in dual reductions) into account

Miscellaneous
-------------
Expand Down
6 changes: 3 additions & 3 deletions src/scip/prop_symmetry.c
Original file line number Diff line number Diff line change
Expand Up @@ -3136,7 +3136,7 @@ SCIP_RETCODE addStrongSBCsSubgroup(

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

SCIP_CALL( SCIPaddCons(scip, cons) );

Expand Down Expand Up @@ -3318,7 +3318,7 @@ SCIP_RETCODE addWeakSBCsSubgroup(

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

SCIP_CALL( SCIPaddCons(scip, cons) );

Expand Down Expand Up @@ -5282,7 +5282,7 @@ SCIP_RETCODE addOrbitopesDynamic(

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

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

0 comments on commit 7205bed

Please sign in to comment.