amalgame/commit
simplify ag_map:compare_align arguments
author | Jacco van Ossenbruggen |
---|---|
Wed May 15 09:25:32 2013 +0200 | |
committer | Jacco van Ossenbruggen |
Wed May 15 09:25:32 2013 +0200 | |
commit | a15672a039b1d14c25e064b5869f7c549c11a86f |
tree | 206af7c208e22fe342e37c14933b4bec92c81ecb |
parent | c10f6e0b76c39de7040816021305249cd8214b3d |
Diff style: patch stat
diff --git a/lib/ag_modules/arity_select.pl b/lib/ag_modules/arity_select.pl index 7f96bf3..5aa9920 100644 --- a/lib/ag_modules/arity_select.pl +++ b/lib/ag_modules/arity_select.pl @@ -58,7 +58,7 @@ select_n_1([align(S,T,P)|As], A1, A2) :- % mapped to only one source. select_1_n(Mapping, Sel, Dis) :- - predsort(ag_map:compare_align(targetplus), Mapping, TargetSorted), + predsort(ag_map:compare_align(target), Mapping, TargetSorted), select_1_n_(TargetSorted, Sel0, Dis0), sort(Sel0, Sel), sort(Dis0, Dis). diff --git a/lib/ag_modules/best_numeric.pl b/lib/ag_modules/best_numeric.pl index 98a046a..349517a 100644 --- a/lib/ag_modules/best_numeric.pl +++ b/lib/ag_modules/best_numeric.pl @@ -21,11 +21,11 @@ selecter(AlignmentGraph, Sel, Disc, Und, Options) :- option(type(SourceOrTarget), Options, target), ( SourceOrTarget = target -> partition_(SourceOrTarget, AlignmentGraph, Sel, Disc, Und) - ; predsort(ag_map:compare_align(targetplus), AlignmentGraph, SortedAlignmentGraph), + ; predsort(ag_map:compare_align(target), AlignmentGraph, SortedAlignmentGraph), partition_(SourceOrTarget, SortedAlignmentGraph, Sel0, Disc0, Und0), - predsort(ag_map:compare_align(sourceplus), Sel0, Sel), - predsort(ag_map:compare_align(sourceplus), Disc0, Disc), - predsort(ag_map:compare_align(sourceplus), Und0, Und) + predsort(ag_map:compare_align(source), Sel0, Sel), + predsort(ag_map:compare_align(source), Disc0, Disc), + predsort(ag_map:compare_align(source), Und0, Und) ). diff --git a/lib/ag_modules/most_generic.pl b/lib/ag_modules/most_generic.pl index ca16527..afbaffc 100644 --- a/lib/ag_modules/most_generic.pl +++ b/lib/ag_modules/most_generic.pl @@ -21,11 +21,11 @@ selecter(AlignmentGraph, Sel, Disc, Und, Options) :- option(type(SourceOrTarget), Options, target), ( SourceOrTarget = target -> partition_(SourceOrTarget, AlignmentGraph, Sel, Disc, Und) - ; predsort(ag_map:compare_align(targetplus), AlignmentGraph, SortedAlignmentGraph), + ; predsort(ag_map:compare_align(target), AlignmentGraph, SortedAlignmentGraph), partition_(SourceOrTarget, SortedAlignmentGraph, Sel0, Disc0, Und0), - predsort(ag_map:compare_align(sourceplus), Sel0, Sel), - predsort(ag_map:compare_align(sourceplus), Disc0, Disc), - predsort(ag_map:compare_align(sourceplus), Und0, Und) + predsort(ag_map:compare_align(source), Sel0, Sel), + predsort(ag_map:compare_align(source), Disc0, Disc), + predsort(ag_map:compare_align(source), Und0, Und) ). partition_(_, [], [], [], []). diff --git a/lib/ag_modules/most_labels.pl b/lib/ag_modules/most_labels.pl index 0a0e305..60ad4cd 100644 --- a/lib/ag_modules/most_labels.pl +++ b/lib/ag_modules/most_labels.pl @@ -22,11 +22,11 @@ selecter(AlignmentGraph, Sel, Disc, Und, Options) :- option(type(SourceOrTarget), Options, target), ( SourceOrTarget = target -> partition_(SourceOrTarget, AlignmentGraph, Sel, Disc, Und) - ; predsort(ag_map:compare_align(targetplus), AlignmentGraph, SortedAlignmentGraph), + ; predsort(ag_map:compare_align(target), AlignmentGraph, SortedAlignmentGraph), partition_(SourceOrTarget, SortedAlignmentGraph, Sel0, Disc0, Und0), - predsort(ag_map:compare_align(sourceplus), Sel0, Sel), - predsort(ag_map:compare_align(sourceplus), Disc0, Disc), - predsort(ag_map:compare_align(sourceplus), Und0, Und) + predsort(ag_map:compare_align(source), Sel0, Sel), + predsort(ag_map:compare_align(source), Disc0, Disc), + predsort(ag_map:compare_align(source), Und0, Und) ). diff --git a/lib/ag_modules/sibling_selecter.pl b/lib/ag_modules/sibling_selecter.pl index 023977f..805acb4 100644 --- a/lib/ag_modules/sibling_selecter.pl +++ b/lib/ag_modules/sibling_selecter.pl @@ -26,10 +26,10 @@ selecter(AlignmentGraph, Sel, [], Und, Options) :- option(type(SourceOrTarget), Options, source), ( SourceOrTarget = target -> partition_(SourceOrTarget, AlignmentGraph, Depth, Sel, Und) - ; predsort(ag_map:compare_align(targetplus), AlignmentGraph, SortedAlignmentGraph), + ; predsort(ag_map:compare_align(target), AlignmentGraph, SortedAlignmentGraph), partition_(SourceOrTarget, SortedAlignmentGraph, Depth, Sel0, Und0), - predsort(ag_map:compare_align(sourceplus), Sel0, Sel), - predsort(ag_map:compare_align(sourceplus), Und0, Und) + predsort(ag_map:compare_align(source), Sel0, Sel), + predsort(ag_map:compare_align(source), Und0, Und) ). diff --git a/lib/ag_modules/token_arity_select.pl b/lib/ag_modules/token_arity_select.pl index cf2b8c3..601e670 100644 --- a/lib/ag_modules/token_arity_select.pl +++ b/lib/ag_modules/token_arity_select.pl @@ -64,7 +64,7 @@ select_n_1([align(S,T,P)|As], A1, A2) :- % mapped to only one source. select_1_n(Mapping, Sel, Dis) :- - predsort(ag_map:compare_align(targetplus), Mapping, TargetSorted), + predsort(ag_map:compare_align(target), Mapping, TargetSorted), select_1_n_(TargetSorted, Sel0, Dis0), sort(Sel0, Sel), sort(Dis0, Dis). diff --git a/lib/ag_modules/voc_exclude.pl b/lib/ag_modules/voc_exclude.pl index fc517f6..0ed6394 100644 --- a/lib/ag_modules/voc_exclude.pl +++ b/lib/ag_modules/voc_exclude.pl @@ -61,15 +61,15 @@ concept_selecter(scheme(SourceVoc), Result, Options) :- concept_selecter(SourceAlignment, TargetAlignment, Options) :- option(exclude_sources(Exc), Options),!, voc_exclude(source, SourceAlignment, Exc, [], TargetAlignment0), - predsort(ag_map:compare_align(targetplus), TargetAlignment0, TargetAlignment). + predsort(ag_map:compare_align(target), TargetAlignment0, TargetAlignment). concept_selecter(SourceAlignment, TargetAlignment, Options) :- option(exclude_targets(Exc), Options),!, debug(align, 'Running target selector', []), - predsort(ag_map:compare_align(targetplus), SourceAlignment, SourceAlignmentSorted), - predsort(ag_map:compare_align(targetplus), Exc, ExcSorted), + predsort(ag_map:compare_align(target), SourceAlignment, SourceAlignmentSorted), + predsort(ag_map:compare_align(target), Exc, ExcSorted), voc_exclude(target, SourceAlignmentSorted, ExcSorted, [], TargetAlignment0), - predsort(ag_map:compare_align(targetplus), TargetAlignment0, TargetAlignment). + predsort(ag_map:compare_align(target), TargetAlignment0, TargetAlignment). voc_exclude(_Type, L, [], Accum, Result) :- !, append(Accum, L, Result). voc_exclude(_Type, [], _, Accum, Accum) :- !. diff --git a/lib/amalgame/map.pl b/lib/amalgame/map.pl index ac78d2a..2390e2d 100644 --- a/lib/amalgame/map.pl +++ b/lib/amalgame/map.pl @@ -269,18 +269,14 @@ prolog:message(map(occurs_min(Min, MappingList))) --> % compare alignment A1 and A2 on the standard order of the url of % their source or target concept, depending on Type. -compare_align(source, Order, align(S1,_,_), align(S2,_,_)) :- compare(Order, S1, S2). - -compare_align(target, Order, align(_,T1,_), align(_,T2,_)) :- compare(Order, T1, T2). - -compare_align(sourceplus, Order, align(S1,T1,P1), align(S2,T2,P2)) :- +compare_align(source, Order, align(S1,T1,P1), align(S2,T2,P2)) :- ( compare(FirstOrder, S1, S2), FirstOrder \== '=' -> FirstOrder = Order ; compare(SecondOrder, T1, T2), SecondOrder \== '=' -> SecondOrder = Order ; compare(Order, P1, P2) ). -compare_align(targetplus, Order, align(S1,T1,P1), align(S2,T2,P2)) :- +compare_align(target, Order, align(S1,T1,P1), align(S2,T2,P2)) :- ( compare(FirstOrder, T1, T2), FirstOrder \== '=' -> FirstOrder = Order ; compare(SecondOrder, S1, S2), SecondOrder \== '='