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

[gnunet]

Author: wachs
Date: 2014-06-27 13:53:24 +0200 (Fri, 27 Jun 2014)
New Revision: 33880

Modified:
   gnunet/src/ats/ats.conf.in
   gnunet/src/ats/plugin_ats_ril.c
Log:
clarify cfg loading


Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in  2014-06-27 10:27:11 UTC (rev 33879)
+++ gnunet/src/ats/ats.conf.in  2014-06-27 11:53:24 UTC (rev 33880)
@@ -79,7 +79,8 @@
 RIL_STEP_TIME_MIN = 500 ms
 RIL_STEP_TIME_MAX = 1000 ms
 
-RIL_ALGORITHM = Q
+# SARSA or Q-LEARNING
+RIL_ALGORITHM = Q-LEARNING
 RIL_DISCOUNT_BETA = 0.7
 RIL_GRADIENT_STEP_SIZE = 0.3
 RIL_TRACE_DECAY = 0.2

Modified: gnunet/src/ats/plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/plugin_ats_ril.c     2014-06-27 10:27:11 UTC (rev 33879)
+++ gnunet/src/ats/plugin_ats_ril.c     2014-06-27 11:53:24 UTC (rev 33880)
@@ -2681,7 +2681,16 @@
 
   if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_ALGORITHM", &string))
   {
-    solver->parameters.algorithm = !strcmp (string, "SARSA") ? RIL_ALGO_SARSA 
: RIL_ALGO_Q;
+    GNUNET_STRINGS_utf8_toupper (string, string);
+    if (0 == strcmp (string, "SARSA"))
+    {
+        solver->parameters.algorithm = RIL_ALGO_SARSA;
+    }
+    if (0 == strcmp (string, "Q-LEARNING"))
+    {
+        solver->parameters.algorithm = RIL_ALGO_Q;
+    }
+
     GNUNET_free (string);
   }
   else