amalgame/commit

REFACT: phase out voc_property

authorJacco van Ossenbruggen
Mon Sep 15 09:18:02 2014 +0200
committerJacco van Ossenbruggen
Mon Sep 15 09:18:02 2014 +0200
commitc7a99f8a27982f40188fdc07acb89b5469ffa7d7
tree39b576c3d16a2224107304f89b1d4c3c26ab1605
parent8172fd7d500484acba2c63af505a5279b8f44dd4
Diff style: patch stat
diff --git a/api/hints.pl b/api/hints.pl
index 70096d5..e8ca814 100644
--- a/api/hints.pl
+++ b/api/hints.pl
@@ -1,5 +1,6 @@
 :- module(ag_hints, []).
 
+:- use_module(library(option)).
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_parameters)).
 :- use_module(library(http/http_json)).
@@ -8,7 +9,6 @@
 :- use_module(library(semweb/rdf_label)).
 :- use_module(library(amalgame/ag_strategy)).
 :- use_module(library(amalgame/ag_stats)).
-:- use_module(library(amalgame/voc_stats)).
 :- use_module(library(amalgame/map)).
 
 :- http_handler(amalgame(data/hint), http_json_hint, []).
@@ -72,8 +72,10 @@ find_hint(Strategy, Context, Hint) :-
 	strategy_vocabulary(Strategy, Voc1),
 	strategy_vocabulary(Strategy, Voc2),
 	Voc1 \== Voc2,
-	voc_property(Voc1, totalCount(Count1)),
-	voc_property(Voc2, totalCount(Count2)),
+	node_stats(Strategy, Voc1, Voc1Stats, []),
+	node_stats(Strategy, Voc2, Voc2Stats, []),
+	option(totalCount(Count1), Voc1Stats),
+	option(totalCount(Count2), Voc2Stats),
 	(   Count1 < Count2
 	->  Source = Voc1, Target = Voc2
 	;   Source = Voc2, Target = Voc1