diff --git a/channel-diagrams.tex b/channel-diagrams.tex index b3269e6..882cf7e 100644 --- a/channel-diagrams.tex +++ b/channel-diagrams.tex @@ -123,15 +123,15 @@ \path (-leftp3) -- +({180-\angle}:\clearance mm) coordinate (-Leftp3); \begin{scope}[-, every to/.style={out={-\angle}, in={180-\angle}}] - \draw (-Leftp1) to (-leftp2); + \draw (-Leftp1) to (-leftp1); \draw (-Leftp2) to (-leftp3); - \draw (-Leftp3) to (-leftp1); + \draw (-Leftp3) to (-leftp2); \end{scope} \begin{scope}[-, every to/.style={out={180+\angle}, in={\angle}}] - \draw (-Rightp1) to (-rightp1); + \draw (-Rightp1) to (-rightp2); \draw (-Rightp2) to (-rightp3); - \draw (-Rightp3) to (-rightp2); + \draw (-Rightp3) to (-rightp1); \end{scope} \node[semicircle, draw, rotate=45, anchor=south] (-G0) at (-Leftp2) {}; @@ -437,7 +437,7 @@ } \tikzset{ - circAB/.style={ draw, circle, fill halves={blue!50,red!50}, minimum size=4mm } + circAB/.style={ draw, circle, fill halves={red!50,blue!50}, minimum size=4mm } } \tikzset{ circAI/.style={ draw, circle, fill halves={red!50,orange!50}, minimum size=4mm } diff --git a/exportable-diagrams.pdf b/exportable-diagrams.pdf index 9f56e6b..bf6afcf 100644 Binary files a/exportable-diagrams.pdf and b/exportable-diagrams.pdf differ diff --git a/figures/closing-virtual-channel.tex b/figures/closing-virtual-channel.tex index ca3fc57..b8ff6d6 100644 --- a/figures/closing-virtual-channel.tex +++ b/figures/closing-virtual-channel.tex @@ -1,10 +1,10 @@ \begin{tikzpicture}[x=4cm, y=0.8cm] \node (s0) at (0, 0) { \begin{tikzpicture}[x=.8cm] - \node[sqadj] (adj0) at (-1,0) {}; - \node[sqadj] (adj1) at (1,0) {}; - \node[circBI] (bi) at (-1,-1) {}; - \node[circAI] (ai) at (1,-1) {}; + \node[sqadj] (adj0) at (1,0) {}; + \node[sqadj] (adj1) at (-1,0) {}; + \node[circBI] (bi) at (1,-1) {}; + \node[circAI] (ai) at (-1,-1) {}; \pic (G) at (0, -2.5) {guarantee2}; \node[circAB] (ab) at (-0.7,-4) {}; \node[circI] (i) at (0.7, -4) {}; @@ -14,8 +14,8 @@ \begin{scope}[->] \draw (adj0) edge node[midway, left] { 10 } (bi); \draw (adj1) edge node[midway, right] { 10 } (ai); - \draw (bi) edge node[midway, left] { 10 } (G-G0); - \draw (ai) edge node[midway, right] { 10 } (G-G1); + \draw (ai) edge node[midway, left] { 10 } (G-G0); + \draw (bi) edge node[midway, right] { 10 } (G-G1); \draw (G-J) edge node[midway, left] { 10 } (ab); \draw (G-J) edge node[midway, right] { 10 } (i); \draw (ab) edge node[midway, left] { 2 } (a); @@ -26,10 +26,10 @@ \node (s1) at (1, 0) { \begin{tikzpicture}[x=.8cm] - \node[sqadj] (adj0) at (-1,0) {}; - \node[sqadj] (adj1) at (1,0) {}; - \node[circBI] (bi) at (-1,-1) {}; - \node[circAI] (ai) at (1,-1) {}; + \node[sqadj] (adj0) at (1,0) {}; + \node[sqadj] (adj1) at (-1,0) {}; + \node[circBI] (bi) at (1,-1) {}; + \node[circAI] (ai) at (-1,-1) {}; \pic (G) at (0, -2.5) {guarantee}; \node[circB] (b) at (0,-4) {}; \node[circA] (a) at (-1,-4) {}; @@ -39,8 +39,8 @@ \begin{scope}[->] \draw (adj0) to (bi); \draw (adj1) to (ai); - \draw (bi) to (G-G0); - \draw (ai) to (G-G1); + \draw (ai) to (G-G0); + \draw (bi) to (G-G1); \draw (G-J) edge node[near end, left] { 8 } (b); \draw (G-J) edge node[midway, left] { 2 } (a); \draw (G-J) edge node[midway, right] { 10 } (i); @@ -50,25 +50,25 @@ \node (s2) at (2.1, 0) { \begin{tikzpicture}[x=.8cm] - \node[sqadj] (adj0) at (-1,0) {}; - \node[sqadj] (adj1) at (2,0) {}; - \node[circBI] (bi) at (-1,-1) {}; - \node[circAI] (ai) at (2,-1) {}; - \node[circB] (b) at (-1.6,-2) {}; - \node[circI] (ibi) at (-0.6,-2) {}; + \node[sqadj] (adj0) at (2,0) {}; + \node[sqadj] (adj1) at (-1,0) {}; + \node[circBI] (bi) at (2,-1) {}; + \node[circAI] (ai) at (-1,-1) {}; + \node[circA] (a) at (-1.6,-2) {}; + \node[circI] (iai) at (-0.6,-2) {}; \pic (G) at (1, -2.5) {guarantee2other}; - \node[circA] (a) at (0.4,-4) {}; + \node[circB] (b) at (0.4,-4) {}; \node[circI] (i) at (1.6, -4) {}; \node[circle, draw=none, label=below:\strut] at (0, -4) {}; %ghost node for alignment% \begin{scope}[->] \draw (adj0) to (bi); - \draw (bi) edge node[midway, left] {8} (b); - \draw (bi) edge node[midway, right] {2} (ibi); + \draw (ai) edge node[midway, left] {2} (a); + \draw (ai) edge node[midway, right] {8} (iai); \draw (adj1) to (ai); - \draw (ai) to (G-G1); - \draw (G-J) edge node[midway, left] { 2 } (a); + \draw (bi) to (G-G1); + \draw (G-J) edge node[midway, left] { 8 } (b); \draw (G-J) edge node[midway, right] { 10 } (i); \end{scope} \end{tikzpicture} @@ -76,15 +76,15 @@ \node (s3) at (3.4, 0) { \begin{tikzpicture}[x=.8cm] - \node[sqadj] (adj0) at (-1,0) {}; - \node[circBI] (bi) at (-1,-1) {}; - \node[circB] (b) at (-1.7,-2) {}; - \node[circI] (ibi) at (-0.3,-2) {}; + \node[sqadj] (adj1) at (-1,0) {}; + \node[circAI] (ai) at (-1,-1) {}; + \node[circA] (a) at (-1.7,-2) {}; + \node[circI] (iai) at (-0.3,-2) {}; - \node[sqadj] (adj1) at (1.5,0) {}; - \node[circAI] (ai) at (1.5,-1) {}; - \node[circA] (a) at (0.8,-2) {}; - \node[circI] (iai) at (2.2, -2) {}; + \node[sqadj] (adj0) at (1.5,0) {}; + \node[circBI] (bi) at (1.5,-1) {}; + \node[circB] (b) at (0.8,-2) {}; + \node[circI] (ibi) at (2.2, -2) {}; \node[circle, draw=none, label=below:\strut] at (0, -4) {}; %ghost node for alignment% diff --git a/figures/opening-virtual-channel.tex b/figures/opening-virtual-channel.tex index 6ed6be2..390954b 100644 --- a/figures/opening-virtual-channel.tex +++ b/figures/opening-virtual-channel.tex @@ -13,8 +13,8 @@ \pic (G) at (0, -2.5) {guarantee}; - \node[circB] (b2) at (-1,-4) {}; - \node[circA] (a2) at (0,-4) {}; + \node[circA] (a2) at (-1,-4) {}; + \node[circB] (b2) at (0,-4) {}; \node[circI] (i) at (1, -4) {}; \begin{scope}[->] @@ -24,8 +24,8 @@ \draw (b0) edge node[midway, right] { 5 } (ai); \draw (b1) edge node[midway, left] { 5 } (bb); \draw (b1) edge node[midway, right] { 5 } (bi); - \draw (G-J) edge node[midway, left] { 5 } (b2); - \draw (G-J) edge node[near end, left] { 5 } (a2); + \draw (G-J) edge node[midway, left] { 5 } (a2); + \draw (G-J) edge node[near end, left] { 5 } (b2); \draw (G-J) edge node[midway, right] { 10 } (i); \end{scope} \end{tikzpicture} @@ -41,8 +41,8 @@ \node[sqadj] (a0) at (-1,0) {}; \node[circAI] (b0) at (-1,-1) {}; \pic (G) at (0, -2.5) {guarantee}; - \node[circB] (b2) at (-1,-4) {}; - \node[circA] (a2) at (0,-4) {}; + \node[circA] (a2) at (-1,-4) {}; + \node[circB] (b2) at (0,-4) {}; \node[circI] (i) at (1, -4) {}; \begin{scope}[->] @@ -51,8 +51,8 @@ \draw (b1) edge node[midway, left] { 5 } (bb); \draw (b1) edge node[midway, right] { 5 } (bi); \draw (b0) edge node[midway, left] { 10 } (G-G0); - \draw (G-J) edge node[midway, left] { 5 } (b2); - \draw (G-J) edge node[near end, left] { 5 } (a2); + \draw (G-J) edge node[midway, left] { 5 } (a2); + \draw (G-J) edge node[near end, left] { 5 } (b2); \draw (G-J) edge node[midway, right] { 10 } (i); \end{scope} \end{tikzpicture} @@ -65,8 +65,8 @@ \node[circAI] (b0) at (-1,-1) {}; \node[circBI] (b1) at (1,-1) {}; \pic (G) at (0, -2.5) {guarantee}; - \node[circB] (b2) at (-1,-4) {}; - \node[circA] (a2) at (0,-4) {}; + \node[circA] (a2) at (-1,-4) {}; + \node[circB] (b2) at (0,-4) {}; \node[circI] (i) at (1, -4) {}; \begin{scope}[->] @@ -74,8 +74,8 @@ \draw (a1) edge node[midway, right] { 10 } (b1); \draw (b0) edge node[midway, left] { 10 } (G-G0); \draw (b1) edge node[midway, right] { 10 } (G-G1); - \draw (G-J) edge node[midway, left] { 5 } (b2); - \draw (G-J) edge node[near end, left] { 5 } (a2); + \draw (G-J) edge node[midway, left] { 5 } (a2); + \draw (G-J) edge node[near end, left] { 5 } (b2); \draw (G-J) edge node[midway, right] { 10 } (i); \end{scope} \end{tikzpicture} diff --git a/main.pdf b/main.pdf index 6d45c9d..8ed4211 100644 Binary files a/main.pdf and b/main.pdf differ