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

[gnunet]

Author: wachs
Date: 2013-02-14 13:10:02 +0100 (Thu, 14 Feb 2013)
New Revision: 26100

Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/test_ats_mlp.c
Log:
active test


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2013-02-14 12:06:27 UTC (rev 26099)
+++ gnunet/src/ats/Makefile.am  2013-02-14 12:10:02 UTC (rev 26100)
@@ -73,8 +73,8 @@
  test_ats_simplistic_switch_networks \
  test_ats_simplistic_change_preference \
  test_ats_simplistic_pref_aging \
- test_ats_api_performance
-# $(GN_MLP_TEST) \
+ test_ats_api_performance \
+ $(GN_MLP_TEST)
 # $(GN_MLP_TEST_AVG) \
 # $(GN_MLP_PERF)
 # test_ats_api_scheduling_get_type
@@ -195,13 +195,13 @@
   $(top_builddir)/src/ats/libgnunetats.la  
 
 if HAVE_LIBGLPK
-#test_ats_mlp_SOURCES = \
-# $(GN_MLP_SRC) \
-# test_ats_mlp.c
-#test_ats_mlp_LDADD = \
-#  $(GN_LIBGLPK) \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la
+test_ats_mlp_SOURCES = \
+  $(GN_MLP_SRC) \
+  test_ats_mlp.c
+test_ats_mlp_LDADD = \
+  $(GN_LIBGLPK) \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 #test_ats_mlp_averaging_SOURCES = \
 # $(GN_MLP_SRC) \

Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c       2013-02-14 12:06:27 UTC (rev 26099)
+++ gnunet/src/ats/test_ats_mlp.c       2013-02-14 12:10:02 UTC (rev 26100)
@@ -30,12 +30,16 @@
 #include "gnunet_ats_service.h"
 #include "gnunet-service-ats_addresses_mlp.h"
 
+static int ret;
+
+#if 0
+
 #define MLP_MAX_EXEC_DURATION   
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
 #define MLP_MAX_ITERATIONS      INT_MAX
 
 
-static int ret;
 
+
 struct GNUNET_STATISTICS_Handle * stats;
 
 struct GNUNET_CONTAINER_MultiHashMap * addresses;
@@ -142,18 +146,21 @@
   }
   return GNUNET_ATS_NetworkTypeCount;
 }
+#endif
 
-
-
 static void
 check (void *cls, char *const *args, const char *cfgfile,
        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+
+
 #if !HAVE_LIBGLPK
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed!");
   ret = 1;
   return;
 #endif
+
+#if 0
   struct ATS_Address addr[10];
   struct ATS_Address *res[10];
   struct GAS_MLP_SolutionContext ctx;
@@ -252,6 +259,7 @@
   GNUNET_free (addr[1].plugin);
   GNUNET_CONTAINER_multihashmap_destroy (addresses);
   GNUNET_STATISTICS_destroy(stats, GNUNET_NO);
+#endif
 
   ret = 0;
   return;