Remove link_router from tag cluster.

[simgrid.git] / teshsuite / simdag / platforms / basic_parsing_test_sym_full.tesh

diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
index c26faa4..e52e9ad 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> Workstation number: 5, link number: 14
+> Workstation number: 5, link number: 12
 > Route between bob3.hamburger.edu and bob3.hamburger.edu
 >      Route size 3
 >      Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
@@ -155,7 +155,7 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro
 
 $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> Workstation number: 4, link number: 10
+> Workstation number: 4, link number: 8
 > Route between bob1.hamburger.edu and bob1.hamburger.edu
 >      Route size 3
 >      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
@@ -169,25 +169,21 @@ $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=ro
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 >      Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob1.hamburger.edu and alice0.crepe.fr
->      Route size 7
+>      Route size 5
 >      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between bob1.hamburger.edu and alice1.crepe.fr
->      Route size 7
+>      Route size 5
 >      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob1.hamburger.edu
 >      Route size 3
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
@@ -201,45 +197,37 @@ $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=ro
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 >      Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and alice0.crepe.fr
->      Route size 7
+>      Route size 5
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and alice1.crepe.fr
->      Route size 7
+>      Route size 5
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and bob1.hamburger.edu
->      Route size 7
+>      Route size 5
 >      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and bob0.hamburger.edu
->      Route size 7
+>      Route size 5
 >      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and alice0.crepe.fr
 >      Route size 3
 >      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
@@ -253,25 +241,21 @@ $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=ro
 >      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 >      Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and bob1.hamburger.edu
->      Route size 7
+>      Route size 5
 >      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and bob0.hamburger.edu
->      Route size 7
+>      Route size 5
 >      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
 >      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link alice_cluster_link_alice_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
->      Link bob_cluster_link_bob_cluster_router: latency = 0.000050, bandwidth = 125000000.000000
 >      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
 >      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.001700, route bandwidth = 125000000.000000
+>      Route latency = 0.001600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and alice0.crepe.fr
 >      Route size 3
 >      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000