From daaebc59cb7454e4bb79236da27b9d3a565eef78 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 15 Aug 2020 12:45:33 +0200 Subject: [PATCH 1/5] Made mod stronger and addressed #675 --- src/lib/clpz.pl | 216 ++++++++++++++++++++++++------------------------ 1 file changed, 109 insertions(+), 107 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 2844f69f..b78a6d84 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -4941,7 +4941,7 @@ run_propagator(pmod(X,Y,Z), MState) --> ( { fd_get(X, _, n(XL), _, _) } -> ( (XL - Z) mod Y =\= 0 -> { XMin is Z + Y * ((XL - Z) div Y + 1) } - ; { XMin is Z + Y * ((XL - Z) div Y) } + ; { XMin is XL } ), { fd_get(X, XD0, XPs), domain_remove_smaller_than(XD0, XMin, XD2), @@ -4993,119 +4993,121 @@ run_propagator(pmodz(X,Y,Z), MState) --> ( nonvar(Z) -> true % Nothing to do. ; nonvar(X) -> ( X =:= 0 -> kill(MState), Z = X - ; X > 0 -> - ( { fd_get(Y, _, n(YL), _, _), YL > X } -> - kill(MState), - Z = X - ; { fd_get(Z, ZD0, ZPs), - domain_remove_greater_than(ZD0, X, ZD2), - fd_put(Z, ZD2, ZPs) } - % queue_goal(Z #=< X) + ; ( X > 0 -> + ( { fd_get(Y, _, n(YL), _, _), YL > X } -> + kill(MState), + Z = X + ; { fd_get(Z, ZD0, ZPs), + domain_remove_greater_than(ZD0, X, ZD2), + fd_put(Z, ZD2, ZPs) } + % queue_goal(Z #=< X) + ) + ; X < 0 -> + ( { fd_get(Y, _, _, n(YU), _), YU < X } -> + kill(MState), + Z = X + ; { fd_get(Z, ZD0, ZPs), + domain_remove_smaller_than(ZD0, X, ZD2), + fd_put(Z, ZD2, ZPs) } + % queue_goal(Z #>= X) + ) + ), + ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> + { ZMax is YU - 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_smaller_than(ZD1, 0, ZD3), + domain_remove_greater_than(ZD3, ZMax, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in 0..ZMax) + ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> + { ZMin is YL + 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_greater_than(ZD1, 0, ZD3), + domain_remove_smaller_than(ZD3, ZMin, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in ZMin..0) + ; true ) - ; X < 0 -> - ( { fd_get(Y, _, _, n(YU), _), YU < X } -> - kill(MState), - Z = X - ; { fd_get(Z, ZD0, ZPs), - domain_remove_smaller_than(ZD0, X, ZD2), - fd_put(Z, ZD2, ZPs) } - % queue_goal(Z #>= X) - ) - ), - ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> - { ZMax is YU - 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_smaller_than(ZD1, 0, ZD3), - domain_remove_greater_than(ZD3, ZMax, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in 0..ZMax) - ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> - { ZMin is YL + 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_greater_than(ZD1, 0, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in ZMin..0) - ; true ) ; nonvar(Y) -> ( abs(Y) =:= 1 -> kill(MState), Z = 0 ; Y < 0 -> - { ZMin is Y + 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_greater_than(ZD1, 0, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in ZMin..0) + ( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } -> + Z = X + ; { ZMin is Y + 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_greater_than(ZD1, 0, ZD3), + domain_remove_smaller_than(ZD3, ZMin, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in ZMin..0) + ) ; Y > 0 -> - { ZMax is Y - 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_smaller_than(ZD1, 0, ZD3), - domain_remove_greater_than(ZD3, ZMax, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in 0..ZMax) - ), - ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> - { fd_get(Z, ZD0, ZPs), - domain_remove_greater_than(ZD0, XU, ZD2), - fd_put(Z, ZD2, ZPs) } - % queue_goal(Z #=< XU) - ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0 } -> - { fd_get(Z, ZD0, ZPs), - domain_remove_smaller_than(ZD0, XL, ZD2), - fd_put(Z, ZD2, ZPs) } - % queue_goal(Z #>= XL) - ; true + ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } -> + Z = X + ; { ZMax is Y - 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_smaller_than(ZD1, 0, ZD3), + domain_remove_greater_than(ZD3, ZMax, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in 0..ZMax) + ) ) - ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> - { fd_get(Z, ZD0, ZPs), - domain_remove_greater_than(ZD0, XU, ZD2), - fd_put(Z, ZD2, ZPs) } - % queue_goal(Z #=< XU) - ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0 } -> - { fd_get(Z, ZD0, ZPs), - domain_remove_smaller_than(ZD0, XL, ZD2), - fd_put(Z, ZD2, ZPs) } - % queue_goal(Z #>= XL) - ; true - ), - ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> - { ZMax is YU - 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_smaller_than(ZD1, 0, ZD3), - domain_remove_greater_than(ZD3, ZMax, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in 0..ZMax) - ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> - { ZMin is YL + 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_greater_than(ZD1, 0, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in ZMin..0) - ; { fd_get(Y, _, n(YL), n(YU), _) } -> - { ZMin is YL + 1, - ZMax is YU - 1 }, - { fd_get(Z, ZD1, ZPs), - domain_remove_greater_than(ZD1, ZMax, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } - % queue_goal(Z in ZMin..ZMax) - %/* This doesn't work very well. - ; { fd_get(Y, _, _, n(YU), _), YU > 0 } -> - { fd_get(Z, ZD1, ZPs), - ZMax is YU - 1, - domain_remove_greater_than(ZD1, ZMax, ZD3), - fd_put(Z, ZD3, ZPs) } - % queue_goal(Z #< YU) - ; { fd_get(Y, _, n(YL), _, _), YL < 0 } -> - { fd_get(Z, ZD1, ZPs), - ZMin is YL + 1, - domain_remove_smaller_than(ZD1, ZMin, ZD3), - fd_put(Z, ZD3, ZPs) } - % queue_goal(Z #> YL) - % */ - ; true + ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, + fd_get(Y, _, n(YL), _, _), XU < YL } -> + Z = X + ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0, + fd_get(Y, _, _, n(YU), _), XL > YU } -> + Z = X + ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> + { fd_get(Z, ZD0, ZPs), + domain_remove_greater_than(ZD0, XU, ZD2), + fd_put(Z, ZD2, ZPs) } + % queue_goal(Z #=< XU) + ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0 } -> + { fd_get(Z, ZD0, ZPs), + domain_remove_smaller_than(ZD0, XL, ZD2), + fd_put(Z, ZD2, ZPs) } + % queue_goal(Z #>= XL) + ; true + ), + ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> + { ZMax is YU - 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_smaller_than(ZD1, 0, ZD3), + domain_remove_greater_than(ZD3, ZMax, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in 0..ZMax) + ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> + { ZMin is YL + 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_greater_than(ZD1, 0, ZD3), + domain_remove_smaller_than(ZD3, ZMin, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in ZMin..0) + ; { fd_get(Y, _, n(YL), n(YU), _) } -> + { ZMin is YL + 1, + ZMax is YU - 1 }, + { fd_get(Z, ZD1, ZPs), + domain_remove_greater_than(ZD1, ZMax, ZD3), + domain_remove_smaller_than(ZD3, ZMin, ZD5), + fd_put(Z, ZD5, ZPs) } + % queue_goal(Z in ZMin..ZMax) + %/* This doesn't work very well. + ; { fd_get(Y, _, _, n(YU), _), YU > 0 } -> + { fd_get(Z, ZD1, ZPs), + ZMax is YU - 1, + domain_remove_greater_than(ZD1, ZMax, ZD3), + fd_put(Z, ZD3, ZPs) } + % queue_goal(Z #< YU) + ; { fd_get(Y, _, n(YL), _, _), YL < 0 } -> + { fd_get(Z, ZD1, ZPs), + ZMin is YL + 1, + domain_remove_smaller_than(ZD1, ZMin, ZD3), + fd_put(Z, ZD3, ZPs) } + % queue_goal(Z #> YL) + % * / + ; true + ) ) ). From b4b11465a13bfc8b3dab4304feb8a78b3743a260 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 15 Aug 2020 13:37:33 +0200 Subject: [PATCH 2/5] Fixed variable bindings in mod from clpz --- src/lib/clpz.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index b78a6d84..76f22f95 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -4984,9 +4984,8 @@ run_propagator(pmod(X,Y,Z), MState) --> % queue_goal(Y #< Z) ; true ) - ; run_propagator(pmodz(X,Y,Z), MState), - run_propagator(pmody(X,Y,Z), MState), - true + ; run_propagator(pmody(X,Y,Z), MState), + run_propagator(pmodz(X,Y,Z), MState) % This must be the last one. ). run_propagator(pmodz(X,Y,Z), MState) --> @@ -4996,7 +4995,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; ( X > 0 -> ( { fd_get(Y, _, n(YL), _, _), YL > X } -> kill(MState), - Z = X + queue_goal(Z #= X) ; { fd_get(Z, ZD0, ZPs), domain_remove_greater_than(ZD0, X, ZD2), fd_put(Z, ZD2, ZPs) } @@ -5005,7 +5004,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; X < 0 -> ( { fd_get(Y, _, _, n(YU), _), YU < X } -> kill(MState), - Z = X + queue_goal(Z #= X) ; { fd_get(Z, ZD0, ZPs), domain_remove_smaller_than(ZD0, X, ZD2), fd_put(Z, ZD2, ZPs) } @@ -5033,6 +5032,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ( abs(Y) =:= 1 -> kill(MState), Z = 0 ; Y < 0 -> ( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } -> + kill(MState), Z = X ; { ZMin is Y + 1 }, { fd_get(Z, ZD1, ZPs), @@ -5043,6 +5043,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ) ; Y > 0 -> ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } -> + kill(MState), Z = X ; { ZMax is Y - 1 }, { fd_get(Z, ZD1, ZPs), @@ -5054,9 +5055,11 @@ run_propagator(pmodz(X,Y,Z), MState) --> ) ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, fd_get(Y, _, n(YL), _, _), XU < YL } -> + kill(MState), Z = X ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0, fd_get(Y, _, _, n(YU), _), XL > YU } -> + kill(MState), Z = X ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> { fd_get(Z, ZD0, ZPs), From d4263cc8b91d24501f35c5e87ef67a77fb4cbd12 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 15 Aug 2020 17:06:12 +0200 Subject: [PATCH 3/5] Using queue_goal//1 to correctly bind variables --- src/lib/clpz.pl | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 76f22f95..2c8bfdda 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -4928,7 +4928,7 @@ run_propagator(pmod(X,Y,Z), MState) --> ( Y == 0 -> { false } ; Y == Z -> { false } % ; nonvar(Y), Z == X -> true - ; X == Y -> kill(MState), Z = 0 + ; X == Y -> kill(MState), queue_goal(Z = 0) ; true ), ( nonvar(X), nonvar(Y) -> @@ -4984,18 +4984,19 @@ run_propagator(pmod(X,Y,Z), MState) --> % queue_goal(Y #< Z) ; true ) - ; run_propagator(pmody(X,Y,Z), MState), - run_propagator(pmodz(X,Y,Z), MState) % This must be the last one. + ; run_propagator(pmodz(X,Y,Z), MState), + run_propagator(pmody(X,Y,Z), MState), + true ). run_propagator(pmodz(X,Y,Z), MState) --> ( nonvar(Z) -> true % Nothing to do. ; nonvar(X) -> - ( X =:= 0 -> kill(MState), Z = X + ( X =:= 0 -> kill(MState), queue_goal(Z = X) ; ( X > 0 -> ( { fd_get(Y, _, n(YL), _, _), YL > X } -> kill(MState), - queue_goal(Z #= X) + queue_goal(Z = X) ; { fd_get(Z, ZD0, ZPs), domain_remove_greater_than(ZD0, X, ZD2), fd_put(Z, ZD2, ZPs) } @@ -5004,7 +5005,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; X < 0 -> ( { fd_get(Y, _, _, n(YU), _), YU < X } -> kill(MState), - queue_goal(Z #= X) + queue_goal(Z = X) ; { fd_get(Z, ZD0, ZPs), domain_remove_smaller_than(ZD0, X, ZD2), fd_put(Z, ZD2, ZPs) } @@ -5029,11 +5030,11 @@ run_propagator(pmodz(X,Y,Z), MState) --> ) ) ; nonvar(Y) -> - ( abs(Y) =:= 1 -> kill(MState), Z = 0 + ( abs(Y) =:= 1 -> kill(MState), queue_goal(Z = 0) ; Y < 0 -> ( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } -> kill(MState), - Z = X + queue_goal(Z = X) ; { ZMin is Y + 1 }, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), @@ -5044,7 +5045,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; Y > 0 -> ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } -> kill(MState), - Z = X + queue_goal(Z = X) ; { ZMax is Y - 1 }, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), @@ -5056,11 +5057,11 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, fd_get(Y, _, n(YL), _, _), XU < YL } -> kill(MState), - Z = X + queue_goal(Z = X) ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0, fd_get(Y, _, _, n(YU), _), XL > YU } -> kill(MState), - Z = X + queue_goal(Z = X) ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> { fd_get(Z, ZD0, ZPs), domain_remove_greater_than(ZD0, XU, ZD2), From bed4afe74f127b2cd224ed3ba21b2baaa1e3b7c2 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 15 Aug 2020 17:39:34 +0200 Subject: [PATCH 4/5] Simplified the code --- src/lib/clpz.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 2c8bfdda..148c84ed 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -4940,8 +4940,8 @@ run_propagator(pmod(X,Y,Z), MState) --> ), ( { fd_get(X, _, n(XL), _, _) } -> ( (XL - Z) mod Y =\= 0 -> - { XMin is Z + Y * ((XL - Z) div Y + 1) } - ; { XMin is XL } + XMin is Z + Y * ((XL - Z) div Y + 1) + ; XMin is XL ), { fd_get(X, XD0, XPs), domain_remove_smaller_than(XD0, XMin, XD2), @@ -4950,7 +4950,7 @@ run_propagator(pmod(X,Y,Z), MState) --> ; true ), ( { fd_get(X, _, _, n(XU), _) } -> - { XMax is Z + Y * ((XU - Z) div Y) }, + XMax is Z + Y * ((XU - Z) div Y), { fd_get(X, XD1, XPs), domain_remove_greater_than(XD1, XMax, XD3), fd_put(X, XD3, XPs) } @@ -5013,14 +5013,14 @@ run_propagator(pmodz(X,Y,Z), MState) --> ) ), ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> - { ZMax is YU - 1 }, + ZMax is YU - 1, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), domain_remove_greater_than(ZD3, ZMax, ZD5), fd_put(Z, ZD5, ZPs) } % queue_goal(Z in 0..ZMax) ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> - { ZMin is YL + 1 }, + ZMin is YL + 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), domain_remove_smaller_than(ZD3, ZMin, ZD5), @@ -5035,7 +5035,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } -> kill(MState), queue_goal(Z = X) - ; { ZMin is Y + 1 }, + ; ZMin is Y + 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), domain_remove_smaller_than(ZD3, ZMin, ZD5), @@ -5046,7 +5046,7 @@ run_propagator(pmodz(X,Y,Z), MState) --> ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } -> kill(MState), queue_goal(Z = X) - ; { ZMax is Y - 1 }, + ; ZMax is Y - 1, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), domain_remove_greater_than(ZD3, ZMax, ZD5), @@ -5075,22 +5075,22 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; true ), ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> - { ZMax is YU - 1 }, + ZMax is YU - 1, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), domain_remove_greater_than(ZD3, ZMax, ZD5), fd_put(Z, ZD5, ZPs) } % queue_goal(Z in 0..ZMax) ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> - { ZMin is YL + 1 }, + ZMin is YL + 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), domain_remove_smaller_than(ZD3, ZMin, ZD5), fd_put(Z, ZD5, ZPs) } % queue_goal(Z in ZMin..0) ; { fd_get(Y, _, n(YL), n(YU), _) } -> - { ZMin is YL + 1, - ZMax is YU - 1 }, + ZMin is YL + 1, + ZMax is YU - 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, ZMax, ZD3), domain_remove_smaller_than(ZD3, ZMin, ZD5), From 0724c044d67028dccaa2e0454dc9df24624656f1 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 15 Aug 2020 17:56:07 +0200 Subject: [PATCH 5/5] Use nonterminal fd_put//3 in mod from clpz --- src/lib/clpz.pl | 84 ++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 148c84ed..4fa4b846 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -4944,16 +4944,16 @@ run_propagator(pmod(X,Y,Z), MState) --> ; XMin is XL ), { fd_get(X, XD0, XPs), - domain_remove_smaller_than(XD0, XMin, XD2), - fd_put(X, XD2, XPs) } + domain_remove_smaller_than(XD0, XMin, XD2) }, + fd_put(X, XD2, XPs) % queue_goal(X #>= XMin) ; true ), ( { fd_get(X, _, _, n(XU), _) } -> XMax is Z + Y * ((XU - Z) div Y), { fd_get(X, XD1, XPs), - domain_remove_greater_than(XD1, XMax, XD3), - fd_put(X, XD3, XPs) } + domain_remove_greater_than(XD1, XMax, XD3) }, + fd_put(X, XD3, XPs) % queue_goal(X #=< XMax) ; true ) @@ -4973,14 +4973,14 @@ run_propagator(pmod(X,Y,Z), MState) --> ( Z > 0 -> { fd_get(Y, YD, YPs), YMin is Z + 1, - domain_remove_smaller_than(YD, YMin, YD1), - fd_put(Y, YD1, YPs) } + domain_remove_smaller_than(YD, YMin, YD1) }, + fd_put(Y, YD1, YPs) % queue_goal(Y #> Z) ; Z < 0 -> { fd_get(Y, YD, YPs), YMax is Z - 1, - domain_remove_greater_than(YD, YMax, YD1), - fd_put(Y, YD1, YPs) } + domain_remove_greater_than(YD, YMax, YD1) }, + fd_put(Y, YD1, YPs) % queue_goal(Y #< Z) ; true ) @@ -4998,8 +4998,8 @@ run_propagator(pmodz(X,Y,Z), MState) --> kill(MState), queue_goal(Z = X) ; { fd_get(Z, ZD0, ZPs), - domain_remove_greater_than(ZD0, X, ZD2), - fd_put(Z, ZD2, ZPs) } + domain_remove_greater_than(ZD0, X, ZD2) }, + fd_put(Z, ZD2, ZPs) % queue_goal(Z #=< X) ) ; X < 0 -> @@ -5007,8 +5007,8 @@ run_propagator(pmodz(X,Y,Z), MState) --> kill(MState), queue_goal(Z = X) ; { fd_get(Z, ZD0, ZPs), - domain_remove_smaller_than(ZD0, X, ZD2), - fd_put(Z, ZD2, ZPs) } + domain_remove_smaller_than(ZD0, X, ZD2) }, + fd_put(Z, ZD2, ZPs) % queue_goal(Z #>= X) ) ), @@ -5016,15 +5016,15 @@ run_propagator(pmodz(X,Y,Z), MState) --> ZMax is YU - 1, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), - domain_remove_greater_than(ZD3, ZMax, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_greater_than(ZD3, ZMax, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in 0..ZMax) ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> ZMin is YL + 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_smaller_than(ZD3, ZMin, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in ZMin..0) ; true ) @@ -5038,8 +5038,8 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; ZMin is Y + 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_smaller_than(ZD3, ZMin, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in ZMin..0) ) ; Y > 0 -> @@ -5049,8 +5049,8 @@ run_propagator(pmodz(X,Y,Z), MState) --> ; ZMax is Y - 1, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), - domain_remove_greater_than(ZD3, ZMax, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_greater_than(ZD3, ZMax, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in 0..ZMax) ) ) @@ -5064,13 +5064,13 @@ run_propagator(pmodz(X,Y,Z), MState) --> queue_goal(Z = X) ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> { fd_get(Z, ZD0, ZPs), - domain_remove_greater_than(ZD0, XU, ZD2), - fd_put(Z, ZD2, ZPs) } + domain_remove_greater_than(ZD0, XU, ZD2) }, + fd_put(Z, ZD2, ZPs) % queue_goal(Z #=< XU) ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0 } -> { fd_get(Z, ZD0, ZPs), - domain_remove_smaller_than(ZD0, XL, ZD2), - fd_put(Z, ZD2, ZPs) } + domain_remove_smaller_than(ZD0, XL, ZD2) }, + fd_put(Z, ZD2, ZPs) % queue_goal(Z #>= XL) ; true ), @@ -5078,36 +5078,36 @@ run_propagator(pmodz(X,Y,Z), MState) --> ZMax is YU - 1, { fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3), - domain_remove_greater_than(ZD3, ZMax, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_greater_than(ZD3, ZMax, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in 0..ZMax) ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> ZMin is YL + 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, 0, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_smaller_than(ZD3, ZMin, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in ZMin..0) ; { fd_get(Y, _, n(YL), n(YU), _) } -> ZMin is YL + 1, ZMax is YU - 1, { fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, ZMax, ZD3), - domain_remove_smaller_than(ZD3, ZMin, ZD5), - fd_put(Z, ZD5, ZPs) } + domain_remove_smaller_than(ZD3, ZMin, ZD5) }, + fd_put(Z, ZD5, ZPs) % queue_goal(Z in ZMin..ZMax) %/* This doesn't work very well. ; { fd_get(Y, _, _, n(YU), _), YU > 0 } -> { fd_get(Z, ZD1, ZPs), ZMax is YU - 1, - domain_remove_greater_than(ZD1, ZMax, ZD3), - fd_put(Z, ZD3, ZPs) } + domain_remove_greater_than(ZD1, ZMax, ZD3) }, + fd_put(Z, ZD3, ZPs) % queue_goal(Z #< YU) ; { fd_get(Y, _, n(YL), _, _), YL < 0 } -> { fd_get(Z, ZD1, ZPs), ZMin is YL + 1, - domain_remove_smaller_than(ZD1, ZMin, ZD3), - fd_put(Z, ZD3, ZPs) } + domain_remove_smaller_than(ZD1, ZMin, ZD3) }, + fd_put(Z, ZD3, ZPs) % queue_goal(Z #> YL) % * / ; true @@ -5122,26 +5122,26 @@ run_propagator(pmody(X,Y,Z), MState) --> ( Z > 0 -> % queue_goal(Y #> Z) { fd_get(Y, YD, YPs), YMin is Z + 1, - domain_remove_smaller_than(YD, YMin, YD1), - fd_put(Y, YD1, YPs) } + domain_remove_smaller_than(YD, YMin, YD1) }, + fd_put(Y, YD1, YPs) ; Z < 0 -> % queue_goal(Y #< Z) { fd_get(Y, YD, YPs), YMax is Z - 1, - domain_remove_greater_than(YD, YMax, YD1), - fd_put(Y, YD1, YPs) } + domain_remove_greater_than(YD, YMax, YD1) }, + fd_put(Y, YD1, YPs) ; Z =:= 0 -> kill(MState), queue_goal(X / Y #= _) ) ; ( { fd_get(Z, _, n(ZL), _, _), ZL > 0 } -> { fd_get(Y, YD, YPs), YMin is ZL + 1, - domain_remove_smaller_than(YD, YMin, YD1), - fd_put(Y, YD1, YPs) } + domain_remove_smaller_than(YD, YMin, YD1) }, + fd_put(Y, YD1, YPs) % queue_goal(Y #> ZL) ; { fd_get(Z, _, _, n(ZU), _), ZU < 0 } -> { fd_get(Y, YD, YPs), YMax is ZU - 1, - domain_remove_greater_than(YD, YMax, YD1), - fd_put(Y, YD1, YPs) } + domain_remove_greater_than(YD, YMax, YD1) }, + fd_put(Y, YD1, YPs) % queue_goal(Y #< ZU) ; true )