From efe0a04606ff0728593286a60aac55df1b001306 Mon Sep 17 00:00:00 2001 From: Martin Scheidt Date: Tue, 2 Apr 2019 16:52:19 +0200 Subject: [PATCH] Adaptation of track length and tasks --- backmatter/versionhistory.tex | 4 ++ mainmatter/challenges.tex | 12 ++-- material/predefined_track.pdf | Bin 8796 -> 8974 bytes material/predefined_track.tex | 121 ++++++++++++++++++---------------- 4 files changed, 76 insertions(+), 61 deletions(-) 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 2b30d080a8942738695a9f3f9602da62085db73a..ea34626c13d2cc8743d6a0cf81dd48968de056a9 100644 GIT binary patch delta 3441 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