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

[gnunet]

Author: wachs
Date: 2013-06-19 07:32:18 +0200 (Wed, 19 Jun 2013)
New Revision: 27479

Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/perf_ats_mlp.c
   gnunet/src/ats/test_ats_mlp_update.c
Log:
fixes


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2013-06-19 05:27:13 UTC (rev 27478)
+++ gnunet/src/ats/Makefile.am  2013-06-19 05:32:18 UTC (rev 27479)
@@ -215,7 +215,7 @@
   $(top_builddir)/src/ats/libgnunetats.la  
 
 test_ats_mlp_update_SOURCES = \
-  $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c
+  $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c 
gnunet-service-ats_normalization.c
 test_ats_mlp_update_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -224,7 +224,7 @@
   
   
 perf_ats_mlp_SOURCES = \
-  $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c
+  $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c 
gnunet-service-ats_normalization.c
 perf_ats_mlp_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \

Modified: gnunet/src/ats/perf_ats_mlp.c
===================================================================
--- gnunet/src/ats/perf_ats_mlp.c       2013-06-19 05:27:13 UTC (rev 27478)
+++ gnunet/src/ats/perf_ats_mlp.c       2013-06-19 05:32:18 UTC (rev 27479)
@@ -55,7 +55,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_ats_service.h"
-#include "gnunet-service-ats_addresses_mlp.h"
+#include "gnunet-service-ats-solver_mlp.h"
 #include "gnunet-service-ats_normalization.h"
 #include "test_ats_api_common.h"
 
@@ -141,6 +141,13 @@
 
 }
 
+static const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
+{
+       return GAS_normalization_get_preferences (id);
+}
+
+
 static void
 perf_create_peer (int cp)
 {
@@ -298,7 +305,7 @@
 
   /* Init MLP solver */
   mlp  = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in,
-               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL);
+               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL, 
&get_preferences_cb, NULL);
   if (NULL == mlp)
   {
        GNUNET_break (0);

Modified: gnunet/src/ats/test_ats_mlp_update.c
===================================================================
--- gnunet/src/ats/test_ats_mlp_update.c        2013-06-19 05:27:13 UTC (rev 
27478)
+++ gnunet/src/ats/test_ats_mlp_update.c        2013-06-19 05:32:18 UTC (rev 
27479)
@@ -28,7 +28,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_ats_service.h"
-#include "gnunet-service-ats_addresses_mlp.h"
+#include "gnunet-service-ats-solver_mlp.h"
+#include "gnunet-service-ats_normalization.h"
 #include "test_ats_api_common.h"
 
 /**
@@ -131,6 +132,11 @@
        end_now (1);
 }
 
+static const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
+{
+       return GAS_normalization_get_preferences (id);
+}
 
 static void
 bandwidth_changed_cb (void *cls, struct ATS_Address *address)
@@ -193,7 +199,7 @@
 
   /* Init MLP solver */
   mlp  = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in,
-               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL);
+               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL, 
&get_preferences_cb, NULL);
   if (NULL == mlp)
   {
        GNUNET_break (0);