Commit 7e993140 authored by yvonneanne's avatar yvonneanne

fix dependencies

parent d78751ba
......@@ -30,9 +30,7 @@ DEBUG = False
# In this example we compare Bonsai and Greedy. You can add more
# algorithms to this data structure to compare the performance
# of additional algorithms.
#algos = {'Bonsai': [RR_swap, RouteDetCirc], 'Greedy': [GreedyArborescenceDecomposition, RouteDetCirc], 'Adhoc': [AdHocExtraLinks, RouteDetCirc]}
algos = {'Greedy': [GreedyArborescenceDecomposition, RouteDetCirc], 'Adhoc': [AdHocExtraLinks, RouteDetCirc]}
algos = {'Bonsai': [RR_swap, RouteDetCirc], 'Greedy': [GreedyArborescenceDecomposition, RouteDetCirc]}
# run one experiment with graph g
# out denotes file handle to write results to
......@@ -230,4 +228,4 @@ if __name__ == "__main__":
end = time.time()
print("time elapsed", end - start)
print("start time", time.asctime(time.localtime(start)))
print("end time", time.asctime(time.localtime(end)))
\ No newline at end of file
print("end time", time.asctime(time.localtime(end)))
......@@ -5,7 +5,6 @@ import itertools
import random
import time
from arborescences import *
from extra_links import *
import glob
#global variables in this file
......@@ -442,4 +441,4 @@ class Statistic:
return max(self.load.values())
def load_distribution(self):
return [x*1.0/self.size**2 for x in np.bincount(self.load.values())]
\ No newline at end of file
return [x*1.0/self.size**2 for x in np.bincount(self.load.values())]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment