From 3b912c2e25b4779672cc29b2b10923fcfa993b3c Mon Sep 17 00:00:00 2001
From: Matthias Wachs <wachs@net.in.tum.de>
Date: Fri, 27 Jun 2014 11:53:24 +0000
Subject: clarify cfg loading

---
 src/ats/ats.conf.in      |  3 ++-
 src/ats/plugin_ats_ril.c | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/ats')

diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index 010e5ca2d..f8e323037 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -79,7 +79,8 @@ MLP_DUMP_SOLUTION_ON_FAIL = YES
 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
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index 35812029c..3d4ffae8d 100644
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -2681,7 +2681,16 @@ libgnunet_plugin_ats_ril_init (void *cls)
 
   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
-- 
cgit v1.2.3