amalgame/commit

FIXED: sort_align issues

diff --git a/lib/ag_modules/map_merger.pl b/lib/ag_modules/map_merger.pl
index 4529cec..621c2ec 100644
--- a/lib/ag_modules/map_merger.pl
+++ b/lib/ag_modules/map_merger.pl
@@ -10,7 +10,7 @@
 
 amalgame_module(amalgame:'MapMerger').
 
-%%      merge_mappings(+ListOfGraphs, -Merged)
+%%      merge_mappings(+ListOfGraphs, -Merged, +Options)
 %
 %       Merge alignment terms. The lists in ListOfGraphs are ordered.
 
diff --git a/lib/ag_modules/most_generic.pl b/lib/ag_modules/most_generic.pl
index 7e8e754..0afd5fd 100644
--- a/lib/ag_modules/most_generic.pl
+++ b/lib/ag_modules/most_generic.pl
@@ -25,11 +25,11 @@ selecter(Mapping, Sel, Disc, Und, Options) :-
 	option(most_least(Most), Options, most),
 	(   SourceOrTarget = target
 	->  partition_(SourceOrTarget, Most, Mapping, Sel, Disc, Und)
-	;   predsort(ag_map:compare_align(target), Mapping, TSorted),
+	;   sort_align(target, Mapping, TSorted),
 	    partition_(SourceOrTarget, Most, 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)
 	).
 
 method_name(most, most_generic).
@@ -130,3 +130,5 @@ hierarchy_related([A|As], L, source, Most, G0, G, [A2|Rest]) :-
 	hierarchy_related(As, L, source, Most, G1, G, Rest).
 
 
+
+
diff --git a/lib/ag_modules/sibling_selecter.pl b/lib/ag_modules/sibling_selecter.pl
index 5d911c9..716cf49 100644
--- a/lib/ag_modules/sibling_selecter.pl
+++ b/lib/ag_modules/sibling_selecter.pl
@@ -3,7 +3,6 @@
 :- use_module(library(apply)).
 :- use_module(library(lists)).
 :- use_module(library(option)).
-:- use_module(library(sort)).
 :- use_module(library(skos/util)).
 :- use_module(library(amalgame/map)).
 :- use_module(library(semweb/rdf_label)).
@@ -31,10 +30,10 @@ selecter(SSorted, Sel, [], Und, Options) :-
 	option(type(SourceOrTarget), Options, source),
 	(   SourceOrTarget = target
 	->  partition_(SourceOrTarget, SSorted, MaxDepth, Sel, Und)
-	;   predsort(ag_map:compare_align(target), SSorted, TSorted),
+	;   sort_align(target, SSorted, TSorted),
 	    partition_(SourceOrTarget, TSorted, MaxDepth, Sel0, Und0),
-	    predsort(ag_map:compare_align(source), Sel0,  Sel),
-	    predsort(ag_map:compare_align(source), Und0,  Und)
+	    sort_align(source, Sel0,  Sel),
+	    sort_align(source, Und0,  Und)
 	).
 ac(Result, Type, Length, align(S,T,P), align(S,T,Pnew)) :-
 	append(P, [[method(sibling_select),