Merge remote-tracking branch 'origin/v90-bugfix'

scipopt · Feb 7, 2024 · ff30eb4 · ff30eb4
2 parents daef1ae + 7205bed
commit ff30eb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -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
 -------------

diff --git a/src/lpi/lpi_grb.c b/src/lpi/lpi_grb.c
@@ -50,7 +50,7 @@
 #endif
 
 #if ( GRB_VERSION_MAJOR < 6 || ( GRB_VERSION_MAJOR == 7 && GRB_VERSION_MINOR == 0 && GRB_VERSION_TECHNICAL < 2 ) )
-#error "The Gurobi intreface only works for Gurobi versions at least 7.0.2"
+#error "The Gurobi interface only works for Gurobi versions at least 7.0.2"
 #endif
 
 #ifdef SCIP_THREADSAFE

diff --git a/src/scip/prop_symmetry.c b/src/scip/prop_symmetry.c
@@ -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) );
 
@@ -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) );
 
@@ -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;