eyeling 1.12.9 → 1.12.11

package/examples/output/takeuchi.n3

@@ -1,107 +1,3 @@
 @prefix : <https://eyereasoner.github.io/eye/reasoning#> .
 
-(7 4 2) :needTak true .
-(3 2 8) :needTak true .
-(1 8 4) :needTak true .
-(1 8 4) :tak 4 .
-(6 4 2) :needTak true .
-(3 2 7) :needTak true .
-(1 7 4) :needTak true .
-(2 2 8) :needTak true .
-(1 8 3) :needTak true .
-(7 3 2) :needTak true .
-(1 7 4) :tak 4 .
-(2 2 8) :tak 8 .
-(1 8 3) :tak 3 .
-(5 4 2) :needTak true .
-(3 2 6) :needTak true .
-(1 6 4) :needTak true .
-(2 2 7) :needTak true .
-(1 7 3) :needTak true .
-(6 3 2) :needTak true .
-(1 6 4) :tak 4 .
-(2 2 7) :tak 7 .
-(1 7 3) :tak 3 .
-(4 4 2) :needTak true .
-(3 2 5) :needTak true .
-(1 5 4) :needTak true .
-(2 2 6) :needTak true .
-(1 6 3) :needTak true .
-(5 3 2) :needTak true .
-(4 4 2) :tak 2 .
-(1 5 4) :tak 4 .
-(2 2 6) :tak 6 .
-(1 6 3) :tak 3 .
-(2 2 5) :needTak true .
-(1 5 3) :needTak true .
-(4 3 2) :needTak true .
-(2 2 5) :tak 5 .
-(1 5 3) :tak 3 .
-(3 3 2) :needTak true .
-(2 2 4) :needTak true .
-(1 4 3) :needTak true .
-(3 3 2) :tak 2 .
-(2 2 4) :tak 4 .
-(1 4 3) :tak 3 .
-(2 4 3) :needTak true .
-(2 4 3) :tak 3 .
-(4 3 2) :tak 3 .
-(5 3 3) :needTak true .
-(3 5 3) :needTak true .
-(4 3 3) :needTak true .
-(2 3 5) :needTak true .
-(2 5 3) :needTak true .
-(3 5 3) :tak 3 .
-(2 3 5) :tak 5 .
-(2 5 3) :tak 3 .
-(5 3 2) :tak 3 .
-(3 3 3) :needTak true .
-(2 3 4) :needTak true .
-(3 3 3) :tak 3 .
-(2 3 4) :tak 4 .
-(6 3 3) :needTak true .
-(3 6 3) :needTak true .
-(3 4 3) :needTak true .
-(2 3 6) :needTak true .
-(2 6 3) :needTak true .
-(3 6 3) :tak 3 .
-(3 4 3) :tak 3 .
-(2 3 6) :tak 6 .
-(2 6 3) :tak 3 .
-(6 3 2) :tak 3 .
-(4 3 3) :tak 3 .
-(7 3 3) :needTak true .
-(3 7 3) :needTak true .
-(5 3 3) :tak 3 .
-(2 3 7) :needTak true .
-(2 7 3) :needTak true .
-(3 7 3) :tak 3 .
-(2 3 7) :tak 7 .
-(2 7 3) :tak 3 .
-(7 3 2) :tak 3 .
-(3 2 5) :tak 3 .
-(6 3 3) :tak 3 .
-(8 3 3) :needTak true .
-(5 4 2) :tak 4 .
-(3 2 6) :tak 3 .
-(7 3 3) :tak 3 .
-(2 3 8) :needTak true .
-(2 8 3) :needTak true .
-(2 3 8) :tak 8 .
-(2 8 3) :tak 3 .
-(4 3 4) :needTak true .
-(3 8 3) :needTak true .
-(3 2 7) :tak 3 .
-(3 3 4) :needTak true .
-(2 4 4) :needTak true .
-(3 8 3) :tak 3 .
-(3 3 4) :tak 4 .
-(2 4 4) :tak 4 .
-(4 4 3) :needTak true .
-(8 3 3) :tak 3 .
-(4 4 3) :tak 3 .
-(3 2 8) :tak 3 .
-(4 3 4) :tak 3 .
-(6 4 2) :tak 3 .
-(7 4 2) :tak 4 .
-(8 4 2) :tak 3 .
+(8 4 2) :takeuchi 3 .

