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

Merge pull request #798 from triska/rebis-dev

Browse Source 
CLP(ℤ) enhancements for Rebis
This commit is contained in:
Mark Thom
2021-02-05 13:24:53 -07:00
committed by GitHub
parent 2d7f31a60d a228e46a39
commit 84da884211
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/clpz.pl
View File

@@ -3068,12 +3068,10 @@ is_false(var(X)) :- nonvar(X).
:- dynamic(goal_expansion/1). :- dynamic(goal_expansion/1).
% goal expansion is disabled for now, until #445 is resolved user:goal_expansion(Goal0, Goal) :-
% \+ goal_expansion(false),
% user:goal_expansion(Goal0, Goal) :- clpz_expandable(Goal0),
% \+ goal_expansion(false), clpz_expansion(Goal0, Goal).
% clpz_expandable(Goal0),
% clpz_expansion(Goal0, Goal).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -6090,7 +6088,7 @@ distinct_goals_([flow_to(F,To)|Es], V) -->
get_attr(To, lowlink, L2), get_attr(To, lowlink, L2),
L1 =\= L2 } -> L1 =\= L2 } ->
{ get_attr(To, value, N) }, { get_attr(To, value, N) },
[clpz:neq_num(V, N)] [neq_num(V, N)]
; [] ; []
), ),
distinct_goals_(Es, V). distinct_goals_(Es, V).
@@ -6611,7 +6609,7 @@ gcc_edge_goal(arc_to(_,_,V,F), Val) -->
get_attr(Val, lowlink, L2), get_attr(Val, lowlink, L2),
L1 =\= L2, L1 =\= L2,
get_attr(Val, value, Value) } -> get_attr(Val, value, Value) } ->
[clpz:neq_num(V, Value)] [neq_num(V, Value)]
; [] ; []
). ).