fix inconsistencies in graph intro material

3 files changed, 36 insertions, 19 deletions

diff --git a/Info/11/NTG/1/Intro/graph.tikz b/Info/11/NTG/1/Intro/graph.tikz
index 26c1af20..a3afea46 100644
--- a/Info/11/NTG/1/Intro/graph.tikz
+++ b/Info/11/NTG/1/Intro/graph.tikz
@@ -5,23 +5,23 @@
 \draw[edge, path, cycle] (nuernberg) -- (wendelstein);
 \draw[edge, cycle] (nuernberg) -- (feucht);
 \draw[edge, cycle] (wendelstein) -- (feucht);
-\node[node, below left=0.4 and -0.4cm of wendelstein] (schwanstein) {Schwanstein};
-\draw[edge] (wendelstein) -- (schwanstein);
-\node[node, below right=0.1cm and 0.6cm of schwanstein] (postbauerHeng) {Postbauer Heng};
+\node[node, below left=0.4 and -0.4cm of wendelstein] (schwanstetten) {Schwanstetten};
+\draw[edge] (wendelstein) -- (schwanstetten);
+\node[node, below right=0.1cm and 0.6cm of schwanstetten] (postbauerHeng) {Postbauer Heng};
 \draw[edge, path] (wendelstein) -- (postbauerHeng);
 \draw[edge] (feucht) -- (postbauerHeng);
 \node[node, align=center, below right=-0.3cm and 0.6cm of postbauerHeng] (neumarkt) {Neumarkt i. d. \\ Oberpfalz};
 \draw[edge] (wendelstein) -- (neumarkt);
 \draw[edge] (feucht) -- (neumarkt);
 \draw[edge] (postbauerHeng) -- (neumarkt);
-\node[node, below=1.5cm of schwanstein] (creding) {Creding};
-\draw[edge, blocked] (schwanstein) -- (creding);
+\node[node, below=1.5cm of schwanstetten] (greding) {Greding};
+\draw[edge, blocked] (schwanstetten) -- (greding);
 \node[node, below right=1 and -1.5cm of postbauerHeng] (beilngries) {Beilngries};
 \draw[edge, path, blocked] (postbauerHeng) -- (beilngries);
 \draw[edge, blocked] (neumarkt) -- (beilngries);
 \node[node, below left=of beilngries] (ingolstadt) {Ingolstadt};
 \draw[edge, path] (beilngries) -- (ingolstadt);
-\draw[edge] (creding) -- (ingolstadt);
+\draw[edge] (greding) -- (ingolstadt);
 \node[node, below right=of beilngries] (kelheim) {Kelheim};
 \draw[edge] (beilngries) -- (kelheim);
 \node[node, below right=of ingolstadt] (muenchen) {München};
diff --git a/Info/11/NTG/1/Intro/slides.md b/Info/11/NTG/1/Intro/slides.md
index 5ad3dc16..b4bb8bc6 100644
--- a/Info/11/NTG/1/Intro/slides.md
+++ b/Info/11/NTG/1/Intro/slides.md
@@ -15,7 +15,7 @@ header-includes: |
 \pause
 
 \begin{tikzpicture}[overlay, remember picture]
-  \node[rotate=-30,scale=3] at (10, 2) {\large \boldred{Falsch}};
+  \node[rotate=-30,scale=3] at (10, 0) {\large \boldred{Falsch}};
 \end{tikzpicture}
 
 \pause
@@ -27,14 +27,26 @@ header-includes: |
 ### Diskutiert folgende Aussage:
 
 \vspace{1cm}
+
+`\only<1>{`{=latex}
+
 > Die besondere Methode, die Objekte einer Klasse erzeugt, heißt **Konstruktor**, weil sie ein neues Objekt *konstruiert*.
 > In Java hat der Konstruktor immer den Namen `new`{.java}, da ein **neues** Objekt erzeugt wird.
 
-\pause
+`}`{=latex}
+
+`\only<2->{`{=latex}
 
+> Die besondere Methode, die Objekte einer Klasse erzeugt, heißt **Konstruktor**, weil sie ein neues Objekt *konstruiert*.
+> In Java hat der Konstruktor immer den Namen \boldred{der Klasse}.
+
+`}`{=latex}
+
+\only<2->{
 \begin{tikzpicture}[overlay, remember picture]
-  \node[rotate=-30,scale=3] at (10, 2) {\large \boldred{Falsch}};
+  \node[rotate=-30,scale=3] at (10, 0) {\large \boldred{Falsch}};
 \end{tikzpicture}
+}
 
 \pause
 
@@ -65,12 +77,13 @@ header-includes: |
 \end{class}
 
 \association{Person}{}{0..n}{Gruppe}{2..*}{};
