Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reorder A and B in X (virtual channel construction) #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+48 −48
Open

Reorder A and B in X (virtual channel construction) #5

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92bdee1
A/B channels are colored A then B
geoknee Apr 20, 2021
1179c9a
swap order of A and B in virtual channel constr.
geoknee Apr 20, 2021
7fd8d55
enforce consistency betwen Figs 25,25
geoknee Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions channel-diagrams.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Comment on lines -126 to +128
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to this file redefine guarantee (used only in Figure 25 and 26) and guarantee2other (used only in Figure 26) diagrams. In essence the change swaps the outcome of G and G': so that the funding from (A,I) eventually prioritises A first in J (and likewise for B). In other words (during opening) the left guarantee now has output ports 132 and the right guarantee has output ports 231. The necessary follow on change is made to Figure 26 when G has been defunded.

This is a necessary change given the reordering of A and B in J.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have just spotted another issue, however, in that L and L' seemed to have switched positions in Figure 26 (w.r.t Figure 25), as well as the ordering of A and B in J. I think we ought to switch L and L' back.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7fd8d55

\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) {};
Expand Down Expand Up @@ -402,13 +402,13 @@
\path (-leftp3) -- +({180-\angle}:\clearance mm) coordinate (-Leftp3);

\begin{scope}[-, every to/.style={out={-\angle}, in={180-\angle}}]
\draw (-Leftp1) to (-leftp3);
\draw (-Leftp3) to (-leftp1);
\draw (-Leftp1) to (-leftp1);
\draw (-Leftp3) to (-leftp3);
\end{scope}

\begin{scope}[-, every to/.style={out={180+\angle}, in={\angle}}]
\draw (-Rightp1) to (-rightp1);
\draw (-Rightp3) to (-rightp3);
\draw (-Rightp1) to (-rightp3);
\draw (-Rightp3) to (-rightp1);
\end{scope}

\node[semicircle, draw, rotate=45, anchor=south] (-G0) at (-Leftp2) {};
Expand Down Expand Up @@ -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 }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is debatable: the split circle is used throughout the paper, including places where it allocated to Bob then Alice, or just to Bob. So the colour-coding does not denote anything about the outcome of that channel, only the participants of that channel.

That said I still prefer it this way. The participants are also ordered A,B so the colouring should be, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It affects Figures 3,5,6,7,8,9,10,13,14,15,16,17,18,19,20,24,25,26

}
\tikzset{
circAI/.style={ draw, circle, fill halves={red!50,orange!50}, minimum size=4mm }
Expand Down
Binary file modified exportable-diagrams.pdf
View file
Open in desktop
Binary file not shown.
24 changes: 12 additions & 12 deletions figures/opening-virtual-channel.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {};
Comment on lines -16 to +17
Copy link
Contributor Author

@geoknee geoknee Apr 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to this file only affect Figure 25. The change consists of permuting the positions of a2 and b2, as well as the edge connecting them with the joint channel. This happens in 3 of the 4 frames of the figure.

\node[circI] (i) at (1, -4) {};

\begin{scope}[->]
Expand All @@ -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}
Expand All @@ -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}[->]
Expand All @@ -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}
Expand All @@ -65,17 +65,17 @@
\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}[->]
\draw (a0) edge node[midway, left] { 10 } (b0);
\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}
Expand Down
Binary file modified main.pdf
View file
Open in desktop
Binary file not shown.