Merge branch 'master' of https://git.frank-ebner.de/FHWS/Fusion2018

tex/gfx/errorOverTime.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: errorOverTime.tex
-%%Creator: gnuplot 5.2 patchlevel 2
-%%CreationDate: Mon Feb 26 10:56:15 2018
+%%Creator: gnuplot 5.2 patchlevel 2 (Gentoo revision r0)
+%%CreationDate: Tue Mar 13 13:08:23 2018
 %%DocumentFonts: 
 %%BoundingBox: 50 50 316 194
 %%EndComments
@@ -438,10 +438,10 @@ systemdict /pdfmark known not {
 SDict begin [
   /Title (errorOverTime.tex)
   /Subject (gnuplot plot)
-  /Creator (gnuplot 5.2 patchlevel 2)
+  /Creator (gnuplot 5.2 patchlevel 2 (Gentoo revision r0))
 %  /Producer (gnuplot)
 %  /Keywords ()
-  /CreationDate (Mon Feb 26 10:56:15 2018)
+  /CreationDate (Tue Mar 13 13:08:23 2018)
   /DOCINFO pdfmark
 end
 } ifelse

tex/gfx/errorOverTime.tex

@@ -101,7 +101,7 @@
       \csname LTb\endcsname%%
       \put(4373,2486){\makebox(0,0)[r]{\strut{}\footnotesize{maximum particle}}}%
       \csname LTb\endcsname%%
-      \put(4373,2266){\makebox(0,0)[r]{\strut{}\footnotesize{weighted-average particle}}}%
+      \put(4373,2266){\makebox(0,0)[r]{\strut{}\footnotesize{weighted average particle}}}%
       \csname LTb\endcsname%%
       \put(4373,2046){\makebox(0,0)[r]{\strut{}\footnotesize{BoxKDE}}}%
     }%

tex/gfx/errorOverTimePlotterSolo.gp

@@ -21,7 +21,7 @@ set ytics 0,5,15
 
 plot \
 	"0_1519064452.csv" using ($1/1000):2 with lines lc rgb "#c8c8c8" lw 2.0 title "\\footnotesize{maximum particle}", \
-	"0_1519062956.csv" using ($1/1000):2 with lines lc rgb "#3465A4" lw 1.5 title "\\footnotesize{weighted-average particle}",\
+	"0_1519062956.csv" using ($1/1000):2 with lines lc rgb "#3465A4" lw 1.5 title "\\footnotesize{weighted average particle}",\
 	"0_1519062756.csv" using ($1/1000):2 with lines lc rgb "#FCAF3E" lw 1.5 title "\\footnotesize{BoxKDE}"
 	
 	

tex/gfx/perf.gp

@@ -21,11 +21,13 @@ set format y "\\footnotesize{$10^{%T}$}"
 set xlabel "\\footnotesize{number of grid points $G$}" 
 set ylabel "\\footnotesize{$t$ in seconds}" offset +2.7,0
 
+#"perf/FastKDE.csv"			using (column(1)**2):(column(2)) with lines lc rgb "#4E9A06" lw 2.0 title "\\footnotesize{FastKDE}",\
+#"perf/BoxSIMD.csv"			using (column(1)**2):(column(2)/1e9) with lines lc rgb "#FCAF3E" lw 2.0 dashtype 2 title "\\footnotesize{BoxKDE (SIMD)}",\
+
 plot \
-	"perf/FastKDE.csv"			using (column(1)**2):(column(2)) with lines lc rgb "#4E9A06" lw 2.0 title "\\footnotesize{FastKDE}",\
 	"perf/R.csv"				using (column(1)**2):(column(2)/1e9) with lines lc rgb "#CC0000" lw 2.0 title "\\footnotesize{BKDE}",\
 	"perf/Box.csv"				using (column(1)**2):(column(2)/1e9) with lines lc rgb "#FCAF3E" lw 2.0 title "\\footnotesize{BoxKDE}",\
-	"perf/WeightedAverage.csv"	using (column(1)**2):(column(2)/1e9) with lines lc rgb "#3465A4" lw 2.0 title "\\footnotesize{weighted-average}"
+	"perf/WeightedAverage.csv"	using (column(1)**2):(column(2)/1e9) with lines lc rgb "#3465A4" lw 2.0 title "\\footnotesize{weighted average}"
 
 #FCAF3E
 #CC0000

