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

[gnunet]

Author: wachs
Date: 2014-05-14 14:08:14 +0200 (Wed, 14 May 2014)
New Revision: 33278

Modified:
   gnunet/src/ats/perf_ats_solver.c
   gnunet/src/ats/perf_ats_solver.conf
Log:
fix logging for failed solutions + cfg


Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c    2014-05-14 12:05:56 UTC (rev 33277)
+++ gnunet/src/ats/perf_ats_solver.c    2014-05-14 12:08:14 UTC (rev 33278)
@@ -963,8 +963,15 @@
         cur_upd_res = 
ph.iterations_results[c_iteration].update_results_array[c_peer];
         data_upd_tmp = GNUNET_strdup (data_upd_str);
         GNUNET_free (data_upd_str);
-        GNUNET_asprintf (&data_upd_str, "%s;%llu", data_upd_tmp,
+        if (GNUNET_YES == cur_full_res->valid)
+        {
+          GNUNET_asprintf (&data_upd_str, "%s;%llu", data_upd_tmp,
             (NULL == cur_upd_res) ? 0 : 
cur_upd_res->d_total_full.rel_value_us);
+        }
+        else
+        {
+            GNUNET_asprintf (&data_str, "%s;", data_tmp);
+        }
         GNUNET_free (data_upd_tmp);
 
       }
@@ -974,7 +981,16 @@
 
       data_tmp = GNUNET_strdup (data_str);
       GNUNET_free (data_str);
-      GNUNET_asprintf (&data_str, "%s;%llu", data_tmp, 
cur_full_res->d_total_full.rel_value_us);
+      if (GNUNET_YES == cur_full_res->valid)
+      {
+          GNUNET_asprintf (&data_str, "%s;%llu", data_tmp,
+              cur_full_res->d_total_full.rel_value_us);
+      }
+      else
+      {
+          GNUNET_asprintf (&data_str, "%s;", data_tmp);
+      }
+
       GNUNET_free (data_tmp);
     }
     data_tmp = GNUNET_strdup (data_str);

Modified: gnunet/src/ats/perf_ats_solver.conf
===================================================================
--- gnunet/src/ats/perf_ats_solver.conf 2014-05-14 12:05:56 UTC (rev 33277)
+++ gnunet/src/ats/perf_ats_solver.conf 2014-05-14 12:08:14 UTC (rev 33278)
@@ -22,10 +22,10 @@
 # How proportional to preferences is bandwidth distribution in a network
 # 1: Fair with respect to addresses without preferences
 # > 10: The bigger, the more respect is payed to preferences 
-PROP_PROPORTIONALITY_FACTOR = 200
+PROP_PROPORTIONALITY_FACTOR = 2.00
 # Should we stick to existing connections are prefer to switch?
 # [10...200], lower value prefers to switch, bigger value is more tolerant
-PROP_STABILITY_FACTOR = 125
+PROP_STABILITY_FACTOR = 1.25
 
 # MLP specific settings
 # MLP defaults