[GNUnet-SVN] r33275 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2014-05-14 10:34:07 +0200 (Wed, 14 May 2014)
New Revision: 33275

Modified:
   gnunet/src/ats/ats.conf.in
   gnunet/src/ats/plugin_ats_mlp.c
   gnunet/src/ats/plugin_ats_proportional.c
   gnunet/src/ats/plugin_ats_ril.c
Log:
use cfg function in solvers


Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in  2014-05-14 08:17:46 UTC (rev 33274)
+++ gnunet/src/ats/ats.conf.in  2014-05-14 08:34:07 UTC (rev 33275)
@@ -34,12 +34,12 @@
 
 # Proportional specific settings
 # How proportional to preferences is bandwidth distribution in a network
-# 1: Fair with respect to addresses without preferences
-# > 100: The bigger, the more respect is payed to preferences 
-PROP_PROPORTIONALITY_FACTOR = 200
+# 1.0: Fair with respect to addresses without preferences
+# > 1.0: The bigger, the more respect is payed to preferences 
+PROP_PROPORTIONALITY_FACTOR = 2.00
 # Should we stick to existing connections are prefer to switch?
-# [100...200], lower value prefers to switch, bigger value is more tolerant
-PROP_STABILITY_FACTOR = 125
+# [1.0...2.0], lower value prefers to switch, bigger value is more tolerant
+PROP_STABILITY_FACTOR = 1.25
 
 # MLP specific settings
 # MLP defaults

Modified: gnunet/src/ats/plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/plugin_ats_mlp.c     2014-05-14 08:17:46 UTC (rev 33274)
+++ gnunet/src/ats/plugin_ats_mlp.c     2014-05-14 08:34:07 UTC (rev 33275)
@@ -2343,7 +2343,7 @@
     {
       mlp->pv.mip_gap = f_tmp;
       LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
-          "MIP gap", mlp->pv.mip_gap);
+          "MIP gap", f_tmp);
     }
   }
 
@@ -2360,7 +2360,7 @@
     {
       mlp->pv.lp_mip_gap = f_tmp;
       LOG (GNUNET_ERROR_TYPE_INFO, "Using %s gap of %.3f\n",
-          "LP/MIP", mlp->pv.lp_mip_gap);
+          "LP/MIP", f_tmp);
     }
   }
 
@@ -2392,7 +2392,7 @@
     {
       mlp->pv.co_D = f_tmp;
       LOG (GNUNET_ERROR_TYPE_INFO, "Using %s gap of %.3f\n",
-          "MLP_COEFFICIENT_D", mlp->pv.lp_mip_gap);
+          "MLP_COEFFICIENT_D", f_tmp);
     }
   }
 
@@ -2410,7 +2410,7 @@
     {
       mlp->pv.co_R = f_tmp;
       LOG (GNUNET_ERROR_TYPE_INFO, "Using %s gap of %.3f\n",
-          "MLP_COEFFICIENT_R", mlp->pv.lp_mip_gap);
+          "MLP_COEFFICIENT_R", f_tmp);
     }
   }
 
@@ -2429,7 +2429,7 @@
     {
       mlp->pv.co_U = f_tmp;
       LOG (GNUNET_ERROR_TYPE_INFO, "Using %s gap of %.3f\n",
-          "MLP_COEFFICIENT_U", mlp->pv.lp_mip_gap);
+          "MLP_COEFFICIENT_U", f_tmp);
     }
   }
 

Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c    2014-05-14 08:17:46 UTC (rev 
33274)
+++ gnunet/src/ats/plugin_ats_proportional.c    2014-05-14 08:34:07 UTC (rev 
33275)
@@ -408,8 +408,7 @@
   struct GAS_PROPORTIONAL_Handle *s;
   struct Network * cur;
   char * net_str[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
-  unsigned long long prop_factor;
-  unsigned long long stability_factor;
+  float f_tmp;
   int c;
 
   GNUNET_assert (NULL != env);
@@ -450,44 +449,40 @@
   s->addresses = env->addresses;
   s->requests = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
 
-  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number(s->env->cfg, 
"ats",
-      "PROP_STABILITY_FACTOR", &stability_factor))
+  s->stability_factor = PROP_STABILITY_FACTOR;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "PROP_STABILITY_FACTOR", &f_tmp))
   {
-    if ((stability_factor >= 100) && (stability_factor <= 200))
+    if ((f_tmp < 1.0) || (f_tmp > 2.0))
     {
-      s->stability_factor = ((double) stability_factor) / 100;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "PROP_STABILITY_FACTOR", f_tmp);
     }
     else
     {
-      GNUNET_break (0);
-      s->stability_factor = PROP_STABILITY_FACTOR;
+      s->stability_factor = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "PROP_STABILITY_FACTOR", f_tmp);
     }
   }
-  else
-  {
-    GNUNET_break (0);
-    s->stability_factor = PROP_STABILITY_FACTOR;
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "Using stability factor %.3f\n",
-      s->stability_factor);
 
-  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number(s->env->cfg, 
"ats",
-      "PROP_PROPORTIONALITY_FACTOR", &prop_factor))
+  s->prop_factor = PROPORTIONALITY_FACTOR;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "PROP_STABILITY_FACTOR", &f_tmp))
   {
-    if (prop_factor >= 100)
-      s->prop_factor = ((double) prop_factor) / 100;
+    if (f_tmp < 1.0)
+    {
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "PROP_PROPORTIONALITY_FACTOR", f_tmp);
+    }
     else
     {
-      GNUNET_break (0);
-      s->prop_factor = PROPORTIONALITY_FACTOR;
+      s->prop_factor = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "PROP_PROPORTIONALITY_FACTOR", f_tmp);
     }
   }
-  else
-    s->prop_factor = PROPORTIONALITY_FACTOR;
-  LOG (GNUNET_ERROR_TYPE_INFO, "Using proportionality factor %.3f\n",
-      s->prop_factor);
 
-
   for (c = 0; c < env->network_count; c++)
   {
     cur = &s->network_entries[c];

Modified: gnunet/src/ats/plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/plugin_ats_ril.c     2014-05-14 08:17:46 UTC (rev 33274)
+++ gnunet/src/ats/plugin_ats_ril.c     2014-05-14 08:34:07 UTC (rev 33275)
@@ -2160,6 +2160,7 @@
   struct RIL_Scope * cur;
   int c;
   char *string;
+  float f_tmp;
 
   LOG(GNUNET_ERROR_TYPE_DEBUG, "API_init() Initializing RIL solver\n");
 
@@ -2209,126 +2210,142 @@
     solver->parameters.select = RIL_DEFAULT_SELECT;
   }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_DISCOUNT_BETA", &string))
+
+  solver->parameters.beta = RIL_DEFAULT_DISCOUNT_BETA;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_DISCOUNT_BETA", &f_tmp))
   {
-    solver->parameters.beta = strtod (string, NULL);
-    GNUNET_free (string);
-    if (!(solver->parameters.beta > 0))
+    if (f_tmp < 0.0)
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_DISCOUNT_BETA not configured as 
positive number. Set to default value of %f instead.\n", 
RIL_DEFAULT_DISCOUNT_BETA);
-      solver->parameters.beta = RIL_DEFAULT_DISCOUNT_BETA;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_DISCOUNT_BETA", f_tmp);
     }
+    else
+    {
+      solver->parameters.beta = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_DISCOUNT_BETA", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.beta = RIL_DEFAULT_DISCOUNT_BETA;
-  }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_DISCOUNT_GAMMA", &string))
+  solver->parameters.gamma = RIL_DEFAULT_DISCOUNT_GAMMA;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_DISCOUNT_GAMMA", &f_tmp))
   {
-    solver->parameters.gamma = strtod (string, NULL);
-    GNUNET_free (string);
-    if (!(solver->parameters.gamma < 1) || (solver->parameters.gamma < 0))
+    if ((f_tmp < 0.0) || (f_tmp > 1.0))
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_DISCOUNT_GAMMA not configured in 
range [0,1[. Set to default value of %f instead.\n", 
RIL_DEFAULT_DISCOUNT_GAMMA);
-      solver->parameters.gamma = RIL_DEFAULT_DISCOUNT_GAMMA;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_DISCOUNT_GAMMA", f_tmp);
     }
+    else
+    {
+      solver->parameters.gamma = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_DISCOUNT_GAMMA", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.gamma = RIL_DEFAULT_DISCOUNT_GAMMA;
-  }
 
-  if (GNUNET_OK
-      == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_GRADIENT_STEP_SIZE", &string))
+  solver->parameters.alpha = RIL_DEFAULT_GRADIENT_STEP_SIZE;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_GRADIENT_STEP_SIZE", &f_tmp))
   {
-    solver->parameters.alpha = strtod (string, NULL);
-    GNUNET_free (string);
-    if (!(solver->parameters.alpha > 0) || solver->parameters.alpha > 1)
+    if ((f_tmp < 0.0) || (f_tmp > 0.0))
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_GRADIENT_STEP_SIZE not configured 
in range ]0,1]. Set to default value of %f instead.\n", 
RIL_DEFAULT_GRADIENT_STEP_SIZE);
-      solver->parameters.alpha = RIL_DEFAULT_GRADIENT_STEP_SIZE;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_GRADIENT_STEP_SIZE", f_tmp);
     }
