eyeling 1.5.21 → 1.5.22

package/examples/gps.n3

@@ -7,45 +7,43 @@
 
 @prefix math: <http://www.w3.org/2000/10/swap/math#>.
 @prefix list: <http://www.w3.org/2000/10/swap/list#>.
-@prefix gps: <https://eyereasoner.github.io/eye/reasoning/gps/gps-schema#>.
-@prefix : <https://eyereasoner.github.io/eye/reasoning#>.
-
-# ---------------------
-# Data (a small sample)
-# ---------------------
+@prefix gps:  <https://eyereasoner.github.io/eye/reasoning/gps/gps-schema#>.
+@prefix :     <https://eyereasoner.github.io/eye/reasoning#>.
 
 # current state
 :i1 :location :Gent.
 
-# map of Belgium
-(:Gent :Brugge   :drive_gent_brugge     1500.0 0.006 0.96 0.99) :edge true .
-(:Gent :Kortrijk :drive_gent_kortrijk   1600.0 0.007 0.96 0.99) :edge true .
-(:Kortrijk :Brugge :drive_kortrijk_brugge 1600.0 0.007 0.96 0.99) :edge true .
-(:Brugge :Oostende :drive_brugge_oostende  900.0 0.004 0.98 1.0) :edge true .
+# -------------------------------------------------
+# map of Belgium (as backward rules / descriptions)
+# -------------------------------------------------
+{:map-BE gps:description ({?S :location :Gent}     true {?S :location :Brugge}   :drive_gent_brugge      1500.0 0.006 0.96 0.99)} <= true.
+{:map-BE gps:description ({?S :location :Gent}     true {?S :location :Kortrijk} :drive_gent_kortrijk    1600.0 0.007 0.96 0.99)} <= true.
+{:map-BE gps:description ({?S :location :Kortrijk} true {?S :location :Brugge}   :drive_kortrijk_brugge  1600.0 0.007 0.96 0.99)} <= true.
+{:map-BE gps:description ({?S :location :Brugge}   true {?S :location :Oostende} :drive_brugge_oostende   900.0 0.004 0.98 1.0 )} <= true.
 
-# ----------------
-# Path computation
-# ----------------
+# -----------------------------
+# Compute all paths by chaining
+# -----------------------------
 
-# Base: one edge is a path
+# Base: a single map description is a path
 {
   (?From ?To (?Act) ?Dur ?Cost ?Belief ?Comfort) :path true.
 }
 <=
 {
-  (?From ?To ?Act ?Dur ?Cost ?Belief ?Comfort) :edge true.
+  :map-BE gps:description (?From true ?To ?Act ?Dur ?Cost ?Belief ?Comfort).
 }.
 
-# Recursive: edge + path => path, aggregate weights, concatenate action list
+# Recursive: chain one step + rest path, and aggregate weights
 {
-  (?From ?To ?Acts ?Dur ?Cost ?Belief ?Comfort) :path true.
+  (?From ?To ?Actions ?Dur ?Cost ?Belief ?Comfort) :path true.
 }
 <=
 {
-  (?From ?Mid ?Act ?Dur1 ?Cost1 ?Bel1 ?Comf1) :edge true.
+  :map-BE gps:description (?From true ?Mid ?Act ?Dur1 ?Cost1 ?Bel1 ?Comf1).
   (?Mid ?To ?RestActs ?Dur2 ?Cost2 ?Bel2 ?Comf2) :path true.
 
-  ((?Act) ?RestActs) list:append ?Acts.
+  ((?Act) ?RestActs) list:append ?Actions.
 
   (?Dur1  ?Dur2)  math:sum     ?Dur.
   (?Cost1 ?Cost2) math:sum     ?Cost.
@@ -53,13 +51,12 @@
   (?Comf1 ?Comf2) math:product ?Comfort.
 }.
 
