amalgame/commit

FIXED: last compare_align sorting issues

diff --git a/lib/ag_modules/most_labels.pl b/lib/ag_modules/most_labels.pl
index 4b8766a..d010d6e 100644
--- a/lib/ag_modules/most_labels.pl
+++ b/lib/ag_modules/most_labels.pl
@@ -24,11 +24,11 @@ selecter(Mapping, Sel, Disc, Und, Options) :-
 	option(type(SourceOrTarget), Options, target),
 	(   SourceOrTarget = target
 	->  partition_(SourceOrTarget, Mapping, Sel, Disc, Und)
-	;   predsort(ag_map:compare_align(target), Mapping, TSorted),
+	;   sort_align(target, Mapping, TSorted),
 	    partition_(SourceOrTarget, TSorted, Sel0, Disc0, Und0),
-	    predsort(ag_map:compare_align(source), Sel0,  Sel),
-	    predsort(ag_map:compare_align(source), Disc0, Disc),
-	    predsort(ag_map:compare_align(source), Und0,  Und)
+	    sort_align(source, Sel0,  Sel),
+	    sort_align(source, Disc0, Disc),
+	    sort_align(source, Und0,  Und)
 	).
 
 %%	partition(+Input, -Output, +Options)
diff --git a/lib/ag_modules/structure_selecter.pl b/lib/ag_modules/structure_selecter.pl
index ce78a0c..7b0f746 100644
--- a/lib/ag_modules/structure_selecter.pl
+++ b/lib/ag_modules/structure_selecter.pl
@@ -11,7 +11,6 @@
 :- use_module(library(lists)).
 :- use_module(library(option)).
 :- use_module(library(pairs)).
-:- use_module(library(sort)).
 
 :- use_module(library(amalgame/map)).
 
@@ -25,11 +24,11 @@ selecter(Matcher, In, Sel, Dis, Und, Options) :-
 	ord_list_to_assoc(Deduped, BackgroundMatches),
 	(   SourceOrTarget \= source
 	->  selecter_(SourceOrTarget, Matcher, In, BackgroundMatches, Sel, Dis, Und, Options)
-	;   predsort(ag_map:compare_align(target), In, InT),
+	;   sort_align(target, In, InT),
 	    selecter_(SourceOrTarget, Matcher, InT, BackgroundMatches, Sel0, Dis0, Und0, Options),
-	    predsort(ag_map:compare_align(source), Sel0,  Sel),
-	    predsort(ag_map:compare_align(source), Dis0,  Dis),
-	    predsort(ag_map:compare_align(source), Und0,  Und)
+	    sort_align(source, Sel0,  Sel),
+	    sort_align(source, Dis0,  Dis),
+	    sort_align(source, Und0,  Und)
 	).
 
 selecter_(_, _, [], _, [], [], [], _).