4 files changed, 42 insertions, 4 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 4b4823888..964af06db 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -17,7 +17,7 @@ endif
 
 if HAVE_LIBGLPK
   GN_LIBGLPK = -lglpk
-  GN_MLP_SRC = gnunet-service-ats_addresses_mlp.c gnunet-service-ats_addresses_mlp.h
+  GN_MLP_SRC = gnunet-service-ats_addresses_mlp.c gnunet-service-ats_addresses_mlp.h gnunet-service-ats_normalization.c gnunet-service-ats_normalization.h
   GN_MLP_TEST = test_ats_mlp
   GN_MLP_TEST_UPDATE = test_ats_mlp_update
   GN_MLP_TEST_AVG = test_ats_mlp_averaging
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index 45a6227fb..5f2ff26d9 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-ats_addresses.h"
+#include "gnunet-service-ats_normalization.h"
 #include "gnunet-service-ats_addresses_mlp.h"
 #include "gnunet_statistics_service.h"
 #include "glpk.h"
@@ -1437,6 +1438,27 @@ mlp_get_preferred_address_it (void *cls, const struct GNUNET_HashCode * key, voi
 }
 
 
+static double get_peer_pref_value (const struct GNUNET_PeerIdentity *peer)
+{
+        double res;
+  const double *preferences = NULL;
+  int c;
+  preferences = GAS_normalization_get_preferences ((struct GNUNET_PeerIdentity *) peer);
+
+  res = 0.0;
+        for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
+        {
+                if (c != GNUNET_ATS_PREFERENCE_END)
+                {
+                        //fprintf (stderr, "VALUE[%u] %s %.3f \n", c, GNUNET_i2s (&cur->addr->peer), t[c]);
+                        res += preferences[c];
+                }
+        }
+        res /= (GNUNET_ATS_PreferenceCount -1);
+        return res;
+}
+
+
 /**
  * Get the preferred address for a specific peer
  *
@@ -1469,7 +1491,7 @@ GAS_mlp_get_preferred_address (void *solver,
 
           p = GNUNET_malloc (sizeof (struct ATS_Peer));
           p->id = (*peer);
-          p->f = DEFAULT_PEER_PREFERENCE;
+          p->f = get_peer_pref_value (peer);;
           GNUNET_CONTAINER_multihashmap_put (mlp->peers, &peer->hashPubKey, p, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
 
           /* Added new peer, we have to rebuild problem before solving */
@@ -1530,15 +1552,27 @@ GAS_mlp_address_change_preference (void *solver,
                                                                                                                                          double pref_rel)
 {
   struct GAS_MLP_Handle *mlp = solver;
+  struct ATS_Peer *p = NULL;
+
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Changing preference for address for peer `%s'\n",
                 GNUNET_i2s(peer));
 
   GNUNET_STATISTICS_update (mlp->stats,"# LP address preference changes", 1, GNUNET_NO);
 
   /* Update the constraints with changed preferences */
+
+
   /* Update quality constraint c7 */
 
-  /* Update relativity constraint c8 */
+  /* Update relativity constraint c9 */
+  if (NULL == (p = GNUNET_CONTAINER_multihashmap_get (mlp->peers, &peer->hashPubKey)))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR, "Updating preference for unknown peer `%s' \n", GNUNET_i2s(peer));
+        return;
+  }
+  p->f = get_peer_pref_value (peer);
+  mlp_create_problem_set_value (&mlp->p, p->r_c9, mlp->p.c_r, -p->f, __LINE__);
+
 
         /* Problem size changed: new address for peer with pending request */
         mlp->mlp_prob_updated = GNUNET_YES;
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index 54714aa26..1f812ebda 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -422,6 +422,9 @@ GAS_normalization_change_preference (void *src,
 const double *
 GAS_normalization_get_preferences (struct GNUNET_PeerIdentity *id)
 {
+        GNUNET_assert (NULL != peers);
+        GNUNET_assert (NULL != id);
+
         struct PeerRelative *rp;
         if (NULL == (rp = GNUNET_CONTAINER_multihashmap_get (peers, &id->hashPubKey)))
         {
diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c
index 21334e414..bd39aed44 100644
--- a/src/ats/test_ats_mlp.c
+++ b/src/ats/test_ats_mlp.c
@@ -104,6 +104,7 @@ end_now (int res)
                 GAS_mlp_done (mlp);
                 mlp = NULL;
   }
+  GAS_normalization_stop ();
 
         ret = res;
 }
@@ -191,7 +192,7 @@ check (void *cls, char *const *args, const char *cfgfile,
       end_now (1);
       return;
   }
-
+  GAS_normalization_start (NULL, NULL);
   /* Setup address hashmap */
   addresses = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);