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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-09 14:49:27 +0000 (Sat, 09 Feb 2008)
New Revision: 17752

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
Log:
Set up the locations "perfectly" to start with.

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java   
2008-02-09 14:34:30 UTC (rev 17751)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java   
2008-02-09 14:49:27 UTC (rev 17752)
@@ -109,8 +109,8 @@
         Logger.normal(RealNodeRoutingTest.class, "Created "+totalNodes+" 
nodes");

         // Now link them up
-        makeKleinbergNetwork(subnetA);
-               makeKleinbergNetwork(subnetB);
+        makeKleinbergNetwork(subnetA, true /* make it easy, we're not testing 
swapping here */);
+               makeKleinbergNetwork(subnetB, true /* make it easy, we're not 
testing swapping here */);

         Logger.normal(RealNodeRoutingTest.class, "Added small-world links, 
weakly connect the subnets");

@@ -259,9 +259,16 @@
        /*
         Borrowed from mrogers simulation code (February 6, 2008)
         */
-       static void makeKleinbergNetwork (Node[] nodes)
+       static void makeKleinbergNetwork (Node[] nodes, boolean idealLocations)
        {
+               // First set the locations up so we don't spend a long time 
swapping just to stabilise each network.
+               double div = 1.0 / (nodes.length + 1);
+               double loc = 0.0;
                for (int i=0; i<nodes.length; i++) {
+                       nodes[i].setLocation(loc);
+                       loc += div;
+               }
+               for (int i=0; i<nodes.length; i++) {
                        Node a = nodes[i];
                        // Normalise the probabilities
                        double norm = 0.0;