aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-05-14 12:08:14 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-05-14 12:08:14 +0000
commite6d6dbc36f0900b6ab51646cd595a1d685cf6297 (patch)
treea685547aadeda0e620d337e61d5010be21931a0d /src/ats
parent0086beb417f55ab47eb9a40fd40280bccf269e8b (diff)
downloadgnunet-e6d6dbc36f0900b6ab51646cd595a1d685cf6297.tar.gz
gnunet-e6d6dbc36f0900b6ab51646cd595a1d685cf6297.zip
fix logging for failed solutions + cfg
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/perf_ats_solver.c20
-rw-r--r--src/ats/perf_ats_solver.conf4
2 files changed, 20 insertions, 4 deletions
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 01906c87d..95adea4b3 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -963,8 +963,15 @@ write_all_iterations (void)
963 cur_upd_res = ph.iterations_results[c_iteration].update_results_array[c_peer]; 963 cur_upd_res = ph.iterations_results[c_iteration].update_results_array[c_peer];
964 data_upd_tmp = GNUNET_strdup (data_upd_str); 964 data_upd_tmp = GNUNET_strdup (data_upd_str);
965 GNUNET_free (data_upd_str); 965 GNUNET_free (data_upd_str);
966 GNUNET_asprintf (&data_upd_str, "%s;%llu", data_upd_tmp, 966 if (GNUNET_YES == cur_full_res->valid)
967 {
968 GNUNET_asprintf (&data_upd_str, "%s;%llu", data_upd_tmp,
967 (NULL == cur_upd_res) ? 0 : cur_upd_res->d_total_full.rel_value_us); 969 (NULL == cur_upd_res) ? 0 : cur_upd_res->d_total_full.rel_value_us);
970 }
971 else
972 {
973 GNUNET_asprintf (&data_str, "%s;", data_tmp);
974 }
968 GNUNET_free (data_upd_tmp); 975 GNUNET_free (data_upd_tmp);
969 976
970 } 977 }
@@ -974,7 +981,16 @@ write_all_iterations (void)
974 981
975 data_tmp = GNUNET_strdup (data_str); 982 data_tmp = GNUNET_strdup (data_str);
976 GNUNET_free (data_str); 983 GNUNET_free (data_str);
977 GNUNET_asprintf (&data_str, "%s;%llu", data_tmp, cur_full_res->d_total_full.rel_value_us); 984 if (GNUNET_YES == cur_full_res->valid)
985 {
986 GNUNET_asprintf (&data_str, "%s;%llu", data_tmp,
987 cur_full_res->d_total_full.rel_value_us);
988 }
989 else
990 {
991 GNUNET_asprintf (&data_str, "%s;", data_tmp);
992 }
993
978 GNUNET_free (data_tmp); 994 GNUNET_free (data_tmp);
979 } 995 }
980 data_tmp = GNUNET_strdup (data_str); 996 data_tmp = GNUNET_strdup (data_str);
diff --git a/src/ats/perf_ats_solver.conf b/src/ats/perf_ats_solver.conf
index 407dec323..c8e13206c 100644
--- a/src/ats/perf_ats_solver.conf
+++ b/src/ats/perf_ats_solver.conf
@@ -22,10 +22,10 @@ BLUETOOTH_QUOTA_OUT = 1000000
22# How proportional to preferences is bandwidth distribution in a network 22# How proportional to preferences is bandwidth distribution in a network
23# 1: Fair with respect to addresses without preferences 23# 1: Fair with respect to addresses without preferences
24# > 10: The bigger, the more respect is payed to preferences 24# > 10: The bigger, the more respect is payed to preferences
25PROP_PROPORTIONALITY_FACTOR = 200 25PROP_PROPORTIONALITY_FACTOR = 2.00
26# Should we stick to existing connections are prefer to switch? 26# Should we stick to existing connections are prefer to switch?
27# [10...200], lower value prefers to switch, bigger value is more tolerant 27# [10...200], lower value prefers to switch, bigger value is more tolerant
28PROP_STABILITY_FACTOR = 125 28PROP_STABILITY_FACTOR = 1.25
29 29
30# MLP specific settings 30# MLP specific settings
31# MLP defaults 31# MLP defaults