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

[gnunet]

Author: wachs
Date: 2012-01-18 14:38:43 +0100 (Wed, 18 Jan 2012)
New Revision: 19239

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
Log:
- constraint min conne


Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-01-18 13:28:03 UTC 
(rev 19238)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-01-18 13:38:43 UTC 
(rev 19239)
@@ -249,6 +249,14 @@
   mlp->ar[mlp->ci] = -mlp->b_min;
   mlp->ci++;
 
+  /* c 4) minimum connections
+   *      (1)*n_1 + ... + (1)*n_m >= n_min
+   */
+  mlp->ia[mlp->ci] = mlp->r_c4;
+  mlp->ja[mlp->ci] = mlpi->c_n;
+  mlp->ar[mlp->ci] = 1;
+  mlp->ci++;
+
   return GNUNET_OK;
 }
 
@@ -322,8 +330,13 @@
 
   /* c 1) bandwidth capping */
   /* c 3) minimum bandwidth */
+  /* c 4) minimum number of connections */
+  mlp->r_c4 = glp_add_rows (mlp->prob, 1);
+  glp_set_row_bnds (mlp->prob, mlp->r_c4, GLP_LO, mlp->n_min, 0.0);
+
   GNUNET_CONTAINER_multihashmap_iterate (addresses, create_constraint_it, mlp);
 
+
 }
 
 /**

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2012-01-18 13:28:03 UTC 
(rev 19238)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2012-01-18 13:38:43 UTC 
(rev 19239)
@@ -146,6 +146,9 @@
   unsigned int cm_size;
   unsigned int ci;
 
+  /* Row index constraint 4: minimum connections */
+  unsigned int r_c4;
+
   /* column index Diversity (D) column */
   int c_d;
   double co_D;