Bug 390195 move/renaming detected instead of addition/deletion

https://bugs.eclipse.org/bugs/show_bug.cgi?id=390195

Fix the detection of move/renaming by making sure we compute the max
distance only using attributes which have been set !

1 files changed, 6 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
index 973405b30..7cc024b66 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
@@ -367,7 +367,7 @@ public class EditionDistance implements DistanceFunction {
 				checkForDifferences(fakeMatch);

 				changes += getCounter().getComputedDistance();

 			}

-			// System.err.println(changes + ":max=>" + maxDistance + ":" + a + ":" + b);

+			System.err.println(changes + ":max=>" + maxDistance + ":" + a + ":" + b);

 			return changes;

 

 		}

@@ -434,10 +434,12 @@ public class EditionDistance implements DistanceFunction {
 			}

 		}

 		for (EAttribute feat : Iterables.filter(eObj.eClass().getEAllAttributes(), featureFilter)) {

-			max += getWeight(feat) * attributeChangeCoef;

+			if (eObj.eIsSet(feat)) {

+				max += getWeight(feat) * attributeChangeCoef;

+			}

 		}

-		max = max + locationChangeCoef * 5 - 1;

-		// System.out.println(eObj.eClass().getName() + ":" + eObj + ":" + max);

+		max = max + locationChangeCoef * 5 - 2;

+		System.out.println(eObj.eClass().getName() + ":" + eObj + ":" + max);

 		return max;

 	}

 }