minor cleanup. extended track to 39 fields.

RailEduKit · May 13, 2019 · b96c618 · b96c618
1 parent efe0a04
commit b96c618
Show file tree

Hide file tree

Showing 45 changed files with 106 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,18 @@
 edugame-rail-traffic-flow
 ======
+
+Version 0.5.1
+------
+minor improvements and some refactoring
+
+
 Version 0.5
 ------
-* added Material for paper based game:
-** papercut tracks, signals, and trains
-** collection of trains with appropriate driving dynamics
-** protocol template
-* minor improvements and some refactoring
+added Material for paper based game:
+* papercut tracks, signals, and trains
+* collection of trains with appropriate driving dynamics
+* protocol template
+minor improvements and some refactoring
 
 Version 0.4
 ------

diff --git a/backmatter/versionhistory.tex b/backmatter/versionhistory.tex
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = ../handbook.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \newcommand{\MS}{Martin Scheidt}

diff --git a/figures/composition.pdf b/figures/composition.pdf
diff --git a/figures/composition.tex b/figures/composition.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass[tikz,border=2,preview=true]{standalone}

diff --git a/figures/composition.tikz b/figures/composition.tikz
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = composition.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}[>=latex]

diff --git a/figures/control_lever.pdf b/figures/control_lever.pdf
diff --git a/figures/control_lever.tex b/figures/control_lever.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass[tikz,border=2,preview=true]{standalone}

diff --git a/figures/control_lever.tikz b/figures/control_lever.tikz
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = control_lever.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}

diff --git a/figures/initial_setup.pdf b/figures/initial_setup.pdf
diff --git a/figures/initial_setup.tex b/figures/initial_setup.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass[tikz,border=2,preview=true]{standalone}

diff --git a/figures/initial_setup.tikz b/figures/initial_setup.tikz
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = initial_setup.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}[>=latex]

diff --git a/figures/movement_example1.tikz b/figures/movement_example1.tikz
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}

diff --git a/figures/movement_example2.tikz b/figures/movement_example2.tikz
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}

diff --git a/figures/movement_example3.tikz b/figures/movement_example3.tikz
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}

diff --git a/figures/movement_example4.tikz b/figures/movement_example4.tikz
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}

diff --git a/figures/movement_example5.tikz b/figures/movement_example5.tikz
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{scope}

diff --git a/frontmatter/copyright.tex b/frontmatter/copyright.tex
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = ../handbook.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \vspace*{\fill}

diff --git a/frontmatter/preambel.tex b/frontmatter/preambel.tex
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = ../handbook.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \chapter*{\IfLanguage{english}{Aim and Materials}\IfLanguage{ngerman}{Ziel und Materialien}}

diff --git a/frontmatter/titlepage.tex b/frontmatter/titlepage.tex
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = ../handbook.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \begin{titlepage}

