fixes for the solver and perf tool

1 files changed, 43 insertions, 12 deletions

diff --git a/src/ats/perf_ats_solver.conf b/src/ats/perf_ats_solver.conf
index 83d5e0164..2cdb6cfae 100644
--- a/src/ats/perf_ats_solver.conf
+++ b/src/ats/perf_ats_solver.conf
@@ -1,19 +1,50 @@
 [ats]
 # Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
+UNSPECIFIED_QUOTA_IN = 1000
+UNSPECIFIED_QUOTA_OUT = 1000
 # LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
+LOOPBACK_QUOTA_IN = 1000
+LOOPBACK_QUOTA_OUT = 1000
 # LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
+LAN_QUOTA_IN = 1000
+LAN_QUOTA_OUT = 1000
 # WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
+WAN_QUOTA_IN = 1000
+WAN_QUOTA_OUT = 1000
 # WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
+WLAN_QUOTA_IN = 1000
+WLAN_QUOTA_OUT = 1000
 # BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
+BLUETOOTH_QUOTA_IN = 1000
+BLUETOOTH_QUOTA_OUT = 1000
+
+# Proportional specific settings
+# How proportional to preferences is bandwidth distribution in a network
+# 1: Fair with respect to addresses without preferences
+# > 100: The bigger, the more respect is payed to preferences 
+PROP_PROPORTIONALITY_FACTOR = 200
+# Should we stick to existing connections are prefer to switch?
+# [100...200], lower value prefers to switch, bigger value is more tolerant
+PROP_STABILITY_FACTOR = 125
+
+# MLP specific settings
+# MLP defaults
+
+# Maximum duration for a solution process
+# MLP_MAX_DURATION = 3 s
+
+# Maximum number of iterations for a solution process
+# MLP_MAX_ITERATIONS = 1024
+# MLP_COEFFICIENT_D = 1.0
+# MLP_COEFFICIENT_U = 1.0
+# MLP_COEFFICIENT_R = 1.0
+MLP_MIN_BANDWIDTH = 1
+# MLP_MIN_CONNECTIONS = 4
+
+# MLP Log settings
+# Dump all problems to disk
+MLP_DUMP_PROBLEM_ALL = NO
+# Dump all solution to disk
+MLP_DUMP_SOLUTION_ALL = NO
+# Print GLPK output
+MLP_GLPK_VERBOSE = NO