Merge remote-tracking branch 'upstream/master'

22 files changed, 175 insertions, 167 deletions

diff --git a/buch/papers/multiplikation/code/MM b/buch/papers/multiplikation/code/MM
index f07985f..d52dda4 100755
--- a/buch/papers/multiplikation/code/MM
+++ b/buch/papers/multiplikation/code/MM
diff --git a/buch/papers/multiplikation/code/MM.c b/buch/papers/multiplikation/code/MM.c
index 04c4dab..a897d4f 100755
--- a/buch/papers/multiplikation/code/MM.c
+++ b/buch/papers/multiplikation/code/MM.c
@@ -31,7 +31,7 @@ int main() {
 	run_algo(strassen, "strassen",0);

 

 	run_algo(MM, "MM", 0);

-  // run_algo(winograd, "winograd", 0);

+  run_algo(winograd, "winograd", 0);

   run_algo_cblas(0);

 

 	return 0;

diff --git a/buch/papers/multiplikation/code/MM.py b/buch/papers/multiplikation/code/MM.py
index 626b82d..47bd6ab 100644
--- a/buch/papers/multiplikation/code/MM.py
+++ b/buch/papers/multiplikation/code/MM.py
@@ -132,6 +132,10 @@ def winograd2(A, B):
     return C
         
 def test_perfomance(n):
+    
+    import mkl
+    mkl.set_num_threads(1)
+    
     t_mm = []
     t_mm_dc = []
     t_mm_strassen = []
@@ -144,21 +148,21 @@ def test_perfomance(n):
         # A = np.random.randint(-100, 100,(i, i))
         # B = np.random.randint(-100, 100,(i, i))
 
-        start = time.time()
-        C3 = strassen(A, B)
-        t_mm_strassen.append(time.time() - start)
+        # start = time.time()
+        # C3 = strassen(A, B)
+        # t_mm_strassen.append(time.time() - start)
 
-        start = time.time()
-        C1 = MM(A, B)
-        t_mm.append(time.time() - start)
+        # start = time.time()
+        # C1 = MM(A, B)
+        # t_mm.append(time.time() - start)
 
-        start = time.time()
-        C2 = MM_dc(A, B)
-        t_mm_dc.append(time.time() - start)
+        # start = time.time()
+        # C2 = MM_dc(A, B)
+        # t_mm_dc.append(time.time() - start)
 
-        start = time.time()
-        C4 = winograd2(A, B)
-        t_wino.append(time.time() - start)
+        # start = time.time()
+        # C4 = winograd2(A, B)
+        # t_wino.append(time.time() - start)
 
         start = time.time()
         C = A@B
@@ -169,22 +173,23 @@ def test_perfomance(n):
     plt.rc('axes', labelsize=23)
     plt.rc('xtick', labelsize=23)
     plt.rc('ytick', labelsize=23)
-    plt.plot(n, t_mm, label='Standard', lw=5)
-    plt.plot(n, t_mm_dc, label='Divide and conquer', lw=5)
-    plt.plot(n, t_mm_strassen, label='Strassen', lw=5)
-    plt.plot(n, t_wino, label='Winograd', lw=5)
+    # plt.plot(n, t_mm, label='Standard', lw=5)
+    # plt.plot(n, t_mm_dc, label='Divide and conquer', lw=5)
+    # plt.plot(n, t_mm_strassen, label='Strassen', lw=5)
+    # plt.plot(n, t_wino, label='Winograd', lw=5)
     plt.plot(n, t_np, label='NumPy A@B', lw=5)
+    # plt.xscale('log', base=2)
     plt.legend()
     plt.xlabel("n")
     plt.ylabel("time (s)")
-    plt.grid(True)
+    plt.grid(True, which="both", ls="-")
     plt.tight_layout()
     # plt.yscale('log')
     plt.legend(fontsize=19)
-    plt.savefig('meas_' + str(max(n))+ '.pdf')
-    arr = np.array([n, t_mm, t_mm_dc, t_mm_strassen, t_wino, t_np])
-    np.savetxt('meas_' + str(max(n))+ '.txt',arr)    
-    return arr
+    # plt.savefig('meas_' + str(max(n))+ '.pdf')
+    # arr = np.array([n, t_mm, t_mm_dc, t_mm_strassen, t_wino, t_np])
+    # np.savetxt('meas_' + str(max(n))+ '.txt',arr)    
+    return t_np
 
 
 def plot(num):
@@ -198,10 +203,11 @@ def plot(num):
     plt.plot(n, t_mm, label='3 For Loops', lw=5)
     plt.plot(n, t_mm_dc, label='Divide and Conquer', lw=5)
     plt.plot(n, t_mm_strassen, label='Strassen', lw=5)
-    # plt.plot(n, t_wino, label='Winograd', lw=5)
+    plt.plot(n, t_wino, label='Winograd', lw=5)
     plt.plot(n, t_np, label='NumPy A@B', lw=5)
     plt.legend()
     plt.xlabel("n")
+    # plt.yscale('log', base=10)
     plt.ylabel("time (s)")
     plt.grid(True)
     plt.tight_layout()
@@ -211,8 +217,9 @@ def plot(num):
     return arr
 
 def plot_c_res(ave, num):
+    
     MM = np.loadtxt("meas/MM.txt", delimiter=',')
-    # winograd = np.loadtxt("meas/winograd.txt", delimiter=',')
+    winograd = np.loadtxt("meas/winograd.txt", delimiter=',')
     blas = np.loadtxt("meas/blas.txt", delimiter=',')
     MM_dc = np.loadtxt("meas/MM_dc.txt", delimiter=',')
     strassen = np.loadtxt("meas/strassen.txt", delimiter=',')
@@ -232,10 +239,10 @@ def plot_c_res(ave, num):
     strassen_t = np.mean(strassen_t.reshape(-1,ave),axis=1)
     strassen_n = np.mean(strassen_n.reshape(-1,ave),axis=1)
     
-    # winograd_t = winograd[:,0] 
-    # winograd_n = winograd[:,1] 
-    # winograd_t = np.mean(winograd_t.reshape(-1,ave),axis=1)
-    # winograd_n = np.mean(winograd_n.reshape(-1,ave),axis=1)
+    winograd_t = winograd[:,0] 
+    winograd_n = winograd[:,1] 
+    winograd_t = np.mean(winograd_t.reshape(-1,ave),axis=1)
+    winograd_n = np.mean(winograd_n.reshape(-1,ave),axis=1)
     
     blas_t = blas[:,0] 
     blas_n = blas[:,1] 
@@ -255,7 +262,7 @@ def plot_c_res(ave, num):
     plt.rc('xtick', labelsize=23)
     plt.rc('ytick', labelsize=23)
     plt.plot(MM_n, MM_t, label='3 For Loops', lw=5)
-    # plt.plot(winograd_n, winograd_t, label='Winograd MM', lw=5)
+    plt.plot(winograd_n, winograd_t, label='Winograd MM', lw=5)
     plt.plot(blas_n, blas_t, label='Blas', lw=5)
     plt.plot(strassen_n, strassen_t, label='Strassen', lw=5)
     plt.plot(MM_dc_n, MM_dc_t, label='Divide and Conquer', lw=5)
@@ -275,22 +282,22 @@ def plot_c_res(ave, num):
 
 # test%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 if __name__ == '__main__':
-    plot_c_res(1, 4096)
+    # plot_c_res(1, 4096)
 
  
-    # plot(8)    
-    # n = np.logspace(1,10,10,base=2,dtype=(np.int))
+    # arr = plot(1024)    
+    n = np.logspace(1,12,12,base=2,dtype=(np.int))
     # n = np.arange(1,50,2)  
-    A = np.random.randint(-10, 10, (5,3))
-    B = np.random.randint(-10, 10, (3,5))
+    # A = np.random.randint(-10, 6, (5,3))
+    # B = np.random.randint(-10, 6, (3,5))
 
-    C = winograd2(A, B)
-    C_test = A@B
-    print(C)
-    print(C_test)
+    # C = winograd2(A, B)
+    # C_test = A@B
+    # print(C)
+    # print(C_test)
     # print(np.equal(C, C_test))
 
-    # t_np = test_perfomance(n)
+    t_np = test_perfomance(n)
     # C = strassen(A, B)
     # C_test = A@B
     
diff --git a/buch/papers/multiplikation/code/c_matrix.h b/buch/papers/multiplikation/code/c_matrix.h
index 13df55d..14389fc 100644
--- a/buch/papers/multiplikation/code/c_matrix.h
+++ b/buch/papers/multiplikation/code/c_matrix.h
@@ -1,97 +1,97 @@
-/* Seminar Matrizen, autogenerated File, Michael Schmid, 30/05/2021, 22:00:57 */ 
+/* Seminar Matrizen, autogenerated File, Michael Schmid, 02/08/2021, 22:48:43 */ 
  
 #include <stdint.h> 
 const int A0[][2] = 
   {
-    {-15,68},
-    {49,86}
+    {75,47},
+    {-41,-24}
   };
 const int B0[][2] = 
   {
-    {33,73},
-    {38,-76}
+    {-53,-95},
+    {-93,30}
   };
 const double dB0[][2] = 
   {
-    {33,73},
-    {38,-76}
+    {-53,-95},
+    {-93,30}
   };
 const double dA0[][2] = 
   {
-    {-15,68},
-    {49,86}
+    {75,47},
+    {-41,-24}
   };
 const int A1[][4] = 
   {
-    {75,-38,-32,-65},
-    {37,74,-31,29},
-    {15,-62,-20,-20},
-    {-31,-35,-89,47}
+    {47,11,-66,8},
+    {36,98,39,82},
+    {-32,12,40,-79},
+    {61,-20,-85,-98}
   };
 const int B1[][4] = 
   {
-    {71,90,78,-98},
-    {4,63,12,-47},
-    {11,-44,75,-69},
-    {95,-15,64,23}
+    {37,75,-53,9},
+    {37,-33,-67,38},
+    {70,39,-93,43},
+    {43,41,23,-4}
   };
 const double dB1[][4] = 
   {
-    {71,90,78,-98},
-    {4,63,12,-47},
-    {11,-44,75,-69},
-    {95,-15,64,23}
+    {37,75,-53,9},
+    {37,-33,-67,38},
+    {70,39,-93,43},
+    {43,41,23,-4}
   };
 const double dA1[][4] = 
   {
-    {75,-38,-32,-65},
-    {37,74,-31,29},
-    {15,-62,-20,-20},
-    {-31,-35,-89,47}
+    {47,11,-66,8},
+    {36,98,39,82},
+    {-32,12,40,-79},
+    {61,-20,-85,-98}
   };
 const int A2[][8] = 
   {
-    {80,42,3,-16,6,55,87,16},
-    {-99,-14,21,-1,-94,-56,91,10},
-    {-47,-55,-59,62,12,-53,87,-65},
-    {-60,94,-67,23,-62,33,-63,-72},
-    {12,-75,16,21,22,-37,1,16},
-    {-100,-99,82,-66,2,64,-13,44},
-    {59,-100,-90,8,36,-24,18,88},
-    {73,-58,75,-100,-19,-29,85,-19}
+    {-54,-87,87,69,52,-21,-86,55},
+    {19,-75,-61,-50,-55,-23,66,-92},
+    {-73,-67,-36,19,84,-11,24,46},
+    {-98,62,-76,57,-100,6,-23,-51},
+    {62,46,1,-64,42,-9,85,-12},
+    {35,-59,-17,-47,78,86,-50,74},
+    {-15,45,33,-59,-9,-81,49,96},
+    {-57,22,-43,7,-30,-45,-5,13}
   };
 const int B2[][8] = 
   {
-    {-61,88,69,49,-53,47,73,45},
-    {16,14,-88,-11,-67,-73,-20,43},
-    {-60,-63,26,32,-29,18,-44,-69},
-    {1,21,21,38,7,-100,-61,-76},
-    {-90,95,-99,88,49,-80,27,-36},
-    {24,-12,-47,-7,29,15,52,37},
-    {-98,-76,29,76,-41,-75,97,79},
-    {62,-90,-35,-14,-30,-42,-95,52}
+    {-71,-82,-80,-78,83,-97,48,-24},
+    {15,75,15,-60,-63,-53,1,-50},
+    {-84,63,67,-2,78,93,-13,95},
+    {61,-26,-88,56,56,27,26,1},
+    {2,54,21,36,9,-41,53,53},
+    {85,-11,42,-51,-6,3,27,97},
+    {10,-2,90,-76,-75,0,8,-37},
+    {10,-64,47,-69,66,-50,89,-66}
   };
 const double dB2[][8] = 
   {
-    {-61,88,69,49,-53,47,73,45},
-    {16,14,-88,-11,-67,-73,-20,43},
-    {-60,-63,26,32,-29,18,-44,-69},
-    {1,21,21,38,7,-100,-61,-76},
-    {-90,95,-99,88,49,-80,27,-36},
-    {24,-12,-47,-7,29,15,52,37},
-    {-98,-76,29,76,-41,-75,97,79},
-    {62,-90,-35,-14,-30,-42,-95,52}
+    {-71,-82,-80,-78,83,-97,48,-24},
+    {15,75,15,-60,-63,-53,1,-50},
+    {-84,63,67,-2,78,93,-13,95},
+    {61,-26,-88,56,56,27,26,1},
+    {2,54,21,36,9,-41,53,53},
+    {85,-11,42,-51,-6,3,27,97},
+    {10,-2,90,-76,-75,0,8,-37},
+    {10,-64,47,-69,66,-50,89,-66}
   };
 const double dA2[][8] = 
   {
-    {80,42,3,-16,6,55,87,16},
-    {-99,-14,21,-1,-94,-56,91,10},
-    {-47,-55,-59,62,12,-53,87,-65},
-    {-60,94,-67,23,-62,33,-63,-72},
-    {12,-75,16,21,22,-37,1,16},
-    {-100,-99,82,-66,2,64,-13,44},
-    {59,-100,-90,8,36,-24,18,88},
-    {73,-58,75,-100,-19,-29,85,-19}
+    {-54,-87,87,69,52,-21,-86,55},
+    {19,-75,-61,-50,-55,-23,66,-92},
+    {-73,-67,-36,19,84,-11,24,46},
+    {-98,62,-76,57,-100,6,-23,-51},
+    {62,46,1,-64,42,-9,85,-12},
+    {35,-59,-17,-47,78,86,-50,74},
+    {-15,45,33,-59,-9,-81,49,96},
+    {-57,22,-43,7,-30,-45,-5,13}
   };
 const int *Ap[3] = {(int*) A0,(int*) A1,(int*) A2}; 
 const int *Bp[3] = {(int*) B0,(int*) B1,(int*) B2}; 
diff --git a/buch/papers/multiplikation/code/c_meas_4096.pdf b/buch/papers/multiplikation/code/c_meas_4096.pdf
index 547d794..304015a 100644
--- a/buch/papers/multiplikation/code/c_meas_4096.pdf
+++ b/buch/papers/multiplikation/code/c_meas_4096.pdf
diff --git a/buch/papers/multiplikation/code/meas/MM.txt b/buch/papers/multiplikation/code/meas/MM.txt
index 1a0cd5d..13b6312 100644
--- a/buch/papers/multiplikation/code/meas/MM.txt
+++ b/buch/papers/multiplikation/code/meas/MM.txt
@@ -1,12 +1,12 @@
 0.000000,2
 0.000000,4
-0.000002,8
-0.000011,16
-0.000080,32
-0.000653,64
-0.005397,128
-0.045147,256
-0.487710,512
-3.964180,1024
-128.863544,2048
-996.370209,4096
+0.000001,8
+0.000010,16
+0.000081,32
+0.000654,64
+0.005556,128
+0.054253,256
+0.487317,512
+4.162845,1024
+125.909034,2048
+1111.312696,4096
diff --git a/buch/papers/multiplikation/code/meas/MM_dc.txt b/buch/papers/multiplikation/code/meas/MM_dc.txt
index 0d5580a..f6be928 100644
--- a/buch/papers/multiplikation/code/meas/MM_dc.txt
+++ b/buch/papers/multiplikation/code/meas/MM_dc.txt
@@ -1,12 +1,12 @@
-0.000006,2
-0.000007,4
-0.000035,8
-0.000228,16
-0.001310,32
-0.007204,64
-0.034338,128
-0.267511,256
-2.131212,512
-17.177403,1024
-146.112874,2048
-1156.777565,4096
+0.000003,2
+0.000002,4
+0.000010,8
+0.000068,16
+0.000594,32
+0.004264,64
+0.036289,128
+0.324645,256
+2.612010,512
+19.928951,1024
+159.333884,2048
+1147.106865,4096
diff --git a/buch/papers/multiplikation/code/meas/blas.txt b/buch/papers/multiplikation/code/meas/blas.txt
index 6b7cd0b..c3ec7ec 100644
--- a/buch/papers/multiplikation/code/meas/blas.txt
+++ b/buch/papers/multiplikation/code/meas/blas.txt
@@ -2,11 +2,11 @@
 0.000000,4
 0.000001,8
 0.000003,16
-0.000021,32
-0.000164,64
-0.001240,128
-0.009657,256
-0.072523,512
-0.735149,1024
-6.895747,2048
-56.812183,4096
+0.000022,32
+0.000179,64
+0.001278,128
+0.010165,256
+0.074739,512
+0.704748,1024
+6.845095,2048
+55.845038,4096
diff --git a/buch/papers/multiplikation/code/meas/strassen.txt b/buch/papers/multiplikation/code/meas/strassen.txt
index 89cf41a..69ea472 100644
--- a/buch/papers/multiplikation/code/meas/strassen.txt
+++ b/buch/papers/multiplikation/code/meas/strassen.txt
@@ -1,12 +1,12 @@
 0.000000,2
 0.000003,4
 0.000010,8
-0.000086,16
-0.000476,32
-0.003366,64
-0.025547,128
-0.184593,256
-1.248713,512
-9.007700,1024
-61.079879,2048
-424.493037,4096
+0.000066,16
+0.000470,32
+0.003368,64
+0.024232,128
+0.172000,256
+1.209262,512
+8.457472,1024
+59.267256,2048
+414.648901,4096
diff --git a/buch/papers/multiplikation/code/meas/winograd.txt b/buch/papers/multiplikation/code/meas/winograd.txt
index 3a4d88b..6e6208a 100644
--- a/buch/papers/multiplikation/code/meas/winograd.txt
+++ b/buch/papers/multiplikation/code/meas/winograd.txt
@@ -2,10 +2,11 @@
 0.000001,4
 0.000002,8
 0.000011,16
-0.000091,32
-0.000663,64
-0.005182,128
-0.046038,256
-0.533429,512
-4.257458,1024
-130.378038,2048
+0.000100,32
+0.000654,64
+0.005229,128
+0.057440,256
+0.517850,512
+4.539413,1024
+130.627663,2048
+1179.261048,4096
diff --git a/buch/papers/multiplikation/code/meas_1024.pdf b/buch/papers/multiplikation/code/meas_1024.pdf
index fd0a108..3312420 100644
--- a/buch/papers/multiplikation/code/meas_1024.pdf
+++ b/buch/papers/multiplikation/code/meas_1024.pdf
diff --git a/buch/papers/multiplikation/code/meas_1024.txt b/buch/papers/multiplikation/code/meas_1024.txt
index c5ce619..ab507a2 100644
--- a/buch/papers/multiplikation/code/meas_1024.txt
+++ b/buch/papers/multiplikation/code/meas_1024.txt
@@ -1,6 +1,6 @@
 2.000000000000000000e+00 4.000000000000000000e+00 8.000000000000000000e+00 1.600000000000000000e+01 3.200000000000000000e+01 6.400000000000000000e+01 1.280000000000000000e+02 2.560000000000000000e+02 5.120000000000000000e+02 1.024000000000000000e+03
-1.502037048339843750e-05 6.628036499023437500e-05 4.780292510986328125e-04 2.713203430175781250e-03 2.115225791931152344e-02 1.758832931518554688e-01 1.338865518569946289e+00 1.009106445312500000e+01 8.192077994346618652e+01 7.835870332717895508e+02
-6.675720214843750000e-06 7.200241088867187500e-05 5.540847778320312500e-04 3.144979476928710938e-03 2.545046806335449219e-02 2.083067893981933594e-01 1.659256219863891602e+00 1.319160294532775879e+01 1.046767003536224365e+02 9.679818902015686035e+02
-1.668930053710937500e-05 1.628398895263671875e-04 7.648468017578125000e-04 4.426956176757812500e-03 2.922415733337402344e-02 1.800994873046875000e-01 1.286747694015502930e+00 9.412034273147583008e+00 6.263725924491882324e+01 4.427414393424987793e+02
-2.408027648925781250e-05 8.463859558105468750e-05 4.761219024658203125e-04 2.339839935302734375e-03 1.682758331298828125e-02 1.299476623535156250e-01 1.048770904541015625e+00 8.114667415618896484e+00 6.373566389083862305e+01 6.489995403289794922e+02
-1.573562622070312500e-05 7.152557373046875000e-06 7.152557373046875000e-06 2.074241638183593750e-05 5.388259887695312500e-05 6.365776062011718750e-05 3.257751464843750000e-03 1.396179199218750000e-03 3.274917602539062500e-03 2.186250686645507812e-02
+1.859664916992187500e-05 8.296966552734375000e-05 5.471706390380859375e-04 3.053665161132812500e-03 2.407431602478027344e-02 1.868948936462402344e-01 1.563691616058349609e+00 1.100623321533203125e+01 8.547679090499877930e+01 7.507572824954986572e+02
+8.106231689453125000e-06 9.012222290039062500e-05 7.290840148925781250e-04 4.970788955688476562e-03 2.718997001647949219e-02 2.652802467346191406e-01 1.777865171432495117e+00 1.327002429962158203e+01 1.053971357345581055e+02 8.473208103179931641e+02
+2.098083496093750000e-05 1.742839813232421875e-04 9.438991546630859375e-04 4.754066467285156250e-03 4.852557182312011719e-02 2.204136848449707031e-01 1.447179555892944336e+00 9.938656568527221680e+00 6.396102952957153320e+01 4.614939928054809570e+02
+2.789497375488281250e-05 1.049041748046875000e-04 5.528926849365234375e-04 4.555702209472656250e-03 1.871442794799804688e-02 1.530685424804687500e-01 1.194762229919433594e+00 8.298985958099365234e+00 6.836994743347167969e+01 5.373736469745635986e+02
+1.835823059082031250e-05 7.867813110351562500e-06 1.001358032226562500e-05 5.412101745605468750e-05 4.267692565917968750e-05 1.184940338134765625e-04 2.441406250000000000e-04 6.957054138183593750e-04 2.217054367065429688e-03 1.880884170532226562e-02
diff --git a/buch/papers/multiplikation/code/meas_128.pdf b/buch/papers/multiplikation/code/meas_128.pdf
index ed1ec63..c54648f 100644
--- a/buch/papers/multiplikation/code/meas_128.pdf
+++ b/buch/papers/multiplikation/code/meas_128.pdf
diff --git a/buch/papers/multiplikation/code/meas_128.txt b/buch/papers/multiplikation/code/meas_128.txt
index 976bbdf..f3a5beb 100644
--- a/buch/papers/multiplikation/code/meas_128.txt
+++ b/buch/papers/multiplikation/code/meas_128.txt
@@ -1,6 +1,6 @@
 2.000000000000000000e+00 4.000000000000000000e+00 8.000000000000000000e+00 1.600000000000000000e+01 3.200000000000000000e+01 6.400000000000000000e+01 1.280000000000000000e+02
-1.978874206542968750e-05 1.134872436523437500e-04 4.298686981201171875e-04 2.815246582031250000e-03 2.616596221923828125e-02 1.767718791961669922e-01 1.293319463729858398e+00
-6.675720214843750000e-06 1.251697540283203125e-04 4.818439483642578125e-04 3.490447998046875000e-03 2.465796470642089844e-02 2.014584541320800781e-01 1.630620479583740234e+00
-2.408027648925781250e-05 2.126693725585937500e-04 1.172780990600585938e-03 4.364490509033203125e-03 3.148293495178222656e-02 2.010228633880615234e-01 1.429297924041748047e+00
-2.932548522949218750e-05 1.466274261474609375e-04 4.270076751708984375e-04 2.837419509887695312e-03 1.723575592041015625e-02 1.308519840240478516e-01 1.015527009963989258e+00
-3.337860107421875000e-05 1.096725463867187500e-05 9.536743164062500000e-06 3.600120544433593750e-05 2.837181091308593750e-05 5.912780761718750000e-05 1.981019973754882812e-03
+1.239776611328125000e-05 5.507469177246093750e-05 3.888607025146484375e-04 2.762079238891601562e-03 2.097773551940917969e-02 1.672370433807373047e-01 1.410297393798828125e+00
+5.483627319335937500e-06 5.888938903808593750e-05 3.871917724609375000e-04 3.364324569702148438e-03 2.481031417846679688e-02 2.047052383422851562e-01 1.712310314178466797e+00
+1.358985900878906250e-05 1.189708709716796875e-04 6.430149078369140625e-04 5.586385726928710938e-03 3.101944923400878906e-02 1.874091625213623047e-01 1.327976465225219727e+00
+1.978874206542968750e-05 7.224082946777343750e-05 4.618167877197265625e-04 3.294944763183593750e-03 1.755571365356445312e-02 1.360688209533691406e-01 1.028253555297851562e+00
+1.215934753417968750e-05 5.722045898437500000e-06 2.074241638183593750e-05 4.339218139648437500e-05 2.813339233398437500e-05 5.292892456054687500e-05 1.921653747558593750e-04
diff --git a/buch/papers/multiplikation/code/meas_256.pdf b/buch/papers/multiplikation/code/meas_256.pdf
index 5f049dc..2eb177b 100644
--- a/buch/papers/multiplikation/code/meas_256.pdf
+++ b/buch/papers/multiplikation/code/meas_256.pdf
diff --git a/buch/papers/multiplikation/code/meas_256.txt b/buch/papers/multiplikation/code/meas_256.txt
index 15035c6..62e77cb 100644
--- a/buch/papers/multiplikation/code/meas_256.txt
+++ b/buch/papers/multiplikation/code/meas_256.txt
@@ -1,6 +1,6 @@
 2.000000000000000000e+00 4.000000000000000000e+00 8.000000000000000000e+00 1.600000000000000000e+01 3.200000000000000000e+01 6.400000000000000000e+01 1.280000000000000000e+02 2.560000000000000000e+02
-1.049041748046875000e-05 5.340576171875000000e-05 5.936622619628906250e-04 2.707719802856445312e-03 2.246093750000000000e-02 1.631326675415039062e-01 1.335460901260375977e+00 1.052024245262145996e+01
-4.768371582031250000e-06 5.531311035156250000e-05 8.208751678466796875e-04 3.099203109741210938e-03 2.490711212158203125e-02 2.070860862731933594e-01 1.739669799804687500e+00 1.384817218780517578e+01
-1.478195190429687500e-05 1.132488250732421875e-04 5.970001220703125000e-04 3.906726837158203125e-03 3.041696548461914062e-02 2.000186443328857422e-01 1.392681598663330078e+00 9.388872385025024414e+00
-1.716613769531250000e-05 6.866455078125000000e-05 5.314350128173828125e-04 2.688407897949218750e-03 1.695108413696289062e-02 1.297233104705810547e-01 1.087257385253906250e+00 8.699601650238037109e+00
-2.336502075195312500e-05 4.529953002929687500e-06 8.106231689453125000e-06 4.291534423828125000e-05 6.008148193359375000e-05 8.988380432128906250e-05 1.647472381591796875e-04 4.460811614990234375e-04
+1.144409179687500000e-05 5.507469177246093750e-05 3.774166107177734375e-04 3.177404403686523438e-03 2.508044242858886719e-02 2.120554447174072266e-01 1.431464910507202148e+00 1.076412820816040039e+01
+5.722045898437500000e-06 5.745887756347656250e-05 4.494190216064453125e-04 3.611087799072265625e-03 3.317713737487792969e-02 2.292332649230957031e-01 2.090558290481567383e+00 1.306217479705810547e+01
+1.788139343261718750e-05 1.168251037597656250e-04 5.981922149658203125e-04 4.416465759277343750e-03 3.002405166625976562e-02 2.104022502899169922e-01 1.488269329071044922e+00 9.164114713668823242e+00
+1.955032348632812500e-05 7.224082946777343750e-05 3.829002380371093750e-04 2.558946609497070312e-03 2.043128013610839844e-02 1.361320018768310547e-01 1.089214324951171875e+00 8.553364753723144531e+00
+2.384185791015625000e-05 5.245208740234375000e-06 6.437301635742187500e-06 2.455711364746093750e-05 4.148483276367187500e-05 8.702278137207031250e-05 3.793239593505859375e-04 6.709098815917968750e-04
diff --git a/buch/papers/multiplikation/code/meas_32.pdf b/buch/papers/multiplikation/code/meas_32.pdf
index 94c3731..b926095 100644
--- a/buch/papers/multiplikation/code/meas_32.pdf
+++ b/buch/papers/multiplikation/code/meas_32.pdf
diff --git a/buch/papers/multiplikation/code/meas_32.txt b/buch/papers/multiplikation/code/meas_32.txt
index afdb6d5..0fdc18d 100644
--- a/buch/papers/multiplikation/code/meas_32.txt
+++ b/buch/papers/multiplikation/code/meas_32.txt
@@ -1,6 +1,6 @@
 2.000000000000000000e+00 4.000000000000000000e+00 8.000000000000000000e+00 1.600000000000000000e+01 3.200000000000000000e+01
-1.215934753417968750e-05 5.459785461425781250e-05 3.700256347656250000e-04 3.249406814575195312e-03 1.996850967407226562e-02
-4.529953002929687500e-06 5.650520324707031250e-05 4.577636718750000000e-04 4.029273986816406250e-03 2.444481849670410156e-02
-1.311302185058593750e-05 1.165866851806640625e-04 6.275177001953125000e-04 4.323244094848632812e-03 2.624726295471191406e-02
-1.835823059082031250e-05 6.890296936035156250e-05 3.914833068847656250e-04 2.423048019409179688e-03 1.761770248413085938e-02
-1.263618469238281250e-05 5.006790161132812500e-06 5.960464477539062500e-06 1.144409179687500000e-05 3.600120544433593750e-05
+1.239776611328125000e-05 5.507469177246093750e-05 3.802776336669921875e-04 2.795457839965820312e-03 2.073740959167480469e-02
+5.006790161132812500e-06 5.841255187988281250e-05 3.988742828369140625e-04 3.505229949951171875e-03 2.511668205261230469e-02
+1.335144042968750000e-05 1.149177551269531250e-04 6.387233734130859375e-04 4.088878631591796875e-03 2.969408035278320312e-02
+1.955032348632812500e-05 8.058547973632812500e-05 3.998279571533203125e-04 2.514839172363281250e-03 1.842117309570312500e-02
+1.215934753417968750e-05 8.583068847656250000e-06 6.675720214843750000e-06 2.694129943847656250e-05 2.789497375488281250e-05
diff --git a/buch/papers/multiplikation/code/meas_4096.pdf b/buch/papers/multiplikation/code/meas_4096.pdf
new file mode 100644
index 0000000..e889d17
--- /dev/null
+++ b/buch/papers/multiplikation/code/meas_4096.pdf
diff --git a/buch/papers/multiplikation/code/meas_4096.txt b/buch/papers/multiplikation/code/meas_4096.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/buch/papers/multiplikation/code/meas_4096.txt
diff --git a/buch/papers/multiplikation/code/meas_64.pdf b/buch/papers/multiplikation/code/meas_64.pdf
index 3a90949..92af29b 100644
--- a/buch/papers/multiplikation/code/meas_64.pdf
+++ b/buch/papers/multiplikation/code/meas_64.pdf
diff --git a/buch/papers/multiplikation/code/meas_64.txt b/buch/papers/multiplikation/code/meas_64.txt
index ae6ff9b..b4fc7a1 100644
--- a/buch/papers/multiplikation/code/meas_64.txt
+++ b/buch/papers/multiplikation/code/meas_64.txt
@@ -1,6 +1,6 @@
 2.000000000000000000e+00 4.000000000000000000e+00 8.000000000000000000e+00 1.600000000000000000e+01 3.200000000000000000e+01 6.400000000000000000e+01
-1.645088195800781250e-05 7.295608520507812500e-05 3.807544708251953125e-04 2.672195434570312500e-03 2.010774612426757812e-02 1.662156581878662109e-01
-7.390975952148437500e-06 7.843971252441406250e-05 4.265308380126953125e-04 3.107070922851562500e-03 2.457642555236816406e-02 2.122807502746582031e-01
-1.931190490722656250e-05 1.568794250488281250e-04 7.593631744384765625e-04 3.937005996704101562e-03 3.596329689025878906e-02 2.131938934326171875e-01
-2.622604370117187500e-05 9.226799011230468750e-05 3.504753112792968750e-04 2.469539642333984375e-03 1.652932167053222656e-02 1.281068325042724609e-01
-1.788139343261718750e-05 7.152557373046875000e-06 6.914138793945312500e-06 1.120567321777343750e-05 2.884864807128906250e-05 6.914138793945312500e-05
+2.145767211914062500e-05 6.175041198730468750e-05 4.422664642333984375e-04 3.235816955566406250e-03 2.289748191833496094e-02 1.855163574218750000e-01
+1.025199890136718750e-05 6.341934204101562500e-05 5.202293395996093750e-04 3.566026687622070312e-03 3.026723861694335938e-02 2.312932014465332031e-01
+2.384185791015625000e-05 1.807212829589843750e-04 6.821155548095703125e-04 4.796504974365234375e-03 2.968001365661621094e-02 2.291278839111328125e-01
+3.504753112792968750e-05 1.106262207031250000e-04 4.322528839111328125e-04 2.696514129638671875e-03 2.188420295715332031e-02 1.477701663970947266e-01
+3.218650817871093750e-05 1.144409179687500000e-05 7.390975952148437500e-06 4.625320434570312500e-05 3.814697265625000000e-05 5.435943603515625000e-05