supporting lists of graph terms as conclusions

eyereasoner · Sep 29, 2023 · b2f383c · b2f383c
1 parent 3d29f68
commit b2f383c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 27 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1,5 +1,6 @@
                                   EYE release
 
+v4.18.0 (2023-09-29) supporting lists of graph terms as conclusions
 v4.17.7 (2023-09-28) correcting list:remove and list:removeAt built-ins
 v4.17.6 (2023-09-25) fixing inference fuse explanation
 v4.17.5 (2023-09-24) speeding up inference fuse

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.17.7
+4.18.0
diff --git a/eye.pl b/eye.pl
@@ -21,7 +21,7 @@
 :- use_module(library(pcre)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('EYE v4.17.7 (2023-09-28)').
+version_info('EYE v4.18.0 (2023-09-29)').
 
 license_info('MIT License
 
@@ -4943,6 +4943,7 @@
         ;   true
         ),
         \+atom(Conc),
+        \+is_list(Conc),
         (   flag('rule-histogram'),
             copy_term_nat(Rule, RuleL)
         ->  lookup(RTP, tp, RuleL),
@@ -6506,7 +6507,8 @@
     when(
         (   nonvar(A)
         ),
-        (   sort(A, B)
+        (   is_list(A),
+            sort(A, B)
         )
     ).
 

diff --git a/eye.zip b/eye.zip
diff --git a/reasoning/blogic/version.n3s.out b/reasoning/blogic/version.n3s.out
@@ -1,3 +1,3 @@
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 
-() log:version "EYE v4.17.7 (2023-09-28)".
+() log:version "EYE v4.18.0 (2023-09-29)".
diff --git a/reasoning/refresh/beetle.n3 b/reasoning/refresh/beetle.n3
@@ -7,17 +7,15 @@
 # all cars are red or green or blue
 {
     ?A a :Car.
-} => {
-    (
-        {
-            ?A :is :red.
-        } {
-            ?A :is :green.
-        } {
-            ?A :is :blue.
-        }
-    ) log:or true.
-}.
+} => (
+    {
+        ?A :is :red.
+    } {
+        ?A :is :green.
+    } {
+        ?A :is :blue.
+    }
+).
 
 # red things are beautiful
 {

diff --git a/reasoning/refresh/refresh.n3 b/reasoning/refresh/refresh.n3
@@ -7,34 +7,26 @@
 
 # factoring
 {
-    ?P => {
-        ?C log:or true.
-    }.
+    ?P => ?C.
     ?C list:sort (?D).
 } => {
     ?P => ?D.
 }.
 
 # resolution
 {
-    ?P => {
-        ?C log:or true.
-    }.
+    ?P => ?C.
     ?C list:member ?D.
     ?D => ?E.
     (?C ?D) list:remove ?F.
     ?G list:firstRest (?E ?F).
 } => {
-    ?P => {
-        ?G log:or true.
-    }.
+    ?P => ?G.
 }.
 
 # not(P) implies P is inconsistent
 {
-    ?P => {
-        () log:or true.
-    }.
+    ?P => ().
 } => {
     ?P => false.
 }.