package/examples/takeuchi.n3

@@ -10,73 +10,20 @@
 @prefix math: <http://www.w3.org/2000/10/swap/math#>.
 @prefix : <https://eyereasoner.github.io/eye/reasoning#>.
 
-# Forward/tabling style: compute only what’s reachable from :needTak.
-
-# Seed: only the call we want
-(8 4 2) :needTak true .
-
-# If a call is needed and X>Y, mark the three direct subcalls as needed
-{
-  (?X ?Y ?Z) :needTak true.
-  ?X math:greaterThan ?Y.
-  (?X 1) math:difference ?X1.
-  (?Y 1) math:difference ?Y1.
-  (?Z 1) math:difference ?Z1.
-}
-=>
-{
-  (?X1 ?Y ?Z) :needTak true.
-  (?Y1 ?Z ?X) :needTak true.
-  (?Z1 ?X ?Y) :needTak true.
-}.
-
-# Base case: if X<=Y then result is Z
-{
-  (?X ?Y ?Z) :needTak true.
-  ?X math:notGreaterThan ?Y.
-}
-=>
-{
-  (?X ?Y ?Z) :tak ?Z.
+{(?X ?Y ?Z) :tak ?Z} <= {
+    ?X math:notGreaterThan ?Y.
 }.
 
-# Once the three direct subcalls have results, we also need the “final call” tak(A1,A2,A3)
-{
-  (?X ?Y ?Z) :needTak true.
-  ?X math:greaterThan ?Y.
-
-  (?X 1) math:difference ?X1.
-  (?X1 ?Y ?Z) :tak ?A1.
-
-  (?Y 1) math:difference ?Y1.
-  (?Y1 ?Z ?X) :tak ?A2.
-
-  (?Z 1) math:difference ?Z1.
-  (?Z1 ?X ?Y) :tak ?A3.
-}
-=>
-{
-  (?A1 ?A2 ?A3) :needTak true.
-}.
-
-# Recursive case: if everything is known, tak(X,Y,Z) is tak(A1,A2,A3)
-{
-  (?X ?Y ?Z) :needTak true.
-  ?X math:greaterThan ?Y.
-
-  (?X 1) math:difference ?X1.
-  (?X1 ?Y ?Z) :tak ?A1.
-
-  (?Y 1) math:difference ?Y1.
-  (?Y1 ?Z ?X) :tak ?A2.
-
-  (?Z 1) math:difference ?Z1.
-  (?Z1 ?X ?Y) :tak ?A3.
-
-  (?A1 ?A2 ?A3) :tak ?A.
-}
-=>
-{
-  (?X ?Y ?Z) :tak ?A.
+{(?X ?Y ?Z) :tak ?A} <= {
+    ?X math:greaterThan ?Y.     # guard makes this clause disjoint from the base case
+    (?X 1) math:difference ?X1.
+    (?X1 ?Y ?Z) :tak ?A1.
+    (?Y 1) math:difference ?Y1.
+    (?Y1 ?Z ?X) :tak ?A2.
+    (?Z 1) math:difference ?Z1.
+    (?Z1 ?X ?Y) :tak ?A3.
+    (?A1 ?A2 ?A3) :tak ?A.
 }.
 
+# test
+{(8 4 2) :tak ?A} => {(8 4 2) :takeuchi ?A}.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.12.9",
+  "version": "1.12.11",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [
@@ -50,6 +50,6 @@
     "test": "npm run test:all",
     "posttest": "npm run test:package",
     "preversion": "npm test",
-    "postversion": "git push --follow-tags"
+    "postversion": "git push origin HEAD --follow-tags"
   }
 }