diff --git a/documents/GeoTopo/Arbeitszeit.txt b/documents/GeoTopo/Arbeitszeit.txt index 1a41d44..40f2ee9 100644 --- a/documents/GeoTopo/Arbeitszeit.txt +++ b/documents/GeoTopo/Arbeitszeit.txt @@ -10,4 +10,4 @@ Datum | Uhrzeit 14.12.2013 | 13:00 - 14:45 15.12.2013 | 20:30 - 21:20 16.12.2013 | 15:00 - 15:30 -17.12.2013 | 07:30 - 07:45, 14:30 - 15:40 +17.12.2013 | 07:30 - 07:45, 14:30 - 15:40, 16:30 - diff --git a/documents/GeoTopo/GeoTopo.pdf b/documents/GeoTopo/GeoTopo.pdf index 8306ff4..99103da 100644 Binary files a/documents/GeoTopo/GeoTopo.pdf and b/documents/GeoTopo/GeoTopo.pdf differ diff --git a/documents/GeoTopo/Kapitel3.tex b/documents/GeoTopo/Kapitel3.tex index d92a425..2d46db9 100644 --- a/documents/GeoTopo/Kapitel3.tex +++ b/documents/GeoTopo/Kapitel3.tex @@ -145,12 +145,12 @@ \begin{figure}[ht] \centering \subfloat[$\gamma_1 * (\gamma_2 * \gamma_3)$]{ - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-1.jpg} + \input{figures/topology-path-not-associative-1.tex} \label{fig:assotiativitaet-von-wegen-a} } \subfloat[$(\gamma_1 * \gamma_2) * \gamma_3$]{ - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-2.jpg} + \input{figures/topology-path-not-associative-2.tex} \label{fig:assotiativitaet-von-wegen-b} }% \label{fig:assoziativitaet-von-wegen} diff --git a/documents/GeoTopo/figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-1.jpg b/documents/GeoTopo/figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-1.jpg deleted file mode 100644 index e77e665..0000000 Binary files a/documents/GeoTopo/figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-1.jpg and /dev/null differ diff --git a/documents/GeoTopo/figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-2.jpg b/documents/GeoTopo/figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-2.jpg deleted file mode 100644 index d210ab5..0000000 Binary files a/documents/GeoTopo/figures/todo/zusammensetzen-von-wegen-nicht-assoziativ-2.jpg and /dev/null differ diff --git a/documents/GeoTopo/figures/topology-path-not-associative-1.tex b/documents/GeoTopo/figures/topology-path-not-associative-1.tex new file mode 100644 index 0000000..7b75d41 --- /dev/null +++ b/documents/GeoTopo/figures/topology-path-not-associative-1.tex @@ -0,0 +1,10 @@ +\begin{tikzpicture} + \draw[very thick,red] (0,0) -- (5,0) node [midway, below] {$\gamma_1$}; + \draw[very thick,green](5,0) -- (7.5,0) node [midway, below] {$\gamma_2$}; + \draw[very thick,blue] (7.5,0) -- (10,0) node [midway, below] {$\gamma_3$}; + + \draw[thick] (0,0.2) -- ( 0,-0.2) node[label=below:$0$] {}; + \draw[thick] (5,0.2) -- ( 5,-0.2) node[label=below:$\nicefrac{1}{2}$] {}; + \draw[thick] (7.5,0.2) -- (7.5,-0.2) node[label=below:$\nicefrac{3}{4}$] {}; + \draw[thick] (10,0.2) -- ( 10,-0.2) node[label=below:$1$] {}; +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/topology-path-not-associative-2.tex b/documents/GeoTopo/figures/topology-path-not-associative-2.tex new file mode 100644 index 0000000..4e60a44 --- /dev/null +++ b/documents/GeoTopo/figures/topology-path-not-associative-2.tex @@ -0,0 +1,10 @@ +\begin{tikzpicture} + \draw[very thick,red] (0,0) -- (2.5,0) node [midway, below] {$\gamma_1$}; + \draw[very thick,green](2.5,0) -- (5,0) node [midway, below] {$\gamma_2$}; + \draw[very thick,blue] (5,0) -- (10,0) node [midway, below] {$\gamma_3$}; + + \draw[thick] (0,0.2) -- ( 0,-0.2) node[label=below:$0$] {}; + \draw[thick] (2.5,0.2) -- (2.5,-0.2) node[label=below:$\nicefrac{1}{4}$] {}; + \draw[thick] (5.0,0.2) -- (5.0,-0.2) node[label=below:$\nicefrac{1}{2}$] {}; + \draw[thick] (10,0.2) -- ( 10,-0.2) node[label=below:$1$] {}; +\end{tikzpicture} diff --git a/tikz/topology-path-not-associative-1/Makefile b/tikz/topology-path-not-associative-1/Makefile new file mode 100644 index 0000000..563cdc7 --- /dev/null +++ b/tikz/topology-path-not-associative-1/Makefile @@ -0,0 +1,31 @@ +SOURCE = topology-path-not-associative-1 +DELAY = 80 +DENSITY = 300 +WIDTH = 512 + +make: + pdflatex $(SOURCE).tex -output-format=pdf + make clean + +clean: + rm -rf $(TARGET) *.class *.html *.log *.aux *.data *.gnuplot + +gif: + pdfcrop $(SOURCE).pdf + convert -verbose -delay $(DELAY) -loop 0 -density $(DENSITY) $(SOURCE)-crop.pdf $(SOURCE).gif + make clean + +png: + make + make svg + inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png + +transparentGif: + convert $(SOURCE).pdf -transparent white result.gif + make clean + +svg: + #inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg + pdf2svg $(SOURCE).pdf $(SOURCE).svg + # Necessary, as pdf2svg does not always create valid svgs: + inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg diff --git a/tikz/topology-path-not-associative-1/Readme.md b/tikz/topology-path-not-associative-1/Readme.md new file mode 100644 index 0000000..e699fb2 --- /dev/null +++ b/tikz/topology-path-not-associative-1/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](topology-path-not-associative-1.png) diff --git a/tikz/topology-path-not-associative-1/topology-path-not-associative-1.png b/tikz/topology-path-not-associative-1/topology-path-not-associative-1.png new file mode 100644 index 0000000..e1b1587 Binary files /dev/null and b/tikz/topology-path-not-associative-1/topology-path-not-associative-1.png differ diff --git a/tikz/topology-path-not-associative-1/topology-path-not-associative-1.tex b/tikz/topology-path-not-associative-1/topology-path-not-associative-1.tex new file mode 100644 index 0000000..06f068e --- /dev/null +++ b/tikz/topology-path-not-associative-1/topology-path-not-associative-1.tex @@ -0,0 +1,16 @@ +\documentclass[varwidth=true, border=2pt]{standalone} +\usepackage{tikz} +\usepackage{nicefrac} + +\begin{document} +\begin{tikzpicture} + \draw[very thick,red] (0,0) -- (5,0) node [midway, below] {$\gamma_1$}; + \draw[very thick,green](5,0) -- (7.5,0) node [midway, below] {$\gamma_2$}; + \draw[very thick,blue] (7.5,0) -- (10,0) node [midway, below] {$\gamma_3$}; + + \draw[thick] (0,0.2) -- ( 0,-0.2) node[label=below:$0$] {}; + \draw[thick] (5,0.2) -- ( 5,-0.2) node[label=below:$\nicefrac{1}{2}$] {}; + \draw[thick] (7.5,0.2) -- (7.5,-0.2) node[label=below:$\nicefrac{3}{4}$] {}; + \draw[thick] (10,0.2) -- ( 10,-0.2) node[label=below:$1$] {}; +\end{tikzpicture} +\end{document} diff --git a/tikz/topology-path-not-associative-2/Makefile b/tikz/topology-path-not-associative-2/Makefile new file mode 100644 index 0000000..60763e1 --- /dev/null +++ b/tikz/topology-path-not-associative-2/Makefile @@ -0,0 +1,31 @@ +SOURCE = topology-path-not-associative-2 +DELAY = 80 +DENSITY = 300 +WIDTH = 512 + +make: + pdflatex $(SOURCE).tex -output-format=pdf + make clean + +clean: + rm -rf $(TARGET) *.class *.html *.log *.aux *.data *.gnuplot + +gif: + pdfcrop $(SOURCE).pdf + convert -verbose -delay $(DELAY) -loop 0 -density $(DENSITY) $(SOURCE)-crop.pdf $(SOURCE).gif + make clean + +png: + make + make svg + inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png + +transparentGif: + convert $(SOURCE).pdf -transparent white result.gif + make clean + +svg: + #inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg + pdf2svg $(SOURCE).pdf $(SOURCE).svg + # Necessary, as pdf2svg does not always create valid svgs: + inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg diff --git a/tikz/topology-path-not-associative-2/Readme.md b/tikz/topology-path-not-associative-2/Readme.md new file mode 100644 index 0000000..8df755c --- /dev/null +++ b/tikz/topology-path-not-associative-2/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](topology-path-not-associative-2.png) diff --git a/tikz/topology-path-not-associative-2/topology-path-not-associative-2.png b/tikz/topology-path-not-associative-2/topology-path-not-associative-2.png new file mode 100644 index 0000000..882583b Binary files /dev/null and b/tikz/topology-path-not-associative-2/topology-path-not-associative-2.png differ diff --git a/tikz/topology-path-not-associative-2/topology-path-not-associative-2.tex b/tikz/topology-path-not-associative-2/topology-path-not-associative-2.tex new file mode 100644 index 0000000..97ba9de --- /dev/null +++ b/tikz/topology-path-not-associative-2/topology-path-not-associative-2.tex @@ -0,0 +1,16 @@ +\documentclass[varwidth=true, border=2pt]{standalone} +\usepackage{tikz} +\usepackage{nicefrac} + +\begin{document} +\begin{tikzpicture} + \draw[very thick,red] (0,0) -- (2.5,0) node [midway, below] {$\gamma_1$}; + \draw[very thick,green](2.5,0) -- (5,0) node [midway, below] {$\gamma_2$}; + \draw[very thick,blue] (5,0) -- (10,0) node [midway, below] {$\gamma_3$}; + + \draw[thick] (0,0.2) -- ( 0,-0.2) node[label=below:$0$] {}; + \draw[thick] (2.5,0.2) -- (2.5,-0.2) node[label=below:$\nicefrac{1}{4}$] {}; + \draw[thick] (5.0,0.2) -- (5.0,-0.2) node[label=below:$\nicefrac{1}{2}$] {}; + \draw[thick] (10,0.2) -- ( 10,-0.2) node[label=below:$1$] {}; +\end{tikzpicture} +\end{document}