test for solvers to support delayed start

5 files changed, 131 insertions, 4 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index e7396358f..2ed2f4694 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -26,6 +26,7 @@ if HAVE_LIBGLPK
   GN_MLP_PERF = perf_ats_mlp
   GN_MLP_ADD_ADDRESS = test_ats_solver_add_address_mlp
   GN_MLP_ADD_REQUEST_ADDRESS = test_ats_solver_add_address_and_request_mlp
+  GN_MLP_ADD_REQUEST_ADDRESS_DELAYED = test_ats_solver_add_address_and_request_delayed_mlp
   GN_MLP_REQUEST_ADD_ADDRESS = test_ats_solver_request_and_add_address_mlp
   GN_MLP_REQUEST_DELETE_ADDRESS = test_ats_solver_request_and_delete_address_mlp
   GN_MLP_PREFERENCES_ADDRESS = test_ats_solver_preferences_mlp
@@ -123,10 +124,11 @@ TESTING_TESTS = \
  test_ats_api_performance_list_peer_addresses \
  test_ats_api_performance_list_all_addresses_active \
  test_ats_api_performance_monitor \
- test_ats_api_delayed_service_performance_monitor\ 
+ test_ats_api_delayed_service_performance_monitor \
  test_ats_api_performance_monitor_initial_callback \
  test_ats_solver_add_address_proportional \
  test_ats_solver_add_address_and_request_proportional \
+ test_ats_solver_add_address_and_request_delayed_proportional\
  test_ats_solver_request_and_add_address_proportional \
  test_ats_solver_request_and_delete_address_proportional \
  test_ats_solver_alternative_after_delete_address_proportional \
@@ -134,12 +136,14 @@ TESTING_TESTS = \
  test_ats_solver_preferences_ril \
  $(GN_MLP_ADD_ADDRESS) \
  $(GN_MLP_ADD_REQUEST_ADDRESS) \
+ $(GN_MLP_ADD_REQUEST_ADDRESS_DELAYED) \
  $(GN_MLP_REQUEST_ADD_ADDRESS) \
  $(GN_MLP_REQUEST_DELETE_ADDRESS) \
  $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) \
  $(GN_MLP_PREFERENCES_ADDRESS) \
  test_ats_solver_add_address_ril \
  test_ats_solver_add_address_and_request_ril \
+  test_ats_solver_add_address_and_request_delayed_ril \
  test_ats_solver_request_and_add_address_ril \
  test_ats_solver_request_and_delete_address_ril \
  test_ats_solver_alternative_after_delete_address_ril \
@@ -347,6 +351,26 @@ test_ats_solver_add_address_and_request_proportional_LDADD = \
   libgnunetats.la \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
 
+test_ats_solver_add_address_and_request_delayed_proportional_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_delayed_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
+        $(top_builddir)/src/statistics/libgnunetstatistics.la
+        
+test_ats_solver_add_address_and_request_delayed_ril_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_delayed_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
+        $(top_builddir)/src/statistics/libgnunetstatistics.la   
+
 if HAVE_LIBGLPK
 test_ats_solver_add_address_and_request_mlp_SOURCES = \
  test_ats_solver_add_address_and_request.c \
@@ -359,6 +383,16 @@ test_ats_solver_add_address_and_request_mlp_LDADD = \
         $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
+test_ats_solver_add_address_and_request_delayed_mlp_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_delayed_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
+        $(top_builddir)/src/statistics/libgnunetstatistics.la   
+
 test_ats_solver_add_address_and_request_ril_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -538,9 +572,13 @@ EXTRA_DIST = \
   test_ats_mlp.conf \
   test_ats_solver_default.conf \
   test_ats_solver_proportional.conf \
+  test_ats_solver_proportional.conf \
   test_ats_solver_mlp.conf \
+  test_ats_solver_delayed_mlp.conf \
   test_ats_solver_ril.conf \
+  test_ats_solver_delayed_ril.conf \
   perf_ats_solver_mlp.conf \
+  test_ats_solver_delayed_mlp.conf \
   perf_ats_solver_proportional.conf \
   perf_ats_solver_ril.conf \
   perf_ats_solver.conf
diff --git a/src/ats/test_ats_solver_add_address_and_request.c b/src/ats/test_ats_solver_add_address_and_request.c
index 1f07f46af..cca1e4692 100644
--- a/src/ats/test_ats_solver_add_address_and_request.c
+++ b/src/ats/test_ats_solver_add_address_and_request.c
@@ -214,6 +214,7 @@ main (int argc, char *argv[])
   char *test_filename = GNUNET_strdup (argv[0]);
   char *config_file;
   char *solver;
