eyeprolog 0.5.13 → 0.5.14

package/examples/proof/composition-of-injective-functions-is-injective.pl

@@ -3,113 +3,110 @@ why(
   sameInputByCompositeInjectivity(h, a, b),
   proof(
     goal(sameInputByCompositeInjectivity(h, a, b)),
-    by(rule("composition-of-injective-functions-is-injective.pl", clause(19))),
+    by(rule("composition-of-injective-functions-is-injective.pl", clause(21))),
     bindings([binding("H", h), binding("X", a), binding("Y", b), binding("G", g), binding("F", f), binding("Z", e)]),
     uses([
       proof(
         goal(compositeOf(h, g, f)),
-        by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+        by(fact("composition-of-injective-functions-is-injective.pl", clause(18)))
       ),
       proof(
         goal(injective(g)),
-        by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
+        by(fact("composition-of-injective-functions-is-injective.pl", clause(17)))
       ),
       proof(
         goal(injective(f)),
-        by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
+        by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
       ),
       proof(
         goal(app(h, a, e)),
-        by(rule("composition-of-injective-functions-is-injective.pl", clause(17))),
+        by(rule("composition-of-injective-functions-is-injective.pl", clause(19))),
         bindings([binding("H", h), binding("X", a), binding("Z", e), binding("G", g), binding("F", f), binding("Y", c)]),
         uses([
           proof(
             goal(compositeOf(h, g, f)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(18)))
           ),
           proof(
             goal(app(f, a, c)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(10)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
           ),
           proof(
             goal(app(g, c, e)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
           )
         ])
       ),
       proof(
         goal(app(h, b, e)),
-        by(rule("composition-of-injective-functions-is-injective.pl", clause(17))),
+        by(rule("composition-of-injective-functions-is-injective.pl", clause(19))),
         bindings([binding("H", h), binding("X", b), binding("Z", e), binding("G", g), binding("F", f), binding("Y", d)]),
         uses([
           proof(
             goal(compositeOf(h, g, f)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(18)))
           ),
           proof(
             goal(app(f, b, d)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(11)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
           ),
           proof(
             goal(app(g, d, e)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
           )
         ])
       ),
       proof(
         goal(sameTerm(a, b)),
-        by(rule("composition-of-injective-functions-is-injective.pl", clause(9))),
+        by(rule("composition-of-injective-functions-is-injective.pl", clause(11))),
         bindings([binding("Y", a), binding("X", b)]),
         uses([
+          proof(
+            goal(@<(a, b)),
+            by(builtin(@<, 2))
+          ),
           proof(
             goal(sameTerm(b, a)),
-            by(rule("composition-of-injective-functions-is-injective.pl", clause(18))),
+            by(rule("composition-of-injective-functions-is-injective.pl", clause(20))),
             bindings([binding("X", b), binding("Y", a), binding("F", f), binding("U", d), binding("V", c)]),
             uses([
               proof(
                 goal(injective(f)),
-                by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
+                by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
               ),
               proof(
                 goal(app(f, b, d)),
-                by(fact("composition-of-injective-functions-is-injective.pl", clause(11)))
+                by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
               ),
               proof(
                 goal(app(f, a, c)),
-                by(fact("composition-of-injective-functions-is-injective.pl", clause(10)))
+                by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
               ),
               proof(
                 goal(sameTerm(d, c)),
-                by(rule("composition-of-injective-functions-is-injective.pl", clause(9))),
-                bindings([binding("Y", d), binding("X", c)]),
+                by(rule("composition-of-injective-functions-is-injective.pl", clause(20))),
+                bindings([binding("X", d), binding("Y", c), binding("F", g), binding("U", e), binding("V", e)]),
                 uses([
                   proof(
-                    goal(sameTerm(c, d)),
-                    by(rule("composition-of-injective-functions-is-injective.pl", clause(18))),
-                    bindings([binding("X", c), binding("Y", d), binding("F", g), binding("U", e), binding("V", e)]),
+                    goal(injective(g)),
+                    by(fact("composition-of-injective-functions-is-injective.pl", clause(17)))
+                  ),
+                  proof(
+                    goal(app(g, d, e)),
+                    by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
+                  ),
+                  proof(
+                    goal(app(g, c, e)),
+                    by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
+                  ),
+                  proof(
+                    goal(sameTerm(e, e)),
+                    by(rule("composition-of-injective-functions-is-injective.pl", clause(10))),
+                    bindings([binding("X", e)]),
                     uses([
                       proof(
-                        goal(injective(g)),
-                        by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
-                      ),
-                      proof(
-                        goal(app(g, c, e)),
-                        by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
-                      ),
-                      proof(
-                        goal(app(g, d, e)),
-                        by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
-                      ),
-                      proof(
-                        goal(sameTerm(e, e)),
-                        by(rule("composition-of-injective-functions-is-injective.pl", clause(8))),
-                        bindings([binding("X", e)]),
-                        uses([
-                          proof(
-                            goal(inZ(e)),
-                            by(fact("composition-of-injective-functions-is-injective.pl", clause(5)))
-                          )
-                        ])
+                        goal(inZ(e)),
+                        by(fact("composition-of-injective-functions-is-injective.pl", clause(7)))
                       )
                     ])
                   )
@@ -132,115 +129,101 @@ why(
   sameInputByCompositeInjectivity(h, b, a),
   proof(
     goal(sameInputByCompositeInjectivity(h, b, a)),
-    by(rule("composition-of-injective-functions-is-injective.pl", clause(19))),
+    by(rule("composition-of-injective-functions-is-injective.pl", clause(21))),
     bindings([binding("H", h), binding("X", b), binding("Y", a), binding("G", g), binding("F", f), binding("Z", e)]),
     uses([
       proof(
         goal(compositeOf(h, g, f)),
-        by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+        by(fact("composition-of-injective-functions-is-injective.pl", clause(18)))
       ),
       proof(
         goal(injective(g)),
-        by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
+        by(fact("composition-of-injective-functions-is-injective.pl", clause(17)))
       ),
       proof(
         goal(injective(f)),
-        by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
+        by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
       ),
       proof(
         goal(app(h, b, e)),
-        by(rule("composition-of-injective-functions-is-injective.pl", clause(17))),
+        by(rule("composition-of-injective-functions-is-injective.pl", clause(19))),
         bindings([binding("H", h), binding("X", b), binding("Z", e), binding("G", g), binding("F", f), binding("Y", d)]),
         uses([
           proof(
             goal(compositeOf(h, g, f)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(18)))
           ),
           proof(
             goal(app(f, b, d)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(11)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
           ),
           proof(
             goal(app(g, d, e)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
           )
         ])
       ),
       proof(
         goal(app(h, a, e)),
-        by(rule("composition-of-injective-functions-is-injective.pl", clause(17))),
+        by(rule("composition-of-injective-functions-is-injective.pl", clause(19))),
         bindings([binding("H", h), binding("X", a), binding("Z", e), binding("G", g), binding("F", f), binding("Y", c)]),
         uses([
           proof(
             goal(compositeOf(h, g, f)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(18)))
           ),
           proof(
             goal(app(f, a, c)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(10)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
           ),
           proof(
             goal(app(g, c, e)),
-            by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
           )
         ])
       ),
       proof(
         goal(sameTerm(b, a)),
-        by(rule("composition-of-injective-functions-is-injective.pl", clause(9))),
-        bindings([binding("Y", b), binding("X", a)]),
+        by(rule("composition-of-injective-functions-is-injective.pl", clause(20))),
+        bindings([binding("X", b), binding("Y", a), binding("F", f), binding("U", d), binding("V", c)]),
         uses([
           proof(
-            goal(sameTerm(a, b)),
-            by(rule("composition-of-injective-functions-is-injective.pl", clause(18))),
-            bindings([binding("X", a), binding("Y", b), binding("F", f), binding("U", c), binding("V", d)]),
+            goal(injective(f)),
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(16)))
+          ),
+          proof(
+            goal(app(f, b, d)),
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
+          ),
+          proof(
+            goal(app(f, a, c)),
+            by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
+          ),
+          proof(
+            goal(sameTerm(d, c)),
+            by(rule("composition-of-injective-functions-is-injective.pl", clause(20))),
+            bindings([binding("X", d), binding("Y", c), binding("F", g), binding("U", e), binding("V", e)]),
             uses([
               proof(
-                goal(injective(f)),
-                by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
+                goal(injective(g)),
+                by(fact("composition-of-injective-functions-is-injective.pl", clause(17)))
               ),
               proof(
-                goal(app(f, a, c)),
-                by(fact("composition-of-injective-functions-is-injective.pl", clause(10)))
+                goal(app(g, d, e)),
+                by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
               ),
               proof(
-                goal(app(f, b, d)),
-                by(fact("composition-of-injective-functions-is-injective.pl", clause(11)))
+                goal(app(g, c, e)),
+                by(fact("composition-of-injective-functions-is-injective.pl", clause(14)))
               ),
               proof(
-                goal(sameTerm(c, d)),
-                by(rule("composition-of-injective-functions-is-injective.pl", clause(9))),
-                bindings([binding("Y", c), binding("X", d)]),
+                goal(sameTerm(e, e)),
+                by(rule("composition-of-injective-functions-is-injective.pl", clause(10))),
+                bindings([binding("X", e)]),
                 uses([
                   proof(
-                    goal(sameTerm(d, c)),
-                    by(rule("composition-of-injective-functions-is-injective.pl", clause(18))),
-                    bindings([binding("X", d), binding("Y", c), binding("F", g), binding("U", e), binding("V", e)]),
-                    uses([
-                      proof(
-                        goal(injective(g)),
-                        by(fact("composition-of-injective-functions-is-injective.pl", clause(15)))
-                      ),
-                      proof(
-                        goal(app(g, d, e)),
-                        by(fact("composition-of-injective-functions-is-injective.pl", clause(13)))
-                      ),
-                      proof(
-                        goal(app(g, c, e)),
-                        by(fact("composition-of-injective-functions-is-injective.pl", clause(12)))
-                      ),
-                      proof(
-                        goal(sameTerm(e, e)),
-                        by(rule("composition-of-injective-functions-is-injective.pl", clause(8))),
-                        bindings([binding("X", e)]),
-                        uses([
-                          proof(
-                            goal(inZ(e)),
-                            by(fact("composition-of-injective-functions-is-injective.pl", clause(5)))
-                          )
-                        ])
-                      )
-                    ])
+                    goal(inZ(e)),
+                    by(fact("composition-of-injective-functions-is-injective.pl", clause(7)))
                   )
                 ])
               )

package/examples/proof/group-inverse-uniqueness.pl

@@ -12,7 +12,7 @@ why(
         bindings([binding("A", x), binding("B", i)]),
         uses([
           proof(
-            goal(op(i, x, e)),
+            goal(group_op(i, x, e)),
             by(fact("group-inverse-uniqueness.pl", clause(7)))
           )
         ])
@@ -23,7 +23,7 @@ why(
         bindings([binding("A", x), binding("B", j)]),
         uses([
           proof(
-            goal(op(x, j, e)),
+            goal(group_op(x, j, e)),
             by(fact("group-inverse-uniqueness.pl", clause(8)))
           )
         ])
@@ -54,7 +54,7 @@ why(
         bindings([binding("A", x), binding("B", j)]),
         uses([
           proof(
-            goal(op(j, x, e)),
+            goal(group_op(j, x, e)),
             by(fact("group-inverse-uniqueness.pl", clause(9)))
           )
         ])
@@ -65,7 +65,7 @@ why(
         bindings([binding("A", x), binding("B", i)]),
         uses([
           proof(
-            goal(op(x, i, e)),
+            goal(group_op(x, i, e)),
             by(fact("group-inverse-uniqueness.pl", clause(10)))
           )
         ])

package/examples/proof/list-collection.pl

@@ -1,44 +1,88 @@
-length(numbers, 3).
+collectionLength(numbers, 3).
 why(
-  length(numbers, 3),
+  collectionLength(numbers, 3),
   proof(
-    goal(length(numbers, 3)),
-    by(library(length, 2))
+    goal(collectionLength(numbers, 3)),
+    by(rule("list-collection.pl", clause(3))),
+    bindings([binding("N", 3), binding("List", [1, 2, 3])]),
+    uses([
+      proof(
+        goal(collection(numbers, [1, 2, 3])),
+        by(fact("list-collection.pl", clause(1)))
+      ),
+      proof(
+        goal(length([1, 2, 3], 3)),
+        by(library(length, 2))
+      )
+    ])
   )
 ).
 
-member(numbers, 1).
+collectionMember(numbers, 1).
 why(
-  member(numbers, 1),
+  collectionMember(numbers, 1),
   proof(
-    goal(member(numbers, 1)),
-    by(library(member, 2))
+    goal(collectionMember(numbers, 1)),
+    by(rule("list-collection.pl", clause(4))),
+    bindings([binding("X", 1), binding("List", [1, 2, 3])]),
+    uses([
+      proof(
+        goal(collection(numbers, [1, 2, 3])),
+        by(fact("list-collection.pl", clause(1)))
+      ),
+      proof(
+        goal(member(1, [1, 2, 3])),
+        by(library(member, 2))
+      )
+    ])
   )
 ).
 
-member(numbers, 2).
+collectionMember(numbers, 2).
 why(
-  member(numbers, 2),
+  collectionMember(numbers, 2),
   proof(
-    goal(member(numbers, 2)),
-    by(library(member, 2))
+    goal(collectionMember(numbers, 2)),
+    by(rule("list-collection.pl", clause(4))),
+    bindings([binding("X", 2), binding("List", [1, 2, 3])]),
+    uses([
+      proof(
+        goal(collection(numbers, [1, 2, 3])),
+        by(fact("list-collection.pl", clause(1)))
+      ),
+      proof(
+        goal(member(2, [1, 2, 3])),
+        by(library(member, 2))
+      )
+    ])
   )
 ).
 
-member(numbers, 3).
+collectionMember(numbers, 3).
 why(
-  member(numbers, 3),
+  collectionMember(numbers, 3),
   proof(
-    goal(member(numbers, 3)),
-    by(library(member, 2))
+    goal(collectionMember(numbers, 3)),
+    by(rule("list-collection.pl", clause(4))),
+    bindings([binding("X", 3), binding("List", [1, 2, 3])]),
+    uses([
+      proof(
+        goal(collection(numbers, [1, 2, 3])),
+        by(fact("list-collection.pl", clause(1)))
+      ),
+      proof(
+        goal(member(3, [1, 2, 3])),
+        by(library(member, 2))
+      )
+    ])
   )
 ).
 
-append(letters, [a, b, c]).
+collectionAppend(letters, [a, b, c]).
 why(
-  append(letters, [a, b, c]),
+  collectionAppend(letters, [a, b, c]),
   proof(
-    goal(append(letters, [a, b, c])),
+    goal(collectionAppend(letters, [a, b, c])),
     by(rule("list-collection.pl", clause(5))),
     bindings([binding("Extended", [a, b, c]), binding("List", [a, b])]),
     uses([

package/examples/proof/spacecraft-battery-diagnosis.pl

@@ -7,7 +7,7 @@ why(
     bindings([binding("Pack", bp1), binding("Margin", -18.0), binding("Maximum", 60.0), binding("Temperature", 78.0)]),
     uses([
       proof(
-        goal(limit(max_safe_temperature_c, 60.0)),
+        goal(safety_limit(max_safe_temperature_c, 60.0)),
         by(fact("spacecraft-battery-diagnosis.pl", clause(7)))
       ),
       proof(
@@ -68,7 +68,7 @@ why(
             by(fact("spacecraft-battery-diagnosis.pl", clause(1)))
           ),
           proof(
-            goal(limit(max_safe_temperature_c, 60.0)),
+            goal(safety_limit(max_safe_temperature_c, 60.0)),
             by(fact("spacecraft-battery-diagnosis.pl", clause(7)))
           ),
           proof(
@@ -87,7 +87,7 @@ why(
             by(fact("spacecraft-battery-diagnosis.pl", clause(2)))
           ),
           proof(
-            goal(limit(max_temperature_rise_c_per_min, 1.5)),
+            goal(safety_limit(max_temperature_rise_c_per_min, 1.5)),
             by(fact("spacecraft-battery-diagnosis.pl", clause(8)))
           ),
           proof(
@@ -106,7 +106,7 @@ why(
             by(fact("spacecraft-battery-diagnosis.pl", clause(5)))
           ),
           proof(
-            goal(limit(max_cell_delta_v, 0.08)),
+            goal(safety_limit(max_cell_delta_v, 0.08)),
             by(fact("spacecraft-battery-diagnosis.pl", clause(9)))
           ),
           proof(
@@ -180,7 +180,7 @@ why(
                 by(fact("spacecraft-battery-diagnosis.pl", clause(1)))
               ),
               proof(
-                goal(limit(max_safe_temperature_c, 60.0)),
+                goal(safety_limit(max_safe_temperature_c, 60.0)),
                 by(fact("spacecraft-battery-diagnosis.pl", clause(7)))
               ),
               proof(
@@ -199,7 +199,7 @@ why(
                 by(fact("spacecraft-battery-diagnosis.pl", clause(2)))
               ),
               proof(
-                goal(limit(max_temperature_rise_c_per_min, 1.5)),
+                goal(safety_limit(max_temperature_rise_c_per_min, 1.5)),
                 by(fact("spacecraft-battery-diagnosis.pl", clause(8)))
               ),
               proof(
@@ -218,7 +218,7 @@ why(
                 by(fact("spacecraft-battery-diagnosis.pl", clause(5)))
               ),
               proof(
-                goal(limit(max_cell_delta_v, 0.08)),
+                goal(safety_limit(max_cell_delta_v, 0.08)),
                 by(fact("spacecraft-battery-diagnosis.pl", clause(9)))
               ),
               proof(
@@ -281,7 +281,7 @@ why(
             by(fact("spacecraft-battery-diagnosis.pl", clause(6)))
           ),
           proof(
-            goal(limit(max_safe_temperature_c, 60.0)),
+            goal(safety_limit(max_safe_temperature_c, 60.0)),
             by(fact("spacecraft-battery-diagnosis.pl", clause(7)))
           ),
           proof(