diff --git a/RELEASE b/RELEASE index f2d38291b..aec44bb0a 100644 --- a/RELEASE +++ b/RELEASE @@ -1,5 +1,6 @@ EYE release +v3.22.4 (2023-05-06) fixing duplicate triples for blogic v3.22.3 (2023-05-04) adding explicit use_module(library(uuid)) v3.22.2 (2023-05-03) fixing log:uri v3.22.1 (2023-05-02) fixing list:iterate (obs from Ieben Smessaert) diff --git a/VERSION b/VERSION index ce070a60e..00f104afa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.22.3 +3.22.4 diff --git a/eye.pl b/eye.pl index 0fd08e90c..ec087a47a 100644 --- a/eye.pl +++ b/eye.pl @@ -22,7 +22,7 @@ :- catch(use_module(library(uuid)), _, true). :- catch(use_module(library(http/http_open)), _, true). -version_info('EYE v3.22.3 (2023-05-04)'). +version_info('EYE v3.22.4 (2023-05-06)'). license_info('MIT License @@ -752,7 +752,8 @@ select(''([], H), L, K), conj_list(H, D), append(K, D, E), - conj_list(F, E) + list_to_set(E, B), + conj_list(F, B) ), ''(V, F), '<>')), % simplify graffiti assertz(implies((''(V, G), @@ -770,8 +771,10 @@ assertz(implies((''(V, G), is_list(V), conj_list(G, L), - select(''([], H), L, K), + list_to_set(L, B), + select(''([], H), B, K), conj_list(H, M), + list_to_set(M, T), select(''(W, O), M, N), is_list(W), ( conj_list(O, D), @@ -788,30 +791,32 @@ assertz(implies((''(V, G), is_list(V), conj_list(G, L), - \+member(''(_, _), L), + list_to_set(L, B), + \+member(''(_, _), B), findall(1, - ( member(''(_, _), L) + ( member(''(_, _), B) ), O ), length(O, E), - length(L, D), + length(B, D), memberchk(E, [0, 2, D]), ''(W, F), is_list(W), conj_list(F, K), - \+member(''(_, _), K), - length(K, 2), - \+ (member(''(_, I), K), atomic(I)), - makevars(K, J, beta(W)), + list_to_set(K, N), + \+member(''(_, _), N), + length(N, 2), + \+ (member(''(_, I), N), atomic(I)), + makevars(N, J, beta(W)), select(''(U, C), J, [P]), is_list(U), - ( select(''(Z, Q), L, A), + ( select(''(Z, Q), B, A), is_list(Z), M = [''(U, C)|A], conj_list(Q, R), memberchk(P, R) - ; select(Q, L, A), + ; select(Q, B, A), M = [P|A], conj_list(C, R), memberchk(Q, R) @@ -824,7 +829,8 @@ assertz(implies((''(V, G), is_list(V), conj_list(G, L), - select(''(Z, H), L, K), + list_to_set(L, B), + select(''(Z, H), B, K), is_list(Z), conj_list(R, K), domain(V, R, P), @@ -838,19 +844,20 @@ assertz(implies((''(V, G), is_list(V), conj_list(G, L), - \+member(''(_, _), L), - \+member(''(_, _), L), - \+member(''(_, _), L), - select(R, L, J), + list_to_set(L, B), + \+member(''(_, _), B), + \+member(''(_, _), B), + \+member(''(_, _), B), + select(R, B, J), conj_list(T, J), findvars(R, N, beta), findall(A, ( member(A, V), \+member(A, N) ), - B + Z ), - E = ''(B, T), + E = ''(Z, T), domain(V, R, P), find_graffiti([R], D), append(V, D, U), @@ -862,7 +869,8 @@ assertz(implies((''(V, G), is_list(V), conj_list(G, L), - select(''(Z, H), L, K), + list_to_set(L, B), + select(''(Z, H), B, K), is_list(Z), conj_list(H, [T]), conj_list(R, K), @@ -875,14 +883,15 @@ assertz(implies((''(V, G), is_list(V), conj_list(G, L), - ( select(''(Z, H), L, K), + list_to_set(L, B), + ( select(''(Z, H), B, K), is_list(Z) -> conj_list(I, K), find_graffiti(K, D), append(V, D, U), makevars(query(I, H), C, beta(U)) ; djiti_answer(answer(G), J), - find_graffiti(L, D), + find_graffiti(B, D), append(V, D, U), makevars(implies(G, J, '<>'), C, beta(U)) ), diff --git a/eye.zip b/eye.zip index c6f87676b..69b38f3f6 100644 Binary files a/eye.zip and b/eye.zip differ