use explicitly ListWeightedMap in tests

Author: matiasg

tests/test_large_case.py

@@ -33,7 +33,7 @@ def large_one_to_one():
         wmap_list.append({'from': str(e), 'to': str(e), 'weight': 0})
         wmap_list.append({'from': str(e), 'to': str((e + 1) % len(elements)), 'weight': 1})
         wmap_list.append({'from': str(e), 'to': str((e - 1) % len(elements)), 'weight': 1})
-    wmap = allocating.WeightedMap(wmap_list)
+    wmap = allocating.ListWeightedMap(wmap_list)
 
     yield allocating.Allocator(sources, wmap, targets)
 
@@ -48,7 +48,7 @@ def large_one_to_one_alternate():
         wmap_list.append({'from': str(e), 'to': str(e), 'weight': 1})
         wmap_list.append({'from': str(e), 'to': str((e + 1) % len(elements)), 'weight': 3 * (e % 2)})
         wmap_list.append({'from': str(e), 'to': str((e - 1) % len(elements)), 'weight': 2.5})
-    wmap = allocating.WeightedMap(wmap_list)
+    wmap = allocating.ListWeightedMap(wmap_list)
 
     yield allocating.Allocator(sources, wmap, targets)
 
@@ -77,7 +77,7 @@ def large_random(sources_number, targets_number, choices, limit_denominator):
         for t in stargets:
             wmap_list.append({'from': source, 'to': t,
                               'weight': random.uniform(0, 1)})
-    wmap = allocating.WeightedMap(wmap_list)
+    wmap = allocating.DictWeightedMap(wmap_list)
 
     return allocating.Allocator(sources, wmap, targets, limit_denominator)
 

tests/test_small_cases.py

@@ -45,7 +45,7 @@ def small_wmap():
             {'from': 'a', 'to': 1, 'weight': 0},
             {'from': 'b', 'to': 0, 'weight': 2}
             ]
-    yield allocating.WeightedMap(the_list)
+    yield allocating.ListWeightedMap(the_list)
 
 
 @pytest.fixture
@@ -157,7 +157,7 @@ def small_allocator_2():
             {'from': 'b', 'to': 0, 'weight': 1},
             {'from': 'b', 'to': 1, 'weight': 0}
             ]
-    wmap = allocating.WeightedMap(the_list)
+    wmap = allocating.ListWeightedMap(the_list)
     instances = {'a': 2, 'b': 1}
     capacities = {0: 2, 1: 1}
     yield allocating.Allocator(instances, wmap, capacities)
@@ -174,7 +174,7 @@ def small_allocator_3():
     the_list = [
             {'from': 'a', 'to': 0, 'weight': 0},
             ]
-    wmap = allocating.WeightedMap(the_list)
+    wmap = allocating.ListWeightedMap(the_list)
     instances = {'a': 1}
     capacities = {0: 1, 1: 1}
     yield allocating.Allocator(instances, wmap, capacities)