Remove link_router from tag cluster.

diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh
index 2ce8c7c..7f7b933 100644 (file)
--- a/examples/msg/token_ring/token_ring.tesh
+++ b/examples/msg/token_ring/token_ring.tesh
@@ -5,26 +5,25 @@ $ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml "--log=root.fmt:[%10.6
 > [  0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
 > [  0.066240] (1:master@bob1.hamburger.edu) Send Data to "host1"
 > [  0.066240] (2:slave@bob3.hamburger.edu) Received "Token"
-> [  0.253920] (2:slave@bob3.hamburger.edu) Send Data to "host2"
-> [  0.253920] (3:slave@alice2.crepe.fr) Received "Token"
-> [  0.320160] (3:slave@alice2.crepe.fr) Send Data to "host3"
-> [  0.320160] (4:slave@alice3.crepe.fr) Received "Token"
-> [  0.507840] (4:slave@alice3.crepe.fr) Send Data to "host4"
-> [  0.507840] (5:slave@bob0.hamburger.edu) Received "Token"
-> [  0.574080] (5:slave@bob0.hamburger.edu) Send Data to "host5"
-> [  0.574080] (6:slave@bob2.hamburger.edu) Received "Token"
-> [  0.640320] (6:slave@bob2.hamburger.edu) Send Data to "host6"
-> [  0.640320] (7:slave@bob4.hamburger.edu) Received "Token"
-> [  0.828000] (7:slave@bob4.hamburger.edu) Send Data to "host7"
-> [  0.828000] (8:slave@alice0.crepe.fr) Received "Token"
-> [  0.894240] (8:slave@alice0.crepe.fr) Send Data to "host8"
-> [  0.894240] (9:slave@alice4.crepe.fr) Received "Token"
-> [  0.960480] (10:slave@alice1.crepe.fr) Received "Token"
-> [  0.960480] (9:slave@alice4.crepe.fr) Send Data to "host9"
-> [  1.148160] (0:@) Simulation time 1.14816
-> [  1.148160] (10:slave@alice1.crepe.fr) Send Data to "host0"
-> [  1.148160] (1:master@bob1.hamburger.edu) Received "Token"
-
+> [  0.242880] (2:slave@bob3.hamburger.edu) Send Data to "host2"
+> [  0.242880] (3:slave@alice2.crepe.fr) Received "Token"
+> [  0.309120] (3:slave@alice2.crepe.fr) Send Data to "host3"
+> [  0.309120] (4:slave@alice3.crepe.fr) Received "Token"
+> [  0.485760] (4:slave@alice3.crepe.fr) Send Data to "host4"
+> [  0.485760] (5:slave@bob0.hamburger.edu) Received "Token"
+> [  0.552000] (5:slave@bob0.hamburger.edu) Send Data to "host5"
+> [  0.552000] (6:slave@bob2.hamburger.edu) Received "Token"
+> [  0.618240] (6:slave@bob2.hamburger.edu) Send Data to "host6"
+> [  0.618240] (7:slave@bob4.hamburger.edu) Received "Token"
+> [  0.794880] (7:slave@bob4.hamburger.edu) Send Data to "host7"
+> [  0.794880] (8:slave@alice0.crepe.fr) Received "Token"
+> [  0.861120] (8:slave@alice0.crepe.fr) Send Data to "host8"
+> [  0.861120] (9:slave@alice4.crepe.fr) Received "Token"
+> [  0.927360] (10:slave@alice1.crepe.fr) Received "Token"
+> [  0.927360] (9:slave@alice4.crepe.fr) Send Data to "host9"
+> [  1.104000] (0:@) Simulation time 1.104
+> [  1.104000] (10:slave@alice1.crepe.fr) Send Data to "host0"
+> [  1.104000] (1:master@bob1.hamburger.edu) Received "Token"
 
 ! output sort
 $ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_peers.xml --cfg=coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 87631c0..4ce3475 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -3329,7 +3329,7 @@ static void routing_parse_Scluster(void)
   char *cluster_availability_file = A_surfxml_cluster_availability_file;
   char *cluster_state_file = A_surfxml_cluster_state_file;
   char *host_id, *groups, *link_id = NULL;
-  char *router_id, *link_router, *link_backbone;
+  char *router_id, *link_backbone;
   char *availability_file = xbt_strdup(cluster_availability_file);
   char *state_file = xbt_strdup(cluster_state_file);
 
@@ -3511,7 +3511,7 @@ static void routing_parse_Scluster(void)
   router_id =
       bprintf("%s%s_router%s", cluster_prefix, cluster_id,
               cluster_suffix);
-  link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
+  //link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
   link_backbone = bprintf("%s_backbone", cluster_id);
 
   XBT_DEBUG("<router id=\"%s\"/>", router_id);
@@ -3521,29 +3521,29 @@ static void routing_parse_Scluster(void)
   SURFXML_END_TAG(router);
 
   //TODO
-  xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free);
-  temp_cluster_bw = xbt_strdup(cluster_bw);
-  temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
-  temp_cluster_lat = xbt_strdup(cluster_lat);
-  temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
-  XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,temp_cluster_bw, temp_cluster_lat);
-  A_surfxml_link_state = A_surfxml_link_state_ON;
-  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
-  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
-  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-  SURFXML_BUFFER_SET(link_id, link_router);
-  SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
-  SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
-  SURFXML_BUFFER_SET(link_bandwidth_file, "");
-  SURFXML_BUFFER_SET(link_latency_file, "");
-  SURFXML_BUFFER_SET(link_state_file, "");
-  SURFXML_START_TAG(link);
-  SURFXML_END_TAG(link);
-
-  xbt_free(temp_cluster_bw);
-  xbt_free(temp_cluster_lat);
+//  xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free);
+//  temp_cluster_bw = xbt_strdup(cluster_bw);
+//  temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
+//  temp_cluster_lat = xbt_strdup(cluster_lat);
+//  temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+//  XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,temp_cluster_bw, temp_cluster_lat);
+//  A_surfxml_link_state = A_surfxml_link_state_ON;
+//  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+//  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+//  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+//  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+//  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+//  SURFXML_BUFFER_SET(link_id, link_router);
+//  SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
+//  SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
+//  SURFXML_BUFFER_SET(link_bandwidth_file, "");
+//  SURFXML_BUFFER_SET(link_latency_file, "");
+//  SURFXML_BUFFER_SET(link_state_file, "");
+//  SURFXML_START_TAG(link);
+//  SURFXML_END_TAG(link);
+
+//  xbt_free(temp_cluster_bw);
+//  xbt_free(temp_cluster_lat);
 
   XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bb_bw, cluster_bb_lat);
   A_surfxml_link_state = A_surfxml_link_state_ON;