tex/gfx/perf.tex

@@ -82,15 +82,25 @@
 \begin{picture}(5040.00,3600.00)%
     \gplgaddtomacro\gplbacktext{%
       \csname LTb\endcsname%%
-      \put(554,983){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-6}$}}}%
+      \put(554,704){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-7}$}}}%
       \csname LTb\endcsname%%
-      \put(554,1540){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-4}$}}}%
+      \put(554,1013){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-6}$}}}%
       \csname LTb\endcsname%%
-      \put(554,2097){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-2}$}}}%
+      \put(554,1323){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-5}$}}}%
       \csname LTb\endcsname%%
-      \put(554,2654){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{0}$}}}%
+      \put(554,1632){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-4}$}}}%
       \csname LTb\endcsname%%
-      \put(554,3211){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{2}$}}}%
+      \put(554,1942){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-3}$}}}%
+      \csname LTb\endcsname%%
+      \put(554,2251){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-2}$}}}%
+      \csname LTb\endcsname%%
+      \put(554,2561){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{-1}$}}}%
+      \csname LTb\endcsname%%
+      \put(554,2870){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{0}$}}}%
+      \csname LTb\endcsname%%
+      \put(554,3180){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{1}$}}}%
+      \csname LTb\endcsname%%
+      \put(554,3489){\makebox(0,0)[r]{\strut{}\footnotesize{$10^{2}$}}}%
       \csname LTb\endcsname%%
       \put(686,484){\makebox(0,0){\strut{}\footnotesize{$10^{2}$}}}%
       \csname LTb\endcsname%%
@@ -111,13 +121,11 @@
       \put(30,2096){\rotatebox{-270}{\makebox(0,0){\strut{}\footnotesize{$t$ in seconds}}}}%
       \put(2829,154){\makebox(0,0){\strut{}\footnotesize{number of grid points $G$}}}%
       \csname LTb\endcsname%%
-      \put(4415,1460){\makebox(0,0)[r]{\strut{}\footnotesize{FastKDE}}}%
-      \csname LTb\endcsname%%
       \put(4415,1262){\makebox(0,0)[r]{\strut{}\footnotesize{BKDE}}}%
       \csname LTb\endcsname%%
       \put(4415,1064){\makebox(0,0)[r]{\strut{}\footnotesize{BoxKDE}}}%
       \csname LTb\endcsname%%
-      \put(4415,866){\makebox(0,0)[r]{\strut{}\footnotesize{weighted-average}}}%
+      \put(4415,866){\makebox(0,0)[r]{\strut{}\footnotesize{weighted average}}}%
     }%
     \gplbacktext
     \put(0,0){\includegraphics{perf}}%

tex/gfx/perf/BoxSIMD.csv

@@ -0,0 +1,60 @@
+10 972
+11 1053
+12 1188
+14 1350
+15 1458
+17 2079
+20 2295
+22 2268
+25 3024
+28 3321
+32 3267
+36 4644
+40 4914
+45 6481
+51 8209
+57 10855
+65 13583
+73 17174
+82 21333
+92 25465
+103 31027
+116 40263
+131 51902
+147 65674
+166 81444
+186 1.0902e+05
+209 1.4037e+05
+235 1.8028e+05
+265 2.3677e+05
+298 3.2e+05
+335 3.7625e+05
+376 4.8003e+05
+423 6.727e+05
+476 8.3675e+05
+535 1.2853e+06
+602 1.6774e+06
+676 2.1823e+06
+760 3.1376e+06
+855 5.1244e+06
+961 6.9201e+06
+1081 1.2096e+07
+1215 1.2767e+07
+1366 1.6668e+07
+1536 2.4807e+07
+1726 2.7084e+07
+1941 3.5893e+07
+2182 4.8553e+07
+2453 5.8113e+07
+2758 7.8821e+07
+3101 9.445e+07
+3486 1.2988e+08
+3919 1.5446e+08
+4406 2.09e+08
+4953 2.6146e+08
+5568 3.5769e+08
+6260 4.8602e+08
+7038 5.6313e+08
+7912 9.2187e+08
+8895 9.5432e+08
+10000 1.2414e+09