fixing log:notIncludes and log:notEqualTo for existential rules per i…

…ssue #25 (obs from Doerthe Arndt)

RELEASE

@@ -1,5 +1,6 @@
                                   EYE release
 
+[v21.1203.1050] fixing log:notIncludes and log:notEqualTo for existential rules per issue https://github.com/josd/eye/issues/25 (obs from Doerthe Arndt)
 [v21.1125.2043] fixing floundering issue with log:notIncludes
 [v21.1124.2208] fixing log:notIncludes issues/25 (obs from Pierre-Antoine Champin)
 [v21.1123.1419] adding ?SCOPE e:find (?SELECT ?WHERE ?ANSWER) built-in which binds the free variables in ?WHERE except those that occur in ?SELECT

VERSION

@@ -1 +1 @@
-EYE v21.1125.2043 josd
+EYE v21.1203.1050 josd

eye.pl

@@ -22,7 +22,7 @@
 :- use_module(library(prolog_jiti)).
 :- use_module(library(http/http_open)).
 
-version_info('EYE v21.1125.2043 josd').
+version_info('EYE v21.1203.1050 josd').
 
 license_info('MIT License
 
@@ -5318,7 +5318,8 @@
     C = B.
 
 '<http://www.w3.org/2000/10/swap/log#notEqualTo>'(X, Y) :-
-    \+'<http://www.w3.org/2000/10/swap/log#equalTo>'(X, Y).
+    makevars([X, Y], [U, V], zeta),
+    \+unify(U, V).
 
 '<http://www.w3.org/2000/10/swap/log#notIncludes>'(X, Y) :-
     within_scope(X),
@@ -5335,8 +5336,9 @@
         (   nonvar(X),
             ground(Y)
         ),
-        (   conj_list(X, A),
-            conj_list(Y, B),
+        (   makevars([X, Y], [U, V], zeta),
+            conj_list(U, A),
+            conj_list(V, B),
             \+includes(A, B)
         )
     ).

reasoning/issue25/README

@@ -0,0 +1,5 @@
+--------
+Issue 25
+--------
+
+See https://github.com/josd/eye/issues/25

reasoning/issue25/test

@@ -0,0 +1,7 @@
+#!/bin/bash
+eye "$@" --wcache http://josd.github.io/eye/reasoning .. --nope http://josd.github.io/eye/reasoning/issue25/test1.n3 --pass-only-new > test1-pass-only-new.n3
+eye "$@" --wcache http://josd.github.io/eye/reasoning .. --nope http://josd.github.io/eye/reasoning/issue25/test2.n3 --pass-only-new > test2-pass-only-new.n3
+eye "$@" --wcache http://josd.github.io/eye/reasoning .. --nope http://josd.github.io/eye/reasoning/issue25/test3.n3 --pass-only-new > test3-pass-only-new.n3
+eye "$@" --wcache http://josd.github.io/eye/reasoning .. --nope http://josd.github.io/eye/reasoning/issue25/test4.n3 --pass-only-new > test4-pass-only-new.n3
+eye "$@" --wcache http://josd.github.io/eye/reasoning .. --nope http://josd.github.io/eye/reasoning/issue25/test5.n3 --pass-only-new > test5-pass-only-new.n3
+eye "$@" --wcache http://josd.github.io/eye/reasoning .. --nope http://josd.github.io/eye/reasoning/issue25/test6.n3 --pass-only-new > test6-pass-only-new.n3

reasoning/issue25/test1-pass-only-new.n3

@@ -0,0 +1,6 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:test :pass 1 .
+:test :pass 2 .
+

reasoning/issue25/test1.n3

@@ -0,0 +1,20 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:alice :name "alice".
+:bob :name "bob".
+:charlie :name "charlie".
+
+:alice :says { :bob a :NiceGuy }.
+
+@forAll :y.
+
+{ :alice :says ?x.
+  :y :name "charlie".
+  ?x log:notIncludes { :y a :NiceGuy }.
+} => { :test :pass 1 }.
+
+{ :alice :says ?x. 
+  ?x log:notIncludes { :y a :NiceGuy }.
+  :y :name "charlie".
+} => { :test :pass 2 }.

reasoning/issue25/test2-pass-only-new.n3

@@ -0,0 +1,4 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+

reasoning/issue25/test2.n3

@@ -0,0 +1,13 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+#G1
+:gang :contains :bob, :charlie.
+:alice :says { :bob :name "bob" }.
+{ 
+  :alice :says _:g.
+  _:g log:notIncludes { _:s _:p _:o }
+  :gang :contains _:s.
+} => {
+  :alice :ignores _:s.
+}.

reasoning/issue25/test3-pass-only-new.n3

@@ -0,0 +1,10 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:bob :father _:sk_0.
+_:sk_0 a :Man.
+:my :graph {:bob :father :ted. :bob :father :ted}.
+:my :graph {:bob :father :ted. :bob :father _:sk_0}.
+:my :graph {:bob :father _:sk_0. :bob :father _:sk_0}.
+:ted a :Man.
+

reasoning/issue25/test3.n3

@@ -0,0 +1,11 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:bob a :Person.
+:bob :father :ted.
+
+{?x a :Person}=>{?x :father _:y. _:y a :Man}.
+{?x :father ?y. ?x :father ?z.  ({?x :father ?y. ?x :father ?z.}) log:conjunction ?u}=>{:my :graph ?u}.
+{ :bob :father ?y. :bob :father ?z. :my :graph ?u. ?u log:notIncludes {:bob :father ?y. :bob :father ?z.} }=>{:o :o :o}.
+
+{?x :father ?y}=>{?y a :Man}.

reasoning/issue25/test4-pass-only-new.n3

@@ -0,0 +1,6 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:my :graph {:bob :father :ted. :bob :father :ted}.
+:ted a :Man.
+

reasoning/issue25/test4.n3

@@ -0,0 +1,11 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:bob a :Person.
+:bob :father :ted.
+
+{?x :father ?y. ?x :father ?z.  ({?x :father ?y. ?x :father ?z.}) log:conjunction ?u}=>{:my :graph ?u}.
+{ :bob :father ?y. :bob :father ?z. :my :graph ?u. ?u log:notIncludes {:bob :father ?y. :bob :father ?z.} }=>{:o :o :o}.
+
+{?x :father ?y}=>{?y a :Man}.
+{?x a :Person}=>{?x :father _:y. _:y a :Man}.

reasoning/issue25/test5-pass-only-new.n3

@@ -0,0 +1,5 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:ted a :Man.
+

reasoning/issue25/test5.n3

@@ -0,0 +1,9 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:bob a :Person.
+:bob :father :ted.
+
+{?x :father ?y}=>{?y a :Man}.
+{?x a :Person}=>{?x :father _:y. _:y a :Man}.
+{?x :father ?y. ?x :father ?z. ?y log:notEqualTo ?z}=>{:here :I :am}.

reasoning/issue25/test6-pass-only-new.n3

@@ -0,0 +1,7 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:bob :father _:sk_0.
+_:sk_0 a :Man.
+:ted a :Man.
+

reasoning/issue25/test6.n3

@@ -0,0 +1,9 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+PREFIX : <http://example.org/test#>
+
+:bob a :Person.
+:bob :father :ted.
+
+{?x a :Person}=>{?x :father _:y. _:y a :Man}.
+{?x :father ?y. ?x :father ?z. ?y log:notEqualTo ?z}=>{:here :I :am}.
+{?x :father ?y}=>{?y a :Man}.