@@ -3580,6 +3580,74 @@ static void routing_parse_Scluster(void)
   char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
   char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id);
 
+  //from router to router
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, router_id);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, router_id);
+  SURFXML_BUFFER_SET(route_dst, router_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("</route>");
+  SURFXML_END_TAG(route);
+
+  //from host to router
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, router_id);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, route_src_dst);
+  SURFXML_BUFFER_SET(route_dst, router_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_src);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+  {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("</route>");
+  SURFXML_END_TAG(route);
+
+  //from router to host
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, route_src_dst);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, router_id);
+  SURFXML_BUFFER_SET(route_dst, route_src_dst);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_dst);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+  {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("</route>");
+  SURFXML_END_TAG(route);
+
+  //from host to host
   XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
   XBT_DEBUG("symmetrical=\"NO\">");
   SURFXML_BUFFER_SET(route_src, route_src_dst);
@@ -3644,43 +3712,39 @@ static void routing_parse_Scluster(void)
       A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
       SURFXML_START_TAG(route);
 
-      if (i == xbt_dynar_length(tab_elements_num)) {
-        route_src = link_router;
-      } else {
-        route_src =
-            bprintf("%s_link_%d", cluster_id,
-                    xbt_dynar_get_as(tab_elements_num, i, int));
-      }
-
-      if (j == xbt_dynar_length(tab_elements_num)) {
-        route_dst = link_router;
-      } else {
-        route_dst =
-            bprintf("%s_link_%d", cluster_id,
-                    xbt_dynar_get_as(tab_elements_num, j, int));
+      if (i != xbt_dynar_length(tab_elements_num)){
+          route_src =
+                bprintf("%s_link_%d", cluster_id,
+                        xbt_dynar_get_as(tab_elements_num, i, int));
+                 XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_src);
+                 SURFXML_BUFFER_SET(link_ctn_id, route_src);
+                 A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+                 {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+                 SURFXML_START_TAG(link_ctn);
+                 SURFXML_END_TAG(link_ctn);
+                 free(route_src);
       }
 
-      XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_src);
-      SURFXML_BUFFER_SET(link_ctn_id, route_src);
-      A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-      if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-      {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
-      SURFXML_START_TAG(link_ctn);
-      SURFXML_END_TAG(link_ctn);
-
       XBT_DEBUG("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
       SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
       A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
       SURFXML_START_TAG(link_ctn);
       SURFXML_END_TAG(link_ctn);
 
-      XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_dst);
-      SURFXML_BUFFER_SET(link_ctn_id, route_dst);
-      A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-      if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-      {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
-      SURFXML_START_TAG(link_ctn);
-      SURFXML_END_TAG(link_ctn);
+      if (j != xbt_dynar_length(tab_elements_num)) {
+          route_dst =
+                bprintf("%s_link_%d", cluster_id,
+                        xbt_dynar_get_as(tab_elements_num, j, int));
+                 XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_dst);
+                 SURFXML_BUFFER_SET(link_ctn_id, route_dst);
+                 A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+                 {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
+                 SURFXML_START_TAG(link_ctn);
+                 SURFXML_END_TAG(link_ctn);
+                 free(route_dst);
+      }
 
       XBT_DEBUG("</route>");
       SURFXML_END_TAG(route);
@@ -3692,7 +3756,7 @@ static void routing_parse_Scluster(void)
 
   free(router_id);
   free(link_backbone);
-  free(link_router);
+  //free(link_router);
   xbt_dict_free(&patterns);
   free(availability_file);
   free(state_file);

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index a16dadc..b81c47e 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -1,6 +1,6 @@
 $ ${bindir:=.}/basic_parsing_test one_cluster.xml "--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: 8
+> Workstation number: 5, link number: 7
 
 $ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
@@ -56,7 +56,7 @@ $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=roo
 
 $ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> Workstation number: 10, link number: 16
+> Workstation number: 10, link number: 14
 
 $ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
@@ -93,7 +93,7 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/model:CpuTI
 
 $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
-> Workstation number: 2, link number: 5
+> Workstation number: 2, link number: 4
 
 $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07

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

diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index 15d366b..29386e3 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -19,7 +19,6 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >   <link id="bob_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_6" bandwidth="125000000" latency="0.000050000"/>
->   <link id="bob_cluster_link_bob_cluster_router" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="bob3.hamburger.edu" dst="bob3.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
@@ -36,7 +35,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob3.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
@@ -54,7 +53,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob3.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
@@ -72,7 +71,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob3.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
@@ -90,7 +89,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob6.hamburger.edu" dst="bob3.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
@@ -108,29 +107,30 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 >   <route src="bob6.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob3.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 > </AS>
 > </platform>
 
+
 $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:@] surf_workstation_model_init_ptask_L07
 > <?xml version='1.0'?>
@@ -375,7 +375,6 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >   <link id="alice_cluster_link_2" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="alice_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="alice_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
->   <link id="alice_cluster_link_alice_cluster_router" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="backbone" bandwidth="1250000000" latency="0.000500000"/>
 >   <link id="bob_cluster_backbone" bandwidth="2250000000" latency="0.000500000"/>
 >   <link id="bob_cluster_link_0" bandwidth="125000000" latency="0.000050000"/>
@@ -383,7 +382,6 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >   <link id="bob_cluster_link_2" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
->   <link id="bob_cluster_link_bob_cluster_router" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="bob1.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
@@ -391,10 +389,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -406,19 +404,19 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
@@ -427,10 +425,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -442,25 +440,25 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
@@ -469,13 +467,13 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -487,16 +485,16 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
@@ -505,13 +503,13 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -523,10 +521,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
@@ -535,10 +533,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -550,19 +548,19 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
@@ -571,10 +569,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -586,19 +584,19 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
@@ -607,10 +605,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -622,25 +620,25 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
@@ -649,13 +647,13 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -667,16 +665,16 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
@@ -685,13 +683,13 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -703,16 +701,16 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
@@ -721,13 +719,13 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -739,82 +737,82 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
 >      <link_ctn id="backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob1.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob3.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
 >      <link_ctn id="backbone"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>      <link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alice2.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alice0.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 > </AS>
 > </platform>