+  int delayed = GNUNET_NO;
 
   ret = 0;
 
@@ -232,25 +233,42 @@ main (int argc, char *argv[])
     GNUNET_break (0);
     return -1;
   }
+
   solver += strlen (src_filename) +1;
 
+  if (NULL != strstr (solver, "delayed_"))
+  {
+    delayed = GNUNET_YES;
+    solver += strlen  ("delayed_");
+  }
+
   if (0 == strcmp(solver, "proportional"))
   {
-    config_file = "test_ats_solver_proportional.conf";
+    if (delayed)
+      config_file = "test_ats_solver_delayed_proportional.conf";
+    else
+      config_file = "test_ats_solver_proportional.conf";
   }
   else if (0 == strcmp(solver, "mlp"))
   {
-    config_file = "test_ats_solver_mlp.conf";
+    if (delayed)
+      config_file = "test_ats_solver_delayed_mlp.conf";
+    else
+      config_file = "test_ats_solver_mlp.conf";
   }
   else if ((0 == strcmp(solver, "ril")))
   {
-    config_file = "test_ats_solver_ril.conf";
+    if (delayed)
+      config_file = "test_ats_solver_delayed_ril.conf";
+    else
+      config_file = "test_ats_solver_ril.conf";
   }
   else
   {
     GNUNET_break (0);
     GNUNET_free (src_filename);
     GNUNET_free (test_filename);
+    FPRINTF (stderr, "Invalid test name or configuration not found `%s'\n",src_filename);
     return 1;
   }
 
diff --git a/src/ats/test_ats_solver_delayed_mlp.conf b/src/ats/test_ats_solver_delayed_mlp.conf
new file mode 100644
index 000000000..65142bc84
--- /dev/null
+++ b/src/ats/test_ats_solver_delayed_mlp.conf
@@ -0,0 +1,20 @@
+@INLINE@ test_ats_solver_default.conf
+
+[ats]
+PREFIX = ./test_delay -t 10 --
+MODE = MLP
+# UNSPECIFIED
+UNSPECIFIED_QUOTA_IN = 64 KiB
+UNSPECIFIED_QUOTA_OUT = 64 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+# WAN
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+# WLAN
+WLAN_QUOTA_IN = 512
+WLAN_QUOTA_OUT = 512
diff --git a/src/ats/test_ats_solver_delayed_proportional.conf b/src/ats/test_ats_solver_delayed_proportional.conf
new file mode 100644
index 000000000..260b069f5
--- /dev/null
+++ b/src/ats/test_ats_solver_delayed_proportional.conf
@@ -0,0 +1,20 @@
+@INLINE@ test_ats_solver_default.conf
+
+[ats]
+PREFIX = ./test_delay -t 10 --
+MODE = PROPORTIONAL
+# UNSPECIFIED
+UNSPECIFIED_QUOTA_IN = 64 KiB
+UNSPECIFIED_QUOTA_OUT = 64 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+# WAN
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+# WLAN
+WLAN_QUOTA_IN = 512
+WLAN_QUOTA_OUT = 512
diff --git a/src/ats/test_ats_solver_delayed_ril.conf b/src/ats/test_ats_solver_delayed_ril.conf
new file mode 100644
index 000000000..e802f351b
--- /dev/null
+++ b/src/ats/test_ats_solver_delayed_ril.conf
@@ -0,0 +1,31 @@
+@INLINE@ test_ats_solver_default.conf
+
+[ats]
+PREFIX = ./test_delay -t 10 --
+MODE = RIL
+# UNSPECIFIED
+UNSPECIFIED_QUOTA_IN = 64 KiB
+UNSPECIFIED_QUOTA_OUT = 64 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+# WAN
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+# WLAN
+WLAN_QUOTA_IN = 512
+WLAN_QUOTA_OUT = 512
+
+# Reinforcement Learning Parameters
+RIL_STEP_TIME_MIN = 500 ms
+RIL_STEP_TIME_MAX = 1000 ms
+
+RIL_ALGORITHM = Q
+RIL_DISCOUNT_BETA = 0.7
+RIL_GRADIENT_STEP_SIZE = 0.3
+RIL_TRACE_DECAY = 0.2
+RIL_EXPLORE_RATIO = 0.1
+RIL_GLOBAL_REWARD_SHARE = 1