ats_ril: - removed some redundantly saved plugin environment attributes

[oweals/gnunet.git] / src / ats / test_ats_mlp.c

diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c
index 21334e414649294ecc453d76d5f11e11998ecdb2..be5e39fcf68dc4e5a7fd74c929b5f3512c7f99e3 100644 (file)
--- a/src/ats/test_ats_mlp.c
+++ b/src/ats/test_ats_mlp.c
@@ -28,7 +28,9 @@
 #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 "gnunet_ats_service.h"
 #include "test_ats_api_common.h"
 
 /**
@@ -73,7 +75,7 @@ int addr_it (void *cls,
              void *value)
 {
        struct ATS_Address *address = (struct ATS_Address *) value;
-       GAS_mlp_address_delete (mlp, addresses, address, GNUNET_NO);
+       GAS_mlp_address_delete (mlp, address, GNUNET_NO);
        GNUNET_CONTAINER_multihashmap_remove (addresses, key, value);
   GNUNET_free (address);
        return GNUNET_OK;
@@ -104,7 +106,7 @@ end_now (int res)
                GAS_mlp_done (mlp);
                mlp = NULL;
   }
-
+  GAS_normalization_stop ();
        ret = res;
 }
 
@@ -125,6 +127,28 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
+const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
+{
+       return GAS_normalization_get_preferences (id);
+}
+
+const double *
+get_property_cb (void *cls, const struct ATS_Address *address)
+{
+       return GAS_normalization_get_properties ((struct ATS_Address *) address);
+}
+
+static void
+normalized_property_changed_cb (void *cls,
+                                                                                                                struct ATS_Address *peer,
+                                                                                                                uint32_t type,
+                                                                                                                double prop_rel)
+{
+        /* TODO */
+}
+
+
 static void
 bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 {
@@ -165,7 +189,6 @@ check (void *cls, char *const *args, const char *cfgfile,
   int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
   unsigned long long  quotas_in[GNUNET_ATS_NetworkTypeCount];
   unsigned long long  quotas_out[GNUNET_ATS_NetworkTypeCount];
-  struct GNUNET_ATS_Information ats;
 
 #if !HAVE_LIBGLPK
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed!");
@@ -191,13 +214,17 @@ check (void *cls, char *const *args, const char *cfgfile,
       end_now (1);
       return;
   }
-
+  GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL);
   /* Setup address hashmap */
   addresses = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
 
   /* Init MLP solver */
-  mlp  = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in,
-               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL);
+  mlp  = GAS_mlp_init (cfg, stats, addresses,
+               quotas, quotas_out, quotas_in,
+               GNUNET_ATS_NetworkTypeCount,
+               &bandwidth_changed_cb, NULL,
+               &get_preferences_cb, NULL,
+               &get_property_cb, NULL);
   if (NULL == mlp)
   {
        GNUNET_break (0);
@@ -233,7 +260,7 @@ check (void *cls, char *const *args, const char *cfgfile,
   GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[0],
                GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
   /* Adding address 0 */
-  GAS_mlp_address_add (mlp, addresses, address[0], GNUNET_ATS_NET_UNSPECIFIED);
+  GAS_mlp_address_add (mlp, address[0], GNUNET_ATS_NET_UNSPECIFIED);
 
   /* Create address 1 */
   address[1] = create_address (&p[0], "test_plugin1", "test_addr1", strlen("test_addr1")+1, 0);
@@ -246,7 +273,7 @@ check (void *cls, char *const *args, const char *cfgfile,
   GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[1],
                GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
   /* Adding address 1*/
-  GAS_mlp_address_add (mlp, addresses, address[1], GNUNET_ATS_NET_UNSPECIFIED);
+  GAS_mlp_address_add (mlp, address[1], GNUNET_ATS_NET_UNSPECIFIED);
 
 
   /* Create address 3 */
@@ -260,22 +287,20 @@ check (void *cls, char *const *args, const char *cfgfile,
   GNUNET_CONTAINER_multihashmap_put (addresses, &p[1].hashPubKey, address[2],
                GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
   /* Adding address 3*/
-  GAS_mlp_address_add (mlp, addresses, address[2], GNUNET_ATS_NET_UNSPECIFIED);
+  GAS_mlp_address_add (mlp, address[2], GNUNET_ATS_NET_UNSPECIFIED);
 
 
   /* Updating address 0*/
-  ats.type =  htonl (GNUNET_ATS_NETWORK_TYPE);
-  ats.value = htonl (GNUNET_ATS_NET_WAN);
-  GAS_mlp_address_update (mlp, addresses, address[0], 1, GNUNET_NO, &ats, 1);
+  GAS_mlp_address_change_network(mlp, address[0], GNUNET_ATS_NET_UNSPECIFIED, GNUNET_ATS_NET_WAN);
 
   /* Retrieving preferred address for peer and wait for callback */
-  GAS_mlp_get_preferred_address (mlp, addresses, &p[0]);
-  GAS_mlp_get_preferred_address (mlp, addresses, &p[1]);
+  GAS_mlp_get_preferred_address (mlp, &p[0]);
+  GAS_mlp_get_preferred_address (mlp, &p[1]);
 
   mlp->write_mip_mps = GNUNET_NO;
   mlp->write_mip_sol = GNUNET_NO;
 
-  GAS_mlp_solve_problem (mlp, addresses);
+  GAS_mlp_solve_problem (mlp);
 }