diff --git a/backmatter/versionhistory.tex b/backmatter/versionhistory.tex index 9912b0a..f10b584 100644 --- a/backmatter/versionhistory.tex +++ b/backmatter/versionhistory.tex @@ -35,4 +35,8 @@ \IfLanguage{ngerman}{Kleinere Verbesserungen und Bastelbögen} \IfLanguage{english}{Minor improvements and craft sheets} } + \vhEntry{0.5.1}{2019-03-29}{MS}{ + \IfLanguage{ngerman}{Anpassung der Streckenlänge und Aufgaben} + \IfLanguage{english}{Adaptation of track length and tasks} + } \end{versionhistory} diff --git a/mainmatter/challenges.tex b/mainmatter/challenges.tex index 8141253..b16ef4d 100644 --- a/mainmatter/challenges.tex +++ b/mainmatter/challenges.tex @@ -21,13 +21,13 @@ \item ein Zug, \item Strecke mit Feldern $-2$ bis $36$, \item Bahnsteig A am Feld $-2$ bis $0$, - \item Bahnsteig B am Feld $14$ bis $15$, - \item Bahnsteig C am Feld $34$ bis $36$. + \item Bahnsteig B am Feld $13$ bis $15$, + \item Bahnsteig C am Feld $37$ bis $39$. } \end{itemize} \task - \IfLanguage{english}{ The train (on field $0$ towards $36$) stands still and has its shift lever at \SI{0}{\kilo\metre\per\hour}.} - \IfLanguage{ngerman}{Der Zug (auf Feld $0$ in Richtung $36$) steht und hat seinen Schalthebel auf \SI{0}{\kilo\metre\per\hour}.} + \IfLanguage{english}{ The train (on field $0$ towards $39$) stands still and has its shift lever at \SI{0}{\kilo\metre\per\hour}.} + \IfLanguage{ngerman}{Der Zug (auf Feld $0$ in Richtung $39$) steht und hat seinen Schalthebel auf \SI{0}{\kilo\metre\per\hour}.} \begin{enumerate}[label=\alph*)] \IfLanguage{english}{ \item If the train accelerates as much as possible, which field can it get to in \emph{nine} laps? @@ -47,8 +47,8 @@ % \input{\ROOT/tables/example_protocol.tex} % \end{center} \task - \IfLanguage{english}{ The train (on field $0$ towards $37$) just passes through the first station and has its shift lever on maximum speed.} - \IfLanguage{ngerman}{Der Zug (auf Feld $0$ in Richtung $37$) fährt gerade durch den ersten Bahnhof durch und hat seinen Schalthebel auf der maximalen Geschwindigkeit.} + \IfLanguage{english}{ The train (on field $0$ towards $39$) just passes through the first station and has its shift lever on maximum speed.} + \IfLanguage{ngerman}{Der Zug (auf Feld $0$ in Richtung $39$) fährt gerade durch den ersten Bahnhof durch und hat seinen Schalthebel auf der maximalen Geschwindigkeit.} \begin{enumerate}[label=\alph*)] \IfLanguage{english}{ \item How many fields does the train need to come to a stop? diff --git a/material/predefined_track.pdf b/material/predefined_track.pdf index 2b30d08..ea34626 100644 Binary files a/material/predefined_track.pdf and b/material/predefined_track.pdf differ diff --git a/material/predefined_track.tex b/material/predefined_track.tex index b2e1f85..6c5aae8 100644 --- a/material/predefined_track.tex +++ b/material/predefined_track.tex @@ -13,99 +13,102 @@ \input{\ROOT/src/material_header.tex} \input{\ROOT/src/colors.tex} +\newlength{\spacewidth}\setlength{\spacewidth}{4.2cm} +\newlength{\spacelength}\setlength{\spacelength}{8cm} + \begin{document} \selectlanguage{ngerman} % currently supported: english, ngerman \tikzset{every path/.style={ultra thick}} \begin{frame} \begin{tikzpicture}[font=\sffamily] - \begin{scope}[shift={(0,5)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 4}; \node[scale=5] at (12,2.25) {\Huge 5}; \node[scale=5] at (20,2.25) {\Huge 6}; \end{scope} \begin{scope}[shift={(0,0)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 1}; \node[scale=5] at (12,2.25) {\Huge 2}; \node[scale=5] at (20,2.25) {\Huge 3}; \end{scope} - \begin{scope}[shift={(0,-5)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,-1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge -2}; \node[scale=5] at (12,2.25) {\Huge -1}; \node[scale=5] at (20,2.25) {\Huge 0}; - \draw (0,-3) -- (0,-0.5) -- (24,-0.5) -- (24,-3); - \draw (0,-1) -- (24,-1); + \draw (0.05\spacelength,-0.45\spacewidth) -- (0.05\spacelength,-0.5) -- (2.95\spacelength,-0.5) -- (2.95\spacelength,-0.45\spacewidth); + \draw (0.05\spacelength,-1) -- (2.95\spacelength,-1); \end{scope} \end{tikzpicture} \end{frame} \begin{frame} \begin{tikzpicture}[font=\sffamily] - \begin{scope}[shift={(0,5)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 7}; \node[scale=5] at (12,2.25) {\Huge 8}; \node[scale=5] at (20,2.25) {\Huge 9}; \end{scope} \begin{scope}[shift={(0,0)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 10}; \node[scale=5] at (12,2.25) {\Huge 11}; \node[scale=5] at (20,2.25) {\Huge 12}; \end{scope} - \begin{scope}[shift={(0,-5)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,-1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 13}; \node[scale=5] at (12,2.25) {\Huge 14}; \node[scale=5] at (20,2.25) {\Huge 15}; - \draw (0,-3) -- (0,-0.5) -- (24,-0.5) -- (24,-3); - \draw (0,-1) -- (24,-1); + \draw (0.05\spacelength,-0.45\spacewidth) -- (0.05\spacelength,-0.5) -- (2.95\spacelength,-0.5) -- (2.95\spacelength,-0.45\spacewidth); + \draw (0.05\spacelength,-1) -- (2.95\spacelength,-1); \end{scope} \end{tikzpicture} \end{frame} \begin{frame} \begin{tikzpicture}[font=\sffamily] - \begin{scope}[shift={(0,6)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 16}; \node[scale=5] at (12,2.25) {\Huge 17}; \node[scale=5] at (20,2.25) {\Huge 18}; \end{scope} - \begin{scope}[shift={(0,1)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,0)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 19}; \node[scale=5] at (12,2.25) {\Huge 20}; \node[scale=5] at (20,2.25) {\Huge 21}; \end{scope} - \begin{scope}[shift={(0,-3)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,-1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 22}; \node[scale=5] at (12,2.25) {\Huge 23}; \node[scale=5] at (20,2.25) {\Huge 24}; \end{scope} - \begin{scope}[shift={(0,-8)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,-2.04\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 25}; \node[scale=5] at (12,2.25) {\Huge 26}; \node[scale=5] at (20,2.25) {\Huge 27}; @@ -114,31 +117,39 @@ \end{frame} \begin{frame} \begin{tikzpicture}[font=\sffamily] - \begin{scope}[shift={(0,5)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 28}; \node[scale=5] at (12,2.25) {\Huge 29}; \node[scale=5] at (20,2.25) {\Huge 30}; \end{scope} \begin{scope}[shift={(0,0)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 31}; \node[scale=5] at (12,2.25) {\Huge 32}; \node[scale=5] at (20,2.25) {\Huge 33}; \end{scope} - \begin{scope}[shift={(0,-5)}] - \draw ( 0,0) rectangle ++(8,4.5); - \draw ( 8,0) rectangle ++(8,4.5); - \draw (16,0) rectangle ++(8,4.5); + \begin{scope}[shift={(0,-1.02\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); \node[scale=5] at ( 4,2.25) {\Huge 34}; \node[scale=5] at (12,2.25) {\Huge 35}; \node[scale=5] at (20,2.25) {\Huge 36}; - \draw (0,-3) -- (0,-0.5) -- (24,-0.5) -- (24,-3); - \draw (0,-1) -- (24,-1); + \end{scope} + \begin{scope}[shift={(0,-2.04\spacewidth)}] + \draw ( 0,0) rectangle ++(\spacelength,\spacewidth); + \draw ( \spacelength,0) rectangle ++(\spacelength,\spacewidth); + \draw (2\spacelength,0) rectangle ++(\spacelength,\spacewidth); + \node[scale=5] at ( 4,2.25) {\Huge 37}; + \node[scale=5] at (12,2.25) {\Huge 38}; + \node[scale=5] at (20,2.25) {\Huge 39}; + \draw (0.05\spacelength,-0.45\spacewidth) -- (0.05\spacelength,-0.5) -- (2.95\spacelength,-0.5) -- (2.95\spacelength,-0.45\spacewidth); + \draw (0.05\spacelength,-1) -- (2.95\spacelength,-1); \end{scope} \end{tikzpicture} \end{frame}