Changeset 10915 in josm for trunk/src

Timestamp:

2016-08-29T18:21:41+02:00 (9 years ago)

Author:

michael2402

Message:

Trim interpolate in EastNorth/LatLon for performance and add comment explaining it. Added unit tests.

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• EastNorth.java (modified) (2 diffs)
• LatLon.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -82 +82 @@
      */
     public EastNorth interpolate(EastNorth en2, double proportion) {
-        return new EastNorth(this.x + proportion * (en2.x - this.x),
-                this.y + proportion * (en2.y - this.y));
+        // this is an alternate form of this.x + proportion * (en2.x - this.x) that is slightly faster
+        return new EastNorth((1 - proportion) * this.x + proportion * en2.x,
+                (1 - proportion) * this.y + proportion * en2.y);
     }
 
@@ -92 +93 @@
      */
     public EastNorth getCenter(EastNorth en2) {
-        return new EastNorth((this.x + en2.x)/2.0, (this.y + en2.y)/2.0);
+        // The JIT will inline this for us, it is as fast as the normal /2 approach
+        return interpolate(en2, .5);
     }
 

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -427 +427 @@
      */
     public LatLon interpolate(LatLon ll2, double proportion) {
-        return new LatLon(this.lat() + proportion * (ll2.lat() - this.lat()),
-                this.lon() + proportion * (ll2.lon() - this.lon()));
+        // this is an alternate form of this.lat() + proportion * (ll2.lat() - this.lat()) that is slightly faster
+        return new LatLon((1 - proportion) * this.lat() + proportion * ll2.lat(),
+                (1 - proportion) * this.lon() + proportion * ll2.lon());
     }
 
@@ -437 +438 @@
      */
     public LatLon getCenter(LatLon ll2) {
+        // The JIT will inline this for us, it is as fast as the normal /2 approach
         return interpolate(ll2, .5);
     }