Merge pull request #513 from kosaniak/master

Prefer lesser numbers for the accelerator value

@@ -240,7 +240,9 @@ def compute_intrs(brokers_data, used_brokers):
     does not contain ``Default`` entry.
     does not contain ``Default`` entry.
     Using `load_data_from` with ``mode='brokers'`` is recommended.
     Using `load_data_from` with ``mode='brokers'`` is recommended.
     """
     """
-    def recur(l, r):
+    keys_to_prefer_lesser = ('accelerator',)
+
+    def recur(l, r, prefer_greater_numbers=True):
         l, r = deepcopy(l), deepcopy(r)
         l, r = deepcopy(l), deepcopy(r)
         if isinstance(l, list) and isinstance(r, list) and len(l) == len(r):
         if isinstance(l, list) and isinstance(r, list) and len(l) == len(r):
             lst = []
             lst = []
@@ -251,13 +253,15 @@ def compute_intrs(brokers_data, used_brokers):
             if l == r:
             if l == r:
                 return l
                 return l
             if l > r:
             if l > r:
-                return l
+                return l if prefer_greater_numbers else r
             if l < r:
             if l < r:
-                return r
+                return r if prefer_greater_numbers else l
         elif isinstance(l, dict) and isinstance(r, dict):
         elif isinstance(l, dict) and isinstance(r, dict):
             for k, v in r.iteritems():
             for k, v in r.iteritems():
                 if k not in l.keys():
                 if k not in l.keys():
                     l[k] = v
                     l[k] = v
+                elif k in keys_to_prefer_lesser:
+                   l[k] = recur(l[k], v, prefer_greater_numbers=False)
                 else:
                 else:
                     l[k] = recur(l[k], v)
                     l[k] = recur(l[k], v)
             return l
             return l