From 08e35eda844c703743fdf0668bfc054eee9454b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 16 Jan 2014 14:37:09 +0100
Subject: [PATCH] Bilderposition korregiert

---
 bericht/abschnitte/bench-iozone.tex |  16 +--
 bericht/benchmarks/ping-pong.tex    | 146 ----------------------------
 2 files changed, 9 insertions(+), 153 deletions(-)
 delete mode 100644 bericht/benchmarks/ping-pong.tex

diff --git a/bericht/abschnitte/bench-iozone.tex b/bericht/abschnitte/bench-iozone.tex
index 46d3cfb..aefcd99 100644
--- a/bericht/abschnitte/bench-iozone.tex
+++ b/bericht/abschnitte/bench-iozone.tex
@@ -4,21 +4,18 @@ Es wurden ein neu angelegtes NFS- und das vorhandene FastFS-Dateisystem vermesse
 
 \subsubsection{NFS}
 
-Testaufruf:
-
-\shellcmd{./iozone -azcR -I -U /mnt/data -f /mnt/data/testfile -b excel-nfs.xls}\\
-
 \begin{figure}[h!]
   \centering
   \includegraphics{benchmarks/iozone-nfs-read-tmpl.pdf}
   \includegraphics{benchmarks/iozone-nfs-write-tmpl.pdf}
 \end{figure}
 
-\subsubsection{FastFS}
-
 Testaufruf:
 
-\shellcmd{./iozone -azcR -+q 1 -U /fastfs -f /fastfs/testfile -b excel-fastfs.xls}\\
+\shellcmd{./iozone -azcR -I -U /mnt/data -f /mnt/data/testfile -b excel-nfs.xls}\\
+
+
+\subsubsection{FastFS}
 
 \begin{figure}[h!]
   \centering
@@ -26,3 +23,8 @@ Testaufruf:
   \includegraphics{benchmarks/iozone-fastfs-write-tmpl.pdf}
 \end{figure}
 
+Testaufruf:
+
+\shellcmd{./iozone -azcR -+q 1 -U /fastfs -f /fastfs/testfile -b excel-fastfs.xls}\\
+
+
diff --git a/bericht/benchmarks/ping-pong.tex b/bericht/benchmarks/ping-pong.tex
deleted file mode 100644
index c6dd21e..0000000
--- a/bericht/benchmarks/ping-pong.tex
+++ /dev/null
@@ -1,146 +0,0 @@
-\documentclass{standalone}
-\usepackage{pgfplots}
-\usepgfplotslibrary{dateplot}
-\usepackage{tikz}
-\usepackage{pgfplotstable}
-
-\begin{document}
-
-\begin{tikzpicture}
-\pgfplotstableread{
-fs t s
-0 88.99 0.00
-1 109.42 0.01
-2 109.43 0.02
-4 109.62 0.03
-8 109.83 0.07
-16 109.87 0.14
-32 110.12 0.28
-64 143.19 0.43
-128 149.24 0.82
-256 150.41 1.62
-512 155.65 3.14
-1024 160.39 6.09
-2048 164.54 11.87
-4096 217.32 17.97
-8192 308.20 25.35
-16384 434.78 35.94
-32768 573.14 54.52
-65536 1742.36 35.87
-131072 1800.80 69.41
-262144 3070.65 81.42
-524288 5457.60 91.62
-1048576 10350.31 96.62
-2097152 20150.02 99.26
-4194304 38953.70 102.69
-8388608 77368.40 103.40
-16777216 154088.97 103.84
-33554432 319229.01 100.24
-67108864 634328.48 100.89
-134217728 1262632.97 101.38
-268435456 2514089.47 101.83
-536870912 5052755.00 101.33
-}\imbpingpong
-
-\begin{tikzpicture}
-    \begin{axis}[
-        xmin=1,
-        xmax=536870912,
-        xmode=log,
-        ymode=log,
-        ytick pos=left,
-        log basis x=2,
-        xlabel={Dateigröße in KiB},
-        ylabel={Zugriffszeit in $\mu$s},
-        y axis line style=blue,
-        x axis line style=black,
-        width=15cm, height=10cm
-    ]
-    \addplot[smooth,blue] table[x={fs}, y={t}] {\imbpingpong};
-    \end{axis}
-    \begin{axis}[
-        xmin=1,
-        xmax=536870912,
-        xmode=log,
-        ytick pos=right,
-        axis y line* = right,
-        hide x axis,
-        ylabel={Übertragungsgeschwindigkeit in MiB/s},
-        ylabel={{\"U}bertragungsgeschwindigkeit in MiB/s},
-        ylabel near ticks,
-        y axis line style=red,
-        x axis line style=black,
-        width=15cm, height=10cm
-      ]
-    \addplot[smooth,red] table[x={fs}, y={s}] {\imbpingpong};
-    \end{axis}
-\end{tikzpicture}
-\pgfplotstableread{
-fs t s
-0 88.99 0.00
-1 109.42 0.01
-2 109.43 0.02
-4 109.62 0.03
-8 109.83 0.07
-16 109.87 0.14
-32 110.12 0.28
-64 143.19 0.43
-128 149.24 0.82
-256 150.41 1.62
-512 155.65 3.14
-1024 160.39 6.09
-2048 164.54 11.87
-4096 217.32 17.97
-8192 308.20 25.35
-16384 434.78 35.94
-32768 573.14 54.52
-65536 1742.36 35.87
-131072 1800.80 69.41
-262144 3070.65 81.42
-524288 5457.60 91.62
-1048576 10350.31 96.62
-2097152 20150.02 99.26
-4194304 38953.70 102.69
-8388608 77368.40 103.40
-16777216 154088.97 103.84
-33554432 319229.01 100.24
-67108864 634328.48 100.89
-134217728 1262632.97 101.38
-268435456 2514089.47 101.83
-536870912 5052755.00 101.33
-}\imbpingpong
-
-\begin{tikzpicture}
-    \begin{axis}[
-        xmin=1,
-        xmax=536870912,
-        xmode=log,
-        ymode=log,
-        ytick pos=left,
-        log basis x=2,
-        xlabel={Dateigr{\"o}{\ss}e in KiB},
-        ylabel={Zugriffszeit in $\mu$s},
-        y axis line style=blue,
-        x axis line style=black,
-        width=15cm, height=10cm
-    ]
-    \addplot[smooth,blue] table[x={fs}, y={t}] {\imbpingpong};
-    \end{axis}
-    \begin{axis}[
-        xmin=1,
-        xmax=536870912,
-        xmode=log,
-        ytick pos=right,
-        axis y line* = right,
-        hide x axis,
-        ylabel={{\"U}bertragungsgeschwindigkeit in MiB/s},
-        ylabel near ticks,
-        y axis line style=red,
-        x axis line style=black,
-        width=15cm, height=10cm
-      ]
-    \addplot[smooth,red] table[x={fs}, y={s}] {\imbpingpong};
-    \end{axis}
-\end{tikzpicture}
-\end{tikzpicture}
-\end{document}