Skip to content
Snippets Groups Projects
Commit 56fccb33 authored by Steven Lange's avatar Steven Lange
Browse files

Fix some issues with diff between OOA and OOD.

Reducing OOA on functional point of view and ignoring implementation
details like "updateReady" or "isIdle()",
parent 032f38ec
No related merge requests found
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
\begin{document} \begin{document}
\begin{tikzpicture} \begin{tikzpicture}
\begin{umlpackage}{Car} \begin{umlpackage}{Car}
%\begin{umlpackage}{STM}
% \umlclass{MAV-Link}
% {}
% {}
%\end{umlpackage}
\begin{umlpackage}{Odroid} \begin{umlpackage}{Odroid}
% classes % classes
\umlclass[scale = 0.5] \umlclass[scale = 0.5]
...@@ -62,9 +57,9 @@ ...@@ -62,9 +57,9 @@
- CACC($d_O, v_P, IPD, PS$) : Integer\\ - CACC($d_O, v_P, IPD, PS$) : Integer\\
- ACC($d_O, v_P, v_s, d_s$) : Integer\\ - ACC($d_O, v_P, v_s, d_s$) : Integer\\
- calcNewOptimalDistance($v_s$) : Integer\\ - calcNewOptimalDistance($v_s$) : Integer\\
+ pushNewSpeed($v_{new}$) + setNewSpeed($v_{new}$)
} (CruiseConrol) } (CruiseConrol)
\umlclass[scale = 0.5, xshift = -5cm, yshift = -9cm] \umlclass[scale = 0.5, xshift = -5.5cm, yshift = -9cm]
{Egomotion} {Egomotion}
{ {
- $d_O$ : Integer\\ - $d_O$ : Integer\\
...@@ -72,41 +67,38 @@ ...@@ -72,41 +67,38 @@
- $v_R$ : Integer\\ - $v_R$ : Integer\\
- $v_P$ : Integer\\ - $v_P$ : Integer\\
- $\alpha_O$ : Integer\\ - $\alpha_O$ : Integer\\
- Path : ? - Path : ?\\
- $\alpha_{new}$ : Integer\\ + $\alpha_{new}$ : Integer\\
+ $v_{new}$ : Integer\\ + $v_{new}$ : Integer\\
+ WantsPlatton : Boolean\\
+ UpdateReady : Boolean
} }
{ {
- calc\_$v_P$($v_R$) : Integer\\ - calc\_$v_P$($v_R$) : Integer\\
- getEnvoirment() : (Integer, Integer)\\ %- getEnvoirment() : (Integer, Integer)\\
- getMavLink() : (Integer, Integer)\\ %- getMavLink() : (Integer, Integer)\\
- getCurseControl : Integer %- getCurseControl : Integer
} (EgoMotion) } (EgoMotion)
\umlclass[scale = 0.5, xshift = 6.7cm, yshift = -14cm] \umlclass[scale = 0.5, xshift = 6.7cm, yshift = -14cm]
{PlatoonController} {PlatoonController}
{ {
- $IPD$ : Integer - $IPD$ : Integer\\
- $PS$ : Integer\\ - $PS$ : Integer\\
- PlatoonState : Integer\\ - PlatoonState : ENUM\\
- $v_s$ : Integer\\ - $v_s$ : Integer\\
- $CarID$ : Integer\\ - $CarID$ : Integer\\
- PlatoonMemberList : ?\\ - PlatoonMemberList : ?\\
- PlatoonPos : Integer\\ - PlatoonPos : Integer\\
- PlatoonPrevID : ?\\ - PlatoonPrevID : ?\\
+ isUpdated : Boolean + WantsPlatton : Boolean
} }
{ {
- PlatoonStateAuswerten(PlatoonState : Integer) : ?\\ - evaluate\_PlatoonState(PlatoonState : Integer) : ?\\
- LV\_CACC\_IPD/PS\_festlegen() : (Integer, Integer)\\ - determine\_LV\_IPD-PS() : (Integer, Integer)\\
- handle\_PBM() : ?\\ - handle\_PBM() : ?\\
- handle\_PCM() : ?\\ - handle\_PCM() : ?\\
- handle\_PHM() : ?\\ - handle\_PHM() : ?\\
- send\_PBM() : ?\\ - send\_PBM() : ?\\
- send\_PCM() : ?\\ - send\_PCM() : ?\\
- send\_PHM() : ?\\ - send\_PHM() : ?
+ isIdle() : Boolean
} }
\umlclass[scale = 0.5, xshift = -9cm, yshift = -20cm] \umlclass[scale = 0.5, xshift = -9cm, yshift = -20cm]
{Envoirment} {Envoirment}
...@@ -124,9 +116,9 @@ ...@@ -124,9 +116,9 @@
{ {
+ $d_O$ : Integer\\ + $d_O$ : Integer\\
+ $v_O$ : Integer\\ + $v_O$ : Integer\\
+ $\alpha_O$ : Interger\\
+ $v_R$ : Integer\\ + $v_R$ : Integer\\
+ $v_P$ : Integer\\ + $v_P$ : Integer\\
+ $\alpha_O$ : Integer\\
+ Path : ?\\ + Path : ?\\
+ $\alpha_{new}$ : Integer\\ + $\alpha_{new}$ : Integer\\
+ $v_{new}$ : Integer\\ + $v_{new}$ : Integer\\
...@@ -134,13 +126,12 @@ ...@@ -134,13 +126,12 @@
+ UpdateReady : Boolean\\ + UpdateReady : Boolean\\
+ $IPD$ : Integer\\ + $IPD$ : Integer\\
+ $PS$ : Integer\\ + $PS$ : Integer\\
+ PlatoonState : Integer\\ + PlatoonState : ENUM\\
+ $v_s$ : Integer\\ + $v_s$ : Integer\\
+ $CarID$ : Integer\\ + $CarID$ : Integer\\
+ PlatoonMemberList : ?\\ + PlatoonMemberList : ?\\
+ PlatoonPos : Integer\\ + PlatoonPos : Integer\\
+ PlatoonPrevID : Integer\\ + PlatoonPrevID : Integer
+ isUpdated : Boolean
} }
{ {
- cacheDate() : ?\\ - cacheDate() : ?\\
...@@ -176,20 +167,21 @@ ...@@ -176,20 +167,21 @@
\umlinherit [geometry=-| ,anchors= 0 and 250] {Camera}{Envoirment} \umlinherit [geometry=-| ,anchors= 0 and 250] {Camera}{Envoirment}
\umlinherit [geometry=|- ,anchors= 90 and 180] {Camera}{Lane-Keeping} \umlinherit [geometry=|- ,anchors= 90 and 180] {Camera}{Lane-Keeping}
\umlinherit [geometry=|- ,anchors= 90 and 25] {Cruise-Control}{MAV-Link} \umlinherit [geometry=|- ,anchors= 90 and 25] {Cruise-Control}{MAV-Link}
\umlinherit [geometry=-| ,anchors= 115 and 280] {Egomotion}{Lane-Keeping} \umlinherit [geometry=|- ,anchors= 217 and 50] {Cruise-Control}{Egomotion}
\umlinherit [geometry=-|-,anchors= 35 and 215] {Egomotion}{Cruise-Control} \umlinherit [geometry=|- ,anchors= 50 and 217] {Egomotion}{Cruise-Control}
\umlinherit [geometry=|-,anchors= -35 and 152] {Egomotion}{PlatoonController} \umlinherit [geometry=|- ,anchors= -35 and 152] {Egomotion}{PlatoonController}
\umlinherit [geometry=-| ,anchors= 115 and 300] {Egomotion}{Lane-Keeping}
\umlinherit [geometry=-|] {Egomotion}{Logging} \umlinherit [geometry=-|] {Egomotion}{Logging}
\umlinherit [geometry=|-|,anchors=90 and 245] {Envoirment}{Egomotion} \umlinherit [geometry=|-|,anchors=90 and 245] {Envoirment}{Egomotion}
\umlinherit [geometry=--] {Lane-Keeping}{MAV-Link} \umlinherit [geometry=--] {Lane-Keeping}{MAV-Link}
\umlinherit [geometry=-| ,anchors= 280 and 115] {Lane-Keeping}{Egomotion} \umlinherit [geometry=-| ,anchors= 300 and 115] {Lane-Keeping}{Egomotion}
\umlinherit [geometry=|- ,anchors= -55 and 222] {Logging}{Network} \umlinherit [geometry=|- ,anchors= -55 and 222] {Logging}{Network}
\umlinherit [geometry=|-|,anchors= 235 and 70] {MAV-Link}{Egomotion} \umlinherit [geometry=|-|,anchors= 235 and 70] {MAV-Link}{Egomotion}
\umlimport [geometry=-| ,anchors= 180 and 270] {Network}{MAV-Link} \umlinherit [geometry=-| ,anchors= 180 and 270] {Network}{MAV-Link}
\umlinherit [geometry=-|] {PlatoonController}{Cruise-Control} \umlinherit [geometry=-|] {PlatoonController}{Cruise-Control}
\umlinherit [geometry=|- ,anchors= 240 and 25] {PlatoonController}{Logging} \umlinherit [geometry=|- ,anchors= 240 and 25] {PlatoonController}{Logging}
\umlinherit [geometry=-|, anchors= 295 and 75] {PlatoonController}{Network} \umlinherit [geometry=-|, anchors= 300 and 85] {PlatoonController}{Network}
\umlinherit [geometry=-|, anchors= 75 and 295] {Network}{PlatoonController} \umlinherit [geometry=-|, anchors= 85 and 300] {Network}{PlatoonController}
\umlinherit [geometry=-| ,anchors= 0 and 290] {Ultrasonic}{Envoirment} \umlinherit [geometry=-| ,anchors= 0 and 290] {Ultrasonic}{Envoirment}
\end{umlpackage} \end{umlpackage}
\end{umlpackage} \end{umlpackage}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment