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

[gnunet]

Author: nevans
Date: 2011-07-16 13:55:21 +0200 (Sat, 16 Jul 2011)
New Revision: 16029

Modified:
   gnunet/src/nse/gnunet-service-nse.c
   gnunet/src/nse/test_nse.conf
Log:
changes

Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-07-16 11:21:35 UTC (rev 16028)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-07-16 11:55:21 UTC (rev 16029)
@@ -366,8 +366,13 @@
           = 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,

Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf        2011-07-16 11:21:35 UTC (rev 16028)
+++ gnunet/src/nse/test_nse.conf        2011-07-16 11:55:21 UTC (rev 16029)
@@ -5,8 +5,9 @@
 [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 = NO
 
 [testing]
-NUM_PEERS = 40
+NUM_PEERS = 20
 WEAKRANDOM = YES
 TOPOLOGY = CLIQUE
 F2F = NO