From 38db8d4e1a191aaef8e5a7cd096a87f2dec72c29 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sun, 9 May 2021 23:54:37 +0200 Subject: [PATCH] FIXED: module qualification for between/3 in goal expansion (#941) Many thanks to @dcnorris for reporting this issue! --- src/lib/clpz.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 20674469..8ee53c0d 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -2968,7 +2968,7 @@ clpz_expansion(Var in Dom, In) :- ( ground(Dom), Dom = L..U, integer(L), integer(U) -> expansion_simpler( ( integer(Var) -> - between(L, U, Var) + between:between(L, U, Var) ; clpz:clpz_in(Var, Dom) ), In) ; In = clpz:clpz_in(Var, Dom) @@ -3045,7 +3045,9 @@ expansion_simpler(Var =:= Expr0, Goal) :- ( maplist(call, Gs) -> Value is Expr, Goal = (Var =:= Value) ; Goal = false ). -expansion_simpler(between(L,U,V), Goal) :- maplist(integer, [L,U,V]), !, +expansion_simpler(between:between(L,U,V), Goal) :- + maplist(integer, [L,U,V]), + !, ( between(L,U,V) -> Goal = true ; Goal = false ). -- 2.54.0