+    else
+    {
+      solver->parameters.alpha = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_GRADIENT_STEP_SIZE", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.alpha = RIL_DEFAULT_GRADIENT_STEP_SIZE;
-  }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_TRACE_DECAY", &string))
+  solver->parameters.lambda = RIL_DEFAULT_TRACE_DECAY;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_TRACE_DECAY", &f_tmp))
   {
-    solver->parameters.lambda = strtod (string, NULL);
-    GNUNET_free (string);
-    if (solver->parameters.lambda < 0 || solver->parameters.lambda > 1)
+    if ((f_tmp < 0.0) || (f_tmp > 0.0))
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_TRACE_DECAY not configured in range 
[0,1]. Set to default value of %f instead.\n", RIL_DEFAULT_TRACE_DECAY);
-      solver->parameters.lambda = RIL_DEFAULT_TRACE_DECAY;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_TRACE_DECAY", f_tmp);
     }
+    else
+    {
+      solver->parameters.lambda = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_TRACE_DECAY", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.lambda = RIL_DEFAULT_TRACE_DECAY;
-  }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_EXPLORE_RATIO", &string))
+  solver->parameters.epsilon_init = RIL_DEFAULT_EXPLORE_RATIO;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_EXPLORE_RATIO", &f_tmp))
   {
-    solver->parameters.epsilon_init = strtod (string, NULL);
-    GNUNET_free (string);
-    if (solver->parameters.epsilon_init < 0 || solver->parameters.epsilon_init 
> 1)
+    if ((f_tmp < 0.0) || (f_tmp > 0.0))
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_EXPLORE_RATIO not configured in 
range [0,1]. Set to default value of %f instead.\n", RIL_DEFAULT_EXPLORE_RATIO);
-      solver->parameters.epsilon_init = RIL_DEFAULT_EXPLORE_RATIO;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_EXPLORE_RATIO", f_tmp);
     }
+    else
+    {
+      solver->parameters.epsilon_init = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_EXPLORE_RATIO", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.epsilon_init = RIL_DEFAULT_EXPLORE_RATIO;
-  }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_EXPLORE_DECAY", &string))
+  solver->parameters.epsilon_decay = RIL_DEFAULT_EXPLORE_DECAY;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_EXPLORE_DECAY", &f_tmp))
   {
-    solver->parameters.epsilon_decay = strtod (string, NULL);
-    GNUNET_free (string);
-    if (solver->parameters.epsilon_decay < 0 || 
solver->parameters.epsilon_decay > 1)
+    if ((f_tmp < 0.0) || (f_tmp > 0.0))
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_EXPLORE_RATIO not configured in 
range [0,1]. Set to default value of %f instead.\n", RIL_DEFAULT_EXPLORE_DECAY);
-      solver->parameters.epsilon_decay = RIL_DEFAULT_EXPLORE_DECAY;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_EXPLORE_DECAY", f_tmp);
     }
+    else
+    {
+      solver->parameters.epsilon_decay = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_EXPLORE_DECAY", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.epsilon_decay = RIL_DEFAULT_EXPLORE_DECAY;
-  }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_TEMPERATURE", &string))
+  solver->parameters.temperature_init = RIL_DEFAULT_TEMPERATURE;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_TEMPERATURE", &f_tmp))
   {
-    solver->parameters.temperature_init = strtod (string, NULL);
-    GNUNET_free (string);
-    if (solver->parameters.temperature_init <= 0)
+    if (f_tmp <= 0.0)
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_TEMPERATURE not positive. Set to 
default value of %f instead.\n", RIL_DEFAULT_TEMPERATURE);
-      solver->parameters.temperature_init = RIL_DEFAULT_TEMPERATURE;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_TEMPERATURE", f_tmp);
     }
+    else
+    {
+      solver->parameters.temperature_init = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_TEMPERATURE", f_tmp);
+    }
   }
-  else
-  {
-    solver->parameters.temperature_init = RIL_DEFAULT_TEMPERATURE;
-  }
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_TEMPERATURE_DECAY", &string))
+  solver->parameters.temperature_decay = RIL_DEFAULT_TEMPERATURE_DECAY;
+  if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
+      "RIL_TEMPERATURE_DECAY", &f_tmp))
   {
-    solver->parameters.temperature_decay = strtod (string, NULL);
-    GNUNET_free (string);
-    if (solver->parameters.temperature_decay <= 0 || 
solver->parameters.temperature_decay > 1)
+    if ((f_tmp <= 0.0) || solver->parameters.temperature_decay > 1)
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "RIL_TEMPERATURE_DECAY not in range 
[0,1]. Set to default value of %f instead.\n", RIL_DEFAULT_TEMPERATURE_DECAY);
-      solver->parameters.temperature_decay = RIL_DEFAULT_TEMPERATURE_DECAY;
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
+          "RIL_TEMPERATURE_DECAY", f_tmp);
     }
+    else
+    {
+      solver->parameters.temperature_decay = f_tmp;
+      LOG (GNUNET_ERROR_TYPE_INFO, "Using %s of %.3f\n",
+          "RIL_TEMPERATURE_DECAY", f_tmp);
+    }
   }
-  else
-  {
-  solver->parameters.temperature_decay = RIL_DEFAULT_TEMPERATURE_DECAY;
-  }
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg, "ats", 
"RIL_SIMULATE", &solver->simulate))
   {