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

Merge pull request #1816 from notoria/clpz

Browse Source 
Small fixes for `CLP(ℤ)`
This commit is contained in:
Mark Thom
2023-05-27 11:07:50 -06:00
committed by GitHub
parent 462097d956 495df8846a
commit 7bc7f0ad06
1 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/clpz.pl
View File

@@ -4990,7 +4990,6 @@ run_propagator(ptzdiv(X,Y,Z), MState) -->
run_propagator(pmod(X,Y,Z), MState) --> run_propagator(pmod(X,Y,Z), MState) -->
( Y == 0 -> { false } ( Y == 0 -> { false }
; Y == Z -> { false } ; Y == Z -> { false }
% ; nonvar(Y), Z == X -> true
; X == Y -> kill(MState), queue_goal(Z = 0) ; X == Y -> kill(MState), queue_goal(Z = 0)
; true ; true
), ),
@@ -5020,8 +5019,6 @@ run_propagator(pmod(X,Y,Z), MState) -->
% queue_goal(X #=< XMax) % queue_goal(X #=< XMax)
; true ; true
) )
% kill(MState),
% queue_goal(X #= Z + Y * _) % Add a variable to be efficient.
; nonvar(Z), nonvar(X) -> ; nonvar(Z), nonvar(X) ->
( Z > 0 -> ( Z > 0 ->
( X < 0 -> true ( X < 0 -> true
@@ -5156,7 +5153,7 @@ run_propagator(pmodz(X,Y,Z), MState) -->
domain_remove_smaller_than(ZD3, ZMin, ZD5) }, domain_remove_smaller_than(ZD3, ZMin, ZD5) },
fd_put(Z, ZD5, ZPs) fd_put(Z, ZD5, ZPs)
% queue_goal(Z in ZMin..0) % queue_goal(Z in ZMin..0)
; { fd_get(Y, _, n(YL), n(YU), _) } -> ; { fd_get(Y, _, n(YL), n(YU), _), YL < 0, YU > 0 } ->
ZMin is YL + 1, ZMin is YL + 1,
ZMax is YU - 1, ZMax is YU - 1,
{ fd_get(Z, ZD1, ZPs), { fd_get(Z, ZD1, ZPs),
@@ -5181,21 +5178,23 @@ run_propagator(pmodz(X,Y,Z), MState) -->
) )
). ).
run_propagator(pmody(X,Y,Z), MState) --> run_propagator(pmody(_X,Y,Z), _MState) -->
( nonvar(Y) -> true % Nothing to do. ( nonvar(Y) -> true % Nothing to do.
% ; nonvar(X) -> true % ; nonvar(X) -> true
; nonvar(Z) -> ; nonvar(Z) ->
( Z > 0 -> % queue_goal(Y #> Z) ( Z > 0 ->
{ fd_get(Y, YD, YPs), { fd_get(Y, YD, YPs),
YMin is Z + 1, YMin is Z + 1,
domain_remove_smaller_than(YD, YMin, YD1) }, domain_remove_smaller_than(YD, YMin, YD1) },
fd_put(Y, YD1, YPs) fd_put(Y, YD1, YPs)
; Z < 0 -> % queue_goal(Y #< Z) % queue_goal(Y #> Z)
; Z < 0 ->
{ fd_get(Y, YD, YPs), { fd_get(Y, YD, YPs),
YMax is Z - 1, YMax is Z - 1,
domain_remove_greater_than(YD, YMax, YD1) }, domain_remove_greater_than(YD, YMax, YD1) },
fd_put(Y, YD1, YPs) fd_put(Y, YD1, YPs)
; Z =:= 0 -> kill(MState), queue_goal(X / Y #= _) % queue_goal(Y #< Z)
; Z =:= 0 % Multiple solutions so do nothing special.
) )
; ( { fd_get(Z, _, n(ZL), _, _), ZL > 0 } -> ; ( { fd_get(Z, _, n(ZL), _, _), ZL > 0 } ->
{ fd_get(Y, YD, YPs), { fd_get(Y, YD, YPs),