Merge commit 'de3359c8ebda7c605760e41bd1f4387633424709' into develop
This commit is contained in:
commit
17c3b07111
@ -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<bool> c) {
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user