[GNUnet-SVN] r18318 - gnunet/src/nse

[gnunet]

Author: bartpolot
Date: 2011-11-25 16:38:24 +0100 (Fri, 25 Nov 2011)
New Revision: 18318

Modified:
   gnunet/src/nse/gnunet-service-nse.c
   gnunet/src/nse/nse_profiler_test.conf
Log:
Use _weighted_ average of last estimations to calculate network size

Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-11-25 14:15:00 UTC (rev 18317)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-11-25 15:38:24 UTC (rev 18318)
@@ -305,7 +305,7 @@
   double variance;
   double val;
   double nsize;
-
+#define WEST 1
   /* Weighted incremental algorithm for stddev according to West (1979) */
 #if WEST
   double sumweight;
@@ -322,7 +322,7 @@
   {
     j = (estimate_index - i + HISTORY_SIZE) % HISTORY_SIZE;
     val = htonl (size_estimate_messages[j].matching_bits);
-    weight = 1.0;              /* was: estimate_count + 1 - i; */
+    weight = estimate_count + 1 - i;
 
     temp = weight + sumweight;
     q = val - mean;

Modified: gnunet/src/nse/nse_profiler_test.conf
===================================================================
--- gnunet/src/nse/nse_profiler_test.conf       2011-11-25 14:15:00 UTC (rev 
18317)
+++ gnunet/src/nse/nse_profiler_test.conf       2011-11-25 15:38:24 UTC (rev 
18318)
@@ -9,12 +9,12 @@
 #BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
 AUTOSTART = YES
-DEBUG = NO
+DEBUG = YES
 CONFIG = $DEFAULTCONFIG
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
-INTERVAL = 15 s
+INTERVAL = 30 s
 WORKBITS = 0
 PROOFFILE = $SERVICEHOME/nse.proof
 
@@ -69,18 +69,22 @@
 PORT = 0
 plugins = unix
 
+[chat]
+AUTOSTART = NO
+PORT = 0
+
 [testing]
-NUM_PEERS = 1000
+NUM_PEERS = 200
 WEAKRANDOM = YES
 TOPOLOGY = NONE
-CONNECT_TOPOLOGY = SMALL_WORLD_RING
-#CONNECT_TOPOLOGY = ERDOS_RENYI
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 20
+#CONNECT_TOPOLOGY = SMALL_WORLD_RING
+CONNECT_TOPOLOGY = ERDOS_RENYI
+CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
+CONNECT_TOPOLOGY_OPTION_MODIFIER = 5
 PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 60 s
+CONNECT_TIMEOUT = 360 s
 CONNECT_ATTEMPTS = 3
 #DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
@@ -105,6 +109,6 @@
 #ROUND3 = 100
 #ROUND2 = 500
 #ROUND3 = 1000
-WAIT_TIME = 120 s
+WAIT_TIME = 19200 s
 CONNECTION_LIMIT = 10