Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add a platform with a bypass route. Add the test to cmake.
authorNavarrop <Pierre.Navarro@imag.fr>
Tue, 15 Nov 2011 15:18:37 +0000 (16:18 +0100)
committerNavarrop <Pierre.Navarro@imag.fr>
Tue, 15 Nov 2011 15:18:37 +0000 (16:18 +0100)
Update flatifier and basic_parsing_test to not put "\t" but spaces.

buildtools/Cmake/AddTests.cmake
src/surf/surf_routing.c
teshsuite/simdag/platforms/basic_parsing_test.c
teshsuite/simdag/platforms/basic_parsing_test.tesh
teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh [new file with mode: 0644]
teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh
teshsuite/simdag/platforms/flatifier.c
teshsuite/simdag/platforms/flatifier.tesh
teshsuite/simdag/platforms/get_full_link.tesh
teshsuite/simdag/platforms/three_clusters_bypass.xml [new file with mode: 0644]

index 82da6eb..d5d96de 100644 (file)
@@ -104,6 +104,7 @@ ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}             --seten
 ADD_TEST(tesh-simdag-parser-sym-full           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
 ADD_TEST(tesh-simdag-flatifier         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)
 ADD_TEST(tesh-simdag-full-links                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
+ADD_TEST(tesh-simdag-parser-bypass ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
 ADD_TEST(tesh-simdag-basic0            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic0.tesh)
 ADD_TEST(tesh-simdag-basic1            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic1.tesh)
 ADD_TEST(tesh-simdag-basic2            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic2.tesh)
index c5b0e2d..354272f 100644 (file)
@@ -523,8 +523,8 @@ static void _get_route_and_latency(const char *src, const char *dst,
     if (latency)
       xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route
 
-    // FIXME this path is never tested. I need examples to check the bypass mechanism...
-    THROW_UNIMPLEMENTED; // let's warn the users of the problem
+//    // FIXME this path is never tested. I need examples to check the bypass mechanism...
+//    THROW_UNIMPLEMENTED; // let's warn the users of the problem
     xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
       xbt_dynar_push(*links, &link);
     }
index c2b4668..2d841f3 100644 (file)
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
                  route_size = SD_route_get_size(w1, w2);
                  printf("Route size %d\n", route_size);
                  for (i = 0; i < route_size; i++) {
-                       printf("   Link %s: latency = %f, bandwidth = %f\n",
+                       printf("  Link %s: latency = %f, bandwidth = %f\n",
                                   SD_link_get_name(route[i]),
                                   SD_link_get_current_latency(route[i]),
                                   SD_link_get_current_bandwidth(route[i]));
@@ -66,14 +66,14 @@ int main(int argc, char **argv)
                          printf("Route between %s and %s\n", name1, name2);
                          route = SD_route_get_list(w1, w2);
                          route_size = SD_route_get_size(w1, w2);
-                         printf("\tRoute size %d\n", route_size);
+                         printf("  Route size %d\n", route_size);
                          for (k = 0; k < route_size; k++) {
-                               printf("\tLink %s: latency = %f, bandwidth = %f\n",
+                               printf("  Link %s: latency = %f, bandwidth = %f\n",
                                           SD_link_get_name(route[k]),
                                           SD_link_get_current_latency(route[k]),
                                           SD_link_get_current_bandwidth(route[k]));
                          }
-                         printf("\tRoute latency = %f, route bandwidth = %f\n",
+                         printf("  Route latency = %f, route bandwidth = %f\n",
                                         SD_route_get_current_latency(w1, w2),
                                         SD_route_get_current_bandwidth(w1, w2));
                        }
index 4c0ff75..aacd553 100644 (file)
@@ -118,4 +118,4 @@ $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
 >    - Seen: "AS2" is type : 3
 >    - Seen: "AS3" is type : 3
 >    - Seen: "AS4" is type : 3
->    - Seen: "AS" is type : 3
+>    - Seen: "AS" is type : 3
\ No newline at end of file
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
new file mode 100644 (file)
index 0000000..3226af8
--- /dev/null
@@ -0,0 +1,57 @@
+$ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK
+> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
+> Workstation number: 3, link number: 8
+> Route between 1 and 1
+>   Route size 2
+>   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+> Route between 1 and 2
+>   Route size 1
+>   Link link_tmp: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.000500, route bandwidth = 1250000000.000000
+> Route between 1 and 3
+>   Route size 4
+>   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.001100, route bandwidth = 125000000.000000
+> Route between 2 and 1
+>   Route size 4
+>   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.001100, route bandwidth = 125000000.000000
+> Route between 2 and 2
+>   Route size 2
+>   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+> Route between 2 and 3
+>   Route size 4
+>   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.001100, route bandwidth = 125000000.000000
+> Route between 3 and 1
+>   Route size 4
+>   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.001100, route bandwidth = 125000000.000000
+> Route between 3 and 2
+>   Route size 4
+>   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.001100, route bandwidth = 125000000.000000
+> Route between 3 and 3
+>   Route size 2
+>   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
\ No newline at end of file
index fb3eb29..fa2352d 100644 (file)
@@ -3,334 +3,334 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 > 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
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob3.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob3.hamburger.edu and bob2.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob3.hamburger.edu and bob4.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob3.hamburger.edu and bob6.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob3.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob2.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob4.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob6.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_0_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob2.hamburger.edu and bob3.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob2.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob2.hamburger.edu and bob2.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob2.hamburger.edu and bob4.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob2.hamburger.edu and bob6.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob4.hamburger.edu and bob3.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob4.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob4.hamburger.edu and bob2.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob4.hamburger.edu and bob4.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob4.hamburger.edu and bob6.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_4_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob6.hamburger.edu and bob3.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob6.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_0_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob6.hamburger.edu and bob2.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob6.hamburger.edu and bob4.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_4_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob6.hamburger.edu and bob6.hamburger.edu
->      Route size 3
->      Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link bob_cluster_link_6_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 
 $ ${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: 8
 > Route between bob1.hamburger.edu and bob1.hamburger.edu
->      Route size 3
->      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_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob1.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      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_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_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 5
->      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
 > Route between bob1.hamburger.edu and alice1.crepe.fr
->      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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.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
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link bob_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and bob0.hamburger.edu
->      Route size 3
->      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_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_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 5
->      Link bob_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Link bob_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
 > Route between bob0.hamburger.edu and alice1.crepe.fr
->      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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and bob1.hamburger.edu
->      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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and bob0.hamburger.edu
->      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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.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
->      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_0: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between alice0.crepe.fr and alice1.crepe.fr
->      Route size 3
->      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_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_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 5
->      Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000
->      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and bob0.hamburger.edu
->      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 backbone: latency = 0.000500, bandwidth = 1250000000.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.001600, route bandwidth = 125000000.000000
+>   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 backbone: latency = 0.000500, bandwidth = 1250000000.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.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
->      Link alice_cluster_backbone: latency = 0.000500, bandwidth = 2250000000.000000
->      Link alice_cluster_link_0: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_0: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 > Route between alice1.crepe.fr and alice1.crepe.fr
->      Route size 3
->      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_1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000600, route bandwidth = 125000000.000000
+>   Route size 3
+>   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_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000600, route bandwidth = 125000000.000000
 
 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.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: 2, link number: 4
 > Route between alice and alice
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between alice and bob
->      Route size 3
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000150, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000150, route bandwidth = 125000000.000000
 > Route between bob and alice
->      Route size 3
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000150, route bandwidth = 125000000.000000
+>   Route size 3
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000150, route bandwidth = 125000000.000000
 > Route between bob and bob
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 
 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_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: 2, link number: 3
 > Route between alice and alice
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between alice and bob
->      Route size 1
->      Link link1_UP: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link1_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between bob and alice
->      Route size 1
->      Link link1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between bob and bob
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 
 $ ${bindir:=.}/basic_parsing_test Dijkstra.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: 2, link number: 6
 > Route between NODO01 and NODO01
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between NODO01 and NODO02
->      Route size 2
->      Link 1: latency = 0.001000, bandwidth = 1000000.000000
->      Link 2: latency = 0.001000, bandwidth = 1000000.000000
->      Route latency = 0.002000, route bandwidth = 1000000.000000
+>   Route size 2
+>   Link 1: latency = 0.001000, bandwidth = 1000000.000000
+>   Link 2: latency = 0.001000, bandwidth = 1000000.000000
+>   Route latency = 0.002000, route bandwidth = 1000000.000000
 > Route between NODO02 and NODO01
->      Route size 2
->      Link 2: latency = 0.001000, bandwidth = 1000000.000000
->      Link 1: latency = 0.001000, bandwidth = 1000000.000000
->      Route latency = 0.002000, route bandwidth = 1000000.000000
+>   Route size 2
+>   Link 2: latency = 0.001000, bandwidth = 1000000.000000
+>   Link 1: latency = 0.001000, bandwidth = 1000000.000000
+>   Route latency = 0.002000, route bandwidth = 1000000.000000
 > Route between NODO02 and NODO02
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
index 1f1c663..5695df8 100644 (file)
@@ -133,7 +133,7 @@ int main(int argc, char **argv)
   {
                  xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
                  {
-                               printf("  <route src=\"%s\" dst=\"%s\">\n       "
+                               printf("  <route src=\"%s\" dst=\"%s\">\n  "
                                          ,src
                                          ,dst);
                                xbt_dynar_t route=NULL;
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
                  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
                  {
                            if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
-                               printf("  <route src=\"%s\" dst=\"%s\">\n       "
+                               printf("  <route src=\"%s\" dst=\"%s\">\n  "
                                          ,src
                                          ,dst);
                                xbt_dynar_t route=NULL;
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
                  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
                  {
                                if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
-                               printf("  <route src=\"%s\" dst=\"%s\">\n       "
+                               printf("  <route src=\"%s\" dst=\"%s\">\n  "
                                          ,src
                                          ,dst);
                                xbt_dynar_t route=NULL;
@@ -193,7 +193,7 @@ int main(int argc, char **argv)
                  }
                  xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
                  {
-                               printf("  <route src=\"%s\" dst=\"%s\">\n       "
+                               printf("  <route src=\"%s\" dst=\"%s\">\n  "
                                          ,src, dst);
                                xbt_dynar_t route=NULL;
                                routing_get_route_and_latency(src,dst,&route, NULL);
index 29386e3..bc0ac38 100644 (file)
@@ -20,112 +20,112 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_6" 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"/>
+>   <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="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>   <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <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_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"/>
+>   <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="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>   <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <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_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"/>
+>   <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="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>   <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <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_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"/>
+>   <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="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>   <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <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_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"/>
+>   <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob6.hamburger.edu" dst="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>   <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob6.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob6.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob6.hamburger.edu" dst="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <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_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_backbone"/>
+>   <link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob3.hamburger.edu">
->      <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_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_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_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_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
 >   </route>
 > </AS>
 > </platform>
@@ -140,7 +140,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6
 >   <host id="bob" power="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -158,7 +158,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]
 >   </host>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -172,7 +172,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]
 >   <host id="bob" power="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -186,7 +186,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]%
 >   <host id="bob" power="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -200,7 +200,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e
 >   <host id="bob" power="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -214,7 +214,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]
 >   <host id="bob" power="1000000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -228,7 +228,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6
 >   <host id="bob" power="1000000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -242,7 +242,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h
 >   <host id="bob" power="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -257,7 +257,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="80000000" latency="0.000100000"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -272,7 +272,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -287,7 +287,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -302,7 +302,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="80000000" latency="0.000100000"/>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -321,31 +321,31 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.
 >   <link id="link2" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="link3" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="alice" dst="alice">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 >   <route src="alice" dst="trudy">
->      <link_ctn id="link3"/>
+>   <link_ctn id="link3"/>
 >   </route>
 >   <route src="alice" dst="bob">
->      <link_ctn id="link2"/><link_ctn id="link3"/>
+>   <link_ctn id="link2"/><link_ctn id="link3"/>
 >   </route>
 >   <route src="trudy" dst="alice">
->      <link_ctn id="link3"/>
+>   <link_ctn id="link3"/>
 >   </route>
 >   <route src="trudy" dst="trudy">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 >   <route src="trudy" dst="bob">
->      <link_ctn id="link2"/>
+>   <link_ctn id="link2"/>
 >   </route>
 >   <route src="bob" dst="alice">
->      <link_ctn id="link1"/>
+>   <link_ctn id="link1"/>
 >   </route>
 >   <route src="bob" dst="trudy">
->      <link_ctn id="link2"/>
+>   <link_ctn id="link2"/>
 >   </route>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -383,436 +383,436 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 >   <link id="bob_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_4" 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"/>
+>   <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="bob3.hamburger.edu">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>   <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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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_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="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"/>
+>   <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <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"/>
+>   <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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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_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="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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>   <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <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="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_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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>   <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <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="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_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"/>
+>   <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </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"/>
+>   <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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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_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="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"/>
+>   <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </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"/>
+>   <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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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_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="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"/>
+>   <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </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"/>
+>   <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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>   <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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_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="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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>   <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <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="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_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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>   <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <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="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_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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>   <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="backbone"/><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="backbone"/><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="backbone"/><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"/>
+>   <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
+>   <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <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="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_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_backbone"/>
+>   <link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="backbone"/>
+>   <link_ctn id="backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob1.hamburger.edu">
->      <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_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_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_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_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_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_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_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_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_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"/>
+>   <link_ctn id="backbone"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_backbone"/>
+>   <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_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_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_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_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_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_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_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_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_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_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
 >   </route>
 > </AS>
 > </platform>
@@ -831,16 +831,16 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]
 >   <link id="link_bob" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="switch" bandwidth="125000000" latency="0.000050000" sharing_policy="FATPIPE"/>
 >   <route src="alice" dst="alice">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 >   <route src="alice" dst="bob">
->      <link_ctn id="link_alice"/><link_ctn id="switch"/><link_ctn id="link_bob"/>
+>   <link_ctn id="link_alice"/><link_ctn id="switch"/><link_ctn id="link_bob"/>
 >   </route>
 >   <route src="bob" dst="alice">
->      <link_ctn id="link_bob"/><link_ctn id="switch"/><link_ctn id="link_alice"/>
+>   <link_ctn id="link_bob"/><link_ctn id="switch"/><link_ctn id="link_alice"/>
 >   </route>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
@@ -856,16 +856,147 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="alice" dst="alice">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 >   <route src="alice" dst="bob">
->      <link_ctn id="link1"/>
+>   <link_ctn id="link1"/>
 >   </route>
 >   <route src="bob" dst="alice">
->      <link_ctn id="link1"/>
+>   <link_ctn id="link1"/>
 >   </route>
 >   <route src="bob" dst="bob">
->      <link_ctn id="__loopback__"/>
+>   <link_ctn id="__loopback__"/>
 >   </route>
 > </AS>
 > </platform>
+
+$ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.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'?>
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+> <platform version="3">
+> <AS id="AS0" routing="Full">
+>   <host id="1" power="1000000000"/>
+>   <host id="2" power="1000000000"/>
+>   <host id="3" power="1000000000"/>
+>   <router id="my_cluster_2_router"/>
+>   <router id="my_cluster_1_router"/>
+>   <router id="my_cluster_3_router"/>
+>   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
+>   <link id="link1" bandwidth="1250000000" latency="0.000500000"/>
+>   <link id="link2" bandwidth="1250000000" latency="0.000500000"/>
+>   <link id="link3" bandwidth="1250000000" latency="0.000500000"/>
+>   <link id="link_tmp" bandwidth="1250000000" latency="0.000500000"/>
+>   <link id="my_cluster_1_link_1" bandwidth="125000000" latency="0.000050000"/>
+>   <link id="my_cluster_2_link_2" bandwidth="125000000" latency="0.000050000"/>
+>   <link id="my_cluster_3_link_3" bandwidth="125000000" latency="0.000050000"/>
+>   <route src="1" dst="1">
+>   <link_ctn id="my_cluster_1_link_1"/><link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="1" dst="2">
+>   <link_ctn id="link_tmp"/>
+>   </route>
+>   <route src="1" dst="3">
+>   <link_ctn id="my_cluster_1_link_1"/><link_ctn id="link1"/><link_ctn id="link3"/><link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+>   <route src="1" dst="my_cluster_2_router">
+>   <link_ctn id="link_tmp"/>
+>   </route>
+>   <route src="1" dst="my_cluster_1_router">
+>   <link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="1" dst="my_cluster_3_router">
+>   <link_ctn id="my_cluster_1_link_1"/><link_ctn id="link1"/><link_ctn id="link3"/>
+>   </route>
+>   <route src="2" dst="1">
+>   <link_ctn id="my_cluster_2_link_2"/><link_ctn id="link2"/><link_ctn id="link1"/><link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="2" dst="2">
+>   <link_ctn id="my_cluster_2_link_2"/><link_ctn id="my_cluster_2_link_2"/>
+>   </route>
+>   <route src="2" dst="3">
+>   <link_ctn id="my_cluster_2_link_2"/><link_ctn id="link2"/><link_ctn id="link3"/><link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+>   <route src="2" dst="my_cluster_2_router">
+>   <link_ctn id="my_cluster_2_link_2"/>
+>   </route>
+>   <route src="2" dst="my_cluster_1_router">
+>   <link_ctn id="my_cluster_2_link_2"/><link_ctn id="link2"/><link_ctn id="link1"/>
+>   </route>
+>   <route src="2" dst="my_cluster_3_router">
+>   <link_ctn id="my_cluster_2_link_2"/><link_ctn id="link2"/><link_ctn id="link3"/>
+>   </route>
+>   <route src="3" dst="1">
+>   <link_ctn id="my_cluster_3_link_3"/><link_ctn id="link3"/><link_ctn id="link1"/><link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="3" dst="2">
+>   <link_ctn id="my_cluster_3_link_3"/><link_ctn id="link3"/><link_ctn id="link2"/><link_ctn id="my_cluster_2_link_2"/>
+>   </route>
+>   <route src="3" dst="3">
+>   <link_ctn id="my_cluster_3_link_3"/><link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+>   <route src="3" dst="my_cluster_2_router">
+>   <link_ctn id="my_cluster_3_link_3"/><link_ctn id="link3"/><link_ctn id="link2"/>
+>   </route>
+>   <route src="3" dst="my_cluster_1_router">
+>   <link_ctn id="my_cluster_3_link_3"/><link_ctn id="link3"/><link_ctn id="link1"/>
+>   </route>
+>   <route src="3" dst="my_cluster_3_router">
+>   <link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+>   <route src="my_cluster_2_router" dst="my_cluster_2_router">
+>   
+>   </route>
+>   <route src="my_cluster_2_router" dst="my_cluster_1_router">
+>   <link_ctn id="link2"/><link_ctn id="link1"/>
+>   </route>
+>   <route src="my_cluster_2_router" dst="my_cluster_3_router">
+>   <link_ctn id="link2"/><link_ctn id="link3"/>
+>   </route>
+>   <route src="my_cluster_2_router" dst="1">
+>   <link_ctn id="link2"/><link_ctn id="link1"/><link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="my_cluster_2_router" dst="2">
+>   <link_ctn id="my_cluster_2_link_2"/>
+>   </route>
+>   <route src="my_cluster_2_router" dst="3">
+>   <link_ctn id="link2"/><link_ctn id="link3"/><link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+>   <route src="my_cluster_1_router" dst="my_cluster_2_router">
+>   <link_ctn id="link_tmp"/>
+>   </route>
+>   <route src="my_cluster_1_router" dst="my_cluster_1_router">
+>   
+>   </route>
+>   <route src="my_cluster_1_router" dst="my_cluster_3_router">
+>   <link_ctn id="link1"/><link_ctn id="link3"/>
+>   </route>
+>   <route src="my_cluster_1_router" dst="1">
+>   <link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="my_cluster_1_router" dst="2">
+>   <link_ctn id="link_tmp"/>
+>   </route>
+>   <route src="my_cluster_1_router" dst="3">
+>   <link_ctn id="link1"/><link_ctn id="link3"/><link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+>   <route src="my_cluster_3_router" dst="my_cluster_2_router">
+>   <link_ctn id="link3"/><link_ctn id="link2"/>
+>   </route>
+>   <route src="my_cluster_3_router" dst="my_cluster_1_router">
+>   <link_ctn id="link3"/><link_ctn id="link1"/>
+>   </route>
+>   <route src="my_cluster_3_router" dst="my_cluster_3_router">
+>   
+>   </route>
+>   <route src="my_cluster_3_router" dst="1">
+>   <link_ctn id="link3"/><link_ctn id="link1"/><link_ctn id="my_cluster_1_link_1"/>
+>   </route>
+>   <route src="my_cluster_3_router" dst="2">
+>   <link_ctn id="link3"/><link_ctn id="link2"/><link_ctn id="my_cluster_2_link_2"/>
+>   </route>
+>   <route src="my_cluster_3_router" dst="3">
+>   <link_ctn id="my_cluster_3_link_3"/>
+>   </route>
+> </AS>
+> </platform>
\ No newline at end of file
index a1f2716..440c6ff 100644 (file)
@@ -4,73 +4,73 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 > Workstation number: 4, link number: 5
 > Route between host1 and host1
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host1 and host2
->      Route size 1
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host1 and host3
->      Route size 1
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host1 and host4
->      Route size 2
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host2 and host1
->      Route size 1
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host2 and host2
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host2 and host3
->      Route size 1
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host2 and host4
->      Route size 2
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host3 and host1
->      Route size 1
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host3 and host2
->      Route size 1
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host3 and host3
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host3 and host4
->      Route size 1
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host4 and host1
->      Route size 2
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host4 and host2
->      Route size 2
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host4 and host3
->      Route size 1
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host4 and host4
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 
 
 
@@ -78,110 +78,110 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 > Workstation number: 5, link number: 7
 > Route between host1 and host1
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host1 and host2
->      Route size 1
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host1 and host3
->      Route size 1
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host1 and host4
->      Route size 2
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host1 and host5
->      Route size 2
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Link link5: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link5: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host2 and host1
->      Route size 1
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host2 and host2
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host2 and host3
->      Route size 1
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host2 and host4
->      Route size 2
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host2 and host5
->      Route size 1
->      Link link5: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link5: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host3 and host1
->      Route size 1
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host3 and host2
->      Route size 1
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host3 and host3
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host3 and host4
->      Route size 1
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host3 and host5
->      Route size 1
->      Link link6: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link6: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host4 and host1
->      Route size 2
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Link link2: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host4 and host2
->      Route size 2
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Link link3: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link3: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host4 and host3
->      Route size 1
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host4 and host4
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between host4 and host5
->      Route size 2
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Link link6: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link6: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host5 and host1
->      Route size 2
->      Link link5: latency = 0.000050, bandwidth = 125000000.000000
->      Link link1: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link5: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link1: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host5 and host2
->      Route size 1
->      Link link5: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link5: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host5 and host3
->      Route size 1
->      Link link6: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000050, route bandwidth = 125000000.000000
+>   Route size 1
+>   Link link6: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000
 > Route between host5 and host4
->      Route size 2
->      Link link6: latency = 0.000050, bandwidth = 125000000.000000
->      Link link4: latency = 0.000050, bandwidth = 125000000.000000
->      Route latency = 0.000100, route bandwidth = 125000000.000000
+>   Route size 2
+>   Link link6: latency = 0.000050, bandwidth = 125000000.000000
+>   Link link4: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between host5 and host5
->      Route size 1
->      Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->      Route latency = 0.000015, route bandwidth = 498000000.000000
\ No newline at end of file
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
\ No newline at end of file
diff --git a/teshsuite/simdag/platforms/three_clusters_bypass.xml b/teshsuite/simdag/platforms/three_clusters_bypass.xml
new file mode 100644 (file)
index 0000000..dc3a16b
--- /dev/null
@@ -0,0 +1,46 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+<AS  id="AS0"  routing="Full">
+  <cluster id="my_cluster_1" prefix="" suffix=""
+               radical="1"     power="1000000000"    bw="125000000"     lat="5E-5"/>
+               
+  <cluster id="my_cluster_2" prefix="" suffix=""
+           radical="2" power="1000000000"      bw="125000000"  lat="5E-5"/>  
+           
+  <cluster id="my_cluster_3" prefix="" suffix=""
+        radical="3" power="1000000000"    bw="125000000"  lat="5E-5"/>  
+       
+     <link id="link1" bandwidth="1250000000" latency="5E-4"/>  
+        <link id="link2" bandwidth="1250000000" latency="5E-4"/>
+        <link id="link3" bandwidth="1250000000" latency="5E-4"/>
+        <link id="link_tmp"  bandwidth="1250000000" latency="5E-4"/>
+       
+     <ASroute src="my_cluster_1" dst="my_cluster_2" 
+        gw_src="my_cluster_1_router" 
+        gw_dst="my_cluster_2_router">
+               <link_ctn id="link1"/>
+               <link_ctn id="link2"/>
+     </ASroute>
+     
+     <ASroute src="my_cluster_1" dst="my_cluster_3" 
+     gw_src="my_cluster_1_router" 
+     gw_dst="my_cluster_3_router">
+        <link_ctn id="link1"/>
+        <link_ctn id="link3"/>
+     </ASroute>
+     
+     <ASroute src="my_cluster_2" dst="my_cluster_3" 
+     gw_src="my_cluster_2_router" 
+     gw_dst="my_cluster_3_router">
+        <link_ctn id="link2"/>
+        <link_ctn id="link3"/>
+     </ASroute>
+     
+     <bypassRoute src="my_cluster_1" dst="my_cluster_2"
+     gw_src="my_cluster_$1src_router" 
+     gw_dst="my_cluster_$1dst_router">
+        <link_ctn id="link_tmp"/>  
+     </bypassRoute>
+</AS>
+</platform>