using graph:content and graph:isContentOf instead of graph:is

eyereasoner · Sep 7, 2024 · 82d4d78 · 82d4d78
1 parent 759f7d9
commit 82d4d78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.5
+1.5.0
diff --git a/lingua.pl b/lingua.pl
@@ -19,7 +19,7 @@
 :- use_module(library(semweb/turtle)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('lingua v1.4.5').
+version_info('lingua v1.5.0').
 
 help_info('Usage: lingua <options>* <data>*
 
@@ -76,7 +76,8 @@
 :- dynamic('<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'/2).
 :- dynamic('<http://www.w3.org/1999/02/22-rdf-syntax-ns#value>'/2).
 :- dynamic('<http://www.w3.org/2000/01/rdf-schema#subClassOf>'/2).
-:- dynamic('<http://www.w3.org/2000/10/swap/graph#is>'/2).
+:- dynamic('<http://www.w3.org/2000/10/swap/graph#content>'/2).
+:- dynamic('<http://www.w3.org/2000/10/swap/graph#isContentOf>'/2).
 :- dynamic('<http://www.w3.org/2000/10/swap/log#callWithCleanup>'/2).
 :- dynamic('<http://www.w3.org/2000/10/swap/log#collectAllIn>'/2).
 :- dynamic('<http://www.w3.org/2000/10/swap/log#explains>'/2).
@@ -733,16 +734,16 @@
 djiti_fact(':-'(A, B), ':-'(C, D)) :-
     !,
     makevars((A, B), (C, D), eta).
-djiti_fact('<http://www.w3.org/2000/10/swap/graph#is>'(G, T), graph(G, T)) :-
+djiti_fact('<http://www.w3.org/2000/10/swap/graph#content>'(A, B), graph(A, B)) :-
     !,
-    (   \+graphid(G)
-    ->  assertz(graphid(G))
+    (   \+graphid(A)
+    ->  assertz(graphid(A))
     ;   true
     ).
-djiti_fact('<http://www.w3.org/2000/10/swap/graph#is>'(G, T), graph(G, T)) :-
+djiti_fact('<http://www.w3.org/2000/10/swap/graph#isContentOf>'(A, B), graph(B, A)) :-
     !,
-    (   \+graphid(G)
-    ->  assertz(graphid(G))
+    (   \+graphid(B)
+    ->  assertz(graphid(B))
     ;   true
     ).
 djiti_fact('<http://www.w3.org/2000/10/swap/log#dcg>'(_, literal(A, type('<http://www.w3.org/2001/XMLSchema#string>'))), B) :-
@@ -1368,6 +1369,9 @@
         )
     ).
 
+'<http://www.w3.org/2000/10/swap/graph#content>'(A, B) :-
+    graph(A, B).
+
 '<http://www.w3.org/2000/10/swap/graph#difference>'(A, B) :-
     when(
         (   nonvar(A)
@@ -1385,8 +1389,8 @@
         )
     ).
 
-'<http://www.w3.org/2000/10/swap/graph#is>'(A, B) :-
-    graph(A, B).
+'<http://www.w3.org/2000/10/swap/graph#isContentOf>'(A, B) :-
+    graph(B, A).
 
 '<http://www.w3.org/2000/10/swap/graph#length>'(A, B) :-
     when(