ats_ril: - removed some redundantly saved plugin environment attributes

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

diff --git a/src/ats/test_ats_mlp_update.c b/src/ats/test_ats_mlp_update.c
index 4e1556266ffb75884e3147a23f7b17168689e0af..8e5a1d6ebd23ea20a4af0b18f06a94713d1bd7b8 100644 (file)
--- a/src/ats/test_ats_mlp_update.c
+++ b/src/ats/test_ats_mlp_update.c
@@ -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"
 
 /**
@@ -36,6 +37,13 @@
  */
 static int ret;
 
+/**
+ * ATS Information
+ */
+struct GNUNET_ATS_Information ats[4];
+
+struct GNUNET_ATS_Information ats_prev[4];
+
 /**
  * MLP solver handle
  */
@@ -73,7 +81,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,6 +112,7 @@ end_now (int res)
                GAS_mlp_done (mlp);
                mlp = NULL;
   }
+  GAS_normalization_stop ();
 
        ret = res;
 }
@@ -124,6 +133,27 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
        end_now (1);
 }
 
+static 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)
@@ -155,7 +185,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!");
@@ -181,13 +210,18 @@ 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);
@@ -215,17 +249,40 @@ 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]);
-
-  /* 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_add (mlp, address[0], GNUNET_ATS_NET_UNSPECIFIED);
 
   /* Retrieving preferred address for peer and wait for callback */
-  GAS_mlp_get_preferred_address (mlp, addresses, &p[0]);
+  GAS_mlp_get_preferred_address (mlp, &p[0]);
 
-  GAS_mlp_solve_problem (mlp, addresses);
+  /* Solve problem to build matrix */
+  GAS_mlp_solve_problem (mlp);
+
+  address[0]->atsi = ats;
+  address[0]->atsi_count = 4;
+  /* Updating address 0*/
+  ats[0].type =  htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats[0].value = htonl (GNUNET_ATS_NET_WAN);
+  ats[1].type =  htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+  ats[1].value = htonl (10);
+  ats[2].type =  htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+  ats[2].value = htonl (1);
+  ats[3].type =  htonl (GNUNET_ATS_ARRAY_TERMINATOR);
+  ats[3].value = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
+
+  ats_prev[0].type =  htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats_prev[0].value = htonl (GNUNET_ATS_NET_UNSPECIFIED);
+  ats_prev[1].type =  htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+  ats_prev[1].value = htonl (GNUNET_ATS_VALUE_UNDEFINED);
+  ats_prev[2].type =  htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+  ats_prev[2].value = htonl (GNUNET_ATS_VALUE_UNDEFINED);
+  ats_prev[3].type =  htonl (GNUNET_ATS_ARRAY_TERMINATOR);
+  ats_prev[3].value = htonl (GNUNET_ATS_VALUE_UNDEFINED);
+
+  GAS_mlp_address_property_changed(mlp, address[0], GNUNET_ATS_QUALITY_NET_DELAY, 10, 1.1);
+  GAS_mlp_address_property_changed(mlp, address[0], GNUNET_ATS_QUALITY_NET_DISTANCE, 1, 1.0);
+
+  /* Solve problem to build matrix */
+  GAS_mlp_solve_problem (mlp);
 }