-# -------------------------
-# Query: only paths to goal
-# -------------------------
-
+# ------------------------------------------------------
+# "Query": derive gps:path facts for i1, goal = Oostende
+# ------------------------------------------------------
 {
-  :i1 :location ?Start.
-  (?Start :Oostende ?Acts ?Dur ?Cost ?Bel ?Comf) :path true.
+  :i1 :location :Gent.
+  ({:i1 :location :Gent} {:i1 :location :Oostende} ?Acts ?Dur ?Cost ?Bel ?Comf) :path true.
 }
 =>
 {

package/examples/output/gps.n3

@@ -6,11 +6,19 @@
 #   :i1 gps:path ((:drive_gent_kortrijk :drive_kortrijk_brugge :drive_brugge_oostende) 4100 0.018 0.903168 0.9801) .
 # It holds because the following instance of the rule body is provable:
 #   :i1 :location :Gent .
-#   (:Gent :Oostende (:drive_gent_kortrijk :drive_kortrijk_brugge :drive_brugge_oostende) 4100 0.018 0.903168 0.9801) :path true .
+#   ({
+#       :i1 :location :Gent .
+#   } {
+#       :i1 :location :Oostende .
+#   } (:drive_gent_kortrijk :drive_kortrijk_brugge :drive_brugge_oostende) 4100 0.018 0.903168 0.9801) :path true .
 # via the schematic forward rule:
 #   {
-#     :i1 :location ?Start .
-#     (?Start :Oostende ?Acts ?Dur ?Cost ?Bel ?Comf) :path true .
+#     :i1 :location :Gent .
+#     ({
+#         :i1 :location :Gent .
+#     } {
+#         :i1 :location :Oostende .
+#     } ?Acts ?Dur ?Cost ?Bel ?Comf) :path true .
 #   } => {
 #     :i1 gps:path (?Acts ?Dur ?Cost ?Bel ?Comf) .
 #   } .
@@ -20,7 +28,6 @@
 #   ?Comf = 0.9801
 #   ?Cost = 0.018
 #   ?Dur = 4100
-#   ?Start = :Gent
 # Therefore the derived triple above is entailed by the rules and facts.
 # ----------------------------------------------------------------------
 
@@ -31,11 +38,19 @@
 #   :i1 gps:path ((:drive_gent_brugge :drive_brugge_oostende) 2400 0.01 0.9408 0.99) .
 # It holds because the following instance of the rule body is provable:
 #   :i1 :location :Gent .
-#   (:Gent :Oostende (:drive_gent_brugge :drive_brugge_oostende) 2400 0.01 0.9408 0.99) :path true .
+#   ({
+#       :i1 :location :Gent .
+#   } {
+#       :i1 :location :Oostende .
+#   } (:drive_gent_brugge :drive_brugge_oostende) 2400 0.01 0.9408 0.99) :path true .
 # via the schematic forward rule:
 #   {
-#     :i1 :location ?Start .
-#     (?Start :Oostende ?Acts ?Dur ?Cost ?Bel ?Comf) :path true .
+#     :i1 :location :Gent .
+#     ({
+#         :i1 :location :Gent .
+#     } {
+#         :i1 :location :Oostende .
+#     } ?Acts ?Dur ?Cost ?Bel ?Comf) :path true .
 #   } => {
 #     :i1 gps:path (?Acts ?Dur ?Cost ?Bel ?Comf) .
 #   } .
@@ -45,7 +60,6 @@
 #   ?Comf = 0.99
 #   ?Cost = 0.01
 #   ?Dur = 2400
-#   ?Start = :Gent
 # Therefore the derived triple above is entailed by the rules and facts.
 # ----------------------------------------------------------------------
 

package/eyeling.js

@@ -1463,6 +1463,40 @@ function unifyOpenWithList(prefix, tailv, ys, subst) {
   return s2;
 }
 
+function unifyFormulaTriples(xs, ys, subst) {
+  if (xs.length !== ys.length) return null;
+
+  // Fast path: exact same sequence.
+  if (triplesListEqual(xs, ys)) return { ...subst };
+
+  // Backtracking match (order-insensitive), *threading* the substitution through.
+  const used = new Array(ys.length).fill(false);
+
+  function step(i, s) {
+    if (i >= xs.length) return s;
+    const x = xs[i];
+
+    for (let j = 0; j < ys.length; j++) {
+      if (used[j]) continue;
+      const y = ys[j];
+
+      // Cheap pruning when both predicates are IRIs.
+      if (x.p instanceof Iri && y.p instanceof Iri && x.p.value !== y.p.value) continue;
+
+      const s2 = unifyTriple(x, y, s);   // IMPORTANT: use `s`, not {}
+      if (s2 === null) continue;
+
+      used[j] = true;
+      const s3 = step(i + 1, s2);
+      if (s3 !== null) return s3;
+      used[j] = false;
+    }
+    return null;
+  }
+
+  return step(0, { ...subst }); // IMPORTANT: start from the incoming subst
+}
+
 function unifyTerm(a, b, subst) {
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
@@ -1521,11 +1555,10 @@ function unifyTerm(a, b, subst) {
     return s2;
   }
 
-  // Formulas are treated as opaque unless exactly equal
+  // Formulas: unify their internal triple sets (order-insensitive)
   if (a instanceof FormulaTerm && b instanceof FormulaTerm) {
-    if (triplesListEqual(a.triples, b.triples)) return { ...subst };
+    return unifyFormulaTriples(a.triples, b.triples, subst);
   }
-
   return null;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.5.21",
+  "version": "1.5.22",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [