From 2ac766f7351738b14f86c69672674c7d57895f69 Mon Sep 17 00:00:00 2001 From: josd Date: Mon, 15 Jul 2024 11:20:41 +0200 Subject: [PATCH] using log:onNegativeQuestionSurface instead of log:onNegativeComponentSurface --- VERSION | 2 +- rdfsurfaces/complex/complex.s | 16 ++++++++-------- rdfsurfaces/dqc/sdcoding.s | 20 ++++++++++---------- rdfsurfaces/edt/edt.s | 2 +- rdfsurfaces/fibonacci/fibonacci.s | 8 ++++---- rdfsurfaces/peano/peano.s | 14 +++++++------- rdfsurfaces/pi/pi.s | 6 +++--- rdfsurfaces/turing/turing.s | 24 ++++++++++++------------ retina.pl | 20 ++++++++++---------- 9 files changed, 56 insertions(+), 56 deletions(-) diff --git a/VERSION b/VERSION index c8f1d09..e69889c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.5.4 +5.5.5 diff --git a/rdfsurfaces/complex/complex.s b/rdfsurfaces/complex/complex.s index a28c8ca..5d9934d 100644 --- a/rdfsurfaces/complex/complex.s +++ b/rdfsurfaces/complex/complex.s @@ -1,7 +1,7 @@ % exponentiation ''(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:R', '_:T', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10'], ( - ''([], + ''([], ''([['_:A', '_:B'], ['_:C', '_:D']], ['_:E', '_:F']) ), ''(['_:A', '_:B'], ['_:R', '_:T']), @@ -23,7 +23,7 @@ % asin ''(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10', '_:Z11', '_:Z12', '_:Z13', '_:Z14', '_:Z15'], ( - ''([], + ''([], ''(['_:A', '_:B'], ['_:C', '_:D']) ), ''([1, '_:A'], '_:Z1'), @@ -51,7 +51,7 @@ % acos ''(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:U', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10', '_:Z11', '_:Z12', '_:Z13', '_:Z14', '_:Z15'], ( - ''([], + ''([], ''(['_:A', '_:B'], ['_:C', '_:D']) ), ''([1, '_:A'], '_:Z1'), @@ -79,7 +79,7 @@ ''(['_:X', '_:Y', '_:R', '_:T', '_:Tp', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5'], ( - ''([], + ''([], ''(['_:X', '_:Y'], ['_:R', '_:Tp']) ), ''(['_:X', 2], '_:Z1'), @@ -95,7 +95,7 @@ ''(['_:X', '_:Y', '_:T', '_:Tp'], ( - ''([], + ''([], ''(['_:X', '_:Y', '_:T'], '_:Tp') ), ''('_:X', 0), @@ -106,7 +106,7 @@ ''(['_:X', '_:Y', '_:T', '_:Tp'], ( - ''([], + ''([], ''(['_:X', '_:Y', '_:T'], '_:Tp') ), ''('_:X', 0), @@ -117,7 +117,7 @@ ''(['_:X', '_:Y', '_:T', '_:Tp'], ( - ''([], + ''([], ''(['_:X', '_:Y', '_:T'], '_:Tp') ), ''('_:X', 0), @@ -128,7 +128,7 @@ ''(['_:X', '_:Y', '_:T', '_:Tp'], ( - ''([], + ''([], ''(['_:X', '_:Y', '_:T'], '_:Tp') ), ''('_:X', 0), diff --git a/rdfsurfaces/dqc/sdcoding.s b/rdfsurfaces/dqc/sdcoding.s index 50b3029..2e61a90 100644 --- a/rdfsurfaces/dqc/sdcoding.s +++ b/rdfsurfaces/dqc/sdcoding.s @@ -40,7 +40,7 @@ % KG ''(['_:X', '_:Y', '_:Z'], ( - ''([], + ''([], ''('_:X', '_:Y') ), ''('_:X', '_:Z'), @@ -51,7 +51,7 @@ % GK ''(['_:X', '_:Y', '_:Z'], ( - ''([], + ''([], ''('_:X', '_:Y') ), ''('_:X', '_:Z'), @@ -62,7 +62,7 @@ % Alice ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(0, ['_:X', '_:Y']) ), ''('_:X', '_:Y') @@ -71,7 +71,7 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(1, ['_:X', '_:Y']) ), ''('_:X', '_:Y') @@ -80,7 +80,7 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(2, ['_:X', '_:Y']) ), ''('_:X', '_:Y') @@ -89,7 +89,7 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(3, ['_:X', '_:Y']) ), ''('_:X', '_:Y') @@ -99,7 +99,7 @@ % Bob ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(['_:X', '_:Y'], 0) ), ''('_:X', '_:Y') @@ -108,7 +108,7 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(['_:X', '_:Y'], 1) ), ''('_:X', '_:Y') @@ -117,7 +117,7 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(['_:X', '_:Y'], 2) ), ''('_:X', '_:Y') @@ -126,7 +126,7 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''(['_:X', '_:Y'], 3) ), ''('_:X', '_:Y') diff --git a/rdfsurfaces/edt/edt.s b/rdfsurfaces/edt/edt.s index 681a1e1..276b796 100644 --- a/rdfsurfaces/edt/edt.s +++ b/rdfsurfaces/edt/edt.s @@ -400004,7 +400004,7 @@ ''(['_:A', '_:B', '_:C'], ( - ''([], + ''([], ''('_:A', '_:B') ), ''('_:C', '_:B'), diff --git a/rdfsurfaces/fibonacci/fibonacci.s b/rdfsurfaces/fibonacci/fibonacci.s index 127dca4..56a148f 100644 --- a/rdfsurfaces/fibonacci/fibonacci.s +++ b/rdfsurfaces/fibonacci/fibonacci.s @@ -1,6 +1,6 @@ ''(['_:X', '_:Y'], ( - ''([], + ''([], ''('_:X', '_:Y') ), ''(['_:X', 0, 1], '_:Y') @@ -9,7 +9,7 @@ ''(['_:A', '_:B'], ( - ''([], + ''([], ''([0, '_:A', '_:B'], '_:A') ) ) @@ -17,7 +17,7 @@ ''(['_:A', '_:B'], ( - ''([], + ''([], ''([1, '_:A', '_:B'], '_:B') ) ) @@ -25,7 +25,7 @@ ''(['_:A', '_:B', '_:C', '_:D', '_:X', '_:Y'], ( - ''([], + ''([], ''(['_:X', '_:A', '_:B'], '_:Y') ), ''('_:X', 1), diff --git a/rdfsurfaces/peano/peano.s b/rdfsurfaces/peano/peano.s index cc1946c..edff6de 100644 --- a/rdfsurfaces/peano/peano.s +++ b/rdfsurfaces/peano/peano.s @@ -3,7 +3,7 @@ % add ''(['_:A'], ( - ''([], + ''([], ''(['_:A', 0], '_:A') ) ) @@ -11,7 +11,7 @@ ''(['_:A', '_:B', '_:C'], ( - ''([], + ''([], ''(['_:A', ['', '_:B']], ['', '_:C']) ), ''(['_:A', '_:B'], '_:C') @@ -21,7 +21,7 @@ % multiply ''(['_:A'], ( - ''([], + ''([], ''(['_:A', 0], 0) ) ) @@ -29,7 +29,7 @@ ''(['_:A', '_:B', '_:C', '_:D'], ( - ''([], + ''([], ''(['_:A', ['', '_:B']], '_:C') ), ''(['_:A', '_:B'], '_:D'), @@ -40,7 +40,7 @@ % factorial ''(['_:A', '_:B'], ( - ''([], + ''([], ''('_:A', '_:B') ), ''(['_:A', ['', 0]], '_:B') @@ -49,7 +49,7 @@ ''(['_:A'], ( - ''([], + ''([], ''([0, '_:A'], '_:A') ) ) @@ -57,7 +57,7 @@ ''(['_:A', '_:B', '_:C', '_:D'], ( - ''([], + ''([], ''([['', '_:A'], '_:B'], '_:C') ), ''(['_:B', ['', '_:A']], '_:D'), diff --git a/rdfsurfaces/pi/pi.s b/rdfsurfaces/pi/pi.s index b1c1cd3..481bdd4 100644 --- a/rdfsurfaces/pi/pi.s +++ b/rdfsurfaces/pi/pi.s @@ -1,7 +1,7 @@ % Calculate pi using Nilakantha series ''(['_:N', '_:Pi', '_:P', '_:B'], ( - ''([], + ''([], ''(['_:N', '_:Pi'], true) ), ''([1, '_:N', 0, '_:P', 1], true), @@ -12,7 +12,7 @@ ''(['_:N', '_:P', '_:S'], ( - ''([], + ''([], ''(['_:N', '_:N', '_:P', '_:P', '_:S'], true) ) ) @@ -20,7 +20,7 @@ ''(['_:K', '_:N', '_:P0', '_:P', '_:S', '_:K1', '_:K2', '_:P1', '_:S1', '_:B2', '_:B3', '_:B4', '_:B5'], ( - ''([], + ''([], ''(['_:K', '_:N', '_:P0', '_:P', '_:S'], true) ), ''('_:K', '_:N'), diff --git a/rdfsurfaces/turing/turing.s b/rdfsurfaces/turing/turing.s index afac03b..7254694 100644 --- a/rdfsurfaces/turing/turing.s +++ b/rdfsurfaces/turing/turing.s @@ -3,7 +3,7 @@ % interpreter for Univeral Turing Machine ''(['_:OutTape', '_:Machine', '_:I'], ( - ''([], + ''([], ''([], '_:OutTape') ), ''('_:Machine', '_:I'), @@ -13,7 +13,7 @@ ''(['_:List', '_:OutTape', '_:Head', '_:Tail', '_:Machine', '_:I'], ( - ''([], + ''([], ''('_:List', '_:OutTape') ), ''('_:List', ['_:Head', '_:Tail']), @@ -24,7 +24,7 @@ ''(['_:State', '_:Left', '_:Cell', '_:Right', '_:OutTape', '_:Write', '_:Move', '_:Next', '_:A', '_:B', '_:C'], ( - ''([], + ''([], ''(['_:State', '_:Left', '_:Cell', '_:Right'], '_:OutTape') ), ''(['_:State', '_:Cell', '_:Write', '_:Move'], '_:Next'), @@ -35,7 +35,7 @@ ''(['_:Left', '_:Cell', '_:Right', '_:OutTape', '_:R', '_:List'], ( - ''([], + ''([], ''(['', '_:Left', '_:Cell', '_:Right'],'_:OutTape') ), ''('_:Left', '_:R'), @@ -46,7 +46,7 @@ ''(['_:State', '_:Left', '_:Cell', '_:Right', '_:OutTape'], ( - ''([], + ''([], ''(['_:State', '_:Left', '_:Cell', '_:Right'], '_:OutTape') ), ''(['_:State', '_:Left', '_:Cell', '_:Right'], '_:OutTape') @@ -55,7 +55,7 @@ ''(['_:Cell', '_:Right', '_:L'], ( - ''([], + ''([], ''(['', [], '_:Cell', '_:Right', [], #, '_:L'], true) ), ''('_:L', ['_:Cell', '_:Right']) @@ -64,7 +64,7 @@ ''(['_:List', '_:Cell', '_:Right', '_:Tail', '_:Head', '_:L'], ( - ''([], + ''([], ''(['', '_:List', '_:Cell', '_:Right', '_:Tail', '_:Head', '_:L'], true) ), ''('_:List', ['_:Head', '_:Tail']), @@ -74,7 +74,7 @@ ''(['_:Left', '_:Cell', '_:Right'], ( - ''([], + ''([], ''(['', '_:Left', '_:Cell', '_:Right', '_:Left', '_:Cell', '_:Right'], true) ) ) @@ -82,7 +82,7 @@ ''(['_:Left', '_:Cell', '_:L'], ( - ''([], + ''([], ''(['', '_:Left', '_:Cell', [], '_:L', #, []], true) ), ''('_:L', ['_:Cell', '_:Left']) @@ -91,7 +91,7 @@ ''(['_:Left', '_:Cell', '_:List', '_:L', '_:Head', '_:Tail'], ( - ''([], + ''([], ''(['', '_:Left', '_:Cell', '_:List', '_:L', '_:Head', '_:Tail'], true) ), ''('_:List', ['_:Head', '_:Tail']), @@ -101,7 +101,7 @@ ''([], ( - ''([], + ''([], ''([], []) ) ) @@ -109,7 +109,7 @@ ''(['_:List', '_:Reverse', '_:Head', '_:Tail', '_:R'], ( - ''([], + ''([], ''('_:List', '_:Reverse') ), ''('_:List', ['_:Head', '_:Tail']), diff --git a/retina.pl b/retina.pl index c508f1c..4d4e92b 100644 --- a/retina.pl +++ b/retina.pl @@ -23,10 +23,10 @@ :- dynamic(skolem/2). :- dynamic(uuid/2). :- dynamic(''/2). -:- dynamic(''/2). +:- dynamic(''/2). :- dynamic(''/2). -version_info('retina v5.5.4 (2024-07-04)'). +version_info('retina v5.5.5 (2024-07-15)'). % run run :- @@ -244,10 +244,10 @@ % TripleX % }.. % If TripleX is true, we can throw an inference fuse -implies((''(A, T), +implies((''(A, T), % test if the predicate is true (exists in the database) catch(call(T), _, false) - ), throw(inference_fuse(''(A, T), T))). + ), throw(inference_fuse(''(A, T), T))). % - simplify graffiti % Remove unused graffiti nodes. @@ -311,7 +311,7 @@ list_si(V), conj_list(G, L), list_to_set(L, B), - \+member(''(_, _), B), + \+member(''(_, _), B), \+member(''(_, _), B), findall(1, ( member(''(_, _), B) @@ -325,7 +325,7 @@ list_si(W), conj_list(F, K), list_to_set(K, N), - \+member(''(_, _), N), + \+member(''(_, _), N), \+member(''(_, _), N), length(N, 2), makevars(N, J, W), @@ -351,7 +351,7 @@ list_si(V), conj_list(G, L), list_to_set(L, B), - \+member(''(_, _), B), + \+member(''(_, _), B), \+member(''(_, _), B), select(''(Z, H), B, K), list_si(Z), @@ -369,7 +369,7 @@ conj_list(G, L), list_to_set(L, B), \+member(''(_, _), B), - \+member(''(_, _), B), + \+member(''(_, _), B), \+member(''(_, _), B), \+member(exopred(_, _, _), B), ( length(B, O), @@ -398,11 +398,11 @@ list_si(V), conj_list(G, L), list_to_set(L, B), - ( select(''([], T), B, K) + ( select(''([], T), B, K) ; select(''([], T), B, K), conj_list(T, [T]), \+member(''(_, _), K), - \+member(''(_, _), K), + \+member(''(_, _), K), \+member(''(_, _), K), findvars(T, Tv), findvars(K, Kv),