Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2012-10-12 06:24:34 -0400
committerMikaël Barbero2012-10-12 06:24:34 -0400
commite18f179088f9ef6a043542f3264ed23c174a3712 (patch)
treea7003eaa3b1c0fcb50eabc7860517dad642d432d
parent908d828d09d75b2a46152034f3f184f8c38919b5 (diff)
parentec8eae3e8376d5c5c2889b19a1a9167608bd1a12 (diff)
downloadorg.eclipse.emf.compare-e18f179088f9ef6a043542f3264ed23c174a3712.tar.gz
org.eclipse.emf.compare-e18f179088f9ef6a043542f3264ed23c174a3712.tar.xz
org.eclipse.emf.compare-e18f179088f9ef6a043542f3264ed23c174a3712.zip
Merge branch 'master' into api_embellishmentapi_embellishment
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java2
1 files changed, 1 insertions, 1 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 78f79db6d..47a2fac07 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
@@ -480,7 +480,7 @@ public class EditionDistance implements DistanceFunction {
}
}
max = max + locationChangeCoef * 5;
- return max / 2;
+ return Double.valueOf(max / 3 * 2).intValue();
}
}

Back to the top