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

[gnunet]

Author: wachs
Date: 2012-12-03 16:05:57 +0100 (Mon, 03 Dec 2012)
New Revision: 25190

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
Log:
changes

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-03 14:57:53 UTC 
(rev 25189)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-03 15:05:57 UTC 
(rev 25190)
@@ -564,6 +564,7 @@
       break;
     }
 
+  /* Tell solver about update */
   switch (ats_mode)
   {
     case MODE_MLP:
@@ -812,10 +813,20 @@
     return GNUNET_SYSERR;
   }
   old->used = in_use;
-#if HAVE_LIBGLPK
-  if (ats_mode == MODE_MLP)
-     GAS_mlp_address_update (solver, addresses, old);
-#endif
+
+  /* Tell solver about update */
+  switch (ats_mode)
+  {
+    case MODE_MLP:
+      GAS_mlp_address_update (solver, addresses, old);
+      break;
+    case MODE_SIMPLISTIC:
+      GAS_simplistic_address_update (solver, addresses, old);
+      break;
+    default:
+      GNUNET_break (0);
+      break;
+  }
   return GNUNET_OK;
 }
 
@@ -955,10 +966,21 @@
 {
   if (GNUNET_NO == running)
     return;
-#if HAVE_LIBGLPK
-  if (ats_mode == MODE_MLP)
-    GAS_mlp_address_change_preference (solver, peer, kind, score);
-#endif
+
+
+  /* Tell solver about update */
+  switch (ats_mode)
+  {
+    case MODE_MLP:
+      GAS_mlp_address_change_preference (solver, peer, kind, score);
+      break;
+    case MODE_SIMPLISTIC:
+      GAS_simplistic_address_change_preference (solver, peer, kind, score);
+      break;
+    default:
+      GNUNET_break (0);
+      break;
+  }
 }
 
 

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-03 
14:57:53 UTC (rev 25189)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-03 
15:05:57 UTC (rev 25190)
@@ -75,4 +75,21 @@
 
 }
 
+/**
+ * Changes the preferences for a peer in the  problem
+ *
+ * @param solver the solver handle
+ * @param peer the peer
+ * @param kind the kind to change the preference
+ * @param score the score
+ */
+void
+GAS_simplistic_address_change_preference (struct GAS_SIMPLISTIC_Handle *solver,
+                                   const struct GNUNET_PeerIdentity *peer,
+                                   enum GNUNET_ATS_PreferenceKind kind,
+                                   float score)
+{
+
+}
+
 /* end of gnunet-service-ats_addresses_simplistic.c */

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2012-12-03 
14:57:53 UTC (rev 25189)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2012-12-03 
15:05:57 UTC (rev 25190)
@@ -61,4 +61,19 @@
 void
 GAS_simplistic_address_update (struct GAS_SIMPLISTIC_Handle *solver, struct 
GNUNET_CONTAINER_MultiHashMap * addresses, struct ATS_Address *address);
 
+/**
+ * Changes the preferences for a peer in the  problem
+ *
+ * @param solver the solver handle
+ * @param peer the peer
+ * @param kind the kind to change the preference
+ * @param score the score
+ */
+void
+GAS_simplistic_address_change_preference (struct GAS_SIMPLISTIC_Handle *solver,
+                                   const struct GNUNET_PeerIdentity *peer,
+                                   enum GNUNET_ATS_PreferenceKind kind,
+                                   float score);
+
+
 /* end of gnunet-service-ats_addresses_simplistic.h */