From 05d48cdcc397ac870e955146e02a5ef7645a05df Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 27 May 2023 13:19:19 +0200 Subject: [PATCH] Don't add variable ?- Z #= 0, Z #= X mod Y. Z = 0, clpz:(_A*Y#=X), clpz:(Y in inf.. -1\/1..sup) % Unexpected. The expected result: Z = 0, clpz:(X mod Y#=0), clpz:(Y in inf.. -1\/1..sup). --- src/lib/clpz.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 43b8f26e..4cdcdc9a 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -5019,8 +5019,6 @@ run_propagator(pmod(X,Y,Z), MState) --> % queue_goal(X #=< XMax) ; true ) - % kill(MState), - % queue_goal(X #= Z + Y * _) % Add a variable to be efficient. ; nonvar(Z), nonvar(X) -> ( Z > 0 -> ( X < 0 -> true @@ -5180,7 +5178,7 @@ 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(X) -> true ; nonvar(Z) -> @@ -5196,7 +5194,7 @@ run_propagator(pmody(X,Y,Z), MState) --> domain_remove_greater_than(YD, YMax, YD1) }, fd_put(Y, YD1, YPs) % queue_goal(Y #< Z) - ; Z =:= 0 -> kill(MState), queue_goal(X / Y #= _) + ; Z =:= 0 % Multiple solutions so do nothing special. ) ; ( { fd_get(Z, _, n(ZL), _, _), ZL > 0 } -> { fd_get(Y, YD, YPs), -- 2.54.0