diff --git a/handbook.pdf b/handbook.pdf
diff --git a/handbook.tex b/handbook.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass[

diff --git a/mainmatter/challenges.tex b/mainmatter/challenges.tex
@@ -1,25 +1,25 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = ../handbook.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \part{\IfLanguage{english}{Challenges}\IfLanguage{ngerman}{Aufgaben}}
-  
+
 \chapter{\IfLanguage{english}{First Stage}\IfLanguage{ngerman}{Erste Stufe}}
   \section{\IfLanguage{english}{Introduction to Driving Dynamics}\IfLanguage{ngerman}{Einführung Fahrdynamik}}
     \setup
       \begin{itemize}
         \IfLanguage{english}{
           \item A single train,
-          \item Line with fields    $-2$ to $36$,
+          \item Line with fields    $-2$ to $39$,
           \item Platform A at field $-2$ to $0$,
           \item Platform B at field $13$ to $15$,
-          \item Platform C at field $34$ to $36$.
+          \item Platform C at field $37$ to $39$.
         }
         \IfLanguage{ngerman}{
           \item ein Zug,
-          \item Strecke mit Feldern $-2$ bis $36$,
+          \item Strecke mit Feldern $-2$ bis $39$,
           \item Bahnsteig A am Feld $-2$ bis $0$,
           \item Bahnsteig B am Feld $13$ bis $15$,
           \item Bahnsteig C am Feld $37$ bis $39$.
@@ -107,7 +107,7 @@ \chapter{\IfLanguage{english}{Second Stage}\IfLanguage{ngerman}{Zweite Stufe}}
         \IfLanguage{english}{
           \item Two different trains with different train dynamics.
           \item A track with at least 3 complete blocks.
-          \item Am Anfang der Strecke brechen Züge ein. Am Ende der Strecke brechen Züge aus. Die Infrastruktur vor und nach der Strecke wird vernachlässigt.
+          \item Trains enter the system at the beginning of the track. At the end of the track trains exit the system. The infrastructure before and after the line is neglected.
         }
         \IfLanguage{ngerman}{
           \item Zwei verschiedene Züge mit unterschiedlicher Fahrdynamik.

diff --git a/mainmatter/manual.tex b/mainmatter/manual.tex
@@ -1,7 +1,7 @@
 %!TEX TS-program = pdflatexmk
 %!TEX root = ../handbook.tex
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \part{\IfLanguage{english}{Manual}\IfLanguage{ngerman}{Anleitung}}

diff --git a/material/signals.pdf → material/block_signals.pdf b/material/signals.pdf → material/block_signals.pdf
diff --git a/material/signals.tex → material/block_signals.tex b/material/signals.tex → material/block_signals.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass{beamer}
@@ -28,7 +28,7 @@
   pics/distant_signal_go/.default=signalgreen,
 }
 \tikzset{
-  pics/main_signal_go/.style args={#1}{
+  pics/block_signal_go/.style args={#1}{
     code={
       \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1);
       \draw[line width=4pt] (7.5,-0.5) -- ++(1,0);
@@ -41,7 +41,7 @@
       \draw[double] (5.2,-1.5) -- ++(1.6,0);
     }
   },
-  pics/main_signal_go/.default=signalgreen,
+  pics/block_signal_go/.default=signalgreen,
 }
 \tikzset{
   pics/distant_signal_stop/.style args={#1}{
@@ -57,7 +57,7 @@
   pics/distant_signal_stop/.default=signalyellow,
 }
 \tikzset{
-  pics/main_signal_stop/.style args={#1}{
+  pics/block_signal_stop/.style args={#1}{
     code={
       \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1);
       \draw[line width=4pt] (7.5,-0.5) -- ++(1,0);
@@ -70,7 +70,7 @@
       \draw[double] (6.0,-0.7) -- ++(0,-1.6);
     }
   },
-  pics/main_signal_stop/.default=signalred,
+  pics/block_signal_stop/.default=signalred,
 }
 
 \begin{document}
@@ -81,7 +81,7 @@
     \begin{tikzpicture}[font=\sffamily]
       \foreach \x in {0,9.5,19}
         \foreach \y in {10,15}
-          \pic at (\x,\y) {main_signal_go};
+          \pic at (\x,\y) {block_signal_go};
       \foreach \x in {0,9.5,19}
         \foreach \y in {0,5}
           \pic at (\x,\y) {distant_signal_go};
@@ -96,7 +96,7 @@
           \pic at (\x,\y) {distant_signal_stop};
       \foreach \x in {0,9.5,19}
         \foreach \y in {0,5}
-          \pic at (\x,\y) {main_signal_stop};
+          \pic at (\x,\y) {block_signal_stop};
     \end{tikzpicture}
     \vfil
   \end{frame}

diff --git a/material/fast_train.tex b/material/fast_train.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass{beamer}

diff --git a/material/freight_train.tex b/material/freight_train.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass{beamer}

diff --git a/material/local_train.tex b/material/local_train.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass{beamer}

diff --git a/material/plain_platform.tex b/material/plain_platform.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass{beamer}

diff --git a/material/plain_track.tex b/material/plain_track.tex
@@ -1,6 +1,6 @@
 %!TEX TS-program = pdflatexmk
 
-% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0)
+% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
 % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.
 
 \documentclass{beamer}