fixing queries

KNowledgeOnWebScale · Mar 20, 2024 · 32ebff3 · 32ebff3
1 parent 7282cc4
commit 32ebff3
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 186 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1
diff --git a/lingua/beetle.trig b/lingua/beetle.trig
@@ -4,6 +4,7 @@
 #
 # See https://en.wikipedia.org/wiki/Disjunction_elimination
 
+@prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix : <#>.
 
@@ -53,8 +54,8 @@ _:ng7 {
 
 
 # query
-(_:S _:O) lingua:question _:qs.
+_:ng8 lingua:query _:ng8.
 
-_:qs {
-    _:S :is _:O.
+_:ng8 {
+    :beetle :is :beautiful.
 }
diff --git a/lingua/beetle6.trig b/lingua/beetle6.trig
@@ -71,8 +71,8 @@ _:ng11 {
 }
 
 # query
-(_:S) lingua:question _:qs.
+_:ng12 lingua:query _:ng12.
 
-_:qs {
-    _:S :is :nice.
+_:ng12 {
+    :beetle :is :nice.
 }
diff --git a/lingua/blogic.trig b/lingua/blogic.trig
@@ -25,8 +25,8 @@ _:ng2 {
 }
 
 # query
-(_:S) lingua:question _:ng3.
+_:ng3 lingua:query _:ng3.
 
 _:ng3 {
-    _:S a :Mortal.
+    :Socrates a :Mortal.
 }
diff --git a/lingua/edt.trig b/lingua/edt.trig
@@ -11,32 +11,31 @@
 
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
+@prefix var: <http://www.w3.org/2000/10/swap/var#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 @prefix edt: <http://eulersharp.sourceforge.net/2009/12dtb/test#>.
 
 # importing
-() lingua:nand _:ng1.
+_:ng1 lingua:implication true.
 
 _:ng1 {
     <> log:imports <../../eye/reasoning/edt/test-facts.ttl>.
     <> log:imports <../../eye/reasoning/edt/test-dl.ttl>.
-    () lingua:nand true.
 }
 
-(_:X _:D _:C) lingua:nand _:ng2.
+_:ng2 lingua:if _:ng3.
 
 _:ng2 {
-    () lingua:not _:ng3.
-    _:C rdfs:subClassOf _:D.
-    _:X a _:C.
+    var:X a var:D.
 }
 
 _:ng3 {
-    _:X a _:D.
+    var:C rdfs:subClassOf var:D.
+    var:X a var:C.
 }
 
 # query
-() lingua:question _:ng4.
+_:ng4  lingua:query _:ng4.
 
 _:ng4 {
     edt:i100000 a edt:N10000.

diff --git a/lingua/output/rain.trig b/lingua/output/rain.trig
@@ -1,4 +1,3 @@
 @prefix : <https://eyereasoner.github.io/see-lingua/lingua/rain.trig#>.
 
-:obs1 :ascribed :Rain.
 :obs1 :ascribed :WetGrass.
diff --git a/lingua/output/reset.trig b/lingua/output/reset.trig
diff --git a/lingua/output/slide32.trig b/lingua/output/slide32.trig
@@ -1,4 +1,3 @@
 @prefix : <https://eyereasoner.github.io/see-lingua/lingua/slide32.trig#>.
 
-:Ghent a :City.
 :Ghent a :HumanCommunity.
diff --git a/lingua/rain.trig b/lingua/rain.trig
@@ -31,8 +31,8 @@ _:ng4 {
 }
 
 # query
-(_:S _:O) lingua:question _:qs.
+_:ng5 lingua:query _:ng5.
 
-_:qs {
-    _:S :ascribed _:O.
+_:ng5 {
+    :obs1 :ascribed :WetGrass.
 }
diff --git a/lingua/reset.trig b/lingua/reset.trig
diff --git a/lingua/slide32.trig b/lingua/slide32.trig
@@ -15,8 +15,8 @@ _:ng2 {
 }
 
 # query
-(_:S _:C) lingua:question _:qs.
+_:ng3 lingua:query _:ng3.
 
-_:qs {
-    _:S a _:C.
+_:ng3 {
+    :Ghent a :HumanCommunity.
 }
diff --git a/lingua/slide33.trig b/lingua/slide33.trig
@@ -68,8 +68,8 @@ _:ng10 {
 }
 
 # query
-(_:S _:C) lingua:question _:qs.
+_:ng11 lingua:query _:ng11.
 
-_:qs {
-    _:S a _:C.
+_:ng11 {
+    :xxx a :aaa.
 }
diff --git a/lingua/syllogism.trig b/lingua/syllogism.trig
@@ -24,10 +24,6 @@ _:ng2 {
 
 _:ng3 {
     _:Bird a :Bird.
-    () lingua:and _:ng4.
-}
-
-_:ng4 {
     _:Bird a :Mammal.
 }
 
@@ -59,10 +55,6 @@ _:X a :Cat , :White.
 
 _:ng7 {
     _:M a :Muslim.
-    () lingua:and _:ng8.
-}
-
-_:ng8 {
     _:M a :Christian.
 }
 
@@ -99,8 +91,8 @@ _:ng12 {
 }
 
 # Test
-() lingua:question _:qs.
+_:ng13 lingua:query _:ng13.
 
-_:qs {
+_:ng13 {
     :test :is true.
 }