Changeset 11999 in josm for trunk

Timestamp:

2017-04-25T03:18:09+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13387, see #11924 - allow a difference of 3500 ULPs for Java 9 ProjectionRegressionTest (due to Math.cos change of behaviour in JDK-8143353)

File:

• trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -180 +180 @@
         }
 
+        final boolean java9 = TestUtils.getJavaVersion() >= 9;
         for (TestData data : allData) {
             Projection proj = Projections.getProjectionByCode(data.code);
@@ -188 +189 @@
             EastNorth en = proj.latlon2eastNorth(data.ll);
             LatLon ll2 = proj.eastNorth2latlon(data.en);
-            if (TestUtils.getJavaVersion() >= 9) {
-                en = getRoundedToOsmPrecision(en.east(), en.north());
-                ll2 = ll2.getRoundedToOsmPrecision();
-                data.en = getRoundedToOsmPrecision(data.en.east(), data.en.north());
-                data.ll2 = data.ll2.getRoundedToOsmPrecision();
-            }
-            if (!en.equals(data.en)) {
+            boolean eqJava8 = !java9 && en.equals(data.en);
+            boolean eqJava9 = java9 && equalsJava9(en, data.en);
+            if (!eqJava8 && !eqJava9) {
                 String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
                         "        expected: eastnorth(%s,%s),%n" +
@@ -201 +198 @@
                 fail.append(error);
             }
-            if (!ll2.equals(data.ll2)) {
+            eqJava8 = !java9 && ll2.equals(data.ll2);
+            eqJava9 = java9 && equalsJava9(ll2, data.ll2);
+            if (!eqJava8 && !eqJava9) {
                 String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
                         "        expected: latlon(%s,%s),%n" +
@@ -215 +214 @@
         }
     }
+
+    private static boolean equalsDoubleMaxUlp(double d1, double d2) {
+        // Due to error accumulation in projection computation, the difference can reach thousands of ULPs
+        return Math.abs(d1 - d2) <= 3500 * Math.ulp(d1);
+    }
+
+    private static boolean equalsJava9(EastNorth en1, EastNorth en2) {
+        return equalsDoubleMaxUlp(en1.east(), en2.east()) &&
+               equalsDoubleMaxUlp(en1.north(), en2.north());
+    }
+
+    private static boolean equalsJava9(LatLon ll1, LatLon ll2) {
+        return equalsDoubleMaxUlp(ll1.lat(), ll2.lat()) &&
+               equalsDoubleMaxUlp(ll1.lon(), ll2.lon());
+    }
 }