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

Squashed 'software/gecode/' changes from 70a1cfa856..0a39b58153

Browse Source 
0a39b58153 Subsume complete propagator instead of failing it
f95e9e4295 Fix mistake in FlatZincSpace copy constructor

git-subtree-dir: software/gecode
git-subtree-split: 0a39b581532f250f13be0f41787bd4b0e35f648c
This commit is contained in:
Jip J. Dekker 2021-07-13 11:54:18 +10:00
parent 6719176975
commit de3359c8eb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gecode/flatzinc/complete.cpp
View File

@ -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) {

1
gecode/flatzinc/flatzinc.cpp
View File

@ -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;