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

Merge pull request #996 from triska/master

Browse Source 
address #995: wrong results for popcount/1
This commit is contained in:
Mark Thom
2021-06-22 11:56:56 -06:00
committed by GitHub
parent 3e0bece53a 3e7cd24814
commit 4decd1d784
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/clpz.pl
View File

@@ -2959,6 +2959,12 @@ expr_conds(popcount(A0), Count) -->
expr_conds(A0, A), expr_conds(A0, A),
[I is A, arithmetic:popcount(I, Count)]. [I is A, arithmetic:popcount(I, Count)].
no_popcount_t(Gs, T) :-
( member(arithmetic:popcount(_, _), Gs) ->
T = false
; T = true
).
clpz_expandable(_ in _). clpz_expandable(_ in _).
clpz_expandable(_ #= _). clpz_expandable(_ #= _).
clpz_expandable(_ #>= _). clpz_expandable(_ #>= _).
@@ -2998,14 +3004,16 @@ clpz_expansion(X0 #= Y0, Equal) :-
phrase(expr_conds(Y0, Y), CsY), phrase(expr_conds(Y0, Y), CsY),
list_goal(CsX, CondX), list_goal(CsX, CondX),
list_goal(CsY, CondY), list_goal(CsY, CondY),
no_popcount_t(CsY, YT),
no_popcount_t(CsX, XT),
expansion_simpler( expansion_simpler(
( CondX -> ( CondX ->
( var(Y) -> Y is X ( YT, var(Y) -> Y is X
; CondY -> X =:= Y ; CondY -> X =:= Y
; T is X, clpz:clpz_equal(T, Y0) ; T is X, clpz:clpz_equal(T, Y0)
) )
; CondY -> ; CondY ->
( var(X) -> X is Y ( XT, var(X) -> X is Y
; T is Y, clpz:clpz_equal(X0, T) ; T is Y, clpz:clpz_equal(X0, T)
) )
; clpz:clpz_equal(X0, Y0) ; clpz:clpz_equal(X0, Y0)