X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=top%2Fmtask_integration.tex;h=1b0a22e980e68ee66333a865b731f7e27b58e4a5;hb=HEAD;hp=efd0659d27397bce8541a9e38b9e6ae2532820ea;hpb=1544c8074a9b894c6e78beb0911aff25a295352c;p=phd-thesis.git

diff --git a/top/mtask_integration.tex b/top/mtask_integration.tex
index efd0659..1b0a22e 100644
--- a/top/mtask_integration.tex
+++ b/top/mtask_integration.tex
@@ -13,26 +13,28 @@
 	\node (CN) [client,inner sep=0pt,draw,right=of CD] {Client\textsubscript{n}};
 
 	% line between server and browser
-	\draw [dotted] ([xshift=-5em,yshift=-.8em]C1.south west) node[left,above]{browser} node[left,below]{server(s)} -- ([xshift=3em,yshift=-.8em]CN.south east);
+	\draw [dotted] ([xshift=-5em,yshift=-.8em]C1.south west) node[left,above]{presentation} node[left,below]{application} -- ([xshift=5em,yshift=-.8em]CN.south east);
 
-	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=4.5em,yshift=-4.5em] (Tn) {Task\textsubscript{n}};
-	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=3em,yshift=-3.0em] (Td) {\ldots};
-	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=1.5em,yshift=-1.5em] (T2) {Task\textsubscript{2}};
-	\node[task,inner sep=-4.5pt,below=of C1,fill=white] (T1) {Task\textsubscript{1}};
+	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=6.5em,yshift=-4.5em] (Tn) {Task\textsubscript{n}};
+	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=5em,yshift=-3.0em] (Td) {\ldots};
+	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=3.5em,yshift=-1.5em] (T2) {Task\textsubscript{2}};
+	\node[task,inner sep=-4.5pt,below=of C1,fill=white,xshift=2em] (T1) {Task\textsubscript{1}};
 
 	\node[share,node distance=6em,right=of T1,fill=white,xshift=4.5em,yshift=-4.5em] (Sn) {SDS\textsubscript{n}};
 	\node[share,node distance=6em,right=of T1,fill=white,xshift=3em,yshift=-3.0em] (Sd) {\ldots};
 	\node[share,node distance=6em,right=of T1,fill=white,xshift=1.5em,yshift=-1.5em] (S2) {SDS\textsubscript{2}};
 	\node[share,node distance=6em,right=of T1,fill=white] (S1) {SDS\textsubscript{1}};
 
+	\node[fit={(T1)(Sn)},draw] (TS) {};
+
 	% line between client and server
-	\draw [dotted] ([xshift=-5em,yshift=-11em]C1.south west) node[left,above]{server(s)} node[left,below]{device(s)} -- ([xshift=3em,yshift=-11em]CN.south east);
+	\draw [dotted] ([xshift=-5em,yshift=-11em]C1.south west) node[left,above]{application} node[left,below]{perception} -- ([xshift=5em,yshift=-11em]CN.south east);
 
 	% device 1
 	\node[task,text width=1.5em,inner sep=-4.5pt,node distance=12em,below=of C1,double copy shadow={shadow xshift=.4em,shadow yshift=-.4em},fill=white] (D1T1) {};
 	\node[share,text width=.3em,text height=.8ex,right=of D1T1,double copy shadow={shadow xshift=.4em,shadow yshift=-.4em},fill=white] (D1S1) {};
 
-	\node[draw,fit={(D1S1)(D1T1)([shift={(1.2em,-1.2em)}]D1S1.south east)},label=below:{\scriptsize mTask device\textsubscript{1}}] {};
+	\node[draw,fit={(D1S1)(D1T1)([shift={(1.2em,-1.2em)}]D1S1.south east)},label=below:{\scriptsize mTask device\textsubscript{1}}] (D1) {};
 
 	% device 2
 	\node[task,text width=1.5em,inner sep=-4.5pt,node distance=12em,below=of C2,double copy shadow={shadow xshift=.4em,shadow yshift=-.4em},fill=white] (D2T1) {};
@@ -50,21 +52,24 @@
 	\node[draw,fit={(DNS1)(DNT1)([shift={(1.2em,-1.2em)}]DNS1.south east)},label=below:{\scriptsize mTask device\textsubscript{n}}] (DN) {};
 
 	% iTask server
-	\node[fit={(C1)([shift={(1em,-1.2em)}]DN.south east)},draw,label={iTask server}] {};
+	\node[fit={(C1)([shift={(1em,-1.2em)}]DN.south east)},draw,label={IoT application}] {};
 
 	% Arrows
-	\draw [<->] (C1) -- (T1);
-	\draw [<->] (C2) -- (T1);
-	\draw [<->] (CN) -- (T1);
+	\draw [<->,shorten <=2pt,shorten >=2pt] (C1) -- (T1);
+	\draw [<->,shorten <=2pt,shorten >=2pt] (C2) -- (T1);
+	\draw [<->,shorten <=2pt,shorten >=2pt] (CN) -- (T1);
 
-	\draw [<->] (T1) -- (S1);
-	\draw [<->] (T1) -- (S2);
-	\draw [<->] (T1) -- (Sn);
+	\draw [<->,shorten <=2pt,shorten >=2pt] (T1) -- (S1);
+	\draw [<->,shorten <=2pt,shorten >=2pt] (T1) -- (S2);
+	\draw [<->,shorten <=2pt,shorten >=2pt] (T1) -- (Sn);
 
-	\draw [<->] (Tn) -- node [midway,above,sloped] {\scriptsize\texttt{liftmTask}} (D1T1);
-	\draw [<->] (Sn) -- node [midway,above,sloped] {\scriptsize\texttt{liftsds}} (D1S1);
+	\draw [<->,shorten >=2pt] (Tn) -- node [midway,above,fill=white] {\texttt{liftmTask}} (D2T1);
+	\draw [<->,shorten >=2pt] (Sn) -- node [midway,above,fill=white] {\texttt{lowerSds}} (D2S1);
 
-	\draw [<->] (D1T1) -- (D1S1);
+	\draw [<->,shorten <=4pt] (D1T1) -- (D1S1);
+	\draw [<->,shorten <=4pt] (D2T1) -- (D2S1);
+	\draw [<->,shorten <=4pt] (DNT1) -- (DNS1);
 
+	\draw [<->,shorten <=2pt,shorten >=2pt] (D1.north) to [in=180,out=135] node [midway,above,fill=white] {\texttt{withDevice}} (TS.west);
 \end{tikzpicture}
 \end{document}