Merged conflicts.

modsim/ass4_taddeus/vibstring/plot_benchmark.py

@@ -24,13 +24,13 @@ x = x[1:]
 y = y[1:]
 
 # Least squares data fit
-c = tuple(polyfit(, y, 2).tolist())
+c = tuple(polyfit(x, y, 2).tolist())
 fit = polyval(c, x)
 
 # Plot and optionally save data
 plot(x, y, 'x')
-plot(seq[0], seq[1], 'x')
 plot(x, fit, '-')
+plot(seq[0], seq[1], 'x')
 xlabel('Aantal processen')
 ylabel('Tijd (s)')
 if len(argv) > 1:

modsim/ass4_taddeus/vibstring/report/bench.txt

-1 9.67
-1 9.67
 1 9.69
 1 9.69
-2 6.10
+1 9.69
+1 10.84
+2 5.83
+2 5.81
 2 5.78
 2 5.78
-2 5.81
-3 4.40
-3 4.37
+3 4.38
+3 4.35
+3 4.38
 3 4.37
-3 4.36
-4 3.72
-4 3.66
-4 3.65
+4 4.00
 4 3.67
-5 3.81
-5 3.47
-5 3.31
+4 3.65
+4 3.68
+5 3.60
 5 3.24
-Command exited with non-zero status 1
-6 21.04
-6 3.40
-6 4.00
-6 3.38
-7 3.05
-7 3.20
+5 3.46
+5 3.24
+6 4.10
+6 3.55
+6 3.18
+6 3.44
+7 3.09
 7 2.99
-7 7.03
-8 2.92
-8 2.86
+7 3.18
+7 3.18
+8 3.73
+8 3.00
 8 2.67
-8 3.07
-9 2.82
+8 2.85
+9 3.25
+9 2.76
 9 2.76
-9 2.77
-9 2.98
-10 2.76
-10 2.69
-10 3.31
+9 2.56
+10 2.74
+10 3.51
 10 2.88
-11 2.52
-11 2.84
-11 3.23
-11 2.84
-Command exited with non-zero status 1
-12 21.14
-12 3.34
-12 3.58
-12 2.78
-13 3.79
-13 2.54
-13 2.33
-13 3.34
+10 3.68
+11 3.05
+11 3.65
+11 3.43
+11 3.03
+12 3.66
+12 2.58
+12 3.19
+12 2.57
+13 3.47
+13 3.94
+13 2.36
+13 3.54