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

[gnunet]

Author: oehlmann
Date: 2013-11-20 11:41:28 +0100 (Wed, 20 Nov 2013)
New Revision: 30824

Modified:
   gnunet/src/ats/libgnunet_plugin_ats_ril.c
Log:
global/local reward ratio made adjustable

Modified: gnunet/src/ats/libgnunet_plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_ril.c   2013-11-20 10:25:04 UTC (rev 
30823)
+++ gnunet/src/ats/libgnunet_plugin_ats_ril.c   2013-11-20 10:41:28 UTC (rev 
30824)
@@ -40,6 +40,7 @@
 #define RIL_DEFAULT_GRADIENT_STEP_SIZE 0.3
 #define RIL_DEFAULT_TRACE_DECAY 0.5
 #define RIL_DEFAULT_EXPLORE_RATIO 0.1
+#define RIL_DEFAULT_GLOBAL_REWARD_SHARE 0.5
 
 /**
  * ATS reinforcement learning solver
@@ -107,11 +108,16 @@
   double lambda;
 
   /**
-   *
+   * Ratio, whith what probability an agent should explore in the e-greed 
policy
    */
   double explore_ratio;
 
   /**
+   * How big the share of the global part of the reward signal is
+   */
+  double reward_global_share;
+
+  /**
    * Minimal interval time between steps in milliseconds
    */
   struct GNUNET_TIME_Relative step_time_min;
@@ -891,9 +897,10 @@
     return 0;
   }
 
-  reward += envi_reward_global (solver);
-  reward += envi_reward_local (solver, agent);
-  return reward * 0.5;
+  reward += envi_reward_global (solver) * 
(solver->parameters.reward_global_share);
+  reward += envi_reward_local (solver, agent) * (1 - 
solver->parameters.reward_global_share);
+
+  return reward;
 }
 
 /**
@@ -1678,6 +1685,15 @@
   {
     solver->parameters.explore_ratio = RIL_DEFAULT_EXPLORE_RATIO;
   }
+  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", 
"RIL_GLOBAL_REWARD_SHARE", &string))
+  {
+    solver->parameters.reward_global_share = strtod (string, NULL);
+    GNUNET_free (string);
+  }
+  else
+  {
+    solver->parameters.reward_global_share = RIL_DEFAULT_GLOBAL_REWARD_SHARE;
+  }
 
   env->sf.s_add = &GAS_ril_address_add;
   env->sf.s_address_update_property = &GAS_ril_address_property_changed;