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

Merge pull request #432 from triska/master

Browse Source 
correct overeager CLP(ℤ) goal expansion
This commit is contained in:
Mark Thom
2020-05-01 13:41:43 -03:00
committed by GitHub
parent 1b7c226779 ca5a5b4392
commit b71ec91f57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/prolog/lib/clpz.pl
View File

@@ -3038,13 +3038,13 @@ expansion_simpler((A0,B0), (A,B)) :- !,
expansion_simpler(Var is Expr0, Goal) :- expansion_simpler(Var is Expr0, Goal) :-
ground(Expr0), !, ground(Expr0), !,
phrase(expr_conds(Expr0, Expr), Gs), phrase(expr_conds(Expr0, Expr), Gs),
( maplist(call, Gs) -> Var is Expr, Goal = true ( maplist(call, Gs) -> Value is Expr, Goal = (Var = Value)
; Goal = false ; Goal = false
). ).
expansion_simpler(Var =:= Expr0, Goal) :- expansion_simpler(Var =:= Expr0, Goal) :-
ground(Expr0), !, ground(Expr0), !,
phrase(expr_conds(Expr0, Expr), Gs), phrase(expr_conds(Expr0, Expr), Gs),
( maplist(call, Gs) -> Goal = (Var =:= Expr) ( maplist(call, Gs) -> Value is Expr, Goal = (Var =:= Value)
; Goal = false ; Goal = false
). ).
expansion_simpler(between(L,U,V), Goal) :- maplist(integer, [L,U,V]), !, expansion_simpler(between(L,U,V), Goal) :- maplist(integer, [L,U,V]), !,