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

Made mod stronger and addressed #675

Browse Source
This commit is contained in:
notoria
2020-08-15 12:45:33 +02:00
parent 79a74038ac
commit daaebc59cb
1 changed files with 109 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
src/lib/clpz.pl
View File

@@ -4941,7 +4941,7 @@ run_propagator(pmod(X,Y,Z), MState) -->
( { fd_get(X, _, n(XL), _, _) } -> ( { fd_get(X, _, n(XL), _, _) } ->
( (XL - Z) mod Y =\= 0 -> ( (XL - Z) mod Y =\= 0 ->
{ XMin is Z + Y * ((XL - Z) div Y + 1) } { 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), { fd_get(X, XD0, XPs),
domain_remove_smaller_than(XD0, XMin, XD2), 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(Z) -> true % Nothing to do.
; nonvar(X) -> ; nonvar(X) ->
( X =:= 0 -> kill(MState), Z = X ( X =:= 0 -> kill(MState), Z = X
; X > 0 -> ; ( X > 0 ->
( { fd_get(Y, _, n(YL), _, _), YL > X } -> ( { fd_get(Y, _, n(YL), _, _), YL > X } ->
kill(MState), kill(MState),
Z = X 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) }
% queue_goal(Z #=< X) % 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) -> ; nonvar(Y) ->
( abs(Y) =:= 1 -> kill(MState), Z = 0 ( abs(Y) =:= 1 -> kill(MState), Z = 0
; Y < 0 -> ; Y < 0 ->
{ ZMin is Y + 1 }, ( { fd_get(X, _, n(XL), n(XU), _), XU =< 0, Y < XL } ->
{ fd_get(Z, ZD1, ZPs), Z = X
domain_remove_greater_than(ZD1, 0, ZD3), ; { ZMin is Y + 1 },
domain_remove_smaller_than(ZD3, ZMin, ZD5), { fd_get(Z, ZD1, ZPs),
fd_put(Z, ZD5, ZPs) } domain_remove_greater_than(ZD1, 0, ZD3),
% queue_goal(Z in ZMin..0) domain_remove_smaller_than(ZD3, ZMin, ZD5),
fd_put(Z, ZD5, ZPs) }
% queue_goal(Z in ZMin..0)
)
; Y > 0 -> ; Y > 0 ->
{ ZMax is Y - 1 }, ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } ->
{ fd_get(Z, ZD1, ZPs), Z = X
domain_remove_smaller_than(ZD1, 0, ZD3), ; { ZMax is Y - 1 },
domain_remove_greater_than(ZD3, ZMax, ZD5), { fd_get(Z, ZD1, ZPs),
fd_put(Z, ZD5, ZPs) } domain_remove_smaller_than(ZD1, 0, ZD3),
% queue_goal(Z in 0..ZMax) domain_remove_greater_than(ZD3, ZMax, ZD5),
), fd_put(Z, ZD5, ZPs) }
( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } -> % queue_goal(Z in 0..ZMax)
{ 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 } -> ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0,
{ fd_get(Z, ZD0, ZPs), fd_get(Y, _, n(YL), _, _), XU < YL } ->
domain_remove_greater_than(ZD0, XU, ZD2), Z = X
fd_put(Z, ZD2, ZPs) } ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0,
% queue_goal(Z #=< XU) fd_get(Y, _, _, n(YU), _), XL > YU } ->
; { fd_get(X, _, n(XL), n(XU), _), XU =< 0 } -> Z = X
{ fd_get(Z, ZD0, ZPs), ; ( { fd_get(X, _, n(XL), n(XU), _), XL >= 0 } ->
domain_remove_smaller_than(ZD0, XL, ZD2), { fd_get(Z, ZD0, ZPs),
fd_put(Z, ZD2, ZPs) } domain_remove_greater_than(ZD0, XU, ZD2),
% queue_goal(Z #>= XL) fd_put(Z, ZD2, ZPs) }
; true % queue_goal(Z #=< XU)
), ; { fd_get(X, _, n(XL), n(XU), _), XU =< 0 } ->
( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } -> { fd_get(Z, ZD0, ZPs),
{ ZMax is YU - 1 }, domain_remove_smaller_than(ZD0, XL, ZD2),
{ fd_get(Z, ZD1, ZPs), fd_put(Z, ZD2, ZPs) }
domain_remove_smaller_than(ZD1, 0, ZD3), % queue_goal(Z #>= XL)
domain_remove_greater_than(ZD3, ZMax, ZD5), ; true
fd_put(Z, ZD5, ZPs) } ),
% queue_goal(Z in 0..ZMax) ( { fd_get(Y, _, n(YL), n(YU), _), YL > 0 } ->
; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } -> { ZMax is YU - 1 },
{ ZMin is YL + 1 }, { fd_get(Z, ZD1, ZPs),
{ fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD1, 0, ZD3),
domain_remove_greater_than(ZD1, 0, ZD3), domain_remove_greater_than(ZD3, ZMax, ZD5),
domain_remove_smaller_than(ZD3, ZMin, ZD5), fd_put(Z, ZD5, ZPs) }
fd_put(Z, ZD5, ZPs) } % queue_goal(Z in 0..ZMax)
% queue_goal(Z in ZMin..0) ; { fd_get(Y, _, n(YL), n(YU), _), YU < 0 } ->
; { fd_get(Y, _, n(YL), n(YU), _) } -> { ZMin is YL + 1 },
{ ZMin is YL + 1, { fd_get(Z, ZD1, ZPs),
ZMax is YU - 1 }, domain_remove_greater_than(ZD1, 0, ZD3),
{ fd_get(Z, ZD1, ZPs), domain_remove_smaller_than(ZD3, ZMin, ZD5),
domain_remove_greater_than(ZD1, ZMax, ZD3), fd_put(Z, ZD5, ZPs) }
domain_remove_smaller_than(ZD3, ZMin, ZD5), % queue_goal(Z in ZMin..0)
fd_put(Z, ZD5, ZPs) } ; { fd_get(Y, _, n(YL), n(YU), _) } ->
% queue_goal(Z in ZMin..ZMax) { ZMin is YL + 1,
%/* This doesn't work very well. ZMax is YU - 1 },
; { fd_get(Y, _, _, n(YU), _), YU > 0 } -> { fd_get(Z, ZD1, ZPs),
{ fd_get(Z, ZD1, ZPs), domain_remove_greater_than(ZD1, ZMax, ZD3),
ZMax is YU - 1, domain_remove_smaller_than(ZD3, ZMin, ZD5),
domain_remove_greater_than(ZD1, ZMax, ZD3), fd_put(Z, ZD5, ZPs) }
fd_put(Z, ZD3, ZPs) } % queue_goal(Z in ZMin..ZMax)
% queue_goal(Z #< YU) %/* This doesn't work very well.
; { fd_get(Y, _, n(YL), _, _), YL < 0 } -> ; { fd_get(Y, _, _, n(YU), _), YU > 0 } ->
{ fd_get(Z, ZD1, ZPs), { fd_get(Z, ZD1, ZPs),
ZMin is YL + 1, ZMax is YU - 1,
domain_remove_smaller_than(ZD1, ZMin, ZD3), domain_remove_greater_than(ZD1, ZMax, ZD3),
fd_put(Z, ZD3, ZPs) } fd_put(Z, ZD3, ZPs) }
% queue_goal(Z #> YL) % queue_goal(Z #< YU)
% */ ; { fd_get(Y, _, n(YL), _, _), YL < 0 } ->
; true { 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
)
) )
). ).