amalgame/commit

REMOVED: old filter mode for preloaded

diff --git a/config-available/ag_modules.pl b/config-available/ag_modules.pl
index 4e0c03b..309e5e4 100644
--- a/config-available/ag_modules.pl
+++ b/config-available/ag_modules.pl
@@ -6,43 +6,39 @@
 :- use_module(library(ag_modules/descendent_generator)).
 :- use_module(library(ag_modules/exact_label_generator)).
 :- use_module(library(ag_modules/isub_generator)).
+:- use_module(library(ag_modules/preloaded_mapping)).
 :- use_module(library(ag_modules/related_generator)).
 :- use_module(library(ag_modules/snowball_label_generator)).
 
-% Mapping producing partitioners:
+% Mapping producing partitioners, based on the generators above:
 :- use_module(library(ag_modules/ancestor_selecter)).
 :- use_module(library(ag_modules/compound_label_selecter)).
 :- use_module(library(ag_modules/descendent_selecter)).
 :- use_module(library(ag_modules/exact_label_selecter)).
 :- use_module(library(ag_modules/isub_selecter)).
+:- use_module(library(ag_modules/preloaded_selecter)).
 :- use_module(library(ag_modules/related_selecter)).
 :- use_module(library(ag_modules/snowball_label_selecter)).
 
-% Vocabulary filters/selecters
-:- use_module(library(ag_modules/voc_exclude)).
-:- use_module(library(ag_modules/subtree_select)).
-:- use_module(library(ag_modules/type_select)).
-:- use_module(library(ag_modules/propvalue_select)).
-
-% Modules that can be used as matchers
-:- use_module(library(ag_modules/preloaded_mapping)).
-
-% Alignment filters/selecters
+% Other mapping producing partitioners
 :- use_module(library(ag_modules/arity_select)).
 :- use_module(library(ag_modules/ag_sample)).
-:- use_module(library(ag_modules/token_arity_select)).
 :- use_module(library(ag_modules/best_numeric)).
 :- use_module(library(ag_modules/most_methods)).
 :- use_module(library(ag_modules/most_labels)).
 :- use_module(library(ag_modules/most_generic)).
 :- use_module(library(ag_modules/sibling_selecter)).
-:- use_module(library(ag_modules/preloaded_selecter)).
-
+:- use_module(library(ag_modules/token_arity_select)).
 
+% Vocabulary partitioners:
+:- use_module(library(ag_modules/voc_exclude)).
+:- use_module(library(ag_modules/subtree_select)).
+:- use_module(library(ag_modules/type_select)).
+:- use_module(library(ag_modules/propvalue_select)).
 
-% Mergers
+% MultiInput
 :- use_module(library(ag_modules/map_merger)).
-
-% Analyzers
 :- use_module(library(ag_modules/ag_overlap)).
-% :- use_module(library(ag_modules/evaluate)).
+
+
+
diff --git a/lib/ag_modules/preloaded_mapping.pl b/lib/ag_modules/preloaded_mapping.pl
index b589efa..8a5dde8 100644
--- a/lib/ag_modules/preloaded_mapping.pl
+++ b/lib/ag_modules/preloaded_mapping.pl
@@ -7,7 +7,6 @@
 
 :- public amalgame_module/1.
 :- public matcher/4.
-:- public filter/3.
 :- public parameter/4.
 
 amalgame_module(amalgame:'SelectPreLoaded').
@@ -28,20 +27,6 @@ matcher(Source, Target, Mapping, Options) :-
 		Mapping0),
 	sort(Mapping0, Mapping).
 
-filter(In, Out, Options) :-
-	option(name(Graph), Options),
-	filter_(Graph, In, Out).
-
-filter_(_Graph, [], []).
-filter_(Graph, [Hin|Tin], Out) :-
-	Hin = align(S,T,P),
-	(   has_correspondence(align(S, T, PGraph), Graph)
-	->  append(PGraph, P, Pmerged),
-	    Out = [ align(S, T, Pmerged) | Tout]
-	;   Out = Tout
-	),
-	filter_(Graph, Tin, Tout).
-
 c_from_graph(align(S,T,P), Source, Target, Graph) :-
 	has_correspondence(align(S,T,P), Graph),
 	vocab_member(S, Source),