From e77c70cbfc2957a86b2550027e72b0391767dff7 Mon Sep 17 00:00:00 2001
From: Hans-Peter Deifel <hpd@hpdeifel.de>
Date: Sun, 6 Jan 2019 14:33:36 +0100
Subject: [PATCH] optimizations: Consolidate data tables

---
 optimizations/optimizations.org | 48 +++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/optimizations/optimizations.org b/optimizations/optimizations.org
index 67676ab..e7e8a03 100644
--- a/optimizations/optimizations.org
+++ b/optimizations/optimizations.org
@@ -3,20 +3,34 @@
 * The "skip one-element blocks" Optimization
 ** The Data
 
-| Benchmark  |     Time1 |     Time2 |     Time3 | Mean                       |
-|------------+-----------+-----------+-----------+----------------------------|
-| wlan opt   | 15.090650 | 15.047678 | 15.197588 | 15.111972 +/- 0.044569133  |
-| wlan noopt | 15.389362 | 15.363879 | 15.274502 | 15.342581 +/- 0.034825319  |
-|------------+-----------+-----------+-----------+----------------------------|
-| fms opt    | 21.126185 | 20.870302 | 20.996653 | 20.997713 +/- 0.073868962  |
-| fms noopt  | 35.581014 | 36.222743 | 36.020706 | 35.941488 +/- 0.18943837   |
-|------------+-----------+-----------+-----------+----------------------------|
-| dfa opt    | 3.8669068 | 3.8483511 | 3.8465348 | 3.8539309 +/- 6.5091019e-3 |
-| dfa noopt  | 47.182955 | 47.271392 | 47.166293 | 47.20688 +/- 0.032612647   |
-#+TBLFM: @6$2..@6$4=remote(c21020da-1d9c-4553-bffe-478b4e35aa90, @$#$10)
-#+TBLFM: @7$2..@7$4=remote(d2559cc7-c179-48cf-aaab-c7f17a29ea1a, @$#$10)
-#+TBLFM: @2$2..@2$4=remote(a61de2c3-45be-4184-b947-7ddcc41d451f, @$#$11)
-#+TBLFM: @3$2..@3$4=remote(82a6bf0c-547c-4e84-baa1-98c53379d7f3, @$#$11)
-#+TBLFM: @4$2..@4$4=remote(cdef09e0-b92a-46db-9ed5-be0cde788441, @$#$11)
-#+TBLFM: @5$2..@5$4=remote(966b0dc7-cf00-4594-88ae-80332696166e, @$#$11)
-#+TBLFM: $5=vmeane($2..$4)
+#+NAME: one-elem-data
+| Benchmark  |     Time1 |     Time2 |     Time3 |      Mean |
+|------------+-----------+-----------+-----------+-----------|
+| wlan opt   | 39.976493 | 39.832630 | 39.784828 | 39.864650 |
+| wlan noopt | 40.482061 | 40.554590 | 40.829683 | 40.622111 |
+|------------+-----------+-----------+-----------+-----------|
+| fms  opt   | 21.126185 | 20.870302 | 20.996653 | 20.997713 |
+| fms  noopt | 35.581014 | 36.222743 | 36.020706 | 35.941488 |
+|------------+-----------+-----------+-----------+-----------|
+| dfa  opt   | 3.8669068 | 3.8483511 | 3.8465348 | 3.8539309 |
+| dfa  noopt | 47.182955 | 47.271392 | 47.166293 |  47.20688 |
+#+TBLFM: @6$2..@6$4=remote(c21020da-1d9c-4553-bffe-478b4e35aa90, @$#$10)::@7$2..@7$4=remote(d2559cc7-c179-48cf-aaab-c7f17a29ea1a, @$#$10)::@2$2..@2$4=remote(d39b3290-297b-4063-8464-a011a048eff4, @$#$11)::@3$2..@3$4=remote(eb6cd726-026c-49ec-974a-1b6285d0fabb, @$#$11)::@4$2..@4$4=remote(cdef09e0-b92a-46db-9ed5-be0cde788441, @$#$11)::@5$2..@5$4=remote(966b0dc7-cf00-4594-88ae-80332696166e, @$#$11)::$5=vmean($2..$4)
+
+** Making the data easier for pgfplot
+*** Opt
+
+| Benchmark |      Time |
+|-----------+-----------|
+| wlan      |  39.86465 |
+| fms       | 20.997713 |
+| dfa       | 3.8539309 |
+#+TBLFM: @2$2=remote(one-elem-data, @2$5)::@3$2=remote(one-elem-data, @4$5)::@4$2=remote(one-elem-data, @6$5)
+
+*** Noopt
+
+| Benchmark |      Time |
+|-----------+-----------|
+| wlan      | 40.622111 |
+| fms       | 35.941488 |
+| dfa       |  47.20688 |
+#+TBLFM: @2$2=remote(one-elem-data, @3$5)::@3$2=remote(one-elem-data, @5$5)::@4$2=remote(one-elem-data, @7$5)
-- 
GitLab