declaring victory as we are currently capable to do what we did in N3…

… so far but with the huge edge that it is using standard RDF 1.1
eyereasoner · Apr 3, 2024 · a75afaa · a75afaa
1 parent 8a1b784
commit a75afaa
Show file tree

Hide file tree

Showing 55 changed files with 43 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Reasoning engine that is using RDF TriG as the web lingua.
 
-Examples and test cases are in [tests](https://github.com/eyereasoner/lingua/tree/main/tests) and their output in [tests/output](https://github.com/eyereasoner/lingua/tree/main/tests/output)
+Examples and test cases are in [etc](https://github.com/eyereasoner/lingua/tree/main/etc) and their output in [etc/output](https://github.com/eyereasoner/lingua/tree/main/etc/output)
 
 ```
 Usage: lingua <options>* <data>*

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.8
+1.0.0
diff --git a/tests/ackermann.trig → etc/ackermann.trig b/tests/ackermann.trig → etc/ackermann.trig
diff --git a/tests/acp.trig → etc/acp.trig b/tests/acp.trig → etc/acp.trig
diff --git a/tests/backward.trig → etc/backward.trig b/tests/backward.trig → etc/backward.trig
diff --git a/tests/complement.trig → etc/complement.trig b/tests/complement.trig → etc/complement.trig
diff --git a/tests/complex.trig → etc/complex.trig b/tests/complex.trig → etc/complex.trig
diff --git a/tests/derived.trig → etc/derived.trig b/tests/derived.trig → etc/derived.trig
diff --git a/tests/easter.trig → etc/easter.trig b/tests/easter.trig → etc/easter.trig
diff --git a/tests/edt.trig → etc/edt.trig b/tests/edt.trig → etc/edt.trig
diff --git a/tests/fibonacci.trig → etc/fibonacci.trig b/tests/fibonacci.trig → etc/fibonacci.trig
diff --git a/tests/filter.trig → etc/filter.trig b/tests/filter.trig → etc/filter.trig
diff --git a/tests/gps.trig → etc/gps.trig b/tests/gps.trig → etc/gps.trig
diff --git a/tests/graph.trig → etc/graph.trig b/tests/graph.trig → etc/graph.trig
diff --git a/tests/mi.trig → etc/mi.trig b/tests/mi.trig → etc/mi.trig
diff --git a/tests/monadic.trig → etc/monadic.trig b/tests/monadic.trig → etc/monadic.trig
diff --git a/tests/output/ackermann.trig → etc/output/ackermann.trig b/tests/output/ackermann.trig → etc/output/ackermann.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/ackermann.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/ackermann.trig#>.
 
 (0 0) :ackermann 1 .
 (0 6) :ackermann 7 .

diff --git a/tests/output/acp.trig → etc/output/acp.trig b/tests/output/acp.trig → etc/output/acp.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/acp.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/acp.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 @prefix var: <http://www.w3.org/2000/10/swap/var#>.
@@ -19,7 +19,7 @@ _:gn_7 lingua:explanation _:gn_8.
 _:gn_1 {
     :test1 :policy :PolicyX.
     :PolicyX a :Policy.
-    (_:gn_9 _:gn_10) log:forAllIn ((<https://eyereasoner.github.io/lingua/tests/acp.trig>) 1).
+    (_:gn_9 _:gn_10) log:forAllIn ((<https://eyereasoner.github.io/lingua/etc/acp.trig>) 1).
 }
 
 _:gn_2 {
@@ -29,7 +29,7 @@ _:gn_2 {
 _:gn_3 {
     :test1 :policy :PolicyX.
     :PolicyX a :Policy.
-    (var:x_0 _:gn_11 (:C)) log:collectAllIn ((<https://eyereasoner.github.io/lingua/tests/acp.trig>) 1).
+    (var:x_0 _:gn_11 (:C)) log:collectAllIn ((<https://eyereasoner.github.io/lingua/etc/acp.trig>) 1).
     (:C) list:length 1 .
     (1) log:notEqualTo (0).
 }
@@ -41,7 +41,7 @@ _:gn_4 {
 _:gn_5 {
     :test1 :policy :PolicyX.
     :PolicyX a :Policy.
-    (var:x_0 _:gn_12 ()) log:collectAllIn ((<https://eyereasoner.github.io/lingua/tests/acp.trig>) 1).
+    (var:x_0 _:gn_12 ()) log:collectAllIn ((<https://eyereasoner.github.io/lingua/etc/acp.trig>) 1).
     () list:length 0 .
     (0) log:equalTo (0).
 }

diff --git a/tests/output/backward.trig → etc/output/backward.trig b/tests/output/backward.trig → etc/output/backward.trig
@@ -1,5 +1,5 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
-@prefix : <https://eyereasoner.github.io/lingua/tests/backward.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/backward.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix math: <http://www.w3.org/2000/10/swap/math#>.
 

diff --git a/tests/output/complement.trig → etc/output/complement.trig b/tests/output/complement.trig → etc/output/complement.trig
diff --git a/tests/output/complex.trig → etc/output/complex.trig b/tests/output/complex.trig → etc/output/complex.trig
diff --git a/tests/output/derived.trig → etc/output/derived.trig b/tests/output/derived.trig → etc/output/derived.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/derived.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/derived.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix var: <http://www.w3.org/2000/10/swap/var#>.
 

diff --git a/tests/output/easter.trig → etc/output/easter.trig b/tests/output/easter.trig → etc/output/easter.trig
@@ -1,5 +1,5 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
-@prefix : <https://eyereasoner.github.io/lingua/tests/easter.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/easter.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix math: <http://www.w3.org/2000/10/swap/math#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.

diff --git a/tests/output/edt.trig → etc/output/edt.trig b/tests/output/edt.trig → etc/output/edt.trig
diff --git a/tests/output/fibonacci.trig → etc/output/fibonacci.trig b/tests/output/fibonacci.trig → etc/output/fibonacci.trig
@@ -1,5 +1,5 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
-@prefix : <https://eyereasoner.github.io/lingua/tests/fibonacci.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/fibonacci.trig#>.
 
 [] rdf:value 0; :fibonacci 0 .
 [] rdf:value 1; :fibonacci 1 .

diff --git a/tests/output/filter.trig → etc/output/filter.trig b/tests/output/filter.trig → etc/output/filter.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/filter.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/filter.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 @prefix list: <http://www.w3.org/2000/10/swap/list#>.
@@ -14,7 +14,7 @@ _:gn_1 lingua:explanation _:gn_2.
 
 _:gn_1 {
     :Let :where (_:sk_0 _:gn_3).
-    (_:sk_0 _:gn_3 ("Huey" "Dewey")) log:collectAllIn ((<https://eyereasoner.github.io/lingua/tests/filter.trig>) 1).
+    (_:sk_0 _:gn_3 ("Huey" "Dewey")) log:collectAllIn ((<https://eyereasoner.github.io/lingua/etc/filter.trig>) 1).
     ("Huey" "Dewey") list:length 2.
 }
 

diff --git a/tests/output/gps.trig → etc/output/gps.trig b/tests/output/gps.trig → etc/output/gps.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/gps.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/gps.trig#>.
 @prefix gps: <http://eyereasoner.github.io/eye/reasoning/gps/gps-schema#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix list: <http://www.w3.org/2000/10/swap/list#>.

diff --git a/tests/output/graph.trig → etc/output/graph.trig b/tests/output/graph.trig → etc/output/graph.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/graph.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/graph.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 
 :angers :path :nantes.

diff --git a/tests/output/mi.trig → etc/output/mi.trig b/tests/output/mi.trig → etc/output/mi.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/mi.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/mi.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix list: <http://www.w3.org/2000/10/swap/list#>.
 @prefix var: <http://www.w3.org/2000/10/swap/var#>.

diff --git a/tests/output/monadic.trig → etc/output/monadic.trig b/tests/output/monadic.trig → etc/output/monadic.trig
@@ -3046,16 +3046,16 @@ _:gn_3033 lingua:explanation _:gn_3034.
 _:gn_3035 lingua:explanation _:gn_3036.
 
 _:node_1_1 {
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt1.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt2.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt3.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt4.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt5.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt6.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt7.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt8.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt9.ttl>.
-    <https://eyereasoner.github.io/lingua/tests/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt10.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt1.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt2.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt3.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt4.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt5.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt6.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt7.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt8.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt9.ttl>.
+    <https://eyereasoner.github.io/lingua/etc/monadic.trig> log:imports <https://eyereasoner.github.io/eye/reasoning/bmt/1tt10.ttl>.
 }
 
 _:gn_1 {

diff --git a/tests/output/pack.trig → etc/output/pack.trig b/tests/output/pack.trig → etc/output/pack.trig
diff --git a/tests/output/patch.trig → etc/output/patch.trig b/tests/output/patch.trig → etc/output/patch.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/patch.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/patch.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 

diff --git a/tests/output/peano.trig → etc/output/peano.trig b/tests/output/peano.trig → etc/output/peano.trig
@@ -1,3 +1,3 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/peano.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/peano.trig#>.
 
 (:s (:s (:s (:s (:s 0))))) :factorial (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s 0)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).
diff --git a/etc/output/pi.trig b/etc/output/pi.trig
@@ -0,0 +1,3 @@
+@prefix : <https://eyereasoner.github.io/lingua/etc/pi.trig#>.
+
+(50000 3.141592653589793) :pi true.
diff --git a/tests/output/restdesc.trig → etc/output/restdesc.trig b/tests/output/restdesc.trig → etc/output/restdesc.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/restdesc.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/restdesc.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix http: <http://www.w3.org/2011/http#>.
 

diff --git a/tests/output/sha512.trig → etc/output/sha512.trig b/tests/output/sha512.trig → etc/output/sha512.trig
@@ -1,5 +1,5 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
-@prefix : <https://eyereasoner.github.io/lingua/tests/sha512.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/sha512.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix crypto: <http://www.w3.org/2000/10/swap/crypto#>.
 

diff --git a/tests/output/socrates.trig → etc/output/socrates.trig b/tests/output/socrates.trig → etc/output/socrates.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/socrates.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/socrates.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 

diff --git a/tests/output/turing.trig → etc/output/turing.trig b/tests/output/turing.trig → etc/output/turing.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/turing.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/turing.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix list: <http://www.w3.org/2000/10/swap/list#>.
 

diff --git a/tests/output/union.trig → etc/output/union.trig b/tests/output/union.trig → etc/output/union.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/union.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/union.trig#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
 @prefix graph: <http://www.w3.org/2000/10/swap/graph#>.
 

diff --git a/tests/output/universal.trig → etc/output/universal.trig b/tests/output/universal.trig → etc/output/universal.trig
@@ -1,4 +1,4 @@
-@prefix : <https://eyereasoner.github.io/lingua/tests/universal.trig#>.
+@prefix : <https://eyereasoner.github.io/lingua/etc/universal.trig#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix skolem: <http://eyereasoner.github.io/.well-known/genid/8b98b360-9a70-4845-b52c-c675af60ad01#>.
 @prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.

diff --git a/tests/pack.trig → etc/pack.trig b/tests/pack.trig → etc/pack.trig
diff --git a/tests/patch.trig → etc/patch.trig b/tests/patch.trig → etc/patch.trig
diff --git a/tests/peano.trig → etc/peano.trig b/tests/peano.trig → etc/peano.trig
diff --git a/tests/pi.trig → etc/pi.trig b/tests/pi.trig → etc/pi.trig
diff --git a/tests/restdesc.trig → etc/restdesc.trig b/tests/restdesc.trig → etc/restdesc.trig
diff --git a/tests/sha512.trig → etc/sha512.trig b/tests/sha512.trig → etc/sha512.trig
diff --git a/tests/socrates.trig → etc/socrates.trig b/tests/socrates.trig → etc/socrates.trig
diff --git a/tests/test → etc/test b/tests/test → etc/test
@@ -11,7 +11,8 @@ FAILED=0
 version=$(lingua -v)
 
 echo -e "${YELLOW}#${NORMAL}"
-echo -e "${YELLOW}# Running lingua tests with $version${NORMAL}"
+echo -e "${YELLOW}# Running lingua examples and test cases${NORMAL}"
+echo -e "${YELLOW}# $version${NORMAL}"
 echo -e "${YELLOW}#${NORMAL}"
 echo ""
 
@@ -26,7 +27,7 @@ for file in *.trig
 do
     echo -en "$(pad "${file}" -24)"
     start=$(($(date +%s%N)/1000000))
-    lingua --genid 8b98b360-9a70-4845-b52c-c675af60ad01 --wcache https://eyereasoner.github.io ../.. https://eyereasoner.github.io/lingua/tests/$file --output output/$file
+    lingua --genid 8b98b360-9a70-4845-b52c-c675af60ad01 --wcache https://eyereasoner.github.io ../.. https://eyereasoner.github.io/lingua/etc/$file --output output/$file
     end=$(($(date +%s%N)/1000000))
     echo -en "${YELLOW}$(pad "`expr $end - $start` msec" 12)${NORMAL} "
     if [[ $(git diff */$file | wc -l) -eq 0 ]]; then

diff --git a/tests/turing.trig → etc/turing.trig b/tests/turing.trig → etc/turing.trig
diff --git a/tests/union.trig → etc/union.trig b/tests/union.trig → etc/union.trig
diff --git a/tests/universal.trig → etc/universal.trig b/tests/universal.trig → etc/universal.trig
diff --git a/lingua.pl b/lingua.pl
@@ -19,7 +19,7 @@
 :- use_module(library(semweb/turtle)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('lingua v0.0.8').
+version_info('lingua v1.0.0').
 
 help_info('Usage: lingua <options>* <data>*
 

diff --git a/mklingua b/mklingua
@@ -64,7 +64,7 @@ swipl -q -f lingua.pl -g "qsave_program('lingua.pvm', [goal(main)]), halt."
 # link lingua command
 sudo ln -sf $(realpath ./lingua) /usr/local/bin
 
-# run the tests
+# run the examples and test cases
 ./test
 
 # git commands

diff --git a/test b/test
@@ -1,4 +1,4 @@
 #!/bin/bash
-pushd ~/github.com/eyereasoner/lingua/tests > /dev/null
+pushd ~/github.com/eyereasoner/lingua/etc > /dev/null
 ./test
 popd > /dev/null
diff --git a/tests/output/pi.trig b/tests/output/pi.trig
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@prefix : <https://eyereasoner.github.io/lingua/etc/pi.trig#>.

		(50000 3.141592653589793) :pi true.