[GNUnet-SVN] r14777 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-03-30 10:39:47 +0200 (Wed, 30 Mar 2011)
New Revision: 14777

Modified:
   gnunet/src/transport/gnunet-service-transport.c
Log:
define for systems without glpk


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-03-30 08:29:05 UTC 
(rev 14776)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-03-30 08:39:47 UTC 
(rev 14777)
@@ -5585,8 +5585,8 @@
        return;
 #else
        if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "glpk installed\n");
-#endif
 
+
        glp_prob *prob;
 
        int c;
@@ -5599,7 +5599,7 @@
        int c_q_metrics = 0;
 
        double v_b_min = 100;
-       double v_n_min = 2;
+       double v_n_min = 1;
        double M = 1000000000;
 
        double D = 1;
@@ -5694,6 +5694,7 @@
        /* adding columns */
        char * name;
        glp_add_cols(prob, 2 * c_mechs);
+       /* adding b_t cols */
        for (c=1; c <= c_mechs; c++)
        {
                GNUNET_asprintf(&name, "b%i",c);
@@ -5703,14 +5704,15 @@
                glp_set_obj_coef(prob, c, 1.0);
 
        }
+       /* adding n_t cols */
        for (c=c_mechs+1; c <= 2*c_mechs; c++)
        {
                GNUNET_asprintf(&name, "n%i",(c-c_mechs)+1);
                glp_set_col_name(prob, c, name);
+               GNUNET_free (name);
                glp_set_col_bnds(prob, c, GLP_DB, 0.0, 1.0);
                glp_set_col_kind(prob, c, GLP_IV);
                glp_set_obj_coef(prob, c, 1.0);
-               GNUNET_free (name);
        }
 
        /* feasibility constraints */
@@ -5955,6 +5957,7 @@
        GNUNET_free(peers);
 
        return c_mechs;
+#endif
 }
 
 /* To remove: just for testing */