From 46f8a8be64a886002636df3180b4a17a9a90fcdd Mon Sep 17 00:00:00 2001
From: Phuc Tran Truong <truongph@informatik.hu-berlin.de>
Date: Tue, 16 Jan 2018 16:19:45 +0100
Subject: [PATCH] fix typos and add tikzuml stub to architektur.tex
---
doc/mainDocument/sections/architektur.tex | 126 +++++++++++++++++++---
1 file changed, 114 insertions(+), 12 deletions(-)
diff --git a/doc/mainDocument/sections/architektur.tex b/doc/mainDocument/sections/architektur.tex
index 700048a7..67816f80 100644
--- a/doc/mainDocument/sections/architektur.tex
+++ b/doc/mainDocument/sections/architektur.tex
@@ -3,32 +3,30 @@
\section{Architektur und Integrationstests}
\subsection{Systemarchitektur}
-\subsection{Odroid}
+\subsection{ODROID}
\begin{landscape}
\begin{figure}[h]
\begin{center}
\includegraphics[scale=0.45]{Odroid}
\end{center}
- \caption{Odriod-System}
- \label{fig:odriod-sys}
+ \caption{ODROID-System}
+ \label{fig:ODROID-sys}
\end{figure}
\begin{figure}[h]
\begin{center}
\includegraphics[scale=0.5]{SystemArchitektur}
\end{center}
- \caption{Odriod-System}
+ \caption{ODROID-System}
\label{fig:hardware-sys}
\end{figure}
\end{landscape}
-
-
-
+
\subsection{Object Oriented Analysis}
\begin{tikzpicture}
\begin{umlpackage}{Car}
- \begin{umlpackage}{Odroid}
+ \begin{umlpackage}{ODROID}
% classes
\umlclass[scale = 0.5]
{MAV-Link}
@@ -70,7 +68,7 @@
- ACC($d_O, v_P, v_s, d_s$) : Integer\\
- calcNewOptimalDistance($v_s$) : Integer\\
+ setNewSpeed($v_{new}$)
- } (CruiseConrol)
+ } (CruiseControl)
\umlclass[scale = 0.5, xshift = -5.5cm, yshift = -9cm]
{Egomotion}
{
@@ -100,7 +98,7 @@
- PlatoonMemberList : ?\\
- PlatoonPos : Integer\\
- PlatoonPrevID : ?\\
- + WantsPlatton : Boolean
+ + WantsPlatoon : Boolean
}
{
- evaluate\_PlatoonState(PlatoonState : Integer) : ?\\
@@ -134,7 +132,7 @@
+ Path : ?\\
+ $\alpha_{new}$ : Integer\\
+ $v_{new}$ : Integer\\
- + WantsPlatton : Boolean\\
+ + WantsPlatoon : Boolean\\
+ UpdateReady : Boolean\\
+ $IPD$ : Integer\\
+ $PS$ : Integer\\
@@ -200,7 +198,111 @@
\end{tikzpicture}
\subsection{Softwarearchitktur}
-%tikz oder drawio
\includegraphics[width=\textwidth]{SoftwareArchitektur}
+% umltikz stub TODO
+\begin{comment}
+\begin{tikzpicture}
+ \begin{umlpackage}{Softwarearchitektur}
+ % classes
+ \umlclass[scale = 0.5, xshift = 8cm]
+ {MAV-Link}
+ {}
+ {}
+ \umlclass[scale = 0.5, xshift = 8cm, yshift = -4cm]
+ {Lane-Keeping}
+ {}
+ {}
+ \umlclass[scale = 0.5, xshift = 8cm, yshift = -8cm]
+ {Kamera}
+ {}
+ {}
+ \umlclass[scale = 0.5, xshift = 8cm, yshift = -12cm]
+ {USS}
+ {USS-Daten}
+ {}
+ %Network
+ \umlclass[scale = 0.5, xshift = -8cm]
+ {C2C}
+ {
+ IPD, PS
+ }
+ {
+ nach PC\\
+ nP, NULL\\
+ nP(FV)\\
+ nP(LV)\\
+ FV\\
+ LV
+ }
+ \umlclass[scale = 0.5, xshift = -4cm]
+ {PC2}
+ {
+
+ }
+ {
+ handle IPD aus
+ }
+ \umlclass[scale = 0.5]
+ {Logging}
+ {
+
+ }
+ {
+
+ }
+ \umlclass[scale = 0.5, yshift = -4cm]
+ {Egomotion}
+ {
+ $v_p = v_0 + v_p$\\
+ $d_0$
+ }
+ {
+
+ } (EgoMotion)
+ \umlclass[scale = 0.5, xshift = -6cm, yshift = -8cm]
+ {PlatoonController}
+ {
+ IPD, PS, $d_0$, PlatSt, $v_s$
+ }
+ {
+ noPlatoon:\\
+ -wantsPlatoon\\
+ - FV/LV\\
+ - C2C initialisieren\\
+ - IPD, PS bestimmen\\
+ - $v_s$ weiterreichen\\
+ - ACC fahren\\
+ FV:\\
+ - CACC fahren\\
+ - leaveMsg\\
+ LV:\\
+ - ACC fahren\\
+ - leaveMsg\\
+ - IPD/PS update ($v_{new}$ vs. $v_{PC}$)
+ }
+ %Stuff: Pub $v_{new}$, Notify, für CC: PlatoonStat, IPD, PS, $v_s$
+ \umlclass[scale = 0.5, yshift = -8cm]
+ {CruiseControl}
+ {
+
+ }
+ {
+
+ }
+ \umlclass[scale = 0.5, xshift = 4cm, yshift = -12cm]
+ {Environment}
+ {
+ $d_0, v_r$
+ }
+ {
+
+ }
+
+
+ %arrows
+ %\umlinherit [geometry=-| ,anchors= 0 and 250] {src}{dest}
+ \end{umlpackage}
+\end{tikzpicture}
+\end{comment}
\end{document}
\ No newline at end of file
--
GitLab