diff options
author | Stefan Dirix | 2015-08-27 11:52:24 +0000 |
---|---|---|
committer | Axel RICHARD | 2015-09-02 08:43:22 +0000 |
commit | 88d73ad228347f4d7790fb74c3b75990eec5d400 (patch) | |
tree | 2abbfa1309efa942a815d4a78f20f424deae8e5c /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/data/rootid/twoway/a5/left.nodes | |
parent | c1fc714f2410092dd77d6c1c225750aeb5227932 (diff) | |
download | org.eclipse.emf.compare-88d73ad228347f4d7790fb74c3b75990eec5d400.tar.gz org.eclipse.emf.compare-88d73ad228347f4d7790fb74c3b75990eec5d400.tar.xz org.eclipse.emf.compare-88d73ad228347f4d7790fb74c3b75990eec5d400.zip |
[475401] Modify RootIDMatchingStrategy to only return unique mappings
The RootIDMatchingStrategy determines matching between resources by
intersecting the IDs of their root objects. The RootIDMatchingStrategy
now checks if a possible mapping is unique and does therefore not
intersect with another possible mapping.
The previous behavior of returning the first possible mapping creates
"random" results, affected by the order the given iterators return their
resources. Since this strategy can not determine which is the "better"
mapping of multiple options it should not return any of them. This way
the remaining EMFCompareFramework is not confused by "half-true"
mappings.
Includes two-way testcases.
Bug: 475401
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: I2cb886d088d6ce27cbc06ec2958fc02ef9253d36
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/data/rootid/twoway/a5/left.nodes')
-rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/data/rootid/twoway/a5/left.nodes | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/data/rootid/twoway/a5/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/data/rootid/twoway/a5/left.nodes new file mode 100644 index 000000000..35c9bc1f2 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/data/rootid/twoway/a5/left.nodes @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes"> + <nodes:Node xmi:id="_a" name="a"/> + <nodes:Node xmi:id="_b" name="b"/> +</xmi:XMI>
\ No newline at end of file |