amalgame/commit

ADDED: source/target type evidence on most_labels

authorJacco van Ossenbruggen
Tue Aug 26 13:07:36 2014 +0200
committerJacco van Ossenbruggen
Tue Aug 26 13:07:36 2014 +0200
commitb79623e2f062c71efbfa98c13921c289c55a1d2d
treea0f35ad0d364009228072d1c4b15bfcf82eb75cf
parentcd48227a897b8e806a064fe6cda8b79de508df1c
Diff style: patch stat
diff --git a/lib/ag_modules/most_labels.pl b/lib/ag_modules/most_labels.pl
index 689a0a7..ba2de22 100644
--- a/lib/ag_modules/most_labels.pl
+++ b/lib/ag_modules/most_labels.pl
@@ -42,7 +42,7 @@ selecter(AlignmentGraph, Sel, Disc, Und, Options) :-
 partition_(_, [], [], [], []).
 partition_(source, [align(S,T,P)|At], Sel, Dis, Und) :-
 	same_target(At, T, Same, Rest),
-	(   most_labels([align(S,T,P)|Same], Selected, Discarded)
+	(   most_labels(source, [align(S,T,P)|Same], Selected, Discarded)
 	->  Sel = [Selected|SelRest],
 	    append(Discarded, DisRest, Dis),
 	    Und = UndRest
@@ -54,7 +54,7 @@ partition_(source, [align(S,T,P)|At], Sel, Dis, Und) :-
 
 partition_(target, [align(S,T,P)|As], Sel, Dis, Und) :-
 	same_source(As, S, Same, Rest),
-	(   most_labels([align(S,T,P)|Same], Selected, Discarded)
+	(   most_labels(target, [align(S,T,P)|Same], Selected, Discarded)
 	->  Sel = [Selected|SelRest],
 	    append(Discarded, DisRest, Dis),
 	    Und = UndRest
@@ -64,13 +64,13 @@ partition_(target, [align(S,T,P)|As], Sel, Dis, Und) :-
 	),
 	partition_(target, Rest, SelRest, DisRest, UndRest).
 
-ap(Result, Most, SecondMost, align(S,T,P), align(S,T,Pnew)) :-
+ap(Type, Result, Most, SecondMost, align(S,T,P), align(S,T,Pnew)) :-
 	append(P, [[method(most_labels),
-		    score([result(Result),
+		    score([result(Result), type(Type),
 			   most(Most),
 			   second(SecondMost)])]], Pnew).
 
-most_labels(As, Selected, Discarded) :-
+most_labels(Type, As, Selected, Discarded) :-
 	group_label_count(As, Counts),
 	!,
 	sort(Counts, Sorted),
@@ -78,8 +78,8 @@ most_labels(As, Selected, Discarded) :-
 	N1 > N2,
 	pairs_values(T0, T),
 	Discarded0 = [DA|T],
-	ap(selected, N1, N2, Selected0,  Selected),
-	maplist(ap(discarded, N1, N2), Discarded0, Discarded).
+	ap(Type, selected, N1, N2, Selected0,  Selected),
+	maplist(ap(Type, discarded, N1, N2), Discarded0, Discarded).
 
 group_label_count([],[]).
 group_label_count([Align|As], [Count-Align|Ts]) :-