cluster_search/commit

properly export rdf_inverse_property/2

authorJacco van Ossenbruggen
Fri May 3 10:01:39 2013 +0200
committerJacco van Ossenbruggen
Fri May 3 10:01:39 2013 +0200
commit2dd2aee50fe70c1bd407309e45054af182807839
treeacfcacccd80f9e2412e0b0ffa70dd466ae427121
parent9f2e1b622ab6e34443d92dcbe38e33240016d6b9
Diff style: patch stat
diff --git a/lib/cluster_search/rdf_direct_search.pl b/lib/cluster_search/rdf_direct_search.pl
index 57dea76..74a73c7 100644
--- a/lib/cluster_search/rdf_direct_search.pl
+++ b/lib/cluster_search/rdf_direct_search.pl
@@ -26,8 +26,6 @@
 	    rdf_literal_search/4 % +KeyWord, +TargetCond, -State, +Options
 	  ]).
 
-:- use_module(rdf_search).
-:- use_module(rdf_graph).
 :- use_module(library(record)).
 :- use_module(library(assoc)).
 :- use_module(library(url)).
@@ -38,6 +36,8 @@
 :- use_module(library(semweb/rdf_db)).
 :- use_module(library(semweb/rdfs)).
 :- use_module(filter).
+:- use_module(rdf_search).
+:- use_module(rdf_graph).
 
 /** <module> Direct metadata search on RDF graph
 
@@ -139,7 +139,7 @@ edge_i(O, S, P) :-
 	rdf(S, P, O).
 edge_i(O, S, P) :-
 	rdf(O, P0, S),
-	rdf_search:inverse_property(P, P0).
+	rdf_inverse_property(P, P0).
 
 %%	cond_predicate_weight(+Pred, +ExpandState, +Score, -Weight)
 %
diff --git a/lib/cluster_search/rdf_hierarchy_search.pl b/lib/cluster_search/rdf_hierarchy_search.pl
index b55bd70..18c55e7 100644
--- a/lib/cluster_search/rdf_hierarchy_search.pl
+++ b/lib/cluster_search/rdf_hierarchy_search.pl
@@ -25,9 +25,8 @@
 	  [ rdf_hierarchy_search/4	% +KeyWord, +TargetCond, -State, +Options
 	  ]).
 
-:- use_module(rdf_search).
-:- use_module(rdf_graph).
-:- use_module(kwd_search).
+:- use_module(library(semweb/rdf_db)).
+:- use_module(library(semweb/rdfs)).
 :- use_module(library(record)).
 :- use_module(library(assoc)).
 :- use_module(library(url)).
@@ -35,10 +34,11 @@
 :- use_module(library(lists)).
 :- use_module(library(debug)).
 :- use_module(library(option)).
-:- use_module(library('semweb/rdf_db')).
-:- use_module(library('semweb/rdfs')).
 :- use_module(filter).
 :- use_module(iface_util).
+:- use_module(rdf_search).
+:- use_module(rdf_graph).
+:- use_module(kwd_search).
 
 /** <module> Direct metadata and hierarchy search on RDF graph
 
@@ -88,7 +88,7 @@ edge_i(O, S, P) :-
 	rdf(S, P, O).
 edge_i(O, S, P) :-
 	rdf(O, P0, S),
-	rdf_search:inverse_property(P, P0).
+	rdf_inverse_property(P, P0).
 
 
 predicate_weight(P, 1) :-
diff --git a/lib/cluster_search/rdf_search.pl b/lib/cluster_search/rdf_search.pl
index 27b99bd..8acb102 100644
--- a/lib/cluster_search/rdf_search.pl
+++ b/lib/cluster_search/rdf_search.pl
@@ -28,7 +28,9 @@
 	    rdf_extend_search/1,	% !State
 	    rdf_prune_search/1,		% !State
 	    rdf_prune_search/2,		% !State, +Options
-	    rdf_search_property/2	% +Graph, ?Property
+	    rdf_search_property/2,	% +Graph, ?Property
+
+	    rdf_inverse_property/2
 	  ]).
 :- use_module(library(semweb/rdf_db)).
 :- use_module(library(semweb/rdfs)).
@@ -283,7 +285,7 @@ add_edges([H|T], Graph, Expand, State) :-
 add_edge(Link, O, State) :-
 	state_graph(State, Graph),
 	options_from_link(Link, S, P, Options, IF),
-	(   inverse_property(P, IP),
+	(   rdf_inverse_property(P, IP),
 	    (   IF == i			% Adding inverse property
 	    ->	search_graph_rdf(Graph, O, IP, S)
 	    ;   search_graph_rdf(Graph, S, IP, O)
@@ -296,15 +298,15 @@ add_edge(Link, O, State) :-
 options_from_link(i(S,P,W), S, P, [ weight(W), inverse(true) ], i).
 options_from_link(f(S,P,W), S, P, [ weight(W) ], f).
 
-%%	inverse_property(+P1, ?P2) is nondet.
+%%	rdf_inverse_property(+P1, ?P2) is nondet.
 %
 %	True if P1 and P2 are each others inverses.
 
-inverse_property(P1, P2) :-
+rdf_inverse_property(P1, P2) :-
 	rdf_has(P1, owl:inverseOf, P2).
-inverse_property(P1, P2) :-
+rdf_inverse_property(P1, P2) :-
 	rdf_has(P2, owl:inverseOf, P1).
-inverse_property(P, P) :-
+rdf_inverse_property(P, P) :-
 	rdf(P, rdf:type, owl:'SymmetricProperty').