From 56fccb33290832d194d6ebaec864493e4750fbdd Mon Sep 17 00:00:00 2001
From: Steven Lange <langestx@informatik.hu-berlin.de>
Date: Sat, 30 Dec 2017 14:33:49 +0100
Subject: [PATCH] Fix some issues with diff between OOA and OOD.
Reducing OOA on functional point of view and ignoring implementation
details like "updateReady" or "isIdle()",
---
doc/architecture/ObjectOrientedAnalysis.tex | 56 +++++++++------------
1 file changed, 24 insertions(+), 32 deletions(-)
diff --git a/doc/architecture/ObjectOrientedAnalysis.tex b/doc/architecture/ObjectOrientedAnalysis.tex
index b4cb8359..28963688 100644
--- a/doc/architecture/ObjectOrientedAnalysis.tex
+++ b/doc/architecture/ObjectOrientedAnalysis.tex
@@ -16,11 +16,6 @@
\begin{document}
\begin{tikzpicture}
\begin{umlpackage}{Car}
- %\begin{umlpackage}{STM}
- % \umlclass{MAV-Link}
- % {}
- % {}
- %\end{umlpackage}
\begin{umlpackage}{Odroid}
% classes
\umlclass[scale = 0.5]
@@ -62,9 +57,9 @@
- CACC($d_O, v_P, IPD, PS$) : Integer\\
- ACC($d_O, v_P, v_s, d_s$) : Integer\\
- calcNewOptimalDistance($v_s$) : Integer\\
- + pushNewSpeed($v_{new}$)
+ + setNewSpeed($v_{new}$)
} (CruiseConrol)
- \umlclass[scale = 0.5, xshift = -5cm, yshift = -9cm]
+ \umlclass[scale = 0.5, xshift = -5.5cm, yshift = -9cm]
{Egomotion}
{
- $d_O$ : Integer\\
@@ -72,41 +67,38 @@
- $v_R$ : Integer\\
- $v_P$ : Integer\\
- $\alpha_O$ : Integer\\
- - Path : ?
- - $\alpha_{new}$ : Integer\\
+ - Path : ?\\
+ + $\alpha_{new}$ : Integer\\
+ $v_{new}$ : Integer\\
- + WantsPlatton : Boolean\\
- + UpdateReady : Boolean
}
{
- calc\_$v_P$($v_R$) : Integer\\
- - getEnvoirment() : (Integer, Integer)\\
- - getMavLink() : (Integer, Integer)\\
- - getCurseControl : Integer
+ %- getEnvoirment() : (Integer, Integer)\\
+ %- getMavLink() : (Integer, Integer)\\
+ %- getCurseControl : Integer
} (EgoMotion)
\umlclass[scale = 0.5, xshift = 6.7cm, yshift = -14cm]
{PlatoonController}
{
- - $IPD$ : Integer
+ - $IPD$ : Integer\\
- $PS$ : Integer\\
- - PlatoonState : Integer\\
+ - PlatoonState : ENUM\\
- $v_s$ : Integer\\
- $CarID$ : Integer\\
- PlatoonMemberList : ?\\
- PlatoonPos : Integer\\
- PlatoonPrevID : ?\\
- + isUpdated : Boolean
+ + WantsPlatton : Boolean
}
{
- - PlatoonStateAuswerten(PlatoonState : Integer) : ?\\
- - LV\_CACC\_IPD/PS\_festlegen() : (Integer, Integer)\\
+ - evaluate\_PlatoonState(PlatoonState : Integer) : ?\\
+ - determine\_LV\_IPD-PS() : (Integer, Integer)\\
- handle\_PBM() : ?\\
- handle\_PCM() : ?\\
- handle\_PHM() : ?\\
- send\_PBM() : ?\\
- send\_PCM() : ?\\
- - send\_PHM() : ?\\
- + isIdle() : Boolean
+ - send\_PHM() : ?
}
\umlclass[scale = 0.5, xshift = -9cm, yshift = -20cm]
{Envoirment}
@@ -124,9 +116,9 @@
{
+ $d_O$ : Integer\\
+ $v_O$ : Integer\\
+ + $\alpha_O$ : Interger\\
+ $v_R$ : Integer\\
+ $v_P$ : Integer\\
- + $\alpha_O$ : Integer\\
+ Path : ?\\
+ $\alpha_{new}$ : Integer\\
+ $v_{new}$ : Integer\\
@@ -134,13 +126,12 @@
+ UpdateReady : Boolean\\
+ $IPD$ : Integer\\
+ $PS$ : Integer\\
- + PlatoonState : Integer\\
+ + PlatoonState : ENUM\\
+ $v_s$ : Integer\\
+ $CarID$ : Integer\\
+ PlatoonMemberList : ?\\
+ PlatoonPos : Integer\\
- + PlatoonPrevID : Integer\\
- + isUpdated : Boolean
+ + PlatoonPrevID : Integer
}
{
- cacheDate() : ?\\
@@ -176,20 +167,21 @@
\umlinherit [geometry=-| ,anchors= 0 and 250] {Camera}{Envoirment}
\umlinherit [geometry=|- ,anchors= 90 and 180] {Camera}{Lane-Keeping}
\umlinherit [geometry=|- ,anchors= 90 and 25] {Cruise-Control}{MAV-Link}
- \umlinherit [geometry=-| ,anchors= 115 and 280] {Egomotion}{Lane-Keeping}
- \umlinherit [geometry=-|-,anchors= 35 and 215] {Egomotion}{Cruise-Control}
- \umlinherit [geometry=|-,anchors= -35 and 152] {Egomotion}{PlatoonController}
+ \umlinherit [geometry=|- ,anchors= 217 and 50] {Cruise-Control}{Egomotion}
+ \umlinherit [geometry=|- ,anchors= 50 and 217] {Egomotion}{Cruise-Control}
+ \umlinherit [geometry=|- ,anchors= -35 and 152] {Egomotion}{PlatoonController}
+ \umlinherit [geometry=-| ,anchors= 115 and 300] {Egomotion}{Lane-Keeping}
\umlinherit [geometry=-|] {Egomotion}{Logging}
\umlinherit [geometry=|-|,anchors=90 and 245] {Envoirment}{Egomotion}
\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= 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=|- ,anchors= 240 and 25] {PlatoonController}{Logging}
- \umlinherit [geometry=-|, anchors= 295 and 75] {PlatoonController}{Network}
- \umlinherit [geometry=-|, anchors= 75 and 295] {Network}{PlatoonController}
+ \umlinherit [geometry=-|, anchors= 300 and 85] {PlatoonController}{Network}
+ \umlinherit [geometry=-|, anchors= 85 and 300] {Network}{PlatoonController}
\umlinherit [geometry=-| ,anchors= 0 and 290] {Ultrasonic}{Envoirment}
\end{umlpackage}
\end{umlpackage}
--
GitLab