diff --git a/RELEASE b/RELEASE index 2bf275aef..0b0bf5283 100644 --- a/RELEASE +++ b/RELEASE @@ -1,5 +1,6 @@ EYE release +v8.6.3 (2023-11-11) automatic interpretation of variables for rdflegacy v8.6.2 (2023-11-11) using lists of 3-tuples in rdflegacy v8.6.1 (2023-11-11) running rdflegacy fibonacci example v8.6.0 (2023-11-10) adding --legacy to support RDF legacy and dropping sequents diff --git a/VERSION b/VERSION index 7b8d3d832..174933642 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.6.2 +8.6.3 diff --git a/eye.pl b/eye.pl index 90412056e..5a518ccd6 100644 --- 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 v8.6.2 (2023-11-11)'). +version_info('EYE v8.6.3 (2023-11-11)'). license_info('MIT License @@ -640,7 +640,6 @@ % forward rule assertz(implies(( ''(R, ''), - ''(R, V), ''(R, K), findall(Tp, ( member([S, P, O], K), @@ -657,12 +656,12 @@ M ), conj_list(B, M), + findvars([A, B], V, beta), makevars([A, B], [Q, I], beta(V)) ), ''(Q, I), '<>')), % backward rule assertz(implies(( ''(R, ''), - ''(R, V), ''(R, K), findall(Tp, ( member([S, P, O], K), @@ -673,6 +672,7 @@ conj_list(A, L), ''(R, [[S, P, O]]), B =.. [P, S, O], + findvars([A, B], V, beta), makevars(':-'(B, A), C, beta(V)), copy_term_nat(C, CC), labelvars(CC, 0, _, avar), @@ -685,7 +685,6 @@ % query rule assertz(implies(( ''(R, ''), - ''(R, V), ''(R, K), findall(Tp, ( member([S, P, O], K), @@ -703,6 +702,7 @@ ), conj_list(B, M), djiti_answer(answer(B), J), + findvars([A, J], V, beta), makevars(implies(A, J, '<>'), C, beta(V)), copy_term_nat(C, CC), labelvars(CC, 0, _, avar), diff --git a/eye.zip b/eye.zip index 20afbc4e6..92f650f2a 100644 Binary files a/eye.zip and b/eye.zip differ diff --git a/legacy/fibonacci/fibonacci.jsonld b/legacy/fibonacci/fibonacci.jsonld index 32fb6353d..ef646c8c1 100644 --- a/legacy/fibonacci/fibonacci.jsonld +++ b/legacy/fibonacci/fibonacci.jsonld @@ -1,40 +1,21 @@ { "@graph": [ { - "@id": "_:b39", + "@id": "_:b20", "rule:conclusion": { - "@list": [ - { - "@list": [ - { - "@id": "_:b54" - }, - { - "@id": "http://example.org/fibonacci#fibonacci" - }, - { - "@id": "_:b5" - } - ] - } - ] - }, - "rule:premise": { "@list": [ { "@list": [ { "@list": [ { - "@id": "_:b54" + "@id": "_:b51" }, { - "@value": "0", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@id": "_:b24" }, { - "@value": "1", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@id": "_:b10" } ] }, @@ -42,132 +23,98 @@ "@id": "http://example.org/fibonacci#fib" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b54" - }, - { - "@id": "_:b5" - } - ] - }, - "@type": "rule:BackwardRule" - }, - { - "@id": "_:b43", - "rule:conclusion": { + "rule:premise": { "@list": [ { "@list": [ { - "@value": "91", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@id": "_:b51" }, { - "@id": "http://example.org/fibonacci#fibonacci" + "@id": "math:greaterThan" }, { - "@id": "_:b5" + "@value": "1", + "@type": "http://www.w3.org/2001/XMLSchema#integer" } ] - } - ] - }, - "rule:premise": { - "@list": [ + }, { "@list": [ { - "@value": "91", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@list": [ + { + "@id": "_:b51" + }, + { + "@value": "1", + "@type": "http://www.w3.org/2001/XMLSchema#integer" + } + ] }, { - "@id": "http://example.org/fibonacci#fibonacci" + "@id": "math:difference" }, { - "@id": "_:b5" + "@id": "_:b79" } ] - } - ] - }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b5" - } - ] - }, - "@type": "rule:QueryRule" - }, - { - "@id": "_:b73", - "rule:conclusion": { - "@list": [ + }, { "@list": [ { - "@value": "6", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@list": [ + { + "@id": "_:b24" + }, + { + "@id": "_:b10" + } + ] }, { - "@id": "http://example.org/fibonacci#fibonacci" + "@id": "math:sum" }, { - "@id": "_:b5" + "@id": "_:b19" } ] - } - ] - }, - "rule:premise": { - "@list": [ + }, { "@list": [ { - "@value": "6", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@list": [ + { + "@id": "_:b79" + }, + { + "@id": "_:b10" + }, + { + "@id": "_:b19" + } + ] }, { - "@id": "http://example.org/fibonacci#fibonacci" + "@id": "http://example.org/fibonacci#fib" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b5" - } - ] - }, - "@type": "rule:QueryRule" + "@type": "rule:BackwardRule" }, { - "@id": "_:b79", + "@id": "_:b29", "rule:conclusion": { "@list": [ { @@ -175,14 +122,14 @@ { "@list": [ { - "@value": "0", + "@value": "1", "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { "@id": "_:b24" }, { - "@id": "_:b58" + "@id": "_:b10" } ] }, @@ -190,7 +137,7 @@ "@id": "http://example.org/fibonacci#fib" }, { - "@id": "_:b24" + "@id": "_:b10" } ] } @@ -200,39 +147,43 @@ "@list": [ ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { + "@type": "rule:BackwardRule" + }, + { + "@id": "_:b31", + "rule:conclusion": { "@list": [ { - "@id": "_:b24" - }, - { - "@id": "_:b58" + "@list": [ + { + "@id": "_:b51" + }, + { + "@id": "http://example.org/fibonacci#fibonacci" + }, + { + "@id": "_:b3" + } + ] } ] }, - "@type": "rule:BackwardRule" - }, - { - "@id": "_:b111", - "rule:conclusion": { + "rule:premise": { "@list": [ { "@list": [ { "@list": [ { - "@value": "1", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@id": "_:b51" }, { - "@id": "_:b24" + "@value": "0", + "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { - "@id": "_:b58" + "@value": "1", + "@type": "http://www.w3.org/2001/XMLSchema#integer" } ] }, @@ -240,56 +191,29 @@ "@id": "http://example.org/fibonacci#fib" }, { - "@id": "_:b58" + "@id": "_:b3" } ] } ] }, - "rule:premise": { - "@list": [ - ] - }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b24" - }, - { - "@id": "_:b58" - } - ] - }, "@type": "rule:BackwardRule" }, { - "@id": "_:b113", + "@id": "_:b37", "rule:conclusion": { "@list": [ { "@list": [ { - "@list": [ - { - "@id": "_:b54" - }, - { - "@id": "_:b24" - }, - { - "@id": "_:b58" - } - ] + "@value": "91", + "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { - "@id": "http://example.org/fibonacci#fib" + "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } @@ -300,70 +224,78 @@ { "@list": [ { - "@id": "_:b54" + "@value": "91", + "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { - "@id": "math:greaterThan" + "@id": "http://example.org/fibonacci#fibonacci" }, { - "@value": "1", - "@type": "http://www.w3.org/2001/XMLSchema#integer" + "@id": "_:b3" } ] - }, + } + ] + }, + "@type": "rule:QueryRule" + }, + { + "@id": "_:b63", + "rule:conclusion": { + "@list": [ { "@list": [ { - "@list": [ - { - "@id": "_:b54" - }, - { - "@value": "1", - "@type": "http://www.w3.org/2001/XMLSchema#integer" - } - ] + "@value": "6", + "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { - "@id": "math:difference" + "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b68" + "@id": "_:b3" } ] - }, + } + ] + }, + "rule:premise": { + "@list": [ { "@list": [ { - "@list": [ - { - "@id": "_:b24" - }, - { - "@id": "_:b58" - } - ] + "@value": "6", + "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { - "@id": "math:sum" + "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b7" + "@id": "_:b3" } ] - }, + } + ] + }, + "@type": "rule:QueryRule" + }, + { + "@id": "_:b80", + "rule:conclusion": { + "@list": [ { "@list": [ { "@list": [ { - "@id": "_:b68" + "@value": "0", + "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { - "@id": "_:b58" + "@id": "_:b24" }, { - "@id": "_:b7" + "@id": "_:b10" } ] }, @@ -371,42 +303,20 @@ "@id": "http://example.org/fibonacci#fib" }, { - "@id": "_:b5" + "@id": "_:b24" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { + "rule:premise": { "@list": [ - { - "@id": "_:b54" - }, - { - "@id": "_:b5" - }, - { - "@id": "_:b24" - }, - { - "@id": "_:b58" - }, - { - "@id": "_:b68" - }, - { - "@id": "_:b7" - } ] }, "@type": "rule:BackwardRule" }, { - "@id": "_:b115", + "@id": "_:b91", "rule:conclusion": { "@list": [ { @@ -419,7 +329,7 @@ "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } @@ -437,27 +347,16 @@ "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b5" - } - ] - }, "@type": "rule:QueryRule" }, { - "@id": "_:b120", + "@id": "_:b102", "rule:conclusion": { "@list": [ { @@ -470,7 +369,7 @@ "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } @@ -488,40 +387,29 @@ "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b5" - } - ] - }, "@type": "rule:QueryRule" }, { - "@id": "_:b129", + "@id": "_:b112", "rule:conclusion": { "@list": [ { "@list": [ { - "@value": "283", + "@value": "1", "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } @@ -532,47 +420,36 @@ { "@list": [ { - "@value": "283", + "@value": "1", "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b5" - } - ] - }, "@type": "rule:QueryRule" }, { - "@id": "_:b135", + "@id": "_:b118", "rule:conclusion": { "@list": [ { "@list": [ { - "@value": "1", + "@value": "283", "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } @@ -583,30 +460,19 @@ { "@list": [ { - "@value": "1", + "@value": "283", "@type": "http://www.w3.org/2001/XMLSchema#integer" }, { "@id": "http://example.org/fibonacci#fibonacci" }, { - "@id": "_:b5" + "@id": "_:b3" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b5" - } - ] - }, "@type": "rule:QueryRule" } ], diff --git a/legacy/fibonacci/fibonacci.jsonld.ttl b/legacy/fibonacci/fibonacci.jsonld.ttl index 888197ea7..c9e0b8726 100644 --- a/legacy/fibonacci/fibonacci.jsonld.ttl +++ b/legacy/fibonacci/fibonacci.jsonld.ttl @@ -11,434 +11,352 @@ _:b1 _:b2 ; _:b2 _:b3 ; _:b4 . -_:b4 :fibonacci ; - _:b5 . +_:b3 _:b5 ; + _:b6 . -_:b5 _:b6 ; - . - -_:b0 rule:evars ; - rule:premise _:b7 . +_:b6 _:b7 ; + _:b8 . -_:b7 _:b8 ; +_:b8 _:b9 ; . -_:b8 _:b9 ; +_:b4 :fib ; _:b10 . -_:b9 _:b3 ; - _:b11 . - -_:b11 0 ; - _:b12 . - -_:b12 1 ; +_:b10 _:b11 ; . -_:b10 :fib ; - _:b13 . - -_:b13 _:b6 ; - . +_:b0 rule:premise _:b12 . -_:b0 rule:uvars _:b14 . +_:b12 _:b13 ; + _:b14 . -_:b14 _:b3 ; +_:b13 _:b5 ; _:b15 . -_:b15 _:b6 ; - . - -_:b16 a rule:QueryRule ; - rule:conclusion _:b17 . +_:b15 math:greaterThan ; + _:b16 . -_:b17 _:b18 ; +_:b16 1 ; . -_:b18 3674 ; - _:b19 . +_:b14 _:b17 ; + _:b18 . -_:b19 :fibonacci ; +_:b17 _:b19 ; _:b20 . -_:b20 _:b6 ; - . - -_:b16 rule:evars ; - rule:premise _:b21 . +_:b19 _:b5 ; + _:b21 . -_:b21 _:b22 ; +_:b21 1 ; . -_:b22 3674 ; - _:b23 . - -_:b23 :fibonacci ; - _:b24 . +_:b20 math:difference ; + _:b22 . -_:b24 _:b6 ; +_:b22 _:b23 ; . -_:b16 rule:uvars _:b25 . +_:b18 _:b24 ; + _:b25 . -_:b25 _:b6 ; - . +_:b24 _:b26 ; + _:b27 . -_:b26 a rule:QueryRule ; - rule:conclusion _:b27 . +_:b26 _:b7 ; + _:b28 . -_:b27 _:b28 ; +_:b28 _:b9 ; . -_:b28 0 ; +_:b27 math:sum ; _:b29 . -_:b29 :fibonacci ; - _:b30 . - -_:b30 _:b6 ; +_:b29 _:b30 ; . -_:b26 rule:evars ; - rule:premise _:b31 . - -_:b31 _:b32 ; +_:b25 _:b31 ; . -_:b32 0 ; +_:b31 _:b32 ; _:b33 . -_:b33 :fibonacci ; +_:b32 _:b23 ; _:b34 . -_:b34 _:b6 ; +_:b34 _:b9 ; + _:b35 . + +_:b35 _:b30 ; . -_:b26 rule:uvars _:b35 . +_:b33 :fib ; + _:b36 . -_:b35 _:b6 ; +_:b36 _:b11 ; . -_:b36 a rule:QueryRule ; - rule:conclusion _:b37 . +_:b37 a rule:QueryRule ; + rule:conclusion _:b38 . -_:b37 _:b38 ; +_:b38 _:b39 ; . -_:b38 283 ; - _:b39 . - -_:b39 :fibonacci ; +_:b39 6 ; _:b40 . -_:b40 _:b6 ; +_:b40 :fibonacci ; + _:b41 . + +_:b41 _:b11 ; . -_:b36 rule:evars ; - rule:premise _:b41 . +_:b37 rule:premise _:b42 . -_:b41 _:b42 ; +_:b42 _:b43 ; . -_:b42 283 ; - _:b43 . - -_:b43 :fibonacci ; +_:b43 6 ; _:b44 . -_:b44 _:b6 ; - . - -_:b36 rule:uvars _:b45 . +_:b44 :fibonacci ; + _:b45 . -_:b45 _:b6 ; +_:b45 _:b11 ; . -_:b46 a rule:QueryRule ; +_:b46 a rule:BackwardRule ; rule:conclusion _:b47 . _:b47 _:b48 ; . -_:b48 1 ; - _:b49 . - -_:b49 :fibonacci ; +_:b48 _:b49 ; _:b50 . -_:b50 _:b6 ; - . +_:b49 0 ; + _:b51 . -_:b46 rule:evars ; - rule:premise _:b51 . +_:b51 _:b7 ; + _:b52 . -_:b51 _:b52 ; +_:b52 _:b9 ; . -_:b52 1 ; +_:b50 :fib ; _:b53 . -_:b53 :fibonacci ; - _:b54 . - -_:b54 _:b6 ; +_:b53 _:b7 ; . -_:b46 rule:uvars _:b55 . - -_:b55 _:b6 ; - . +_:b46 rule:premise . -_:b56 a rule:QueryRule ; - rule:conclusion _:b57 . +_:b54 a rule:QueryRule ; + rule:conclusion _:b55 . -_:b57 _:b58 ; +_:b55 _:b56 ; . -_:b58 91 ; - _:b59 . +_:b56 3674 ; + _:b57 . -_:b59 :fibonacci ; - _:b60 . +_:b57 :fibonacci ; + _:b58 . -_:b60 _:b6 ; +_:b58 _:b11 ; . -_:b56 rule:evars ; - rule:premise _:b61 . +_:b54 rule:premise _:b59 . -_:b61 _:b62 ; +_:b59 _:b60 ; . -_:b62 91 ; - _:b63 . +_:b60 3674 ; + _:b61 . -_:b63 :fibonacci ; - _:b64 . +_:b61 :fibonacci ; + _:b62 . -_:b64 _:b6 ; +_:b62 _:b11 ; . -_:b56 rule:uvars _:b65 . +_:b63 a rule:QueryRule ; + rule:conclusion _:b64 . -_:b65 _:b6 ; +_:b64 _:b65 ; . -_:b66 a rule:QueryRule ; - rule:conclusion _:b67 . - -_:b67 _:b68 ; - . +_:b65 0 ; + _:b66 . -_:b68 6 ; - _:b69 . - -_:b69 :fibonacci ; - _:b70 . +_:b66 :fibonacci ; + _:b67 . -_:b70 _:b6 ; +_:b67 _:b11 ; . -_:b66 rule:evars ; - rule:premise _:b71 . +_:b63 rule:premise _:b68 . -_:b71 _:b72 ; +_:b68 _:b69 ; . -_:b72 6 ; - _:b73 . - -_:b73 :fibonacci ; - _:b74 . - -_:b74 _:b6 ; - . +_:b69 0 ; + _:b70 . -_:b66 rule:uvars _:b75 . +_:b70 :fibonacci ; + _:b71 . -_:b75 _:b6 ; +_:b71 _:b11 ; . -_:b76 a rule:BackwardRule ; - rule:conclusion _:b77 . +_:b72 a rule:QueryRule ; + rule:conclusion _:b73 . -_:b77 _:b78 ; +_:b73 _:b74 ; . -_:b78 _:b79 ; - _:b80 . - -_:b79 0 ; - _:b81 . +_:b74 1 ; + _:b75 . -_:b81 _:b82 ; - _:b83 . +_:b75 :fibonacci ; + _:b76 . -_:b83 _:b84 ; +_:b76 _:b11 ; . -_:b80 :fib ; - _:b85 . +_:b72 rule:premise _:b77 . -_:b85 _:b82 ; +_:b77 _:b78 ; . -_:b76 rule:evars ; - rule:premise ; - rule:uvars _:b86 . +_:b78 1 ; + _:b79 . -_:b86 _:b82 ; - _:b87 . +_:b79 :fibonacci ; + _:b80 . -_:b87 _:b84 ; +_:b80 _:b11 ; . -_:b88 a rule:BackwardRule ; - rule:conclusion _:b89 . +_:b81 a rule:QueryRule ; + rule:conclusion _:b82 . -_:b89 _:b90 ; +_:b82 _:b83 ; . -_:b90 _:b91 ; - _:b92 . - -_:b91 1 ; - _:b93 . +_:b83 283 ; + _:b84 . -_:b93 _:b82 ; - _:b94 . +_:b84 :fibonacci ; + _:b85 . -_:b94 _:b84 ; +_:b85 _:b11 ; . -_:b92 :fib ; - _:b95 . +_:b81 rule:premise _:b86 . -_:b95 _:b84 ; +_:b86 _:b87 ; . -_:b88 rule:evars ; - rule:premise ; - rule:uvars _:b96 . +_:b87 283 ; + _:b88 . -_:b96 _:b82 ; - _:b97 . +_:b88 :fibonacci ; + _:b89 . -_:b97 _:b84 ; +_:b89 _:b11 ; . -_:b98 a rule:BackwardRule ; - rule:conclusion _:b99 . +_:b90 a rule:BackwardRule ; + rule:conclusion _:b91 . -_:b99 _:b100 ; +_:b91 _:b92 ; . -_:b100 _:b101 ; - _:b102 . +_:b92 _:b93 ; + _:b94 . -_:b101 _:b3 ; - _:b103 . +_:b93 1 ; + _:b95 . -_:b103 _:b82 ; - _:b104 . +_:b95 _:b7 ; + _:b96 . -_:b104 _:b84 ; +_:b96 _:b9 ; . -_:b102 :fib ; - _:b105 . +_:b94 :fib ; + _:b97 . -_:b105 _:b6 ; +_:b97 _:b9 ; . -_:b98 rule:evars ; - rule:premise _:b106 . +_:b90 rule:premise . -_:b106 _:b107 ; - _:b108 . - -_:b107 _:b3 ; - _:b109 . - -_:b109 math:greaterThan ; - _:b110 . +_:b98 a rule:BackwardRule ; + rule:conclusion _:b99 . -_:b110 1 ; +_:b99 _:b100 ; . -_:b108 _:b111 ; - _:b112 . - -_:b111 _:b113 ; - _:b114 . +_:b100 _:b5 ; + _:b101 . -_:b113 _:b3 ; - _:b115 . +_:b101 :fibonacci ; + _:b102 . -_:b115 1 ; +_:b102 _:b11 ; . -_:b114 math:difference ; - _:b116 . +_:b98 rule:premise _:b103 . -_:b116 _:b117 ; +_:b103 _:b104 ; . -_:b112 _:b118 ; - _:b119 . +_:b104 _:b105 ; + _:b106 . -_:b118 _:b120 ; - _:b121 . +_:b105 _:b5 ; + _:b107 . -_:b120 _:b82 ; - _:b122 . +_:b107 0 ; + _:b108 . -_:b122 _:b84 ; +_:b108 1 ; . -_:b121 math:sum ; - _:b123 . +_:b106 :fib ; + _:b109 . -_:b123 _:b124 ; +_:b109 _:b11 ; . -_:b119 _:b125 ; - . +_:b110 a rule:QueryRule ; + rule:conclusion _:b111 . -_:b125 _:b126 ; - _:b127 . +_:b111 _:b112 ; + . -_:b126 _:b117 ; - _:b128 . +_:b112 91 ; + _:b113 . -_:b128 _:b84 ; - _:b129 . +_:b113 :fibonacci ; + _:b114 . -_:b129 _:b124 ; +_:b114 _:b11 ; . -_:b127 :fib ; - _:b130 . +_:b110 rule:premise _:b115 . -_:b130 _:b6 ; +_:b115 _:b116 ; . -_:b98 rule:uvars _:b131 . - -_:b131 _:b3 ; - _:b132 . - -_:b132 _:b6 ; - _:b133 . - -_:b133 _:b82 ; - _:b134 . - -_:b134 _:b84 ; - _:b135 . +_:b116 91 ; + _:b117 . -_:b135 _:b117 ; - _:b136 . +_:b117 :fibonacci ; + _:b118 . -_:b136 _:b124 ; +_:b118 _:b11 ; . diff --git a/legacy/fibonacci/fibonacci.ttl b/legacy/fibonacci/fibonacci.ttl index e61d9bf99..0ea415a83 100644 --- a/legacy/fibonacci/fibonacci.ttl +++ b/legacy/fibonacci/fibonacci.ttl @@ -4,8 +4,6 @@ # backward rules [] a rule:BackwardRule; - rule:uvars (_:X _:Y); - rule:evars (); rule:premise ( ((_:X 0 1) :fib _:Y) ); @@ -14,24 +12,18 @@ ). [] a rule:BackwardRule; - rule:uvars (_:A _:B); - rule:evars (); rule:premise (); rule:conclusion ( ((0 _:A _:B) :fib _:A) ). [] a rule:BackwardRule; - rule:uvars (_:A _:B); - rule:evars (); rule:premise (); rule:conclusion ( ((1 _:A _:B) :fib _:B) ). [] a rule:BackwardRule; - rule:uvars (_:X _:Y _:A _:B _:C _:D); - rule:evars (); rule:premise ( (_:X math:greaterThan 1) ((_:X 1) math:difference _:C) @@ -44,8 +36,6 @@ # queries [] a rule:QueryRule; - rule:uvars (_:Y); - rule:evars (); rule:premise ( (0 :fibonacci _:Y) ); @@ -54,8 +44,6 @@ ). [] a rule:QueryRule; - rule:uvars (_:Y); - rule:evars (); rule:premise ( (1 :fibonacci _:Y) ); @@ -64,8 +52,6 @@ ). [] a rule:QueryRule; - rule:uvars (_:Y); - rule:evars (); rule:premise ( (6 :fibonacci _:Y) ); @@ -74,8 +60,6 @@ ). [] a rule:QueryRule; - rule:uvars (_:Y); - rule:evars (); rule:premise ( (91 :fibonacci _:Y) ); @@ -84,8 +68,6 @@ ). [] a rule:QueryRule; - rule:uvars (_:Y); - rule:evars (); rule:premise ( (283 :fibonacci _:Y) ); @@ -94,8 +76,6 @@ ). [] a rule:QueryRule; - rule:uvars (_:Y); - rule:evars (); rule:premise ( (3674 :fibonacci _:Y) ); diff --git a/legacy/fibonacci/out/fibonacci.jsonld.ttl.out b/legacy/fibonacci/out/fibonacci.jsonld.ttl.out index 8208854bb..630d97c90 100644 --- a/legacy/fibonacci/out/fibonacci.jsonld.ttl.out +++ b/legacy/fibonacci/out/fibonacci.jsonld.ttl.out @@ -1,8 +1,8 @@ @prefix : . +6 :fibonacci 8 . 3674 :fibonacci 295872959797101479478634366815157108100573212705250690577871041398423606408217262643449728342664061812585639168722421830407677671667740585806703531229882783069925750619720511808616484846128237251921414441458265138672827487722512845223115526738192067144721087756159352711138340620702266509343657403678256247195010013499661223527119909308682062873140767135468966093474944529418214755911968500799987099146489838560114063096775586903976827512299123202488315139397181279903459556726060805948910609527571241968534269554079076649680403030083743420820438603816095671532163428933363322524736324029745871445486444623006627119156710782085648303485296149604974010598940800770684835758031137479033374229914629583184427269638360355586190323578625395157899987377625662075558684705457 . 0 :fibonacci 0 . -283 :fibonacci 62232491515607091882574410635924603070626544377175485625797 . 1 :fibonacci 1 . +283 :fibonacci 62232491515607091882574410635924603070626544377175485625797 . 91 :fibonacci 4660046610375530309 . -6 :fibonacci 8 . diff --git a/legacy/socrates/socrates.jsonld b/legacy/socrates/socrates.jsonld index 7c651d418..8c2c2e599 100644 --- a/legacy/socrates/socrates.jsonld +++ b/legacy/socrates/socrates.jsonld @@ -7,13 +7,13 @@ { "@list": [ { - "@id": "_:b9" + "@id": "_:b14" }, { "@id": "rdf:type" }, { - "@id": "_:b18" + "@id": "_:b9" } ] } @@ -24,48 +24,31 @@ { "@list": [ { - "@id": "_:b26" + "@id": "_:b2" }, { "@id": "rdfs:subClassOf" }, { - "@id": "_:b18" + "@id": "_:b9" } ] }, { "@list": [ { - "@id": "_:b9" + "@id": "_:b14" }, { "@id": "rdf:type" }, { - "@id": "_:b26" + "@id": "_:b2" } ] } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b26" - }, - { - "@id": "_:b18" - }, - { - "@id": "_:b9" - } - ] - }, "@type": "rule:ForwardRule" }, { @@ -75,7 +58,7 @@ { "@list": [ { - "@id": "_:b9" + "@id": "_:b14" }, { "@id": "rdf:type" @@ -92,7 +75,7 @@ { "@list": [ { - "@id": "_:b9" + "@id": "_:b14" }, { "@id": "rdf:type" @@ -104,17 +87,6 @@ } ] }, - "rule:evars": { - "@list": [ - ] - }, - "rule:uvars": { - "@list": [ - { - "@id": "_:b9" - } - ] - }, "@type": "rule:QueryRule" }, { diff --git a/legacy/socrates/socrates.jsonld.ttl b/legacy/socrates/socrates.jsonld.ttl index eb6af19df..b486b1753 100644 --- a/legacy/socrates/socrates.jsonld.ttl +++ b/legacy/socrates/socrates.jsonld.ttl @@ -22,8 +22,7 @@ _:b3 rdf:first rdf:type ; _:b4 rdf:first :Mortal ; rdf:rest rdf:nil . -:query1 rule:evars rdf:nil ; - rule:premise _:b5 . +:query1 rule:premise _:b5 . _:b5 rdf:first _:b6 ; rdf:rest rdf:nil . @@ -37,60 +36,43 @@ _:b7 rdf:first rdf:type ; _:b8 rdf:first :Mortal ; rdf:rest rdf:nil . -:query1 rule:uvars _:b9 . - -_:b9 rdf:first _:b2 ; - rdf:rest rdf:nil . - :rule1 rdf:type rule:ForwardRule ; - rule:conclusion _:b10 . + rule:conclusion _:b9 . -_:b10 rdf:first _:b11 ; +_:b9 rdf:first _:b10 ; rdf:rest rdf:nil . -_:b11 rdf:first _:b2 ; - rdf:rest _:b12 . +_:b10 rdf:first _:b2 ; + rdf:rest _:b11 . -_:b12 rdf:first rdf:type ; - rdf:rest _:b13 . +_:b11 rdf:first rdf:type ; + rdf:rest _:b12 . -_:b13 rdf:first _:b14 ; +_:b12 rdf:first _:b13 ; rdf:rest rdf:nil . -:rule1 rule:evars rdf:nil ; - rule:premise _:b15 . - -_:b15 rdf:first _:b16 ; - rdf:rest _:b17 . +:rule1 rule:premise _:b14 . -_:b16 rdf:first _:b18 ; - rdf:rest _:b19 . +_:b14 rdf:first _:b15 ; + rdf:rest _:b16 . -_:b19 rdf:first rdfs:subClassOf ; - rdf:rest _:b20 . +_:b15 rdf:first _:b17 ; + rdf:rest _:b18 . -_:b20 rdf:first _:b14 ; - rdf:rest rdf:nil . +_:b18 rdf:first rdfs:subClassOf ; + rdf:rest _:b19 . -_:b17 rdf:first _:b21 ; +_:b19 rdf:first _:b13 ; rdf:rest rdf:nil . -_:b21 rdf:first _:b2 ; - rdf:rest _:b22 . - -_:b22 rdf:first rdf:type ; - rdf:rest _:b23 . - -_:b23 rdf:first _:b18 ; +_:b16 rdf:first _:b20 ; rdf:rest rdf:nil . -:rule1 rule:uvars _:b24 . - -_:b24 rdf:first _:b18 ; - rdf:rest _:b25 . +_:b20 rdf:first _:b2 ; + rdf:rest _:b21 . -_:b25 rdf:first _:b14 ; - rdf:rest _:b26 . +_:b21 rdf:first rdf:type ; + rdf:rest _:b22 . -_:b26 rdf:first _:b2 ; +_:b22 rdf:first _:b17 ; rdf:rest rdf:nil . diff --git a/legacy/socrates/socrates.ttl b/legacy/socrates/socrates.ttl index 3f4647baf..914b66c89 100644 --- a/legacy/socrates/socrates.ttl +++ b/legacy/socrates/socrates.ttl @@ -10,8 +10,6 @@ # forward rule :rule1 a rule:ForwardRule; - rule:uvars (_:A _:B _:S); - rule:evars (); rule:premise ( (_:A rdfs:subClassOf _:B) (_:S rdf:type _:A) @@ -23,8 +21,6 @@ # query rule :query1 a rule:QueryRule; - rule:uvars (_:S); - rule:evars (); rule:premise ( (_:S rdf:type :Mortal) );