openETCS · UweSteinkeFromSiemens · Jan 9, 2013 · Jan 9, 2013 · Jan 9, 2013 · Jan 9, 2013
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,9 @@
 *~
 *.toc
 *.aux
+
+D2.3/Synthesis/.DS_Store
+
+Workspace/SafetyRequirementsExamples/.DS_Store
+
+Workspace/SafetyRequirementsExamples/includes/.DS_Store
diff --git a/ETCS-benchmark/ETCS-benchmark.pdf → Benchmarking/ETCS-benchmark.pdf b/ETCS-benchmark/ETCS-benchmark.pdf → Benchmarking/ETCS-benchmark.pdf
diff --git a/ETCS-benchmark/ETCS-benchmark.tex → Benchmarking/ETCS-benchmark.tex b/ETCS-benchmark/ETCS-benchmark.tex → Benchmarking/ETCS-benchmark.tex
@@ -123,9 +123,41 @@ \subsection{High priority items}
 
   Rationale: Sample of the communication part.
 
-\item [§3.13 ??] \FIXME{We should find a representative subset of
-  §3.13. Guillaume proposes §3.13.4 (Acceleration / Deceleration due
-  to gradients). Stanislas and David think this is not enough.}
+\item [§3.13.4 (Acceleration / Deceleration due to gradients)]
+
+\item[§3.13.6.2 Emergency brake] and more particularly:
+  \begin{itemize}
+  \item[§3.13.6.2.1.3] (calculation of A\_safe, function of V and d,
+    depending on the gradient profile, braking models of the train,
+    several correction factors etc; this is the basis of the EBD
+    curve, see Figure 38)
+  \end{itemize}
+
+\item[§3.13.7 Determination of Most Restrictive Speed Profile (MRSP)]
+  Combine for example several TSR and LX restrictions
+
+\item[§3.13.8.3 Emergency Brake Deceleration curves (EBD)]
+
+\item[§3.13.9.3.3.9 Computation of d\_FLOI, using d\_SBI2\_MREBDT]
+  (MREBDT: Most Restrictive Target amongst the EBD based targets)
+
+\item[§3.13.9.4 Release speed supervision limits] and more
+  particularly:
+  \begin{itemize}
+  \item[§3.13.9.4.7] (computation of different release speed
+    supervision limits)
+
+  \item[§3.13.9.4.8] (computation of the most restrictive value at the
+    Trip location related to the EOA, amongst several EBI supervision
+    limits)
+
+    \item[§3.13.9.4.8.2] (iterative computation of the release speed)
+
+    \item[§3.13.9.4.9] (using of the most restrictive MRSP value
+      instead of the release speed)
+  \end{itemize}
+
+\item[§3.13.10.4.2 Calculation of the MRDT (Most Restrictive Displayed Target)]
 
 \item [§4.6.2 (Transitions Table) and §4.6.3 (Transitions Condition
   Table)] Only transitions:

