Merge remote-tracking branch 'upstream/master'

6 files changed, 26 insertions, 22 deletions

diff --git a/buch/papers/multiplikation/images/bigo.pdf b/buch/papers/multiplikation/images/bigo.pdf
index dfa2ba4..c29a891 100644
--- a/buch/papers/multiplikation/images/bigo.pdf
+++ b/buch/papers/multiplikation/images/bigo.pdf
diff --git a/buch/papers/multiplikation/images/bigo.tex b/buch/papers/multiplikation/images/bigo.tex
index e3293e4..a415ccb 100644
--- a/buch/papers/multiplikation/images/bigo.tex
+++ b/buch/papers/multiplikation/images/bigo.tex
@@ -39,67 +39,71 @@
 \begin{document}
 
 \begin{tikzpicture}
+
 \begin{axis}[
-    axis lines = left,
+    xmode=log, ymode=log,
+    xmin=1e-0, xmax=5e1,
+    ymin=10e-1, ymax=1e7,
+    grid=both,
+    major grid style={black!50},
     xlabel = $n$ (Data Input),
     ylabel = {$t$ (time)},
     legend pos=north east,
     very thick,
-    ymax = 500,
     yticklabels=\empty,
     xticklabels=\empty,
     scale only axis=true,
   width=12cm, height=6cm,
     ]
 \addplot [
-    domain= 1:20,
+    domain= 1:50,
     samples=100,
     color=red,
 ]
 {1};
 \addlegendentry{$\mathcal{O}(1)$}
 \addplot [
-    domain= 1:20,
+    domain= 1:50,
     samples=100,
     color=green,
 ]
 {x};
 \addlegendentry{$\mathcal{O}(n)$}
 \addplot [
-    domain= 1:20,
+    domain= 1:50,
     samples=100,
     color=blue,
 ]
 {x^2};
-\addlegendentry{$\mathcal{O}(n^2)$}
+\addlegendentry{$\mathcal{O}\left(n^2\right)$}
 \addplot [
-    domain= 1:10,
+    domain= 1:50,
     samples=100,
     color=purple,
 ]
 {x^3};
-\addlegendentry{$\mathcal{O}(n^3)$}
+\addlegendentry{$\mathcal{O}\left(n^3\right)$}
 \addplot [
-    domain= 1:10,
+    domain= 1:50,
     samples=100,
     color=black,
 ]
-{exp(x)};
-\addlegendentry{$\mathcal{O}(e^n)$}
+{exp(x) - 1.7};
+\addlegendentry{$\mathcal{O}\left(e^n\right)$}
 \addplot [
-    domain= 1:20,
+    domain= 1:50,
     samples=100,
     color=orange,
 ]
-{log2(x)};
+{log2(x)+1};
 \addlegendentry{$\mathcal{O}(\log n)$}
 
 \addplot [
-    domain= 1:20,
+    domain= 1:50,
     samples=100,
     color=gray,
 ]
-{x*log2(x)};
+{x*log2(x)+1};
 \addlegendentry{$\mathcal{O}(n \log n)$}
 \end{axis}
 \end{tikzpicture}
diff --git a/buch/papers/multiplikation/images/c_meas_4096.pdf b/buch/papers/multiplikation/images/c_meas_4096.pdf
new file mode 100644
index 0000000..304015a
--- /dev/null
+++ b/buch/papers/multiplikation/images/c_meas_4096.pdf
diff --git a/buch/papers/multiplikation/images/meas_1024.pdf b/buch/papers/multiplikation/images/meas_1024.pdf
new file mode 100644
index 0000000..70c7ec1
--- /dev/null
+++ b/buch/papers/multiplikation/images/meas_1024.pdf
diff --git a/buch/papers/multiplikation/images/strassen.pdf b/buch/papers/multiplikation/images/strassen.pdf
index 9899dcb..a30fdaa 100644
--- a/buch/papers/multiplikation/images/strassen.pdf
+++ b/buch/papers/multiplikation/images/strassen.pdf
diff --git a/buch/papers/multiplikation/images/strassen.tex b/buch/papers/multiplikation/images/strassen.tex
index 797772b..5cf39b4 100644
--- a/buch/papers/multiplikation/images/strassen.tex
+++ b/buch/papers/multiplikation/images/strassen.tex
@@ -81,13 +81,13 @@
 	\node at (-3,-10) {$C_{12}=$} ;
 	\node at (-3,-5) {$C_{11}=$} ;
 	
-	\node at (5,-2)  {I};
-	\node at (10,-2)  {II};
-	\node at (15,-2)  {III};
-	\node at (20,-2)  {IV};
-	\node at (25,-2)  {V};
-	\node at (30,-2)  {VI};
-	\node at (35,-2)  {VII};
+	\node at (5,-2)  {P};
+	\node at (10,-2)  {Q};
+	\node at (15,-2)  {R};
+	\node at (20,-2)  {S};
+	\node at (25,-2)  {T};
+	\node at (30,-2)  {U};
+	\node at (35,-2)  {V};
 }