Merge branch 'probe-link-lengths' of github.com:bertm/fred-staging in…

…to next
hyphanet · May 26, 2014 · ba3543d · ba3543d
2 parents 57733db + 51c5552
commit ba3543d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/freenet/node/probe/Probe.java b/src/freenet/node/probe/Probe.java
@@ -14,6 +14,7 @@
 import freenet.io.comm.MessageFilter;
 import freenet.io.comm.NotConnectedException;
 import freenet.io.comm.PeerContext;
+import freenet.node.Location;
 import freenet.node.Node;
 import freenet.node.OpennetManager;
 import freenet.node.PeerNode;
@@ -636,10 +637,15 @@ private void respond(final Type type, final Listener listener) {
 			 * assumption that a change of 0.002 is enough to make it still useful for statistics but not
 			 * useful for identification, 0.002 change / 0.2 link length = 0.01 sigma.
 			 */
+			double myLoc = node.getLocation();
 			for (PeerNode peer : peers) {
-				linkLengths[i++] = (float)randomNoise(Math.min(Math.abs(peer.getLocation() - node.getLocation()),
-				                                         1.0 - Math.abs(peer.getLocation() - node.getLocation())), 0.01);
+				double peerLoc = peer.getLocation();
+				if (Location.isValid(peerLoc)) {
+					linkLengths[i++] = (float)randomNoise(Location.distance(myLoc, peerLoc), 0.01);
+				}
 			}
+			linkLengths = java.util.Arrays.copyOf(linkLengths, i);
+			java.util.Arrays.sort(linkLengths);
 			listener.onLinkLengths(linkLengths);
 			break;
 		case LOCATION: