amalgame/commit

WIP: remove experimental label stats from mapping

authorJacco van Ossenbruggen
Mon May 11 12:37:24 2015 +0200
committerJacco van Ossenbruggen
Mon May 11 12:37:24 2015 +0200
commite3faefc6b38f30c717e16667376a83ad61b63e5a
tree4be6d329faaa7a4525151a4c9a8ca4f2851b64a0
parent8b006a2afc2824104f1eb02586a4668af0695250
Diff style: patch stat
diff --git a/api/node_info.pl b/api/node_info.pl
index 70cbfff..d2b881a 100644
--- a/api/node_info.pl
+++ b/api/node_info.pl
@@ -18,6 +18,7 @@
 :- use_module(library(amalgame/amalgame_modules)).
 :- use_module(library(amalgame/ag_strategy)).
 :- use_module(library(amalgame/ag_stats)).
+:- use_module(library(amalgame/scheme_stats)).
 :- use_module(library(amalgame/util)).
 :- use_module(components(label)). % we need rdf_link//1 from this module
 
@@ -186,16 +187,8 @@ amalgame_info(URL, Strategy, Stats) :-
 	->  true
 	;   ReferenceStats = []
 	),
+	PSstats = [], PTstats = [],
 
-	(   option(vocs(Vocs), MStats),
-	    option(source(SScheme), Vocs), option(stats(SStats),SScheme),
-	    option(target(TScheme), Vocs), option(stats(TStats),TScheme),
-	    option(properties(SProps), SStats), option(totalCount(STotal), SStats),
-	    option(properties(TProps), TStats), option(totalCount(TTotal), TStats)
-	->  label_property_stats(SProps, PSstats, [totalCount(STotal)]),
-	    label_property_stats(TProps, PTstats, [totalCount(TTotal)])
-	;   PSstats = [], PTstats=[]
-	),
 	append([
 	    BasicStats,
 	    IpStats,
@@ -235,7 +228,8 @@ amalgame_info(Scheme, Strategy, Stats) :-
 	;   Virtual = materialized,
 	    findall(Top, skos_top_concept(Scheme, Top), Tops),
 	    length(Tops, NrDeclaredTops),
-	    DTops = ['# declared top concepts:'  - span('~d (~1f%)'-[NrDeclaredTops, (100*NrDeclaredTops/NrTopConcepts)])]
+	    DTops = ['# declared top concepts:'  -
+		     span('~d (~1f%)'-[NrDeclaredTops, (100*NrDeclaredTops/NrTopConcepts)])]
 	),
 	label_property_stats(PDict, PStats, [totalCount(Total)]),
 	depth_stats(DDict, DStats),
@@ -255,7 +249,6 @@ amalgame_info(URL, Strategy,
 	),
 	append([Definition, Input],Optional).
 
-
 label_property_stats(Dict, Stats, Options) :-
 	findall(\rdf_link(Property)-set(Values),
 		label_property_stat(Dict, Property, Values, Options),