From fe371ff1d100888ebe2b25f4454c6145437ee207 Mon Sep 17 00:00:00 2001 From: notoria Date: Sun, 7 Jan 2024 20:14:32 +0100 Subject: [PATCH] Fix `min/2` and `max/2` ?- X in 0..1, Y in 2..4, Z #= max(X,Y). clpz:(X in 0..1), clpz:(Z#=max(X,Y)), clpz:(Z in 2..4), clpz:(Z#>=Y), clpz:(Y in 2..4). % unexpected. ?- X in 0..1, Y in 2..4, Z #= max(Y,X). Y = Z, clpz:(X in 0..1), clpz:(Y in 2..4). --- src/lib/clpz.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 9ac73745..c0c30681 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -5398,7 +5398,7 @@ run_propagator(pmax(X,Y,Z), MState) --> ; { fd_get(Z, ZD, ZPs) } -> { fd_get(X, _, XInf, XSup, _), fd_get(Y, _, YInf, YSup, _) }, - ( { YInf cis_gt YSup } -> kill(MState), queue_goal(Z = Y) + ( { YInf cis_gt XSup } -> kill(MState), queue_goal(Z = Y) ; { YSup cis_lt XInf } -> kill(MState), queue_goal(Z = X) ; { n(M) cis max(XSup, YSup) } -> { domain_remove_greater_than(ZD, M, ZD1) }, @@ -5433,7 +5433,7 @@ run_propagator(pmin(X,Y,Z), MState) --> ; { fd_get(Z, ZD, ZPs) } -> { fd_get(X, _, XInf, XSup, _), fd_get(Y, _, YInf, YSup, _) }, - ( { YSup cis_lt YInf } -> kill(MState), Z = Y + ( { YSup cis_lt XInf } -> kill(MState), Z = Y ; { YInf cis_gt XSup } -> kill(MState), Z = X ; { n(M) cis min(XInf, YInf) } -> { domain_remove_smaller_than(ZD, M, ZD1) }, -- 2.54.0