[GNUnet-SVN] r34955 - gnunet/src/rps

[gnunet]

Author: ch3
Date: 2015-01-22 20:35:50 +0100 (Thu, 22 Jan 2015)
New Revision: 34955

Modified:
   gnunet/src/rps/gnunet-service-rps.c
   gnunet/src/rps/test_rps.conf
Log:
don't read threshholds from .conf

Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2015-01-22 17:01:11 UTC (rev 34954)
+++ gnunet/src/rps/gnunet-service-rps.c 2015-01-22 19:35:50 UTC (rev 34955)
@@ -1571,28 +1571,7 @@
 
   alpha = 0.45;
   beta  = 0.45;
-  // TODO initialise thresholds - ?
 
-  /* Get alpha from the configuration */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_float (cfg, "RPS",
-                                                         "ALPHA",
-                                                         &alpha))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "No ALPHA specified in the config\n");
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "ALPHA is %f\n", alpha);
- 
-  /* Get beta from the configuration */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_float (cfg, "RPS",
-                                                         "BETA",
-                                                         &beta))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "No BETA specified in the config\n");
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "BETA is %f\n", beta);
-
-  // TODO check that alpha + beta < 1
-
   peer_map = GNUNET_CONTAINER_multipeermap_create (sampler_size_est_need, 
GNUNET_NO);
 
 

Modified: gnunet/src/rps/test_rps.conf
===================================================================
--- gnunet/src/rps/test_rps.conf        2015-01-22 17:01:11 UTC (rev 34954)
+++ gnunet/src/rps/test_rps.conf        2015-01-22 19:35:50 UTC (rev 34955)
@@ -17,9 +17,6 @@
 # So, 50 is enough for a network of size 50^3 = 125000
 INITSIZE = 4
 
-ALPHA = 0.45
-BETA  = 0.45
-
 [testbed]
 HOSTNAME = localhost