Merge remote-tracking branch 'origin/v9-minor'

scipopt · Oct 15, 2024 · 91dcbbb · 91dcbbb
2 parents 6bf00aa + 5250ff1
commit 91dcbbb
Show file tree

Hide file tree

Showing 5 changed files with 478 additions and 32 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -152,6 +152,7 @@ Fixed bugs
 - skip constraint propagation if the residual activity bound cancels the side precision in tightenVarBounds() of cons_linear.c
 - use indices of negation counterparts and accept fixings when ordering and-resultants of pseudoboolean constraints
 - correct bound tracking to make the evaluation of primal-dual-integrals work
+- update locks on model variables before removing pseudoboolean constraints in consPresolPseudoboolean()
 
 Unit tests
 ----------

diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt
@@ -346,6 +346,7 @@ set(instances_PseudoBoolean
     "instances/PseudoBoolean/normalized-bsg_10_4_5.opb\;-4"
     "instances/PseudoBoolean/normalized-mds_10_4_3.opb\;2"
     "instances/PseudoBoolean/normalized-mds_50_25_5.opb\;3"
+    "instances/PseudoBoolean/normalized-90_rounds_0_errors.opb\;0"
     "instances/PseudoBoolean/normalized-t2001.13queen13.1111218308.opb\;+infinity"
     "instances/PseudoBoolean/normalized-t2001.13queen13.1110976730--soft-33-100-0.wbo\;4"
     "instances/PseudoBoolean/wheel010.lap.opb.pre.cip\;25"