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

[gnunet]

Author: wachs
Date: 2012-01-16 18:19:42 +0100 (Mon, 16 Jan 2012)
New Revision: 19177

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
Log:
- minor


Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-01-16 17:17:57 UTC 
(rev 19176)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-01-16 17:19:42 UTC 
(rev 19177)
@@ -63,7 +63,7 @@
   mlp->c_d = col;
   /* Column name */
   glp_set_col_name (mlp->prob, col, "d");
-  /* Column coffiecient */
+  /* Column objective function coefficient */
   glp_set_obj_coef (mlp->prob, col, mlp->co_D);
   /* Column lower bound = 0.0 */
   glp_set_col_bnds (mlp->prob, col, GLP_LO, 0.0, 0.0);
@@ -74,7 +74,7 @@
   mlp->c_u = col;
   /* Column name */
   glp_set_col_name (mlp->prob, col, "u");
-  /* Column coffiecient */
+  /* Column objective function coefficient */
   glp_set_obj_coef (mlp->prob, col, mlp->co_U);
   /* Column lower bound = 0.0 */
   glp_set_col_bnds (mlp->prob, col, GLP_LO, 0.0, 0.0);
@@ -85,17 +85,16 @@
   mlp->c_r = col;
   /* Column name */
   glp_set_col_name (mlp->prob, col, "r");
-  /* Column coffiecient */
+  /* Column objective function coefficient */
   glp_set_obj_coef (mlp->prob, col, mlp->co_R);
   /* Column lower bound = 0.0 */
   glp_set_col_bnds (mlp->prob, col, GLP_LO, 0.0, 0.0);
 
   /* Quality metric columns */
   col = glp_add_cols(mlp->prob, mlp->m);
-  mlp->c_q_start = col;
-  mlp->c_q_end = col + mlp->m;
   for (c = 0; c < mlp->m; c++)
   {
+    mlp->c_q[c] = col + c;
     GNUNET_asprintf (&name, "q_%u", mlp->q[c]);
     glp_set_col_name (mlp->prob, col + c, name);
     glp_set_col_bnds (mlp->prob, col + c, GLP_LO, 0.0, 0.0);

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2012-01-16 17:17:57 UTC 
(rev 19176)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2012-01-16 17:19:42 UTC 
(rev 19177)
@@ -141,12 +141,9 @@
    * contains mapping to GNUNET_ATS_Property*/
   int q[GNUNET_ATS_QualityPropertiesCount];
 
-  /* column index first quality metric (q_1) column */
-  int c_q_start;
+  /* column index quality metrics  */
+  int c_q[GNUNET_ATS_QualityPropertiesCount];
 
-  /* column index last quality metric (q_n) column */
-  int c_q_end;
-
   /* quality metric coefficients*/
   double co_Q[GNUNET_ATS_QualityPropertiesCount];