forgot to recreate the option when reviving supernovae

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

diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index a17dab7..29386e3 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -1,9 +1,9 @@
 #! ./tesh
 
-$ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_cluster.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob0.hamburger.edu" power="1000000000"/>
@@ -19,13 +19,9 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@
 >   <link id="bob_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_6" bandwidth="125000000" latency="0.000050000"/>
->   <link id="bob_cluster_link_bob_cluster_router" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="bob3.hamburger.edu" dst="bob3.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob3.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </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"/>
 >   </route>
@@ -38,30 +34,12 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@
 >   <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"/>
 >   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob3.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob6.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_6"/>
+>   <route src="bob3.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <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"/>
 >   </route>
->   <route src="bob0.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </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"/>
 >   </route>
@@ -74,12 +52,12 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@
 >   <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"/>
 >   </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"/>
+>   </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"/>
 >   </route>
->   <route src="bob2.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </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"/>
 >   </route>
@@ -92,12 +70,12 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@
 >   <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"/>
 >   </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"/>
+>   </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"/>
 >   </route>
->   <route src="bob4.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </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"/>
 >   </route>
@@ -110,12 +88,12 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@
 >   <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"/>
 >   </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"/>
+>   </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"/>
 >   </route>
->   <route src="bob6.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_6"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </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"/>
 >   </route>
@@ -128,13 +106,35 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@
 >   <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"/>
 >   </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"/>
+>   </route>
+>   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </route>
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+
+$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:@] surf_workstation_model_init_ptask_L07
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -145,10 +145,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="1000000000">
@@ -163,10 +163,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -177,10 +177,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -191,10 +191,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -205,10 +205,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="1000000000"/>
@@ -219,10 +219,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="1000000000"/>
@@ -233,10 +233,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_host.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -247,10 +247,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:@] surf_workstation_model_init_ptask_L07
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -262,10 +262,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -277,10 +277,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -292,10 +292,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="bob" power="500000000"/>
@@ -307,10 +307,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="alice" power="500000000"/>
@@ -350,10 +350,10 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.f
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT two_clusters.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="alice0.crepe.fr" power="1000000000"/>
@@ -375,7 +375,6 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <link id="alice_cluster_link_2" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="alice_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="alice_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
->   <link id="alice_cluster_link_alice_cluster_router" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="backbone" bandwidth="1250000000" latency="0.000500000"/>
 >   <link id="bob_cluster_backbone" bandwidth="2250000000" latency="0.000500000"/>
 >   <link id="bob_cluster_link_0" bandwidth="125000000" latency="0.000050000"/>
@@ -383,7 +382,6 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <link id="bob_cluster_link_2" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
->   <link id="bob_cluster_link_bob_cluster_router" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="bob1.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
@@ -391,13 +389,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="bob1.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -409,16 +404,19 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="bob1.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob1.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   </route>
+>   <route src="bob1.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="bob_cluster_link_1"/><link_ctn id="bob_cluster_backbone"/>
+>   </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"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob1.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
@@ -427,13 +425,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="bob3.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -445,40 +440,40 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="bob3.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob3.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   </route>
+>   <route src="bob3.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="bob_cluster_link_3"/><link_ctn id="bob_cluster_backbone"/>
+>   </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"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice2.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
->   </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"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice2.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -486,71 +481,35 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <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"/>
 >   </route>
->   <route src="alice2.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
->   </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"/>
 >   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob1.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob3.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob2.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bob4.hamburger.edu">
->      <link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="backbone"/>
+>   <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"/>
 >   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <route src="alice2.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
+>      <link_ctn id="alice_cluster_link_2"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice3.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
->   </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"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice3.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -558,12 +517,15 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <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"/>
 >   </route>
->   <route src="alice3.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_3"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
->   </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"/>
 >   </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"/>
+>   </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"/>
+>   </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"/>
 >   </route>
@@ -571,13 +533,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="bob0.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -589,16 +548,19 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="bob0.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob0.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   </route>
+>   <route src="bob0.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="bob_cluster_link_0"/><link_ctn id="bob_cluster_backbone"/>
+>   </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"/>
 >   </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"/>
@@ -607,13 +569,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="bob2.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -625,16 +584,19 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="bob2.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob2.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   </route>
+>   <route src="bob2.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="bob_cluster_link_2"/><link_ctn id="bob_cluster_backbone"/>
+>   </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"/>
 >   </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"/>
@@ -643,13 +605,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice2.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="bob4.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice3.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="bob0.hamburger.edu">
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
@@ -661,40 +620,40 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice0.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice4.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="bob4.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
 >   </route>
 >   <route src="bob4.hamburger.edu" dst="alice1.crepe.fr">
->      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   </route>
+>   <route src="bob4.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="bob_cluster_link_4"/><link_ctn id="bob_cluster_backbone"/>
+>   </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"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice0.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
->   </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"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice0.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -702,35 +661,35 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <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"/>
 >   </route>
->   <route src="alice0.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_0"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
->   </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"/>
 >   </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"/>
+>   </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"/>
+>   </route>
 >   <route src="alice4.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice4.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
->   </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"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice4.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -738,71 +697,35 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <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"/>
 >   </route>
->   <route src="alice4.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
->   </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"/>
 >   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alice2.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="backbone"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alice3.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_3"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alice0.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alice4.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_4"/>
->   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
+>   <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"/>
 >   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alice1.crepe.fr">
->      <link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_1"/>
+>   <route src="alice4.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
+>      <link_ctn id="alice_cluster_link_4"/><link_ctn id="alice_cluster_backbone"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob1.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_1"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob3.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_3"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice2.crepe.fr">
 >      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice1.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/>
->   </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"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob0.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob2.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_2"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="bob4.hamburger.edu">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_link_bob_cluster_router"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
+>      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="backbone"/><link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_4"/>
 >   </route>
 >   <route src="alice1.crepe.fr" dst="alice0.crepe.fr">
 >      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0"/>
@@ -810,19 +733,95 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P
 >   <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"/>
 >   </route>
->   <route src="alice1.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->      <link_ctn id="alice_cluster_link_1"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_alice_cluster_router"/>
->   </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"/>
 >   </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"/>
+>   </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"/>
+>   </route>
+>   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="bob_cluster_backbone"/>
+>   </route>
+>   <route src="bobbob_cluster_router.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
+>      <link_ctn id="backbone"/>
+>   </route>
+>   <route src="bobbob_cluster_router.hamburger.edu" dst="bob1.hamburger.edu">
+>      <link_ctn id="bob_cluster_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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </route>
+>   <route src="alicealice_cluster_router.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
+>      <link_ctn id="backbone"/>
+>   </route>
+>   <route src="alicealice_cluster_router.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
+>      <link_ctn id="alice_cluster_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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </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"/>
+>   </route>
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+
+$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:@] surf_workstation_model_init_ptask_L07
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="alice" power="500000000"/>
@@ -846,10 +845,10 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.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 "simgrid.dtd">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 > <platform version="3">
 > <AS id="AS0" routing="Full">
 >   <host id="alice" power="500000000"/>