amalgame/commit

REFACT: phase out voc_property

authorJacco van Ossenbruggen
Mon Sep 15 09:13:48 2014 +0200
committerJacco van Ossenbruggen
Mon Sep 15 09:13:48 2014 +0200
commita814219efd303fe152070e91f9f97bce9eb9db01
tree6dfe3da342cfb6b2343570a65787bff8d923b92c
parent1f03fc035731534a0e74756960d8668090f0e0de
Diff style: patch stat
diff --git a/lib/amalgame/ag_strategy.pl b/lib/amalgame/ag_strategy.pl
index e820c28..aa09507 100644
--- a/lib/amalgame/ag_strategy.pl
+++ b/lib/amalgame/ag_strategy.pl
@@ -25,7 +25,7 @@
 :- use_module(library(amalgame/util)).
 :- use_module(library(amalgame/map)).
 :- use_module(library(amalgame/ag_provenance)).
-:- use_module(library(amalgame/voc_stats)).
+:- use_module(library(amalgame/ag_stats)).
 
 
 :- rdf_meta
@@ -81,12 +81,13 @@ strategy_vocabularies(Strategy, Schemes) :-
 
 strategy_languages(Strategy, Languages) :-
 	strategy_vocabularies(Strategy, Vocs),
-	maplist(lang_used, Vocs, Langs),
+	maplist(lang_used(Strategy), Vocs, Langs),
 	append(Langs, Languages0),
 	sort(Languages0, Languages).
 
-lang_used(Voc, Langs) :-
-	voc_property(Voc, languages(Langs)).
+lang_used(Strategy, Voc, Langs) :-
+	node_stats(Strategy, Voc, Stats, []),
+	option(languages(Langs), Stats).
 
 %%	strategy_add_vocabulary(+Strategy, +Vocabulary) is det.
 %