Finalize script and updated main plot

Author: astrofrog

comparison/benchmark.py

@@ -44,8 +44,8 @@ def time_stats(stmt=None, setup=None):
     return np.min(times) / number, np.mean(times) / number, np.median(times) / number
 
 
-FMT_HEADER = '# {:7s}' + ' {:10s}' * 8 + '\n'
-FMT = '{:9d}' + ' {:10.7e}' * 8 + '\n'
+FMT_HEADER = '# {:7s}' + ' {:10s}' * 12 + '\n'
+FMT = '{:9d}' + ' {:10.7e}' * 12 + '\n'
 
 with open('benchmark_times.txt', 'w') as f:
 

comparison/plot.py

@@ -4,13 +4,13 @@
 import matplotlib.pyplot as plt
 
 (size,
- np_1d_mean, np_1d_std, fa_1d_mean, fa_1d_std,
- np_2d_mean, np_2d_std, fa_2d_mean, fa_2d_std) = np.loadtxt('benchmark_times.txt', unpack=True)
+ np_1d_min, np_1d_mean, np_1d_median, fa_1d_min, fa_1d_mean, fa_1d_median,
+ np_2d_min, np_2d_mean, np_2d_median, fa_2d_min, fa_2d_mean, fa_2d_median) = np.loadtxt('benchmark_times.txt', unpack=True)
 
 fig = plt.figure()
 ax = fig.add_subplot(1, 1, 1)
-ax.plot(size, np_1d_mean / fa_1d_mean, color=(34 / 255, 122 / 255, 181 / 255), label='1D')
-ax.plot(size, np_2d_mean / fa_2d_mean, color=(255 / 255, 133 / 255, 25 / 255), label='2D')
+ax.plot(size, np_1d_min / fa_1d_min, color=(34 / 255, 122 / 255, 181 / 255), label='1D')
+ax.plot(size, np_2d_min / fa_2d_min, color=(255 / 255, 133 / 255, 25 / 255), label='2D')
 ax.set_xscale('log')
 ax.set_xlim(0.3, 3e8)
 ax.set_ylim(1, 35)