Use _weighted_ average of last estimations to calculate network size

2 files changed, 15 insertions, 11 deletions

diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 33ec51f03..6e866f82c 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -305,7 +305,7 @@ setup_estimate_message (struct GNUNET_NSE_ClientMessage *em)
   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 @@ setup_estimate_message (struct GNUNET_NSE_ClientMessage *em)
   {
     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;
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 2f97a2c09..b9d4fe183 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -9,12 +9,12 @@ BINARY = gnunet-service-nse
 #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 @@ AUTOSTART = NO
 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 @@ TOPOLOGY_OUTPUT_FILE = nse_topo_100_peers
 #ROUND3 = 100
 #ROUND2 = 500
 #ROUND3 = 1000
-WAIT_TIME = 120 s
+WAIT_TIME = 19200 s
 CONNECTION_LIMIT = 10