Changeset 4573 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2011-11-03T23:23:34+01:00 (13 years ago)

Author:

Don-vip

Message:

see #7028 - improves GPX dragging performances by 50%, but the main issue is still here (rounding is exact, but 1000 times slower than before)

File:

• trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -12 +12 @@
 public class LatLonTest {
 
+    protected static final double[] sampleValues = new double[]{
+            -180.0, -179.9, -179.6, -179.5, -179.4, -179.1, -179.0, -100.0, -99.9, -10.0, -9.9, -1.0, -0.1,
+            180.0,  179.9,  179.6,  179.5,  179.4,  179.1,  179.0,  100.0,  99.9,  10.0,  9.9,  1.0,  0.1,
+            0.12, 0.123, 0.1234, 0.12345, 0.123456, 0.1234567,
+            1.12, 1.123, 1.1234, 1.12345, 1.123456, 1.1234567,
+            10.12, 10.123, 10.1234, 10.12345, 10.123456, 10.1234567,
+            100.12, 100.123, 100.1234, 100.12345, 100.123456, 100.1234567
+           };
+    
     @Test
     public void roundingTests() {
         
-        for (double value : new double[]{
-                -180.0, -179.9, -179.6, -179.5, -179.4, -179.1, -179.0, -100.0, -99.9, -10.0, -9.9, -1.0, -0.1,
-                 180.0,  179.9,  179.6,  179.5,  179.4,  179.1,  179.0,  100.0,  99.9,  10.0,  9.9,  1.0,  0.1,
-                 0.12, 0.123, 0.1234, 0.12345, 0.123456, 0.1234567,
-                 1.12, 1.123, 1.1234, 1.12345, 1.123456, 1.1234567,
-                 10.12, 10.123, 10.1234, 10.12345, 10.123456, 10.1234567,
-                 100.12, 100.123, 100.1234, 100.12345, 100.123456, 100.1234567
-                }) {
+        for (double value : sampleValues) {
             assertEquals(LatLon.roundToOsmPrecision(value), value, 0);
         }
@@ -40 +42 @@
         assertEquals(LatLon.roundToOsmPrecision(100.12345678),  100.1234568, 0);
         assertEquals(LatLon.roundToOsmPrecision(100.123456789), 100.1234568, 0);
+
+        assertEquals(LatLon.roundToOsmPrecision(100.00000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.0000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.00000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.0000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.00000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.000000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.0000000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.00000000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.000000000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.0000000000000000001),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(100.00000000000000000001),  100.0000000, 0);
+
+        assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.999999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.99999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.9999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.999999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.99999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.9999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.999999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.99999999),  100.0000000, 0);
+        assertEquals(LatLon.roundToOsmPrecision(99.9999999),  99.9999999, 0);
     }
 }