changes

diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 90fc680d3d67874a50ced69783e4ef7765674ad6..664b8062db68b6bf8c3e0d09a901380ad078c192 100644 (file)
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -366,8 +366,13 @@ update_network_size_estimate(struct GNUNET_NSE_FloodMessage *message)
           = htons (sizeof(struct GNUNET_NSE_ClientMessage));
       current_estimate_message.header.type
           = htons (GNUNET_MESSAGE_TYPE_NSE_ESTIMATE);
+#if AVERAGE_SQUARE
       current_estimate_message.size_estimate = average;
       current_estimate_message.std_deviation = std_dev;
+#else
+      current_estimate_message.size_estimate = pow(2, average);
+      current_estimate_message.std_deviation = pow(2, std_dev);
+#endif
       /* Finally, broadcast the current estimate to all clients */
 #if DEBUG_NSE
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 32f7a326200abd571f95074d062e58f8fa54a12e..cbb2382a7478817e67c08854a11ef1f3504685fc 100644 (file)
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -5,8 +5,9 @@ DEFAULTCONFIG = test_nse.conf
 [nse]
 PORT = 22353
 UNIXPATH = /tmp/test-nse-service-nse.unix
-BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
+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 = YES
 
@@ -38,7 +39,7 @@ AUTOSTART = YES
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 40
+NUM_PEERS = 20
 WEAKRANDOM = YES
 TOPOLOGY = CLIQUE
 F2F = NO