diff --git a/ETCS-benchmark/template/ccbysa.png → Benchmarking/template/ccbysa.png b/ETCS-benchmark/template/ccbysa.png → Benchmarking/template/ccbysa.png
diff --git a/ETCS-benchmark/template/ccbysabig.png → Benchmarking/template/ccbysabig.png b/ETCS-benchmark/template/ccbysabig.png → Benchmarking/template/ccbysabig.png
diff --git a/ETCS-benchmark/template/chart.png → Benchmarking/template/chart.png b/ETCS-benchmark/template/chart.png → Benchmarking/template/chart.png
diff --git a/ETCS-benchmark/template/itea.jpg → Benchmarking/template/itea.jpg b/ETCS-benchmark/template/itea.jpg → Benchmarking/template/itea.jpg
diff --git a/ETCS-benchmark/template/openetcs_article.cls → Benchmarking/template/openetcs_article.cls b/ETCS-benchmark/template/openetcs_article.cls → Benchmarking/template/openetcs_article.cls
diff --git a/ETCS-benchmark/template/openetcs_report.cls → Benchmarking/template/openetcs_report.cls b/ETCS-benchmark/template/openetcs_report.cls → Benchmarking/template/openetcs_report.cls
diff --git a/D2.3/Synthesis/Process.ppt b/D2.3/Synthesis/Process.ppt
diff --git a/D2.3/Synthesis/images/Process1.png b/D2.3/Synthesis/images/Process1.png
diff --git a/D2.3/Synthesis/images/Process2.png b/D2.3/Synthesis/images/Process2.png
diff --git a/D2.3/Synthesis/images/archi.png b/D2.3/Synthesis/images/archi.png
diff --git a/D2.3/Synthesis/req.tex b/D2.3/Synthesis/req.tex
@@ -0,0 +1,95 @@
+%% Requirements.
+
+
+\newcounter{reqnum}
+\setcounter{reqnum}{0}
+\newcounter{subreqnum}
+\newcounter{subsubreqnum}
+\newlength{\partopbuf}
+\newlength{\topbuf}
+
+% Automated numbering versions of the macros
+\newcommand{\req}[1]{\addtocounter{reqnum}{1} \setcounter{subreqnum}{0}
+	\setlength{\partopbuf}{\partopsep}
+	\setlength{\partopsep}{0pt}
+	\setlength{\topbuf}{\topsep}
+	\setlength{\topsep}{0pt}
+	\begin{description}\item[{\small\reqt-X-\thereqnum}] #1\end{description}
+	\setlength{\partopsep}{\partopbuf}
+	\setlength{\topsep}{\topbuf}	
+	}
+
+\newcommand{\subreq}[1]{
+	\addtocounter{subreqnum}{1} \setcounter{subsubreqnum}{0}
+	\setlength{\partopbuf}{\partopsep}
+	\setlength{\partopsep}{0pt}
+	\setlength{\topbuf}{\topsep}
+	\setlength{\topsep}{0pt}
+	\begin{description}\addtolength{\leftmargin}{1cm}
+	\item[{\small\reqt-X-\thereqnum.\thesubreqnum}] #1
+	\addtolength{\leftmargin}{-1cm}\end{description}
+	\setlength{\partopsep}{\partopbuf}
+	\setlength{\topsep}{\topbuf}
+}
+
+\newcommand{\subsubreq}[1]{
+	\addtocounter{subsubreqnum}{1}
+	\setlength{\partopbuf}{\partopsep}
+	\setlength{\partopsep}{0pt}
+	\setlength{\topbuf}{\topsep}
+	\setlength{\topsep}{0pt}
+	\begin{description}\addtolength{\leftmargin}{1cm}
+	\item[{\small\reqt-X-\thereqnum.\thesubreqnum.\thesubsubreqnum}] #1
+	\addtolength{\leftmargin}{-1cm}\end{description}
+	\setlength{\partopsep}{\partopbuf}
+	\setlength{\topsep}{\topbuf}
+}
+
+% Fixed version of the commands
+\newcommand{\reqfixed}[3]{\addtocounter{reqnum}{1} \setcounter{subreqnum}{0}
+	\setlength{\partopbuf}{\partopsep}
+	\setlength{\partopsep}{0pt}
+	\setlength{\topbuf}{\topsep}
+	\setlength{\topsep}{0pt}
+	\begin{description}\item[{\small\reqt-#1-#2}] #3\end{description}
+	\setlength{\partopsep}{\partopbuf}
+	\setlength{\topsep}{\topbuf}	
+	}
+
+\newcommand{\subreqfixed}[4]{
+	\addtocounter{subreqnum}{1} \setcounter{subsubreqnum}{0}
+	\setlength{\partopbuf}{\partopsep}
+	\setlength{\partopsep}{0pt}
+	\setlength{\topbuf}{\topsep}
+	\setlength{\topsep}{0pt}
+	\begin{description}\addtolength{\leftmargin}{1cm}
+	\item[{\small\reqt-#1-#2.#3}] #4
+	\addtolength{\leftmargin}{-1cm}\end{description}
+	\setlength{\partopsep}{\partopbuf}
+	\setlength{\topsep}{\topbuf}
+}
+
+\newcommand{\subsubreqfixed}[5]{
+	\addtocounter{subsubreqnum}{1}
+	\setlength{\partopbuf}{\partopsep}
+	\setlength{\partopsep}{0pt}
+	\setlength{\topbuf}{\topsep}
+	\setlength{\topsep}{0pt}
+	\begin{description}\addtolength{\leftmargin}{1cm}
+	\item[{\small\reqt-#1-#2.#3.#4}] #5
+	\addtolength{\leftmargin}{-1cm}\end{description}
+	\setlength{\partopsep}{\partopbuf}
+	\setlength{\topsep}{\topbuf}
+}
+
+% Citation of the requirement
+
+% Citation of the reference (for markup purpose)
+\newcommand{\refreq}[1]{\textbf{#1}}
+
+% Citation of the reference and text (for markup purpose)
+% The purpose of this is to automatically replace the placeholder by the 
+% full text. \fullrefreq{R-xxx}{} or \fullrefreq{R-xxx}{blabla} 
+% will be replaced by \fullrefreq{R-xxx}{text of the R-xxx requirement} 
+\newcommand{\fullrefreq}[2]{\textbf{#1}: \textrm{#2}}
+
diff --git a/D2.3/Synthesis/req_synthesis.pdf b/D2.3/Synthesis/req_synthesis.pdf