From ec6e7f8b4f507dfb701478c4c0f463df1739046c Mon Sep 17 00:00:00 2001 From: geno Date: Fri, 22 Mar 2024 13:46:28 +0100 Subject: [PATCH] update hof and some examples --- .../high-order-fun/anonfun_10_local_view.dot | 2 +- .../high-order-fun/anonfun_15_local_view.dot | 2 +- .../high-order-fun/greet_0_global_view.dot | 30 ++++++------- .../high-order-fun/greet_0_local_view.dot | 10 ++--- examples/high-order-fun/hof.erl | 10 ++--- examples/serverclient/server_0_local_view.dot | 4 +- examples/test/barber/test0_local_view.dot | 19 -------- examples/test/barber/test_0_local_view.dot | 19 ++++++++ .../{b0_local_view.dot => b_0_local_view.dot} | 4 +- .../{c1_local_view.dot => c_1_local_view.dot} | 6 +-- examples/test/foo1/test0_global_view.dot | 18 -------- examples/test/foo1/test0_local_view.dot | 15 ------- .../test_0_global_view.dot} | 12 +++--- examples/test/foo1/test_0_local_view.dot | 15 +++++++ .../{a1_local_view.dot => a_1_local_view.dot} | 4 +- .../{b0_local_view.dot => b_0_local_view.dot} | 4 +- .../{c0_local_view.dot => c_0_local_view.dot} | 4 +- ...global_view.dot => test_0_global_view.dot} | 4 +- ...0_local_view.dot => test_0_local_view.dot} | 8 ++-- .../{a1_local_view.dot => a_1_local_view.dot} | 4 +- .../{b1_local_view.dot => b_1_local_view.dot} | 4 +- examples/test/foo3/test0_global_view.dot | 36 ---------------- examples/test/foo3/test_0_global_view.dot | 41 ++++++++++++++++++ ...0_local_view.dot => test_0_local_view.dot} | 14 +++--- .../{r0_local_view.dot => r_0_local_view.dot} | 6 +-- examples/test/foo4/test0_global_view.dot | 36 ---------------- examples/test/foo4/test0_local_view.dot | 19 -------- examples/test/foo4/test_0_global_view.dot | 43 +++++++++++++++++++ examples/test/foo4/test_0_local_view.dot | 19 ++++++++ ...w11_local_view.dot => w1_1_local_view.dot} | 4 +- ...w21_local_view.dot => w2_1_local_view.dot} | 4 +- ..._local_view.dot => proxy_1_local_view.dot} | 6 +-- ...local_view.dot => target_0_local_view.dot} | 8 ++-- examples/test/foo5/test0_global_view.dot | 18 -------- examples/test/foo5/test0_local_view.dot | 21 --------- examples/test/foo5/test_0_global_view.dot | 19 ++++++++ examples/test/foo5/test_0_local_view.dot | 21 +++++++++ ...local_view.dot => client_1_local_view.dot} | 4 +- ...local_view.dot => server_0_local_view.dot} | 4 +- examples/test/foo6/test0_local_view.dot | 12 ------ examples/test/foo6/test_0_global_view.dot | 19 ++++++++ examples/test/foo6/test_0_local_view.dot | 12 ++++++ ...0_local_view.dot => pong_0_local_view.dot} | 8 ++-- ...lobal_view.dot => start_0_global_view.dot} | 4 +- ..._local_view.dot => start_0_local_view.dot} | 8 ++-- 45 files changed, 299 insertions(+), 285 deletions(-) delete mode 100644 examples/test/barber/test0_local_view.dot create mode 100644 examples/test/barber/test_0_local_view.dot rename examples/test/foo1/{b0_local_view.dot => b_0_local_view.dot} (77%) rename examples/test/foo1/{c1_local_view.dot => c_1_local_view.dot} (83%) delete mode 100644 examples/test/foo1/test0_global_view.dot delete mode 100644 examples/test/foo1/test0_local_view.dot rename examples/test/{foo6/test0_global_view.dot => foo1/test_0_global_view.dot} (53%) create mode 100644 examples/test/foo1/test_0_local_view.dot rename examples/test/foo2/{a1_local_view.dot => a_1_local_view.dot} (77%) rename examples/test/foo2/{b0_local_view.dot => b_0_local_view.dot} (83%) rename examples/test/foo2/{c0_local_view.dot => c_0_local_view.dot} (83%) rename examples/test/foo2/{test0_global_view.dot => test_0_global_view.dot} (68%) rename examples/test/foo2/{test0_local_view.dot => test_0_local_view.dot} (52%) rename examples/test/foo3/{a1_local_view.dot => a_1_local_view.dot} (83%) rename examples/test/foo3/{b1_local_view.dot => b_1_local_view.dot} (77%) delete mode 100644 examples/test/foo3/test0_global_view.dot create mode 100644 examples/test/foo3/test_0_global_view.dot rename examples/test/foo3/{test0_local_view.dot => test_0_local_view.dot} (50%) rename examples/test/foo4/{r0_local_view.dot => r_0_local_view.dot} (86%) delete mode 100644 examples/test/foo4/test0_global_view.dot delete mode 100644 examples/test/foo4/test0_local_view.dot create mode 100644 examples/test/foo4/test_0_global_view.dot create mode 100644 examples/test/foo4/test_0_local_view.dot rename examples/test/foo4/{w11_local_view.dot => w1_1_local_view.dot} (83%) rename examples/test/foo4/{w21_local_view.dot => w2_1_local_view.dot} (83%) rename examples/test/foo5/{proxy1_local_view.dot => proxy_1_local_view.dot} (81%) rename examples/test/foo5/{target0_local_view.dot => target_0_local_view.dot} (87%) delete mode 100644 examples/test/foo5/test0_global_view.dot delete mode 100644 examples/test/foo5/test0_local_view.dot create mode 100644 examples/test/foo5/test_0_global_view.dot create mode 100644 examples/test/foo5/test_0_local_view.dot rename examples/test/foo6/{client1_local_view.dot => client_1_local_view.dot} (74%) rename examples/test/foo6/{server0_local_view.dot => server_0_local_view.dot} (68%) delete mode 100644 examples/test/foo6/test0_local_view.dot create mode 100644 examples/test/foo6/test_0_global_view.dot create mode 100644 examples/test/foo6/test_0_local_view.dot rename examples/test/ping/{pong0_local_view.dot => pong_0_local_view.dot} (87%) rename examples/test/ping/{start0_global_view.dot => start_0_global_view.dot} (66%) rename examples/test/ping/{start0_local_view.dot => start_0_local_view.dot} (80%) diff --git a/examples/high-order-fun/anonfun_10_local_view.dot b/examples/high-order-fun/anonfun_10_local_view.dot index 3b2b5a0..0c1d607 100644 --- a/examples/high-order-fun/anonfun_10_local_view.dot +++ b/examples/high-order-fun/anonfun_10_local_view.dot @@ -5,5 +5,5 @@ digraph anonfun_10 { n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="2"]; - n_1 -> n_2 [id="[$e|0]", label="receive hello"]; + n_1 -> n_2 [id="[$e|0]", label="receive _"]; } diff --git a/examples/high-order-fun/anonfun_15_local_view.dot b/examples/high-order-fun/anonfun_15_local_view.dot index 7544476..3aa41ac 100644 --- a/examples/high-order-fun/anonfun_15_local_view.dot +++ b/examples/high-order-fun/anonfun_15_local_view.dot @@ -5,5 +5,5 @@ digraph anonfun_15 { n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="2"]; - n_1 -> n_2 [id="[$e|0]", label="receive hello"]; + n_1 -> n_2 [id="[$e|0]", label="receive _"]; } diff --git a/examples/high-order-fun/greet_0_global_view.dot b/examples/high-order-fun/greet_0_global_view.dot index ad30aaa..c51d0df 100644 --- a/examples/high-order-fun/greet_0_global_view.dot +++ b/examples/high-order-fun/greet_0_global_view.dot @@ -21,21 +21,21 @@ digraph global { n_17 [id="3", shape=circle, label="3"]; n_18 [id="16", shape=circle, label="16"]; - n_1 -> n_12 [id="[$e|7]", label="greet/0.0→greet/0.0:hello"]; - n_8 -> n_4 [id="[$e|9]", label="greet/0.0→greet/0.0:hello"]; - n_17 -> n_1 [id="[$e|3]", label="greet/0.0→anonfun_15.0:hello"]; - n_10 -> n_18 [id="[$e|14]", label="greet/0.0→greet/0.0:hello"]; - n_15 -> n_14 [id="[$e|6]", label="greet/0.0→anonfun_10.0:hello"]; - n_14 -> n_7 [id="[$e|12]", label="greet/0.0→anonfun_15.0:hello"]; - n_1 -> n_10 [id="[$e|8]", label="greet/0.0→anonfun_10.0:hello"]; - n_4 -> n_5 [id="[$e|15]", label="greet/0.0→anonfun_15.0:hello"]; - n_12 -> n_2 [id="[$e|13]", label="greet/0.0→anonfun_10.0:hello"]; - n_8 -> n_3 [id="[$e|10]", label="greet/0.0→anonfun_15.0:hello"]; - n_15 -> n_16 [id="[$e|5]", label="greet/0.0→anonfun_15.0:hello"]; - n_16 -> n_9 [id="[$e|11]", label="greet/0.0→anonfun_10.0:hello"]; + n_1 -> n_12 [id="[$e|7]", label="greet/0.0→greet/0.0:hello2"]; + n_8 -> n_4 [id="[$e|9]", label="greet/0.0→greet/0.0:hello2"]; + n_17 -> n_1 [id="[$e|3]", label="greet/0.0→anonfun_15.0:hello1"]; + n_10 -> n_18 [id="[$e|14]", label="greet/0.0→greet/0.0:hello2"]; + n_15 -> n_14 [id="[$e|6]", label="greet/0.0→anonfun_10.0:hello3"]; + n_14 -> n_7 [id="[$e|12]", label="greet/0.0→anonfun_15.0:hello1"]; + n_1 -> n_10 [id="[$e|8]", label="greet/0.0→anonfun_10.0:hello3"]; + n_4 -> n_5 [id="[$e|15]", label="greet/0.0→anonfun_15.0:hello1"]; + n_12 -> n_2 [id="[$e|13]", label="greet/0.0→anonfun_10.0:hello3"]; + n_8 -> n_3 [id="[$e|10]", label="greet/0.0→anonfun_15.0:hello1"]; + n_15 -> n_16 [id="[$e|5]", label="greet/0.0→anonfun_15.0:hello1"]; + n_16 -> n_9 [id="[$e|11]", label="greet/0.0→anonfun_10.0:hello3"]; n_11 -> n_13 [id="[$e|0]", label="greet/0.0Δanonfun_15.0"]; n_13 -> n_17 [id="[$e|1]", label="greet/0.0Δanonfun_10.0"]; - n_3 -> n_6 [id="[$e|16]", label="greet/0.0→greet/0.0:hello"]; - n_17 -> n_8 [id="[$e|4]", label="greet/0.0→anonfun_10.0:hello"]; - n_17 -> n_15 [id="[$e|2]", label="greet/0.0→greet/0.0:hello"]; + n_3 -> n_6 [id="[$e|16]", label="greet/0.0→greet/0.0:hello2"]; + n_17 -> n_8 [id="[$e|4]", label="greet/0.0→anonfun_10.0:hello3"]; + n_17 -> n_15 [id="[$e|2]", label="greet/0.0→greet/0.0:hello2"]; } diff --git a/examples/high-order-fun/greet_0_local_view.dot b/examples/high-order-fun/greet_0_local_view.dot index 9ab3204..922c302 100644 --- a/examples/high-order-fun/greet_0_local_view.dot +++ b/examples/high-order-fun/greet_0_local_view.dot @@ -10,10 +10,10 @@ digraph greet_0 { n_6 [id="7", shape=circle, label="5"]; n_7 [id="3", shape=circle, label="2"]; - n_6 -> n_5 [id="[$e|7]", label="send hello to anonfun_10.0"]; - n_7 -> n_4 [id="[$e|3]", label="send hello to anonfun_15.0"]; + n_6 -> n_5 [id="[$e|7]", label="send hello3 to anonfun_10.0"]; n_1 -> n_6 [id="[$e|6]", label="spawn anonfun_10.0"]; - n_5 -> n_3 [id="[$e|5]", label="receive hello"]; - n_2 -> n_7 [id="[$e|1]", label="spawn anonfun_15.0"]; - n_4 -> n_1 [id="[$e|4]", label="send hello to pid_self"]; + n_4 -> n_1 [id="[$e|0]", label="send hello2 to pid_self"]; + n_5 -> n_3 [id="[$e|1]", label="receive _"]; + n_7 -> n_4 [id="[$e|4]", label="send hello1 to anonfun_15.0"]; + n_2 -> n_7 [id="[$e|2]", label="spawn anonfun_15.0"]; } diff --git a/examples/high-order-fun/hof.erl b/examples/high-order-fun/hof.erl index 057571c..dc31976 100644 --- a/examples/high-order-fun/hof.erl +++ b/examples/high-order-fun/hof.erl @@ -3,19 +3,19 @@ recv() -> receive - hello -> done + _ -> done end. greet() -> Fun = fun() -> receive - hello -> done + _ -> done end end, A = spawn(fun() -> recv() end), - A ! hello, - self() ! hello, + A ! hello1, + self() ! hello2, B = spawn(Fun), - B ! hello, + B ! hello3, recv(), Fun(). diff --git a/examples/serverclient/server_0_local_view.dot b/examples/serverclient/server_0_local_view.dot index 73fa518..209bd7c 100644 --- a/examples/serverclient/server_0_local_view.dot +++ b/examples/serverclient/server_0_local_view.dot @@ -8,9 +8,9 @@ digraph server_0 { n_4 [id="4", shape=circle, label="3"]; n_5 [id="3", shape=doublecircle, label="4"]; - n_2 -> n_3 [id="[$e|0]", label="receive {req,P}"]; n_3 -> n_1 [id="[$e|3]", label="spawn handle_req/1.0"]; n_4 -> n_5 [id="[$e|6]", label="spawn handle_req/1.1"]; - n_2 -> n_4 [id="[$e|2]", label="receive ciao"]; n_1 -> n_2 [id="[$e|7]", label="send {res,handle_req/1.0} to P"]; + n_2 -> n_4 [id="[$e|2]", label="receive ciao"]; + n_2 -> n_3 [id="[$e|0]", label="receive {req,P}"]; } diff --git a/examples/test/barber/test0_local_view.dot b/examples/test/barber/test0_local_view.dot deleted file mode 100644 index 9d85705..0000000 --- a/examples/test/barber/test0_local_view.dot +++ /dev/null @@ -1,19 +0,0 @@ -digraph test0 { - rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; - n_1 [id="5", shape=circle, label="5"]; - n_2 [id="6", shape=circle, label="6"]; - n_3 [id="1", shape=circle, label="1"]; - n_0 -> n_3 [arrowhead=none]; - n_4 [id="2", shape=circle, label="2"]; - n_5 [id="4", shape=doublecircle, label="7"]; - n_6 [id="7", shape=circle, label="3"]; - n_7 [id="3", shape=circle, label="4"]; - - n_4 -> n_6 [id="[$e|4]", label="spawn customer3/0"]; - n_6 -> n_7 [id="[$e|0]", label="spawn customer3/1"]; - n_3 -> n_4 [id="[$e|5]", label="spawn open_barber_shop0/0"]; - n_1 -> n_2 [id="[$e|3]", label="receive {Name2,State2}"]; - n_7 -> n_1 [id="[$e|1]", label="receive {Name1,State1}"]; - n_2 -> n_5 [id="[$e|2]", label="send stop to open_barber_shop0/0"]; -} diff --git a/examples/test/barber/test_0_local_view.dot b/examples/test/barber/test_0_local_view.dot new file mode 100644 index 0000000..be8f780 --- /dev/null +++ b/examples/test/barber/test_0_local_view.dot @@ -0,0 +1,19 @@ +digraph test_0 { + rankdir="LR"; + n_0 [label="test_0", shape="plaintext"]; + n_1 [id="5", shape=circle, label="5"]; + n_2 [id="6", shape=circle, label="6"]; + n_3 [id="1", shape=circle, label="1"]; + n_0 -> n_3 [arrowhead=none]; + n_4 [id="2", shape=circle, label="2"]; + n_5 [id="4", shape=doublecircle, label="7"]; + n_6 [id="7", shape=circle, label="3"]; + n_7 [id="3", shape=circle, label="4"]; + + n_7 -> n_1 [id="[$e|4]", label="receive {Name1,State1}"]; + n_3 -> n_4 [id="[$e|1]", label="spawn open_barber_shop/0.0"]; + n_4 -> n_6 [id="[$e|0]", label="spawn customer/3.0"]; + n_1 -> n_2 [id="[$e|5]", label="receive {Name2,State2}"]; + n_6 -> n_7 [id="[$e|3]", label="spawn customer/3.1"]; + n_2 -> n_5 [id="[$e|2]", label="send stop to open_barber_shop/0.0"]; +} diff --git a/examples/test/foo1/b0_local_view.dot b/examples/test/foo1/b_0_local_view.dot similarity index 77% rename from examples/test/foo1/b0_local_view.dot rename to examples/test/foo1/b_0_local_view.dot index 05ef4b7..e1ca012 100644 --- a/examples/test/foo1/b0_local_view.dot +++ b/examples/test/foo1/b_0_local_view.dot @@ -1,6 +1,6 @@ -digraph b0 { +digraph b_0 { rankdir="LR"; - n_0 [label="b0", shape="plaintext"]; + n_0 [label="b_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="2"]; diff --git a/examples/test/foo1/c1_local_view.dot b/examples/test/foo1/c_1_local_view.dot similarity index 83% rename from examples/test/foo1/c1_local_view.dot rename to examples/test/foo1/c_1_local_view.dot index 1d0a219..7363f95 100644 --- a/examples/test/foo1/c1_local_view.dot +++ b/examples/test/foo1/c_1_local_view.dot @@ -1,11 +1,11 @@ -digraph c1 { +digraph c_1 { rankdir="LR"; - n_0 [label="c1", shape="plaintext"]; + n_0 [label="c_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; n_3 [id="3", shape=doublecircle, label="3"]; - n_2 -> n_3 [id="[$e|1]", label="send X to B"]; n_1 -> n_2 [id="[$e|0]", label="receive X"]; + n_2 -> n_3 [id="[$e|1]", label="send X to B"]; } diff --git a/examples/test/foo1/test0_global_view.dot b/examples/test/foo1/test0_global_view.dot deleted file mode 100644 index 9e5cc59..0000000 --- a/examples/test/foo1/test0_global_view.dot +++ /dev/null @@ -1,18 +0,0 @@ -digraph global { - rankdir="LR"; - n_0 [label="global", shape="plaintext"]; - n_1 [id="5", shape=circle, label="6"]; - n_2 [id="1", shape=circle, label="1"]; - n_0 -> n_2 [arrowhead=none]; - n_3 [id="2", shape=circle, label="2"]; - n_4 [id="4", shape=circle, label="4"]; - n_5 [id="7", shape=circle, label="5"]; - n_6 [id="3", shape=circle, label="3"]; - - n_2 -> n_3 [id="[$e|2]", label="test0/0Δb0/0"]; - n_3 -> n_6 [id="[$e|3]", label="test0/0Δc1/0"]; - n_4 -> n_1 [id="[$e|5]", label="test0/0→b0/0:uno"]; - n_5 -> n_1 [id="[$e|6]", label="test0/0→c1/0:dos"]; - n_6 -> n_5 [id="[$e|1]", label="test0/0→b0/0:uno"]; - n_6 -> n_4 [id="[$e|0]", label="test0/0→c1/0:dos"]; -} diff --git a/examples/test/foo1/test0_local_view.dot b/examples/test/foo1/test0_local_view.dot deleted file mode 100644 index da4c3fa..0000000 --- a/examples/test/foo1/test0_local_view.dot +++ /dev/null @@ -1,15 +0,0 @@ -digraph test0 { - rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; - n_1 [id="5", shape=circle, label="3"]; - n_2 [id="1", shape=circle, label="1"]; - n_0 -> n_2 [arrowhead=none]; - n_3 [id="2", shape=circle, label="2"]; - n_4 [id="4", shape=doublecircle, label="5"]; - n_5 [id="3", shape=circle, label="4"]; - - n_5 -> n_4 [id="[$e|2]", label="send dos to c1/0"]; - n_3 -> n_1 [id="[$e|3]", label="spawn c1/0"]; - n_2 -> n_3 [id="[$e|1]", label="spawn b0/0"]; - n_1 -> n_5 [id="[$e|0]", label="send uno to b0/0"]; -} diff --git a/examples/test/foo6/test0_global_view.dot b/examples/test/foo1/test_0_global_view.dot similarity index 53% rename from examples/test/foo6/test0_global_view.dot rename to examples/test/foo1/test_0_global_view.dot index 2293cd2..dadfffd 100644 --- a/examples/test/foo6/test0_global_view.dot +++ b/examples/test/foo1/test_0_global_view.dot @@ -10,10 +10,10 @@ digraph global { n_6 [id="7", shape=circle, label="7"]; n_7 [id="3", shape=circle, label="3"]; - n_5 -> n_1 [id="[$e|3]", label="test0/0Δclient1/0"]; - n_4 -> n_5 [id="[$e|2]", label="test0/0Δclient1/1"]; - n_2 -> n_6 [id="[$e|5]", label="test0/0Δclient1/0"]; - n_4 -> n_7 [id="[$e|1]", label="test0/0Δclient1/0"]; - n_5 -> n_2 [id="[$e|4]", label="test0/0Δclient1/1"]; - n_3 -> n_4 [id="[$e|0]", label="test0/0Δserver0/0"]; + n_7 -> n_1 [id="[$e|3]", label="test/0.0→c/1.0:dos"]; + n_1 -> n_6 [id="[$e|5]", label="test/0.0→b/0.0:uno"]; + n_3 -> n_4 [id="[$e|0]", label="test/0.0Δb/0.0"]; + n_4 -> n_7 [id="[$e|1]", label="test/0.0Δc/1.0"]; + n_5 -> n_2 [id="[$e|4]", label="test/0.0→c/1.0:dos"]; + n_7 -> n_5 [id="[$e|2]", label="test/0.0→b/0.0:uno"]; } diff --git a/examples/test/foo1/test_0_local_view.dot b/examples/test/foo1/test_0_local_view.dot new file mode 100644 index 0000000..7f2c31d --- /dev/null +++ b/examples/test/foo1/test_0_local_view.dot @@ -0,0 +1,15 @@ +digraph test_0 { + rankdir="LR"; + n_0 [label="test_0", shape="plaintext"]; + n_1 [id="5", shape=circle, label="3"]; + n_2 [id="1", shape=circle, label="1"]; + n_0 -> n_2 [arrowhead=none]; + n_3 [id="2", shape=circle, label="2"]; + n_4 [id="4", shape=doublecircle, label="5"]; + n_5 [id="3", shape=circle, label="4"]; + + n_5 -> n_4 [id="[$e|3]", label="send dos to c/1.0"]; + n_1 -> n_5 [id="[$e|0]", label="send uno to b/0.0"]; + n_2 -> n_3 [id="[$e|1]", label="spawn b/0.0"]; + n_3 -> n_1 [id="[$e|2]", label="spawn c/1.0"]; +} diff --git a/examples/test/foo2/a1_local_view.dot b/examples/test/foo2/a_1_local_view.dot similarity index 77% rename from examples/test/foo2/a1_local_view.dot rename to examples/test/foo2/a_1_local_view.dot index d324b91..77c1f62 100644 --- a/examples/test/foo2/a1_local_view.dot +++ b/examples/test/foo2/a_1_local_view.dot @@ -1,6 +1,6 @@ -digraph a1 { +digraph a_1 { rankdir="LR"; - n_0 [label="a1", shape="plaintext"]; + n_0 [label="a_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="2"]; diff --git a/examples/test/foo2/b0_local_view.dot b/examples/test/foo2/b_0_local_view.dot similarity index 83% rename from examples/test/foo2/b0_local_view.dot rename to examples/test/foo2/b_0_local_view.dot index 136d27b..ad304bc 100644 --- a/examples/test/foo2/b0_local_view.dot +++ b/examples/test/foo2/b_0_local_view.dot @@ -1,6 +1,6 @@ -digraph b0 { +digraph b_0 { rankdir="LR"; - n_0 [label="b0", shape="plaintext"]; + n_0 [label="b_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="3"]; diff --git a/examples/test/foo2/c0_local_view.dot b/examples/test/foo2/c_0_local_view.dot similarity index 83% rename from examples/test/foo2/c0_local_view.dot rename to examples/test/foo2/c_0_local_view.dot index 295fd12..a8cbf34 100644 --- a/examples/test/foo2/c0_local_view.dot +++ b/examples/test/foo2/c_0_local_view.dot @@ -1,6 +1,6 @@ -digraph c0 { +digraph c_0 { rankdir="LR"; - n_0 [label="c0", shape="plaintext"]; + n_0 [label="c_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; diff --git a/examples/test/foo2/test0_global_view.dot b/examples/test/foo2/test_0_global_view.dot similarity index 68% rename from examples/test/foo2/test0_global_view.dot rename to examples/test/foo2/test_0_global_view.dot index 294cc9b..24ea431 100644 --- a/examples/test/foo2/test0_global_view.dot +++ b/examples/test/foo2/test_0_global_view.dot @@ -6,6 +6,6 @@ digraph global { n_2 [id="2", shape=circle, label="2"]; n_3 [id="3", shape=circle, label="3"]; - n_2 -> n_3 [id="[$e|0]", label="test0/0Δa1/0"]; - n_1 -> n_2 [id="[$e|1]", label="test0/0Δc0/0"]; + n_1 -> n_2 [id="[$e|0]", label="test/0.0Δc/0.0"]; + n_2 -> n_3 [id="[$e|1]", label="test/0.0Δa/1.0"]; } diff --git a/examples/test/foo2/test0_local_view.dot b/examples/test/foo2/test_0_local_view.dot similarity index 52% rename from examples/test/foo2/test0_local_view.dot rename to examples/test/foo2/test_0_local_view.dot index 22d5e28..d216c76 100644 --- a/examples/test/foo2/test0_local_view.dot +++ b/examples/test/foo2/test_0_local_view.dot @@ -1,11 +1,11 @@ -digraph test0 { +digraph test_0 { rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; + n_0 [label="test_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; n_3 [id="3", shape=doublecircle, label="3"]; - n_2 -> n_3 [id="[$e|0]", label="spawn a1/0"]; - n_1 -> n_2 [id="[$e|1]", label="spawn c0/0"]; + n_2 -> n_3 [id="[$e|0]", label="spawn a/1.0"]; + n_1 -> n_2 [id="[$e|1]", label="spawn c/0.0"]; } diff --git a/examples/test/foo3/a1_local_view.dot b/examples/test/foo3/a_1_local_view.dot similarity index 83% rename from examples/test/foo3/a1_local_view.dot rename to examples/test/foo3/a_1_local_view.dot index 764f4b9..97264bf 100644 --- a/examples/test/foo3/a1_local_view.dot +++ b/examples/test/foo3/a_1_local_view.dot @@ -1,6 +1,6 @@ -digraph a1 { +digraph a_1 { rankdir="LR"; - n_0 [label="a1", shape="plaintext"]; + n_0 [label="a_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; diff --git a/examples/test/foo3/b1_local_view.dot b/examples/test/foo3/b_1_local_view.dot similarity index 77% rename from examples/test/foo3/b1_local_view.dot rename to examples/test/foo3/b_1_local_view.dot index ef0fdf6..66c1912 100644 --- a/examples/test/foo3/b1_local_view.dot +++ b/examples/test/foo3/b_1_local_view.dot @@ -1,6 +1,6 @@ -digraph b1 { +digraph b_1 { rankdir="LR"; - n_0 [label="b1", shape="plaintext"]; + n_0 [label="b_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="2"]; diff --git a/examples/test/foo3/test0_global_view.dot b/examples/test/foo3/test0_global_view.dot deleted file mode 100644 index 7900a27..0000000 --- a/examples/test/foo3/test0_global_view.dot +++ /dev/null @@ -1,36 +0,0 @@ -digraph global { - rankdir="LR"; - n_0 [label="global", shape="plaintext"]; - n_1 [id="15", shape=circle, label="4"]; - n_2 [id="12", shape=circle, label="8"]; - n_3 [id="11", shape=circle, label="9"]; - n_4 [id="17", shape=circle, label="6"]; - n_5 [id="14", shape=circle, label="10"]; - n_6 [id="6", shape=circle, label="3"]; - n_7 [id="13", shape=circle, label="12"]; - n_8 [id="10", shape=circle, label="11"]; - n_9 [id="1", shape=circle, label="1"]; - n_0 -> n_9 [arrowhead=none]; - n_10 [id="9", shape=circle, label="7"]; - n_11 [id="2", shape=circle, label="13"]; - n_12 [id="8", shape=circle, label="5"]; - n_13 [id="3", shape=circle, label="2"]; - - n_7 -> n_11 [id="[$e|22]", label="a1/0→test0/0:3"]; - n_1 -> n_10 [id="[$e|0]", label="a1/0→test0/0:3"]; - n_10 -> n_11 [id="[$e|8]", label="a1/0→test0/0:1"]; - n_5 -> n_11 [id="[$e|19]", label="a1/0→test0/0:3"]; - n_3 -> n_11 [id="[$e|23]", label="a1/0→test0/0:1"]; - n_6 -> n_12 [id="[$e|7]", label="a1/0→test0/0:3"]; - n_6 -> n_1 [id="[$e|11]", label="b1/0→test0/0:2"]; - n_4 -> n_8 [id="[$e|1]", label="a1/0→test0/0:3"]; - n_1 -> n_5 [id="[$e|2]", label="a1/0→test0/0:1"]; - n_2 -> n_11 [id="[$e|20]", label="b1/0→test0/0:2"]; - n_12 -> n_2 [id="[$e|4]", label="a1/0→test0/0:1"]; - n_8 -> n_11 [id="[$e|21]", label="b1/0→test0/0:2"]; - n_4 -> n_7 [id="[$e|9]", label="b1/0→test0/0:2"]; - n_9 -> n_13 [id="[$e|6]", label="test0/0Δa1/0"]; - n_12 -> n_3 [id="[$e|13]", label="b1/0→test0/0:2"]; - n_6 -> n_4 [id="[$e|5]", label="a1/0→test0/0:1"]; - n_13 -> n_6 [id="[$e|16]", label="test0/0Δb1/0"]; -} diff --git a/examples/test/foo3/test_0_global_view.dot b/examples/test/foo3/test_0_global_view.dot new file mode 100644 index 0000000..1bf2774 --- /dev/null +++ b/examples/test/foo3/test_0_global_view.dot @@ -0,0 +1,41 @@ +digraph global { + rankdir="LR"; + n_0 [label="global", shape="plaintext"]; + n_1 [id="5", shape=circle, label="5"]; + n_2 [id="15", shape=circle, label="15"]; + n_3 [id="12", shape=circle, label="12"]; + n_4 [id="11", shape=circle, label="11"]; + n_5 [id="17", shape=circle, label="17"]; + n_6 [id="18", shape=circle, label="18"]; + n_7 [id="14", shape=circle, label="14"]; + n_8 [id="6", shape=circle, label="6"]; + n_9 [id="13", shape=circle, label="13"]; + n_10 [id="10", shape=circle, label="10"]; + n_11 [id="1", shape=circle, label="1"]; + n_0 -> n_11 [arrowhead=none]; + n_12 [id="9", shape=circle, label="9"]; + n_13 [id="2", shape=circle, label="2"]; + n_14 [id="8", shape=circle, label="8"]; + n_15 [id="4", shape=circle, label="4"]; + n_16 [id="7", shape=circle, label="7"]; + n_17 [id="3", shape=circle, label="3"]; + n_18 [id="16", shape=circle, label="16"]; + + n_17 -> n_1 [id="[$e|3]", label="a/1.0→test/0.0:3"]; + n_16 -> n_9 [id="[$e|11]", label="b/1.0→test/0.0:2"]; + n_10 -> n_18 [id="[$e|14]", label="a/1.0→test/0.0:1"]; + n_17 -> n_8 [id="[$e|4]", label="b/1.0→test/0.0:2"]; + n_4 -> n_5 [id="[$e|15]", label="a/1.0→test/0.0:3"]; + n_12 -> n_2 [id="[$e|13]", label="b/1.0→test/0.0:2"]; + n_11 -> n_13 [id="[$e|0]", label="test/0.0Δa/1.0"]; + n_15 -> n_14 [id="[$e|6]", label="b/1.0→test/0.0:2"]; + n_3 -> n_6 [id="[$e|16]", label="a/1.0→test/0.0:1"]; + n_15 -> n_16 [id="[$e|5]", label="a/1.0→test/0.0:3"]; + n_8 -> n_4 [id="[$e|9]", label="a/1.0→test/0.0:1"]; + n_14 -> n_7 [id="[$e|12]", label="a/1.0→test/0.0:3"]; + n_17 -> n_15 [id="[$e|2]", label="a/1.0→test/0.0:1"]; + n_13 -> n_17 [id="[$e|1]", label="test/0.0Δb/1.0"]; + n_8 -> n_3 [id="[$e|10]", label="a/1.0→test/0.0:3"]; + n_1 -> n_12 [id="[$e|7]", label="a/1.0→test/0.0:1"]; + n_1 -> n_10 [id="[$e|8]", label="b/1.0→test/0.0:2"]; +} diff --git a/examples/test/foo3/test0_local_view.dot b/examples/test/foo3/test_0_local_view.dot similarity index 50% rename from examples/test/foo3/test0_local_view.dot rename to examples/test/foo3/test_0_local_view.dot index 7fd7be4..db2c0f7 100644 --- a/examples/test/foo3/test0_local_view.dot +++ b/examples/test/foo3/test_0_local_view.dot @@ -1,6 +1,6 @@ -digraph test0 { +digraph test_0 { rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; + n_0 [label="test_0", shape="plaintext"]; n_1 [id="5", shape=doublecircle, label="6"]; n_2 [id="6", shape=circle, label="3"]; n_3 [id="1", shape=circle, label="1"]; @@ -9,9 +9,9 @@ digraph test0 { n_5 [id="4", shape=circle, label="5"]; n_6 [id="3", shape=circle, label="4"]; - n_4 -> n_2 [id="[$e|0]", label="spawn b1/0"]; - n_5 -> n_1 [id="[$e|1]", label="receive Z"]; - n_2 -> n_6 [id="[$e|2]", label="receive X"]; - n_6 -> n_5 [id="[$e|3]", label="receive Y"]; - n_3 -> n_4 [id="[$e|4]", label="spawn a1/0"]; + n_2 -> n_6 [id="[$e|3]", label="receive X"]; + n_6 -> n_5 [id="[$e|4]", label="receive Y"]; + n_5 -> n_1 [id="[$e|0]", label="receive Z"]; + n_3 -> n_4 [id="[$e|2]", label="spawn a/1.0"]; + n_4 -> n_2 [id="[$e|1]", label="spawn b/1.0"]; } diff --git a/examples/test/foo4/r0_local_view.dot b/examples/test/foo4/r_0_local_view.dot similarity index 86% rename from examples/test/foo4/r0_local_view.dot rename to examples/test/foo4/r_0_local_view.dot index 850abf2..fe1aa35 100644 --- a/examples/test/foo4/r0_local_view.dot +++ b/examples/test/foo4/r_0_local_view.dot @@ -1,13 +1,13 @@ -digraph r0 { +digraph r_0 { rankdir="LR"; - n_0 [label="r0", shape="plaintext"]; + n_0 [label="r_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="3"]; n_3 [id="4", shape=doublecircle, label="4"]; n_4 [id="3", shape=circle, label="2"]; - n_1 -> n_4 [id="[$e|1]", label="receive X"]; n_4 -> n_2 [id="[$e|2]", label="receive Y"]; + n_1 -> n_4 [id="[$e|1]", label="receive X"]; n_2 -> n_3 [id="[$e|0]", label="receive Z"]; } diff --git a/examples/test/foo4/test0_global_view.dot b/examples/test/foo4/test0_global_view.dot deleted file mode 100644 index b29ea1d..0000000 --- a/examples/test/foo4/test0_global_view.dot +++ /dev/null @@ -1,36 +0,0 @@ -digraph global { - rankdir="LR"; - n_0 [label="global", shape="plaintext"]; - n_1 [id="15", shape=circle, label="9"]; - n_2 [id="12", shape=circle, label="8"]; - n_3 [id="11", shape=circle, label="7"]; - n_4 [id="17", shape=circle, label="11"]; - n_5 [id="18", shape=circle, label="4"]; - n_6 [id="14", shape=circle, label="10"]; - n_7 [id="13", shape=circle, label="13"]; - n_8 [id="10", shape=circle, label="12"]; - n_9 [id="1", shape=circle, label="1"]; - n_0 -> n_9 [arrowhead=none]; - n_10 [id="9", shape=circle, label="6"]; - n_11 [id="2", shape=circle, label="14"]; - n_12 [id="7", shape=circle, label="3"]; - n_13 [id="3", shape=circle, label="2"]; - n_14 [id="16", shape=circle, label="5"]; - - n_5 -> n_14 [id="[$e|1]", label="test0/0→w11/0:w1"]; - n_9 -> n_13 [id="[$e|13]", label="test0/0Δr0/0"]; - n_2 -> n_11 [id="[$e|23]", label="test0/0→w21/0:w2"]; - n_3 -> n_8 [id="[$e|9]", label="test0/0→r0/0:r0"]; - n_13 -> n_12 [id="[$e|8]", label="test0/0Δw11/0"]; - n_14 -> n_2 [id="[$e|2]", label="test0/0→r0/0:r0"]; - n_12 -> n_5 [id="[$e|6]", label="test0/0Δw21/0"]; - n_5 -> n_10 [id="[$e|0]", label="test0/0→r0/0:r0"]; - n_10 -> n_6 [id="[$e|4]", label="test0/0→w11/0:w1"]; - n_5 -> n_3 [id="[$e|16]", label="test0/0→w21/0:w2"]; - n_8 -> n_11 [id="[$e|5]", label="test0/0→w11/0:w1"]; - n_10 -> n_7 [id="[$e|14]", label="test0/0→w21/0:w2"]; - n_6 -> n_11 [id="[$e|22]", label="test0/0→w21/0:w2"]; - n_14 -> n_1 [id="[$e|12]", label="test0/0→w21/0:w2"]; - n_1 -> n_11 [id="[$e|19]", label="test0/0→r0/0:r0"]; - n_3 -> n_4 [id="[$e|10]", label="test0/0→w11/0:w1"]; -} diff --git a/examples/test/foo4/test0_local_view.dot b/examples/test/foo4/test0_local_view.dot deleted file mode 100644 index 50ae661..0000000 --- a/examples/test/foo4/test0_local_view.dot +++ /dev/null @@ -1,19 +0,0 @@ -digraph test0 { - rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; - n_1 [id="5", shape=doublecircle, label="7"]; - n_2 [id="6", shape=circle, label="5"]; - n_3 [id="1", shape=circle, label="1"]; - n_0 -> n_3 [arrowhead=none]; - n_4 [id="2", shape=circle, label="2"]; - n_5 [id="4", shape=circle, label="6"]; - n_6 [id="7", shape=circle, label="3"]; - n_7 [id="3", shape=circle, label="4"]; - - n_5 -> n_1 [id="[$e|1]", label="send w2 to w21/0"]; - n_3 -> n_4 [id="[$e|2]", label="spawn r0/0"]; - n_7 -> n_2 [id="[$e|3]", label="spawn w21/0"]; - n_6 -> n_7 [id="[$e|0]", label="spawn w11/0"]; - n_4 -> n_6 [id="[$e|4]", label="send r0 to r0/0"]; - n_2 -> n_5 [id="[$e|5]", label="send w1 to w11/0"]; -} diff --git a/examples/test/foo4/test_0_global_view.dot b/examples/test/foo4/test_0_global_view.dot new file mode 100644 index 0000000..b6fe664 --- /dev/null +++ b/examples/test/foo4/test_0_global_view.dot @@ -0,0 +1,43 @@ +digraph global { + rankdir="LR"; + n_0 [label="global", shape="plaintext"]; + n_1 [id="5", shape=circle, label="5"]; + n_2 [id="15", shape=circle, label="15"]; + n_3 [id="19", shape=circle, label="19"]; + n_4 [id="12", shape=circle, label="12"]; + n_5 [id="11", shape=circle, label="11"]; + n_6 [id="17", shape=circle, label="17"]; + n_7 [id="18", shape=circle, label="18"]; + n_8 [id="14", shape=circle, label="14"]; + n_9 [id="6", shape=circle, label="6"]; + n_10 [id="13", shape=circle, label="13"]; + n_11 [id="10", shape=circle, label="10"]; + n_12 [id="1", shape=circle, label="1"]; + n_0 -> n_12 [arrowhead=none]; + n_13 [id="9", shape=circle, label="9"]; + n_14 [id="2", shape=circle, label="2"]; + n_15 [id="8", shape=circle, label="8"]; + n_16 [id="4", shape=circle, label="4"]; + n_17 [id="7", shape=circle, label="7"]; + n_18 [id="3", shape=circle, label="3"]; + n_19 [id="16", shape=circle, label="16"]; + + n_4 -> n_7 [id="[$e|16]", label="test/0.0→w1/1.0:w1"]; + n_16 -> n_1 [id="[$e|3]", label="test/0.0→r/0.0:r0"]; + n_9 -> n_11 [id="[$e|8]", label="test/0.0→r/0.0:r0"]; + n_18 -> n_16 [id="[$e|2]", label="test/0.0Δw2/1.0"]; + n_11 -> n_19 [id="[$e|14]", label="test/0.0→w2/1.0:w2"]; + n_1 -> n_15 [id="[$e|6]", label="test/0.0→w1/1.0:w1"]; + n_15 -> n_8 [id="[$e|12]", label="test/0.0→w2/1.0:w2"]; + n_5 -> n_6 [id="[$e|15]", label="test/0.0→r/0.0:r0"]; + n_16 -> n_17 [id="[$e|5]", label="test/0.0→w2/1.0:w2"]; + n_17 -> n_10 [id="[$e|11]", label="test/0.0→w1/1.0:w1"]; + n_9 -> n_5 [id="[$e|9]", label="test/0.0→w2/1.0:w2"]; + n_14 -> n_18 [id="[$e|1]", label="test/0.0Δw1/1.0"]; + n_16 -> n_9 [id="[$e|4]", label="test/0.0→w1/1.0:w1"]; + n_13 -> n_2 [id="[$e|13]", label="test/0.0→w1/1.0:w1"]; + n_10 -> n_3 [id="[$e|17]", label="test/0.0→r/0.0:r0"]; + n_12 -> n_14 [id="[$e|0]", label="test/0.0Δr/0.0"]; + n_1 -> n_13 [id="[$e|7]", label="test/0.0→w2/1.0:w2"]; + n_17 -> n_4 [id="[$e|10]", label="test/0.0→r/0.0:r0"]; +} diff --git a/examples/test/foo4/test_0_local_view.dot b/examples/test/foo4/test_0_local_view.dot new file mode 100644 index 0000000..1c77c26 --- /dev/null +++ b/examples/test/foo4/test_0_local_view.dot @@ -0,0 +1,19 @@ +digraph test_0 { + rankdir="LR"; + n_0 [label="test_0", shape="plaintext"]; + n_1 [id="5", shape=doublecircle, label="7"]; + n_2 [id="6", shape=circle, label="5"]; + n_3 [id="1", shape=circle, label="1"]; + n_0 -> n_3 [arrowhead=none]; + n_4 [id="2", shape=circle, label="2"]; + n_5 [id="4", shape=circle, label="6"]; + n_6 [id="7", shape=circle, label="3"]; + n_7 [id="3", shape=circle, label="4"]; + + n_3 -> n_4 [id="[$e|3]", label="spawn r/0.0"]; + n_5 -> n_1 [id="[$e|2]", label="send w2 to w2/1.0"]; + n_2 -> n_5 [id="[$e|5]", label="send w1 to w1/1.0"]; + n_7 -> n_2 [id="[$e|1]", label="spawn w2/1.0"]; + n_4 -> n_6 [id="[$e|4]", label="send r0 to r/0.0"]; + n_6 -> n_7 [id="[$e|0]", label="spawn w1/1.0"]; +} diff --git a/examples/test/foo4/w11_local_view.dot b/examples/test/foo4/w1_1_local_view.dot similarity index 83% rename from examples/test/foo4/w11_local_view.dot rename to examples/test/foo4/w1_1_local_view.dot index af67126..d3a44e5 100644 --- a/examples/test/foo4/w11_local_view.dot +++ b/examples/test/foo4/w1_1_local_view.dot @@ -1,6 +1,6 @@ -digraph w11 { +digraph w1_1 { rankdir="LR"; - n_0 [label="w11", shape="plaintext"]; + n_0 [label="w1_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; diff --git a/examples/test/foo4/w21_local_view.dot b/examples/test/foo4/w2_1_local_view.dot similarity index 83% rename from examples/test/foo4/w21_local_view.dot rename to examples/test/foo4/w2_1_local_view.dot index 27ccff2..595d37a 100644 --- a/examples/test/foo4/w21_local_view.dot +++ b/examples/test/foo4/w2_1_local_view.dot @@ -1,6 +1,6 @@ -digraph w21 { +digraph w2_1 { rankdir="LR"; - n_0 [label="w21", shape="plaintext"]; + n_0 [label="w2_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; diff --git a/examples/test/foo5/proxy1_local_view.dot b/examples/test/foo5/proxy_1_local_view.dot similarity index 81% rename from examples/test/foo5/proxy1_local_view.dot rename to examples/test/foo5/proxy_1_local_view.dot index c58b6cd..8aae543 100644 --- a/examples/test/foo5/proxy1_local_view.dot +++ b/examples/test/foo5/proxy_1_local_view.dot @@ -1,11 +1,11 @@ -digraph proxy1 { +digraph proxy_1 { rankdir="LR"; - n_0 [label="proxy1", shape="plaintext"]; + n_0 [label="proxy_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="2"]; n_3 [id="3", shape=doublecircle, label="3"]; - n_2 -> n_3 [id="[$e|0]", label="send M to Target"]; n_1 -> n_2 [id="[$e|1]", label="receive M"]; + n_2 -> n_3 [id="[$e|0]", label="send M to Target"]; } diff --git a/examples/test/foo5/target0_local_view.dot b/examples/test/foo5/target_0_local_view.dot similarity index 87% rename from examples/test/foo5/target0_local_view.dot rename to examples/test/foo5/target_0_local_view.dot index 5c4c796..35c2d94 100644 --- a/examples/test/foo5/target0_local_view.dot +++ b/examples/test/foo5/target_0_local_view.dot @@ -1,6 +1,6 @@ -digraph target0 { +digraph target_0 { rankdir="LR"; - n_0 [label="target0", shape="plaintext"]; + n_0 [label="target_0", shape="plaintext"]; n_1 [id="5", shape=doublecircle, label="5"]; n_2 [id="1", shape=circle, label="1"]; n_0 -> n_2 [arrowhead=none]; @@ -8,8 +8,8 @@ digraph target0 { n_4 [id="4", shape=circle, label="4"]; n_5 [id="3", shape=circle, label="2"]; - n_2 -> n_5 [id="[$e|2]", label="receive A"]; + n_4 -> n_1 [id="[$e|1]", label="receive D"]; n_5 -> n_3 [id="[$e|3]", label="receive B"]; n_3 -> n_4 [id="[$e|0]", label="receive C"]; - n_4 -> n_1 [id="[$e|1]", label="receive D"]; + n_2 -> n_5 [id="[$e|2]", label="receive A"]; } diff --git a/examples/test/foo5/test0_global_view.dot b/examples/test/foo5/test0_global_view.dot deleted file mode 100644 index 2421558..0000000 --- a/examples/test/foo5/test0_global_view.dot +++ /dev/null @@ -1,18 +0,0 @@ -digraph global { - rankdir="LR"; - n_0 [label="global", shape="plaintext"]; - n_1 [id="5", shape=circle, label="6"]; - n_2 [id="1", shape=circle, label="1"]; - n_0 -> n_2 [arrowhead=none]; - n_3 [id="2", shape=circle, label="2"]; - n_4 [id="4", shape=circle, label="4"]; - n_5 [id="7", shape=circle, label="5"]; - n_6 [id="3", shape=circle, label="3"]; - - n_3 -> n_6 [id="[$e|2]", label="test0/0Δproxy1/1"]; - n_6 -> n_5 [id="[$e|3]", label="test0/0→proxy1/0:m2"]; - n_4 -> n_1 [id="[$e|4]", label="test0/0→proxy1/0:m2"]; - n_2 -> n_3 [id="[$e|0]", label="test0/0Δproxy1/0"]; - n_5 -> n_1 [id="[$e|6]", label="test0/0→proxy1/1:m3"]; - n_6 -> n_4 [id="[$e|5]", label="test0/0→proxy1/1:m3"]; -} diff --git a/examples/test/foo5/test0_local_view.dot b/examples/test/foo5/test0_local_view.dot deleted file mode 100644 index 6df6b68..0000000 --- a/examples/test/foo5/test0_local_view.dot +++ /dev/null @@ -1,21 +0,0 @@ -digraph test0 { - rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; - n_1 [id="5", shape=doublecircle, label="8"]; - n_2 [id="6", shape=circle, label="7"]; - n_3 [id="1", shape=circle, label="1"]; - n_0 -> n_3 [arrowhead=none]; - n_4 [id="2", shape=circle, label="2"]; - n_5 [id="8", shape=circle, label="3"]; - n_6 [id="4", shape=circle, label="6"]; - n_7 [id="7", shape=circle, label="5"]; - n_8 [id="3", shape=circle, label="4"]; - - n_6 -> n_2 [id="[$e|2]", label="send m3 to proxy1/1"]; - n_5 -> n_8 [id="[$e|3]", label="spawn proxy1/1"]; - n_2 -> n_1 [id="[$e|4]", label="send m4 to target0/0"]; - n_4 -> n_5 [id="[$e|0]", label="spawn proxy1/0"]; - n_7 -> n_6 [id="[$e|6]", label="send m2 to proxy1/0"]; - n_3 -> n_4 [id="[$e|5]", label="spawn target0/0"]; - n_8 -> n_7 [id="[$e|1]", label="send m1 to target0/0"]; -} diff --git a/examples/test/foo5/test_0_global_view.dot b/examples/test/foo5/test_0_global_view.dot new file mode 100644 index 0000000..fc1138a --- /dev/null +++ b/examples/test/foo5/test_0_global_view.dot @@ -0,0 +1,19 @@ +digraph global { + rankdir="LR"; + n_0 [label="global", shape="plaintext"]; + n_1 [id="5", shape=circle, label="5"]; + n_2 [id="6", shape=circle, label="6"]; + n_3 [id="1", shape=circle, label="1"]; + n_0 -> n_3 [arrowhead=none]; + n_4 [id="2", shape=circle, label="2"]; + n_5 [id="4", shape=circle, label="4"]; + n_6 [id="7", shape=circle, label="7"]; + n_7 [id="3", shape=circle, label="3"]; + + n_5 -> n_2 [id="[$e|4]", label="test/0.0→proxy/1.1:m3"]; + n_4 -> n_7 [id="[$e|1]", label="test/0.0Δproxy/1.1"]; + n_7 -> n_1 [id="[$e|3]", label="test/0.0→proxy/1.1:m3"]; + n_3 -> n_4 [id="[$e|0]", label="test/0.0Δproxy/1.0"]; + n_7 -> n_5 [id="[$e|2]", label="test/0.0→proxy/1.0:m2"]; + n_1 -> n_6 [id="[$e|5]", label="test/0.0→proxy/1.0:m2"]; +} diff --git a/examples/test/foo5/test_0_local_view.dot b/examples/test/foo5/test_0_local_view.dot new file mode 100644 index 0000000..5e7992b --- /dev/null +++ b/examples/test/foo5/test_0_local_view.dot @@ -0,0 +1,21 @@ +digraph test_0 { + rankdir="LR"; + n_0 [label="test_0", shape="plaintext"]; + n_1 [id="5", shape=doublecircle, label="8"]; + n_2 [id="6", shape=circle, label="7"]; + n_3 [id="1", shape=circle, label="1"]; + n_0 -> n_3 [arrowhead=none]; + n_4 [id="2", shape=circle, label="2"]; + n_5 [id="8", shape=circle, label="3"]; + n_6 [id="4", shape=circle, label="6"]; + n_7 [id="7", shape=circle, label="5"]; + n_8 [id="3", shape=circle, label="4"]; + + n_5 -> n_8 [id="[$e|4]", label="spawn proxy/1.1"]; + n_4 -> n_5 [id="[$e|1]", label="spawn proxy/1.0"]; + n_6 -> n_2 [id="[$e|3]", label="send m3 to proxy/1.1"]; + n_8 -> n_7 [id="[$e|6]", label="send m1 to target/0.0"]; + n_3 -> n_4 [id="[$e|0]", label="spawn target/0.0"]; + n_7 -> n_6 [id="[$e|2]", label="send m2 to proxy/1.0"]; + n_2 -> n_1 [id="[$e|5]", label="send m4 to target/0.0"]; +} diff --git a/examples/test/foo6/client1_local_view.dot b/examples/test/foo6/client_1_local_view.dot similarity index 74% rename from examples/test/foo6/client1_local_view.dot rename to examples/test/foo6/client_1_local_view.dot index 96b9e94..8612ceb 100644 --- a/examples/test/foo6/client1_local_view.dot +++ b/examples/test/foo6/client_1_local_view.dot @@ -1,6 +1,6 @@ -digraph client1 { +digraph client_1 { rankdir="LR"; - n_0 [label="client1", shape="plaintext"]; + n_0 [label="client_1", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=doublecircle, label="2"]; diff --git a/examples/test/foo6/server0_local_view.dot b/examples/test/foo6/server_0_local_view.dot similarity index 68% rename from examples/test/foo6/server0_local_view.dot rename to examples/test/foo6/server_0_local_view.dot index 085eb3c..364a43c 100644 --- a/examples/test/foo6/server0_local_view.dot +++ b/examples/test/foo6/server_0_local_view.dot @@ -1,6 +1,6 @@ -digraph server0 { +digraph server_0 { rankdir="LR"; - n_0 [label="server0", shape="plaintext"]; + n_0 [label="server_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; diff --git a/examples/test/foo6/test0_local_view.dot b/examples/test/foo6/test0_local_view.dot deleted file mode 100644 index d60f0cd..0000000 --- a/examples/test/foo6/test0_local_view.dot +++ /dev/null @@ -1,12 +0,0 @@ -digraph test0 { - rankdir="LR"; - n_0 [label="test0", shape="plaintext"]; - n_1 [id="1", shape=circle, label="1"]; - n_0 -> n_1 [arrowhead=none]; - n_2 [id="2", shape=circle, label="2"]; - n_3 [id="3", shape=doublecircle, label="3"]; - - n_2 -> n_3 [id="[$e|3]", label="spawn client1/0"]; - n_1 -> n_2 [id="[$e|5]", label="spawn server0/0"]; - n_2 -> n_2 [id="[$e|4]", label="spawn client1/1"]; -} diff --git a/examples/test/foo6/test_0_global_view.dot b/examples/test/foo6/test_0_global_view.dot new file mode 100644 index 0000000..c98f9a0 --- /dev/null +++ b/examples/test/foo6/test_0_global_view.dot @@ -0,0 +1,19 @@ +digraph global { + rankdir="LR"; + n_0 [label="global", shape="plaintext"]; + n_1 [id="5", shape=circle, label="5"]; + n_2 [id="6", shape=circle, label="6"]; + n_3 [id="1", shape=circle, label="1"]; + n_0 -> n_3 [arrowhead=none]; + n_4 [id="2", shape=circle, label="2"]; + n_5 [id="4", shape=circle, label="4"]; + n_6 [id="7", shape=circle, label="7"]; + n_7 [id="3", shape=circle, label="3"]; + + n_1 -> n_6 [id="[$e|5]", label="test/0.0Δclient/1.0"]; + n_3 -> n_4 [id="[$e|0]", label="test/0.0Δserver/0.0"]; + n_7 -> n_1 [id="[$e|3]", label="test/0.0Δclient/1.1"]; + n_4 -> n_5 [id="[$e|2]", label="test/0.0Δclient/1.0"]; + n_7 -> n_2 [id="[$e|4]", label="test/0.0Δclient/1.0"]; + n_4 -> n_7 [id="[$e|1]", label="test/0.0Δclient/1.1"]; +} diff --git a/examples/test/foo6/test_0_local_view.dot b/examples/test/foo6/test_0_local_view.dot new file mode 100644 index 0000000..bedf74d --- /dev/null +++ b/examples/test/foo6/test_0_local_view.dot @@ -0,0 +1,12 @@ +digraph test_0 { + rankdir="LR"; + n_0 [label="test_0", shape="plaintext"]; + n_1 [id="1", shape=circle, label="1"]; + n_0 -> n_1 [arrowhead=none]; + n_2 [id="2", shape=circle, label="2"]; + n_3 [id="3", shape=doublecircle, label="3"]; + + n_1 -> n_2 [id="[$e|5]", label="spawn server/0.0"]; + n_2 -> n_2 [id="[$e|0]", label="spawn client/1.1"]; + n_2 -> n_3 [id="[$e|4]", label="spawn client/1.0"]; +} diff --git a/examples/test/ping/pong0_local_view.dot b/examples/test/ping/pong_0_local_view.dot similarity index 87% rename from examples/test/ping/pong0_local_view.dot rename to examples/test/ping/pong_0_local_view.dot index c4fd085..420d997 100644 --- a/examples/test/ping/pong0_local_view.dot +++ b/examples/test/ping/pong_0_local_view.dot @@ -1,14 +1,14 @@ -digraph pong0 { +digraph pong_0 { rankdir="LR"; - n_0 [label="pong0", shape="plaintext"]; + n_0 [label="pong_0", shape="plaintext"]; n_1 [id="1", shape=circle, label="1"]; n_0 -> n_1 [arrowhead=none]; n_2 [id="2", shape=circle, label="3"]; n_3 [id="4", shape=doublecircle, label="4"]; n_4 [id="3", shape=circle, label="2"]; + n_2 -> n_3 [id="[$e|5]", label="send kill to S"]; + n_4 -> n_1 [id="[$e|6]", label="send N to S"]; n_1 -> n_2 [id="[$e|4]", label="receive {S,0}"]; n_1 -> n_4 [id="[$e|0]", label="receive {S,N}"]; - n_4 -> n_1 [id="[$e|6]", label="send N to S"]; - n_2 -> n_3 [id="[$e|5]", label="send kill to S"]; } diff --git a/examples/test/ping/start0_global_view.dot b/examples/test/ping/start_0_global_view.dot similarity index 66% rename from examples/test/ping/start0_global_view.dot rename to examples/test/ping/start_0_global_view.dot index 1df8ff2..1391e97 100644 --- a/examples/test/ping/start0_global_view.dot +++ b/examples/test/ping/start_0_global_view.dot @@ -6,6 +6,6 @@ digraph global { n_2 [id="2", shape=circle, label="2"]; n_3 [id="3", shape=circle, label="3"]; - n_1 -> n_2 [id="[$e|0]", label="start0/0Δpong0/0"]; - n_2 -> n_3 [id="[$e|1]", label="start0/0→start0/0:3"]; + n_2 -> n_3 [id="[$e|1]", label="start/0.0→start/0.0:3"]; + n_1 -> n_2 [id="[$e|0]", label="start/0.0Δpong/0.0"]; } diff --git a/examples/test/ping/start0_local_view.dot b/examples/test/ping/start_0_local_view.dot similarity index 80% rename from examples/test/ping/start0_local_view.dot rename to examples/test/ping/start_0_local_view.dot index add592f..bdbeb88 100644 --- a/examples/test/ping/start0_local_view.dot +++ b/examples/test/ping/start_0_local_view.dot @@ -1,6 +1,6 @@ -digraph start0 { +digraph start_0 { rankdir="LR"; - n_0 [label="start0", shape="plaintext"]; + n_0 [label="start_0", shape="plaintext"]; n_1 [id="5", shape=doublecircle, label="5"]; n_2 [id="6", shape=circle, label="4"]; n_3 [id="1", shape=circle, label="1"]; @@ -8,9 +8,9 @@ digraph start0 { n_4 [id="2", shape=circle, label="2"]; n_5 [id="3", shape=circle, label="3"]; + n_4 -> n_5 [id="[$e|7]", label="send 3 to pid_self"]; n_2 -> n_5 [id="[$e|3]", label="send {pid_self,pid_self} to Pong"]; n_5 -> n_2 [id="[$e|4]", label="receive N"]; + n_3 -> n_4 [id="[$e|1]", label="spawn pong/0.0"]; n_5 -> n_1 [id="[$e|0]", label="receive kill"]; - n_3 -> n_4 [id="[$e|1]", label="spawn pong0/0"]; - n_4 -> n_5 [id="[$e|7]", label="send 3 to pid_self"]; }