Dekker1/on-restart-benchmarks
Archived
1
0
Fork 0
Code

Merge commit 'de3359c8ebda7c605760e41bd1f4387633424709' into develop

Browse Source
This commit is contained in:
Jip J. Dekker 2021-07-13 11:54:18 +10:00
commit 17c3b07111
No known key found for this signature in database
GPG Key ID: 517DF4A00618C9C3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
software/gecode/gecode/flatzinc/complete.cpp
View File

@ -53,7 +53,7 @@ namespace Gecode { namespace FlatZinc {
ExecStatus Complete::propagate(Space &home, const ModEventDelta &med) { ExecStatus Complete::propagate(Space &home, const ModEventDelta &med) {
assert(x0.assigned()); assert(x0.assigned());
(*c) = x0.val(); (*c) = x0.val();
return ES_FAILED; return home.ES_SUBSUMED(*this);
} }
ExecStatus Complete::post(Home home, BoolView x0, std::shared_ptr<bool> c) { ExecStatus Complete::post(Home home, BoolView x0, std::shared_ptr<bool> c) {

1
software/gecode/gecode/flatzinc/flatzinc.cpp
View File

@ -791,6 +791,7 @@ namespace Gecode { namespace FlatZinc {
intVarCount = f.intVarCount; intVarCount = f.intVarCount;
restart_complete.update(*this, f.restart_complete); restart_complete.update(*this, f.restart_complete);
complete_marker = f.complete_marker;
restart_status.update(*this, f.restart_status); restart_status.update(*this, f.restart_status);
int_uniform_var.update(*this, f.int_uniform_var); int_uniform_var.update(*this, f.int_uniform_var);
int_uniform_lb = f.int_uniform_lb; int_uniform_lb = f.int_uniform_lb;