rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using queue_goal//1 to correctly bind variables

Browse Source
This commit is contained in:
notoria
2020-08-15 17:06:12 +02:00
parent b4b11465a1
commit d4263cc8b9
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/clpz.pl
View File

@@ -4928,7 +4928,7 @@ run_propagator(pmod(X,Y,Z), MState) -->
( Y == 0 -> { false } ( Y == 0 -> { false }
; Y == Z -> { false } ; Y == Z -> { false }
% ; nonvar(Y), Z == X -> true % ; nonvar(Y), Z == X -> true
; X == Y -> kill(MState), Z = 0 ; X == Y -> kill(MState), queue_goal(Z = 0)
; true ; true
), ),
( nonvar(X), nonvar(Y) -> ( nonvar(X), nonvar(Y) ->
@@ -4984,18 +4984,19 @@ run_propagator(pmod(X,Y,Z), MState) -->
% queue_goal(Y #< Z) % queue_goal(Y #< Z)
; true ; true
) )
; run_propagator(pmody(X,Y,Z), MState), ; run_propagator(pmodz(X,Y,Z), MState),
run_propagator(pmodz(X,Y,Z), MState) % This must be the last one. run_propagator(pmody(X,Y,Z), MState),
true
). ).
run_propagator(pmodz(X,Y,Z), MState) --> run_propagator(pmodz(X,Y,Z), MState) -->
( nonvar(Z) -> true % Nothing to do. ( nonvar(Z) -> true % Nothing to do.
; nonvar(X) -> ; nonvar(X) ->
( X =:= 0 -> kill(MState), Z = X ( X =:= 0 -> kill(MState), queue_goal(Z = X)
; ( X > 0 -> ; ( X > 0 ->
( { fd_get(Y, _, n(YL), _, _), YL > X } -> ( { fd_get(Y, _, n(YL), _, _), YL > X } ->
kill(MState), kill(MState),
queue_goal(Z #= X) queue_goal(Z = X)
; { fd_get(Z, ZD0, ZPs), ; { fd_get(Z, ZD0, ZPs),
domain_remove_greater_than(ZD0, X, ZD2), domain_remove_greater_than(ZD0, X, ZD2),
fd_put(Z, ZD2, ZPs) } fd_put(Z, ZD2, ZPs) }
@@ -5004,7 +5005,7 @@ run_propagator(pmodz(X,Y,Z), MState) -->
; X < 0 -> ; X < 0 ->
( { fd_get(Y, _, _, n(YU), _), YU < X } -> ( { fd_get(Y, _, _, n(YU), _), YU < X } ->
kill(MState), kill(MState),
queue_goal(Z #= X) queue_goal(Z = X)
; { fd_get(Z, ZD0, ZPs), ; { fd_get(Z, ZD0, ZPs),
domain_remove_smaller_than(ZD0, X, ZD2), domain_remove_smaller_than(ZD0, X, ZD2),
fd_put(Z, ZD2, ZPs) } fd_put(Z, ZD2, ZPs) }
@@ -5029,11 +5030,11 @@ run_propagator(pmodz(X,Y,Z), MState) -->
) )
) )
; nonvar(Y) -> ; nonvar(Y) ->
( abs(Y) =:= 1 -> kill(MState), Z = 0 ( abs(Y) =:= 1 -> kill(MState), queue_goal(Z = 0)
; Y < 0 -> ; Y < 0 ->
( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } -> ( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } ->
kill(MState), kill(MState),
Z = X queue_goal(Z = X)
; { ZMin is Y + 1 }, ; { ZMin is Y + 1 },
{ fd_get(Z, ZD1, ZPs), { fd_get(Z, ZD1, ZPs),
domain_remove_greater_than(ZD1, 0, ZD3), domain_remove_greater_than(ZD1, 0, ZD3),
@@ -5044,7 +5045,7 @@ run_propagator(pmodz(X,Y,Z), MState) -->
; Y > 0 -> ; Y > 0 ->
( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } -> ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } ->
kill(MState), kill(MState),
Z = X queue_goal(Z = X)
; { ZMax is Y - 1 }, ; { ZMax is Y - 1 },
{ fd_get(Z, ZD1, ZPs), { fd_get(Z, ZD1, ZPs),
domain_remove_smaller_than(ZD1, 0, ZD3), 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(X, _, n(XL), n(XU), _), XL >= 0,
fd_get(Y, _, n(YL), _, _), XU < YL } -> fd_get(Y, _, n(YL), _, _), XU < YL } ->
kill(MState), kill(MState),
Z = X queue_goal(Z = X)
; { fd_get(X, _, n(XL), n(XU), _), XU =< 0, ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0,
fd_get(Y, _, _, n(YU), _), XL > YU } -> fd_get(Y, _, _, n(YU), _), XL > YU } ->
kill(MState), kill(MState),
Z = X queue_goal(Z = X)
; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } ->
{ fd_get(Z, ZD0, ZPs), { fd_get(Z, ZD0, ZPs),
domain_remove_greater_than(ZD0, XU, ZD2), domain_remove_greater_than(ZD0, XU, ZD2),