amalgame/commit
replace has_map by has_correspondence/2
| author | Jacco van Ossenbruggen |
|---|---|
| Tue Jul 19 18:46:54 2011 +0200 | |
| committer | Jacco van Ossenbruggen |
| Tue Jul 19 18:46:54 2011 +0200 | |
| commit | cf7286c093d3041e12381c177863711c1e0b94b5 |
| tree | 199b2b00b78df26c397fb84e445856fecf78c3c0 |
| parent | 74ddb63de5f73efa2517190c66075238755bf621 |
Diff style: patch stat
diff --git a/lib/ag_modules/ancestor_match.pl b/lib/ag_modules/ancestor_match.pl index f111a16..9a1f53a 100644 --- a/lib/ag_modules/ancestor_match.pl +++ b/lib/ag_modules/ancestor_match.pl @@ -60,7 +60,7 @@ match(align(S, T, Prov0), align(S, T, [Prov|Prov0]), Options) :- ancestor(S, MaxSteps, AncS, R1, _Steps1), ancestor(T, MaxSteps, AncT, R2, _Steps2), - has_map([AncS, AncT], _, Graph), + has_correspondence(align(AncS,AncT,_), Graph), Prov = [method(ancestor_match), graph([R1,R2]) ]. diff --git a/lib/ag_modules/descendent_match.pl b/lib/ag_modules/descendent_match.pl index ca4c395..4111e2b 100644 --- a/lib/ag_modules/descendent_match.pl +++ b/lib/ag_modules/descendent_match.pl @@ -58,7 +58,7 @@ match(align(S, T, Prov0), align(S, T, [Prov|Prov0]), Options) :- option(steps(MaxSteps), Options), descendent(S, MaxSteps, DescS, R1, _Steps1), descendent(T, MaxSteps, DescT, R2, _Steps2), - has_map([DescS, DescT],_, Graph), + has_correspondence(align(DescS, DescT,_), Graph), Prov = [method(descendent_match), graph([R1,R2]) ]. diff --git a/lib/ag_modules/related_match.pl b/lib/ag_modules/related_match.pl index a47931d..4d17975 100644 --- a/lib/ag_modules/related_match.pl +++ b/lib/ag_modules/related_match.pl @@ -60,7 +60,8 @@ match(align(S, T, Prov0), align(S, T, [Prov|Prov0]), Options) :- related(S, MaxSteps, AncS, R1, _Steps1), related(T, MaxSteps, AncT, R2, _Steps2), - has_map([AncS, AncT],_, O, Graph), + has_correspondence(align(AncS,AncT,P), Graph), + member(O,P), memberchk(relation(R), O), Prov = [method(related_match), graph([R1,R2,rdf(AncS,R,AncT)])