[freenet-cvs] r17766 - trunk/freenet/src/freenet/node/simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-02-09 16:11:46 +0000 (Sat, 09 Feb 2008)
New Revision: 17766

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
Log:
Doh

Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java   
2008-02-09 16:08:10 UTC (rev 17765)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java   
2008-02-09 16:11:46 UTC (rev 17766)
@@ -94,7 +94,7 @@
             } catch (InterruptedException e) {
                 // Ignore
             }
-            for(int i=0;i<NUMBER_OF_NODES;i++) {
+            for(int i=0;i<nodes.length;i++) {
                System.err.println("Cycle "+cycleNumber+" node "+i+": 
"+nodes[i].getLocation());
             }
             int newSwaps = LocationManager.swaps;
@@ -121,10 +121,10 @@
                 } catch (InterruptedException e1) {
                 }
                 try {
-                Node randomNode = nodes[random.nextInt(NUMBER_OF_NODES)];
+                Node randomNode = nodes[random.nextInt(nodes.length)];
                 Node randomNode2 = randomNode;
                 while(randomNode2 == randomNode)
-                    randomNode2 = nodes[random.nextInt(NUMBER_OF_NODES)];
+                    randomNode2 = nodes[random.nextInt(nodes.length)];
                 Logger.normal(RealNodeRoutingTest.class, "Pinging 
"+randomNode2.getDarknetPortNumber()+" from 
"+randomNode.getDarknetPortNumber());
                 double loc2 = randomNode2.getLocation();
                 int hopsTaken = randomNode.routedPing(loc2);
@@ -150,7 +150,7 @@
                System.err.println();
                System.err.println("Reached "+(accuracy*100)+"% accuracy.");
                System.err.println();
-               System.err.println("Network size: "+NUMBER_OF_NODES);
+               System.err.println("Network size: "+nodes.length);
                System.err.println("Maximum HTL: "+MAX_HTL);
                System.err.println("Total started swaps: 
"+LocationManager.startedSwaps);
                 System.err.println("Total rejected swaps (already locked): 
"+LocationManager.swapsRejectedAlreadyLocked);