Author: toad
Date: 2006-08-04 17:16:07 +0000 (Fri, 04 Aug 2006)
New Revision: 9885
Modified:
trunk/freenet/src/freenet/node/PeerManager.java
Log:
simpler distance function. seems correct to me; review is appreciated.
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2006-08-04 16:29:28 UTC
(rev 9884)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2006-08-04 17:16:07 UTC
(rev 9885)
@@ -378,11 +378,8 @@
*/
public static double distance(double a, double b) {
// Circular keyspace
- double dist;
- if (a > b) dist = a - b;
- else dist = b - a;
- if (dist > 0.5) dist = 1.0 - dist;
- return dist;
+ if (a > b) return Math.min (a - b, 1.0 - a + b);
+ else return Math.min (b - a, 1.0 - b + a);
}
/**