+
+\only<2>{
+  \node[rotate=-30,scale=3] at (6, 1) {\large \boldred{Falsch}};
+}
 \end{tikzpicture}
 \end{center}
 
-\begin{tikzpicture}[overlay, remember picture]
-  \node[rotate=-30,scale=3] at (10, 5) {\large \boldred{Falsch}};
-\end{tikzpicture}
 
 ## \faIcon{hands-helping} / \faIcon{chalkboard} Arbeitsauftrag: Code verstehen \hfill{} 4/5
 
@@ -93,9 +106,11 @@ for (int i = zahlen.length - 1; i > 1; i--) {
 ::::
 :::
 
+\only<2>{
 \begin{tikzpicture}[overlay, remember picture]
-  \node[rotate=-30,scale=3] at (10, 2) {\large \boldred{Falsch}};
+  \node[rotate=-30,scale=3] at (10.5, 2.5) {\large \boldred{Falsch}};
 \end{tikzpicture}
+}
 
 ## \faIcon{hands-helping} / \faIcon{chalkboard} Arbeitsauftrag: Vererbung \hfill{} 5/5
 
@@ -129,11 +144,13 @@ class B extends A {
 \vspace{1cm}
 > Dieser Code ist ein korrektes Java Programm!
 
+\only<2>{
 \begin{tikzpicture}[overlay, remember picture]
   \node[rotate=-30,scale=3] at (10, 2) {\large \boldred{Falsch}};
   \draw[red] (8, 4.2) -- (9, 4.2);
   \draw[red] (0, 4.2) -- (1, 4.2);
 \end{tikzpicture}
+}
 
 ## Worum gehts heute?
 
diff --git a/Info/11/NTG/1/Intro/weighted_graph.tikz b/Info/11/NTG/1/Intro/weighted_graph.tikz
index 68550ab7..70295766 100644
--- a/Info/11/NTG/1/Intro/weighted_graph.tikz
+++ b/Info/11/NTG/1/Intro/weighted_graph.tikz
@@ -5,23 +5,23 @@
 \draw[edge] (nuernberg) edge node[left, midway] {20} (wendelstein);
 \draw[edge] (nuernberg) edge node[right, midway] {30} (feucht);
 \draw[edge] (wendelstein) edge node[above] {15} (feucht);
-\node[node, below left=0.4 and -0.4cm of wendelstein] (schwanstein) {Schwanstein};
-\draw[edge] (wendelstein) edge node[left, midway] {5} (schwanstein);
-\node[node, below right=0.1cm and 0.6cm of schwanstein] (postbauerHeng) {Postbauer Heng};
+\node[node, below left=0.4 and -0.4cm of wendelstein] (schwanstetten) {Schwanstetten};
+\draw[edge] (wendelstein) edge node[left, midway] {5} (schwanstetten);
+\node[node, below right=0.1cm and 0.6cm of schwanstetten] (postbauerHeng) {Postbauer Heng};
 \draw[edge] (wendelstein) edge node[right, midway] {20} (postbauerHeng);
 \draw[edge] (feucht) edge node[right] {25} (postbauerHeng);
 \node[node, align=center, below right=-0.3cm and 0.6cm of postbauerHeng] (neumarkt) {Neumarkt i. d. \\ Oberpfalz};
 \draw[edge] (wendelstein) edge node[above, midway] {40} (neumarkt);
 \draw[edge] (feucht) edge node[right, midway] {20} (neumarkt);
 \draw[edge] (postbauerHeng) edge node[below] {5} (neumarkt);
-\node[node, below=1.5cm of schwanstein] (creding) {Creding};
-\draw[edge] (schwanstein) edge node[right, midway] {45} (creding);
+\node[node, below=1.5cm of schwanstetten] (greding) {Greding};
+\draw[edge] (schwanstetten) edge node[right, midway] {45} (greding);
 \node[node, below right=1 and -1.5cm of postbauerHeng] (beilngries) {Beilngries};
 \draw[edge] (postbauerHeng) edge node[left, midway] {35} (beilngries);
 \draw[edge] (neumarkt) edge node[below] {25} (beilngries);
 \node[node, below left=of beilngries] (ingolstadt) {Ingolstadt};
 \draw[edge] (beilngries) edge node[left, midway] {45} (ingolstadt);
-\draw[edge] (creding) edge node[right, midway] {30} (ingolstadt);
+\draw[edge] (greding) edge node[right, midway] {30} (ingolstadt);
 \node[node, below right=of beilngries] (kelheim) {Kelheim};
 \draw[edge] (beilngries) edge node[right, midway] {25} (kelheim);
 \node[node, below right=of ingolstadt] (muenchen) {München};