amalgame/commit

IMPROVED: memberchk/2 -> option/2 future dict compat ...

authorJacco van Ossenbruggen
Tue Aug 26 13:37:38 2014 +0200
committerJacco van Ossenbruggen
Tue Aug 26 13:37:38 2014 +0200
commitf561dc7e153d98d8c273a382315957cd7caf3a14
treec60210946b245493d4445a0ae53f37228e3ee4be
parent908cd7bea304254efbf4574f5e7f4128d62d83ff
Diff style: patch stat
diff --git a/lib/ag_modules/most_methods.pl b/lib/ag_modules/most_methods.pl
index 3c82e6a..7de0f0e 100644
--- a/lib/ag_modules/most_methods.pl
+++ b/lib/ag_modules/most_methods.pl
@@ -94,14 +94,20 @@ group_method_count([], []).
 group_method_count([Align|As], [Count-Align|Ts]) :-
 	Align = align(_,_,Provenance),
 	findall(M, (member(P,Provenance),
-		    positive_result(M,P)), Methods),
+		    positive_result(P,M)), Methods),
 	length(Methods, Count),
 	group_method_count(As, Ts).
 
-positive_result(Method, Evidence) :-
-	memberchk(method(Method), Evidence),
-	\+ ( memberchk(score(Score), Evidence),
-	     memberchk(result(Result), Score),
+%%	positive_result(+Ev, -Method) is semidet.
+%
+%	Evidence is a positive result if it has a defined Method and,
+%	if it has a score with a result, the result should be
+%	_selected_, not discarded or undecided.
+
+positive_result(Evidence, Method) :-
+	option(method(Method), Evidence),
+	\+ ( option(score(Score), Evidence),
+	     option(result(Result), Score),
 	     Result \= selected
 	   ).