From de3359c8ebda7c605760e41bd1f4387633424709 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Tue, 13 Jul 2021 11:54:18 +1000 Subject: [PATCH] Squashed 'software/gecode/' changes from 70a1cfa856..0a39b58153 0a39b58153 Subsume complete propagator instead of failing it f95e9e4295 Fix mistake in FlatZincSpace copy constructor git-subtree-dir: software/gecode git-subtree-split: 0a39b581532f250f13be0f41787bd4b0e35f648c --- gecode/flatzinc/complete.cpp | 2 +- gecode/flatzinc/flatzinc.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gecode/flatzinc/complete.cpp b/gecode/flatzinc/complete.cpp index 547e535..ca977f7 100644 --- a/gecode/flatzinc/complete.cpp +++ b/gecode/flatzinc/complete.cpp @@ -53,7 +53,7 @@ namespace Gecode { namespace FlatZinc { ExecStatus Complete::propagate(Space &home, const ModEventDelta &med) { assert(x0.assigned()); (*c) = x0.val(); - return ES_FAILED; + return home.ES_SUBSUMED(*this); } ExecStatus Complete::post(Home home, BoolView x0, std::shared_ptr c) { diff --git a/gecode/flatzinc/flatzinc.cpp b/gecode/flatzinc/flatzinc.cpp index be2bb10..7959cc4 100644 --- a/gecode/flatzinc/flatzinc.cpp +++ b/gecode/flatzinc/flatzinc.cpp @@ -791,6 +791,7 @@ namespace Gecode { namespace FlatZinc { intVarCount = f.intVarCount; restart_complete.update(*this, f.restart_complete); + complete_marker = f.complete_marker; restart_status.update(*this, f.restart_status); int_uniform_var.update(*this, f.int_uniform_var); int_uniform_lb = f.int_uniform_lb;