this repo has no description

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

Changed files
+2 -1
gecode
+1 -1
gecode/flatzinc/complete.cpp
··· 53 53 ExecStatus Complete::propagate(Space &home, const ModEventDelta &med) { 54 54 assert(x0.assigned()); 55 55 (*c) = x0.val(); 56 - return ES_FAILED; 56 + return home.ES_SUBSUMED(*this); 57 57 } 58 58 59 59 ExecStatus Complete::post(Home home, BoolView x0, std::shared_ptr<bool> c) {
+1
gecode/flatzinc/flatzinc.cpp
··· 791 791 intVarCount = f.intVarCount; 792 792 793 793 restart_complete.update(*this, f.restart_complete); 794 + complete_marker = f.complete_marker; 794 795 restart_status.update(*this, f.restart_status); 795 796 int_uniform_var.update(*this, f.int_uniform_var); 796 797 int_uniform_lb = f.int_uniform_lb;