From a75afaa484b6b4869ed2b69e410af40993f86f7b Mon Sep 17 00:00:00 2001 From: josd Date: Thu, 4 Apr 2024 00:09:58 +0200 Subject: [PATCH] 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 --- README.md | 2 +- VERSION | 2 +- {tests => etc}/ackermann.trig | 0 {tests => etc}/acp.trig | 0 {tests => etc}/backward.trig | 0 {tests => etc}/complement.trig | 0 {tests => etc}/complex.trig | 0 {tests => etc}/derived.trig | 0 {tests => etc}/easter.trig | 0 {tests => etc}/edt.trig | 0 {tests => etc}/fibonacci.trig | 0 {tests => etc}/filter.trig | 0 {tests => etc}/gps.trig | 0 {tests => etc}/graph.trig | 0 {tests => etc}/mi.trig | 0 {tests => etc}/monadic.trig | 0 {tests => etc}/output/ackermann.trig | 2 +- {tests => etc}/output/acp.trig | 8 ++++---- {tests => etc}/output/backward.trig | 2 +- {tests => etc}/output/complement.trig | 0 {tests => etc}/output/complex.trig | 0 {tests => etc}/output/derived.trig | 2 +- {tests => etc}/output/easter.trig | 2 +- {tests => etc}/output/edt.trig | 0 {tests => etc}/output/fibonacci.trig | 2 +- {tests => etc}/output/filter.trig | 4 ++-- {tests => etc}/output/gps.trig | 2 +- {tests => etc}/output/graph.trig | 2 +- {tests => etc}/output/mi.trig | 2 +- {tests => etc}/output/monadic.trig | 20 ++++++++++---------- {tests => etc}/output/pack.trig | 0 {tests => etc}/output/patch.trig | 2 +- {tests => etc}/output/peano.trig | 2 +- etc/output/pi.trig | 3 +++ {tests => etc}/output/restdesc.trig | 2 +- {tests => etc}/output/sha512.trig | 2 +- {tests => etc}/output/socrates.trig | 2 +- {tests => etc}/output/turing.trig | 2 +- {tests => etc}/output/union.trig | 2 +- {tests => etc}/output/universal.trig | 2 +- {tests => etc}/pack.trig | 0 {tests => etc}/patch.trig | 0 {tests => etc}/peano.trig | 0 {tests => etc}/pi.trig | 0 {tests => etc}/restdesc.trig | 0 {tests => etc}/sha512.trig | 0 {tests => etc}/socrates.trig | 0 {tests => etc}/test | 5 +++-- {tests => etc}/turing.trig | 0 {tests => etc}/union.trig | 0 {tests => etc}/universal.trig | 0 lingua.pl | 2 +- mklingua | 2 +- test | 2 +- tests/output/pi.trig | 3 --- 55 files changed, 43 insertions(+), 42 deletions(-) rename {tests => etc}/ackermann.trig (100%) rename {tests => etc}/acp.trig (100%) rename {tests => etc}/backward.trig (100%) rename {tests => etc}/complement.trig (100%) rename {tests => etc}/complex.trig (100%) rename {tests => etc}/derived.trig (100%) rename {tests => etc}/easter.trig (100%) rename {tests => etc}/edt.trig (100%) rename {tests => etc}/fibonacci.trig (100%) rename {tests => etc}/filter.trig (100%) rename {tests => etc}/gps.trig (100%) rename {tests => etc}/graph.trig (100%) rename {tests => etc}/mi.trig (100%) rename {tests => etc}/monadic.trig (100%) rename {tests => etc}/output/ackermann.trig (99%) rename {tests => etc}/output/acp.trig (89%) rename {tests => etc}/output/backward.trig (84%) rename {tests => etc}/output/complement.trig (100%) rename {tests => etc}/output/complex.trig (100%) rename {tests => etc}/output/derived.trig (88%) rename {tests => etc}/output/easter.trig (99%) rename {tests => etc}/output/edt.trig (100%) rename {tests => etc}/output/fibonacci.trig (93%) rename {tests => etc}/output/filter.trig (82%) rename {tests => etc}/output/gps.trig (99%) rename {tests => etc}/output/graph.trig (98%) rename {tests => etc}/output/mi.trig (99%) rename {tests => etc}/output/monadic.trig (99%) rename {tests => etc}/output/pack.trig (100%) rename {tests => etc}/output/patch.trig (87%) rename {tests => etc}/output/peano.trig (90%) create mode 100644 etc/output/pi.trig rename {tests => etc}/output/restdesc.trig (99%) rename {tests => etc}/output/sha512.trig (92%) rename {tests => etc}/output/socrates.trig (81%) rename {tests => etc}/output/turing.trig (99%) rename {tests => etc}/output/union.trig (88%) rename {tests => etc}/output/universal.trig (88%) rename {tests => etc}/pack.trig (100%) rename {tests => etc}/patch.trig (100%) rename {tests => etc}/peano.trig (100%) rename {tests => etc}/pi.trig (100%) rename {tests => etc}/restdesc.trig (100%) rename {tests => etc}/sha512.trig (100%) rename {tests => etc}/socrates.trig (100%) rename {tests => etc}/test (87%) rename {tests => etc}/turing.trig (100%) rename {tests => etc}/union.trig (100%) rename {tests => etc}/universal.trig (100%) delete mode 100644 tests/output/pi.trig diff --git a/README.md b/README.md index 788d70f..ac7e2ff 100644 --- 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 * * diff --git a/VERSION b/VERSION index d169b2f..3eefcb9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.8 +1.0.0 diff --git a/tests/ackermann.trig b/etc/ackermann.trig similarity index 100% rename from tests/ackermann.trig rename to etc/ackermann.trig diff --git a/tests/acp.trig b/etc/acp.trig similarity index 100% rename from tests/acp.trig rename to etc/acp.trig diff --git a/tests/backward.trig b/etc/backward.trig similarity index 100% rename from tests/backward.trig rename to etc/backward.trig diff --git a/tests/complement.trig b/etc/complement.trig similarity index 100% rename from tests/complement.trig rename to etc/complement.trig diff --git a/tests/complex.trig b/etc/complex.trig similarity index 100% rename from tests/complex.trig rename to etc/complex.trig diff --git a/tests/derived.trig b/etc/derived.trig similarity index 100% rename from tests/derived.trig rename to etc/derived.trig diff --git a/tests/easter.trig b/etc/easter.trig similarity index 100% rename from tests/easter.trig rename to etc/easter.trig diff --git a/tests/edt.trig b/etc/edt.trig similarity index 100% rename from tests/edt.trig rename to etc/edt.trig diff --git a/tests/fibonacci.trig b/etc/fibonacci.trig similarity index 100% rename from tests/fibonacci.trig rename to etc/fibonacci.trig diff --git a/tests/filter.trig b/etc/filter.trig similarity index 100% rename from tests/filter.trig rename to etc/filter.trig diff --git a/tests/gps.trig b/etc/gps.trig similarity index 100% rename from tests/gps.trig rename to etc/gps.trig diff --git a/tests/graph.trig b/etc/graph.trig similarity index 100% rename from tests/graph.trig rename to etc/graph.trig diff --git a/tests/mi.trig b/etc/mi.trig similarity index 100% rename from tests/mi.trig rename to etc/mi.trig diff --git a/tests/monadic.trig b/etc/monadic.trig similarity index 100% rename from tests/monadic.trig rename to etc/monadic.trig diff --git a/tests/output/ackermann.trig b/etc/output/ackermann.trig similarity index 99% rename from tests/output/ackermann.trig rename to etc/output/ackermann.trig index a7f62f1..970cfef 100644 --- a/tests/output/ackermann.trig +++ b/etc/output/ackermann.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . (0 0) :ackermann 1 . (0 6) :ackermann 7 . diff --git a/tests/output/acp.trig b/etc/output/acp.trig similarity index 89% rename from tests/output/acp.trig rename to etc/output/acp.trig index c63d7ec..71dd843 100644 --- a/tests/output/acp.trig +++ b/etc/output/acp.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix log: . @prefix 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 (() 1). + (_:gn_9 _:gn_10) log:forAllIn (() 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 (() 1). + (var:x_0 _:gn_11 (:C)) log:collectAllIn (() 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 (() 1). + (var:x_0 _:gn_12 ()) log:collectAllIn (() 1). () list:length 0 . (0) log:equalTo (0). } diff --git a/tests/output/backward.trig b/etc/output/backward.trig similarity index 84% rename from tests/output/backward.trig rename to etc/output/backward.trig index 0336fe3..2e874f0 100644 --- a/tests/output/backward.trig +++ b/etc/output/backward.trig @@ -1,5 +1,5 @@ @prefix rdf: . -@prefix : . +@prefix : . @prefix lingua: . @prefix math: . diff --git a/tests/output/complement.trig b/etc/output/complement.trig similarity index 100% rename from tests/output/complement.trig rename to etc/output/complement.trig diff --git a/tests/output/complex.trig b/etc/output/complex.trig similarity index 100% rename from tests/output/complex.trig rename to etc/output/complex.trig diff --git a/tests/output/derived.trig b/etc/output/derived.trig similarity index 88% rename from tests/output/derived.trig rename to etc/output/derived.trig index 80a8891..a4575af 100644 --- a/tests/output/derived.trig +++ b/etc/output/derived.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix var: . diff --git a/tests/output/easter.trig b/etc/output/easter.trig similarity index 99% rename from tests/output/easter.trig rename to etc/output/easter.trig index e5310b6..e18d36e 100644 --- a/tests/output/easter.trig +++ b/etc/output/easter.trig @@ -1,5 +1,5 @@ @prefix rdf: . -@prefix : . +@prefix : . @prefix lingua: . @prefix math: . @prefix log: . diff --git a/tests/output/edt.trig b/etc/output/edt.trig similarity index 100% rename from tests/output/edt.trig rename to etc/output/edt.trig diff --git a/tests/output/fibonacci.trig b/etc/output/fibonacci.trig similarity index 93% rename from tests/output/fibonacci.trig rename to etc/output/fibonacci.trig index bc02df1..f88b3da 100644 --- a/tests/output/fibonacci.trig +++ b/etc/output/fibonacci.trig @@ -1,5 +1,5 @@ @prefix rdf: . -@prefix : . +@prefix : . [] rdf:value 0; :fibonacci 0 . [] rdf:value 1; :fibonacci 1 . diff --git a/tests/output/filter.trig b/etc/output/filter.trig similarity index 82% rename from tests/output/filter.trig rename to etc/output/filter.trig index 8c0c155..31ebb8e 100644 --- a/tests/output/filter.trig +++ b/etc/output/filter.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix log: . @prefix 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 (() 1). + (_:sk_0 _:gn_3 ("Huey" "Dewey")) log:collectAllIn (() 1). ("Huey" "Dewey") list:length 2. } diff --git a/tests/output/gps.trig b/etc/output/gps.trig similarity index 99% rename from tests/output/gps.trig rename to etc/output/gps.trig index ed2bb0c..3d3b2b3 100644 --- a/tests/output/gps.trig +++ b/etc/output/gps.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix gps: . @prefix lingua: . @prefix list: . diff --git a/tests/output/graph.trig b/etc/output/graph.trig similarity index 98% rename from tests/output/graph.trig rename to etc/output/graph.trig index b539b4c..80b36dd 100644 --- a/tests/output/graph.trig +++ b/etc/output/graph.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . :angers :path :nantes. diff --git a/tests/output/mi.trig b/etc/output/mi.trig similarity index 99% rename from tests/output/mi.trig rename to etc/output/mi.trig index 97cac6e..f83a616 100644 --- a/tests/output/mi.trig +++ b/etc/output/mi.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix list: . @prefix var: . diff --git a/tests/output/monadic.trig b/etc/output/monadic.trig similarity index 99% rename from tests/output/monadic.trig rename to etc/output/monadic.trig index 0c4f56c..c5aa143 100644 --- a/tests/output/monadic.trig +++ b/etc/output/monadic.trig @@ -3046,16 +3046,16 @@ _:gn_3033 lingua:explanation _:gn_3034. _:gn_3035 lingua:explanation _:gn_3036. _:node_1_1 { - log:imports . - log:imports . - log:imports . - log:imports . - log:imports . - log:imports . - log:imports . - log:imports . - log:imports . - log:imports . + log:imports . + log:imports . + log:imports . + log:imports . + log:imports . + log:imports . + log:imports . + log:imports . + log:imports . + log:imports . } _:gn_1 { diff --git a/tests/output/pack.trig b/etc/output/pack.trig similarity index 100% rename from tests/output/pack.trig rename to etc/output/pack.trig diff --git a/tests/output/patch.trig b/etc/output/patch.trig similarity index 87% rename from tests/output/patch.trig rename to etc/output/patch.trig index 956640d..b9ed6b4 100644 --- a/tests/output/patch.trig +++ b/etc/output/patch.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix log: . diff --git a/tests/output/peano.trig b/etc/output/peano.trig similarity index 90% rename from tests/output/peano.trig rename to etc/output/peano.trig index c573153..01a872b 100644 --- a/tests/output/peano.trig +++ b/etc/output/peano.trig @@ -1,3 +1,3 @@ -@prefix : . +@prefix : . (: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 new file mode 100644 index 0000000..2768195 --- /dev/null +++ b/etc/output/pi.trig @@ -0,0 +1,3 @@ +@prefix : . + +(50000 3.141592653589793) :pi true. diff --git a/tests/output/restdesc.trig b/etc/output/restdesc.trig similarity index 99% rename from tests/output/restdesc.trig rename to etc/output/restdesc.trig index 97dca8c..5860073 100644 --- a/tests/output/restdesc.trig +++ b/etc/output/restdesc.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix http: . diff --git a/tests/output/sha512.trig b/etc/output/sha512.trig similarity index 92% rename from tests/output/sha512.trig rename to etc/output/sha512.trig index 79cc412..e4b3069 100644 --- a/tests/output/sha512.trig +++ b/etc/output/sha512.trig @@ -1,5 +1,5 @@ @prefix rdf: . -@prefix : . +@prefix : . @prefix lingua: . @prefix crypto: . diff --git a/tests/output/socrates.trig b/etc/output/socrates.trig similarity index 81% rename from tests/output/socrates.trig rename to etc/output/socrates.trig index 4ab5758..1729ec3 100644 --- a/tests/output/socrates.trig +++ b/etc/output/socrates.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix rdfs: . diff --git a/tests/output/turing.trig b/etc/output/turing.trig similarity index 99% rename from tests/output/turing.trig rename to etc/output/turing.trig index 4071338..3490acd 100644 --- a/tests/output/turing.trig +++ b/etc/output/turing.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix list: . diff --git a/tests/output/union.trig b/etc/output/union.trig similarity index 88% rename from tests/output/union.trig rename to etc/output/union.trig index 4ee356e..42d0027 100644 --- a/tests/output/union.trig +++ b/etc/output/union.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix lingua: . @prefix graph: . diff --git a/tests/output/universal.trig b/etc/output/universal.trig similarity index 88% rename from tests/output/universal.trig rename to etc/output/universal.trig index eaf3998..c0e48e2 100644 --- a/tests/output/universal.trig +++ b/etc/output/universal.trig @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix rdfs: . @prefix skolem: . @prefix lingua: . diff --git a/tests/pack.trig b/etc/pack.trig similarity index 100% rename from tests/pack.trig rename to etc/pack.trig diff --git a/tests/patch.trig b/etc/patch.trig similarity index 100% rename from tests/patch.trig rename to etc/patch.trig diff --git a/tests/peano.trig b/etc/peano.trig similarity index 100% rename from tests/peano.trig rename to etc/peano.trig diff --git a/tests/pi.trig b/etc/pi.trig similarity index 100% rename from tests/pi.trig rename to etc/pi.trig diff --git a/tests/restdesc.trig b/etc/restdesc.trig similarity index 100% rename from tests/restdesc.trig rename to etc/restdesc.trig diff --git a/tests/sha512.trig b/etc/sha512.trig similarity index 100% rename from tests/sha512.trig rename to etc/sha512.trig diff --git a/tests/socrates.trig b/etc/socrates.trig similarity index 100% rename from tests/socrates.trig rename to etc/socrates.trig diff --git a/tests/test b/etc/test similarity index 87% rename from tests/test rename to etc/test index 7ce2534..fd15864 100755 --- a/tests/test +++ b/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 b/etc/turing.trig similarity index 100% rename from tests/turing.trig rename to etc/turing.trig diff --git a/tests/union.trig b/etc/union.trig similarity index 100% rename from tests/union.trig rename to etc/union.trig diff --git a/tests/universal.trig b/etc/universal.trig similarity index 100% rename from tests/universal.trig rename to etc/universal.trig diff --git a/lingua.pl b/lingua.pl index 7f9b474..09fc209 100644 --- 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 * * diff --git a/mklingua b/mklingua index 7b0e5d8..cf80eab 100755 --- 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 index 0b8f984..b3ea52b 100755 --- 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 deleted file mode 100644 index 7ac2131..0000000 --- a/tests/output/pi.trig +++ /dev/null @@ -1,3 +0,0 @@ -@prefix : . - -(50000 3.141592653589793) :pi true.