Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv29116/src/freenet/node/rt

Modified Files:
        StandardNodeEstimator.java 
Log Message:
The ngrt was already a member of StandardNodeEstimator

Index: StandardNodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimator.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -w -r1.52 -r1.53
--- StandardNodeEstimator.java  22 Nov 2003 19:41:04 -0000      1.52
+++ StandardNodeEstimator.java  25 Nov 2003 13:54:34 -0000      1.53
@@ -842,10 +842,6 @@
                        lowestHighestPair retval = new lowestHighestPair(); 
                        int htl = 10;
                        int size = 10000;
-                       RoutingTable rt = Main.origRT;
-                       if(!(rt instanceof NGRoutingTable))
-                               throw new IllegalStateException("Not using NGR");
-                       NGRoutingTable ngrt = (NGRoutingTable)rt;
                        double pLegitDNF = ngrt.getPLegitDNF();
                        //Prevent everyone from affecting the estimator while we 
iterate over different htls/sizes/...
                        //A change during the iteration makes the graphs look really 
strange.
@@ -919,12 +915,7 @@
                        g.val = new long[samples];
 
                        BigInteger at = BigInteger.ZERO;
-                       RoutingTable rt = Main.origRT;
-                       if(!(rt instanceof NGRoutingTable))
-                               throw new IllegalStateException("Not using NGR");
-                       NGRoutingTable ngrt = (NGRoutingTable)rt;
-                       double globalTime = ngrt.guessGlobal(new Key(Key.halfkeyspace),
-                                       size);
+                       double globalTime = ngrt.guessGlobal(new 
Key(Key.halfkeyspace), size);
                        for (int i = 0; i < samples; i++)
                        {
                                Key k =new Key(at);

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to