Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml
index d392ad9..4b99bcc 100644 (file)
--- a/examples/platforms/bypassRoute.xml
+++ b/examples/platforms/bypassRoute.xml
@@ -30,15 +30,29 @@
       <router id="AS_2_gateway"/>
 
       <!-- routes providing topological information -->  
-      <route src="central_router" dst="AS_2_host1"><link_ctn id="AS_2_link1"/></route>
-      <route src="central_router" dst="AS_2_host2"><link_ctn id="AS_2_link2"/></route>
-      <route src="central_router" dst="AS_2_host3"><link_ctn id="AS_2_link3"/></route>
-      <route src="central_router" dst="AS_2_gateway"><link_ctn id="AS_2_link4"/></route>
+      <route src="central_router" dst="AS_2_host1">
+        <link_ctn id="AS_2_link1"/>
+      </route>
+      <route src="central_router" dst="AS_2_host2">
+        <link_ctn id="AS_2_link2"/>
+      </route>
+      <route src="central_router" dst="AS_2_host3">
+        <link_ctn id="AS_2_link3"/>
+      </route>
+      <route src="central_router" dst="AS_2_gateway">
+        <link_ctn id="AS_2_link4"/>
+      </route>
 
       <!--  longer route -->
-      <route src="bypass_router1" dst="AS_2_host2"><link_ctn id="AS_2_link5"/></route>
-      <route src="bypass_router1" dst="bypass_router2"><link_ctn id="AS_2_link6"/></route>
-      <route src="bypass_router2" dst="AS_2_host1"><link_ctn id="AS_2_link7"/></route>
+      <route src="bypass_router1" dst="AS_2_host2">
+        <link_ctn id="AS_2_link5"/>
+      </route>
+      <route src="bypass_router1" dst="bypass_router2">
+        <link_ctn id="AS_2_link6"/>
+      </route>
+      <route src="bypass_router2" dst="AS_2_host1">
+        <link_ctn id="AS_2_link7"/>
+      </route>
 
       <!-- bypass route -->
       <bypassRoute src="AS_2_host1" dst="AS_2_host2">

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index e2cc7a3..626666d 100644 (file)
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -42,15 +42,18 @@
       <!-- internal routes between clusters -->
       <ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
                gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb3"/><link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb1"/>
       </ASroute>
       <ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
                gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb1"/>
       </ASroute>
       <ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
                gw_dst="cb3-AS1_cb3_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb3"/>
       </ASroute>
       <!-- routes to exit AS -->
       <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist">
@@ -116,71 +119,89 @@
         <link id="dc2_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
         <link id="dc2_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>
         <!-- links to router relationships -->
-        <route src="gw_dc2_horizdist" dst="gw_dc2_maindist"><link_ctn id="dc2_horizdist_maindist"/></route>
-        <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom"><link_ctn id="dc2_maindist_entranceroom"/></route>
-        <route src="gw_dc2_entranceroom" dst="router_AS2_dc2"><link_ctn id="dc2_entranceroom_ISP"/></route>
+        <route src="gw_dc2_horizdist" dst="gw_dc2_maindist">
+        <link_ctn id="dc2_horizdist_maindist"/></route>
+        <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom">
+        <link_ctn id="dc2_maindist_entranceroom"/></route>
+        <route src="gw_dc2_entranceroom" dst="router_AS2_dc2">
+        <link_ctn id="dc2_entranceroom_ISP"/></route>
       </AS>
 
       <!-- internal routes between clusters -->
       <ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb4"/><link_ctn id="link_dc2_cb6"/>
+         <link_ctn id="link_dc2_cb4"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb5"/><link_ctn id="link_dc2_cb6"/>
+         <link_ctn id="link_dc2_cb5"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb5"/><link_ctn id="link_dc2_cb4"/>
+         <link_ctn id="link_dc2_cb5"/>
+        <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb2"/> <link_ctn id="link_dc2_cb6"/>
+         <link_ctn id="link_dc2_cb2"/> 
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb2"/><link_ctn id="link_dc2_cb4"/>
+         <link_ctn id="link_dc2_cb2"/>
+        <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb2"/><link_ctn id="link_dc2_cb5"/>
+         <link_ctn id="link_dc2_cb2"/>
+        <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb6"/>
+         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" 
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb4"/>
+         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb5"/>
+         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb2"/>
+         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb2"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-        <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb6"/>
+        <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-        <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb4"/>
+        <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb5"/>
+         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb2"/>
+         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb2"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb3-AS2_cb3_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb3"/>
+         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb3"/>
       </ASroute>
 
       <!-- routess to exit AS -->
@@ -266,15 +287,18 @@
           <link id="dc3_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
           <link id="dc3_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
           <!-- links to router relationships -->
-          <route src="gw_dc3_horizdist" dst="gw_dc3_maindist"><link_ctn id="dc3_horizdist_maindist"/></route>
-          <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom"><link_ctn id="dc3_maindist_entranceroom"/></route>
+          <route src="gw_dc3_horizdist" dst="gw_dc3_maindist">
+        <link_ctn id="dc3_horizdist_maindist"/></route>
+          <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom">
+        <link_ctn id="dc3_maindist_entranceroom"/></route>
           <route src="gw_dc3_entranceroom" dst="router_AS3_dc3"><link_ctn id="dc3_entranceroom_ISP"/></route>
        </AS>
 
        <!-- internal routes between clusters -->
        <ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
                 gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-          <link_ctn id="link_dc3_cb2"/><link_ctn id="link_dc3_cb3"/>
+         <link_ctn id="link_dc3_cb2"/>
+         <link_ctn id="link_dc3_cb3"/>
        </ASroute>
        <ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
                 gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">

diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml
index 911638e..84fa6bc 100644 (file)
--- a/examples/platforms/config_tracing.xml
+++ b/examples/platforms/config_tracing.xml
@@ -32,20 +32,90 @@
     <link id="5" bandwidth="27.94625MBps" latency="278.066us"/>
     <link id="loopback" bandwidth="498MBps" latency="15us" sharing_policy="FATPIPE"/>
 
-    <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
-    <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
-    <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
-    <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
-    <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="9"/></route>
-    <route src="Tremblay" dst="Fafard"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Tremblay" dst="Ginette"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Tremblay" dst="Bourassa"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Jupiter" dst="Fafard"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Jupiter" dst="Ginette"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Jupiter" dst="Bourassa"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Fafard" dst="Ginette"><link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/></route>
-    <route src="Fafard" dst="Bourassa"><link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Ginette" dst="Bourassa"><link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
+    <route src="Tremblay" dst="Tremblay">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Jupiter" dst="Jupiter">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Fafard" dst="Fafard">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Ginette" dst="Ginette">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Bourassa" dst="Bourassa">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="9"/>
+    </route>
+    <route src="Tremblay" dst="Fafard">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Tremblay" dst="Ginette">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Tremblay" dst="Bourassa">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Jupiter" dst="Fafard">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Jupiter" dst="Ginette">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Jupiter" dst="Bourassa">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Fafard" dst="Ginette">
+      <link_ctn id="8"/>
+      <link_ctn id="1"/>
+      <link_ctn id="0"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Fafard" dst="Bourassa">
+      <link_ctn id="8"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Ginette" dst="Bourassa">
+      <link_ctn id="5"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/crosstraffic.xml b/examples/platforms/crosstraffic.xml
index cbd34bf..50c09d2 100644 (file)
--- a/examples/platforms/crosstraffic.xml
+++ b/examples/platforms/crosstraffic.xml
@@ -11,7 +11,11 @@
 
     <link id="1" bandwidth="10kBps" latency="10ms" sharing_policy="FULLDUPLEX"/>
 
-    <route src="S1" dst="C1" symmetrical="NO"><link_ctn id="1" direction="DOWN"/></route>
-    <route src="C1" dst="S1" symmetrical="NO"><link_ctn id="1" direction="UP"/></route>
+    <route src="S1" dst="C1" symmetrical="NO">
+      <link_ctn id="1" direction="DOWN"/>
+    </route>
+    <route src="C1" dst="S1" symmetrical="NO">
+      <link_ctn id="1" direction="UP"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml
index 5f29e6e..6774021 100644 (file)
--- a/examples/platforms/data_center.xml
+++ b/examples/platforms/data_center.xml
@@ -21,38 +21,47 @@
 
       <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
       <AS id="gw_dataCenter1" routing="Floyd">
-          <!-- equipments-->
-          <router id="gw_dc1_horizdist"/>
-          <router id="gw_dc1_maindist"/>
-          <router id="gw_dc1_entranceroom"/>
+        <!-- equipments-->
+        <router id="gw_dc1_horizdist"/>
+        <router id="gw_dc1_maindist"/>
+        <router id="gw_dc1_entranceroom"/>
 
-          <!-- ISP end point, entering the cloud, so it has coordinates -->
-          <router id="router_dataCenter1" coordinates="25.5 9.4 1.4"/>
+        <!-- ISP end point, entering the cloud, so it has coordinates -->
+        <router id="router_dataCenter1" coordinates="25.5 9.4 1.4"/>
 
-          <!-- links -->
-          <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
-          <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
-          <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/> 
+        <!-- links -->
+        <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+        <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+        <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/> 
 
-          <!-- links to router relationships -->
-          <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
-          <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
-          <route src="gw_dc1_entranceroom" dst="router_dataCenter1"><link_ctn id="dc1_entranceroom_ISP"/></route>
+        <!-- links to router relationships -->
+        <route src="gw_dc1_horizdist" dst="gw_dc1_maindist">
+          <link_ctn id="dc1_horizdist_maindist"/>
+        </route>
+        <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom">
+          <link_ctn id="dc1_maindist_entranceroom"/>
+        </route>
+        <route src="gw_dc1_entranceroom" dst="router_dataCenter1">
+          <link_ctn id="dc1_entranceroom_ISP"/>
+        </route>
       </AS>
 
       <!-- internal routes between cabinets -->
       <ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
                gw_dst="cb3-cabinet3_router.dc1.acloud.com">
-          <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb3"/>
       </ASroute>
       <ASroute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com"
                gw_dst="cb3-cabinet3_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb3"/>
       </ASroute>
       <ASroute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com"
                gw_dst="cb2-cabinet2_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb2"/>
       </ASroute>
     </AS>
-</AS>
+  </AS>
 </platform>

diff --git a/examples/platforms/dogbone.xml b/examples/platforms/dogbone.xml
index a09b39f..26a1a99 100644 (file)
--- a/examples/platforms/dogbone.xml
+++ b/examples/platforms/dogbone.xml
@@ -15,14 +15,40 @@
     <link id="4" bandwidth="100MBps" latency="10ms"/>
     <link id="5" bandwidth="100MBps" latency="10ms"/>
 
-    <route src="S1" dst="C1"><link_ctn id="1"/><link_ctn id="2"/><link_ctn id="3"/></route>
-    <route src="S2" dst="C2"><link_ctn id="4"/><link_ctn id="2"/><link_ctn id="5"/></route>
-    <route src="S1" dst="C2"><link_ctn id="1"/><link_ctn id="2"/><link_ctn id="5"/></route>
-    <route src="S2" dst="C1"><link_ctn id="4"/><link_ctn id="2"/><link_ctn id="3"/></route>
-    <route src="S1" dst="R1"><link_ctn id="1"/></route>
-    <route src="R1" dst="R2"><link_ctn id="2"/></route>
-    <route src="R2" dst="C1"><link_ctn id="3"/></route>
-    <route src="S2" dst="R1"><link_ctn id="4"/></route>
-    <route src="R2" dst="C2"><link_ctn id="5"/></route>
+    <route src="S1" dst="C1">
+      <link_ctn id="1"/>
+      <link_ctn id="2"/>
+      <link_ctn id="3"/>
+    </route>
+    <route src="S2" dst="C2">
+      <link_ctn id="4"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="S1" dst="C2">
+      <link_ctn id="1"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="S2" dst="C1">
+      <link_ctn id="4"/>
+      <link_ctn id="2"/>
+      <link_ctn id="3"/>
+    </route>
+    <route src="S1" dst="R1">
+      <link_ctn id="1"/>
+    </route>
+    <route src="R1" dst="R2">
+      <link_ctn id="2"/>
+    </route>
+    <route src="R2" dst="C1">
+      <link_ctn id="3"/>
+    </route>
+    <route src="S2" dst="R1">
+      <link_ctn id="4"/>
+    </route>
+    <route src="R2" dst="C2">
+      <link_ctn id="5"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml
index adc1353..2d17166 100644 (file)
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -1,29 +1,35 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS id="AS0" routing="Full">
-  <!-- Multiple pstate processor capacities can be defined as a list of powers specified for a given host -->
-  <!-- Attribute 'pstate' specifies the initialy selected pstate (here, the lowest pstate corresponds to the highest
-       processor speed) -->
-  <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-    <!--  List of min_power:max_power pairs (in Watts) corresponding to the speed consumed when the processor is idle
-          and when it is fully loaded -->
-    <!--  The list must contain one speed pair for each previously defined pstate-->
-    <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
-    <prop id="watt_off" value="10" />
-  </host>
-  <host id="MyHost2" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-    <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
-    <prop id="watt_off" value="10" />
-  </host>
-  <host id="MyHost3" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-    <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
-    <prop id="watt_off" value="10" />
-  </host>
+  <AS id="AS0" routing="Full">
+    <!-- Multiple pstate processor capacities can be defined as a list of powers specified for a given host -->
+    <!-- Attribute 'pstate' specifies the initialy selected pstate (here, the lowest pstate corresponds to the highest
+         processor speed) -->
+    <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+      <!--  List of min_power:max_power pairs (in Watts) corresponding to the speed consumed when the processor is idle
+            and when it is fully loaded -->
+      <!--  The list must contain one speed pair for each previously defined pstate-->
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
+    <host id="MyHost2" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
+    <host id="MyHost3" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
 
-  <link id="bus" bandwidth="100kBps" latency="0"/>
-  <route src="MyHost1" dst="MyHost2"><link_ctn id="bus"/></route>
-  <route src="MyHost1" dst="MyHost3"><link_ctn id="bus"/></route>
-  <route src="MyHost2" dst="MyHost3"><link_ctn id="bus"/></route>
-</AS>
+    <link id="bus" bandwidth="100kBps" latency="0"/>
+    <route src="MyHost1" dst="MyHost2">
+      <link_ctn id="bus"/>
+    </route>
+    <route src="MyHost1" dst="MyHost3">
+      <link_ctn id="bus"/>
+    </route>
+    <route src="MyHost2" dst="MyHost3">
+      <link_ctn id="bus"/>
+    </route>
+  </AS>
 </platform>

diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 551d4f8..6e62453 100644 (file)
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -25,14 +25,22 @@
       <link id="Marseille_Toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <route src="lille" dst="paris"><link_ctn id="Lille_Paris"/></route>
-      <route src="paris" dst="nancy"><link_ctn id="Paris_Nancy"/></route>
-      <route src="paris" dst="rennes"><link_ctn id="Paris_Rennes"/></route>
-      <route src="paris" dst="lyon"><link_ctn id="Paris_Lyon"/></route>
-      <route src="bordeaux" dst="lyon"><link_ctn id="Bordeaux_Lyon"/></route>
-      <route src="lyon" dst="grenoble"><link_ctn id="Lyon_Grenoble"/></route>
-      <route src="lyon" dst="marseille"><link_ctn id="Lyon_Marseille"/></route>
-      <route src="marseille" dst="sophia"><link_ctn id="Marseille_Sophia"/></route>
-      <route src="marseille" dst="toulouse"><link_ctn id="Marseille_Toulouse"/></route>
+      <route src="paris" dst="nancy">
+        <link_ctn id="Paris_Nancy"/></route>
+      <route src="paris" dst="rennes">
+        <link_ctn id="Paris_Rennes"/></route>
+      <route src="paris" dst="lyon">
+        <link_ctn id="Paris_Lyon"/></route>
+      <route src="bordeaux" dst="lyon">
+        <link_ctn id="Bordeaux_Lyon"/></route>
+      <route src="lyon" dst="grenoble">
+        <link_ctn id="Lyon_Grenoble"/></route>
+      <route src="lyon" dst="marseille">
+        <link_ctn id="Lyon_Marseille"/></route>
+      <route src="marseille" dst="sophia">
+        <link_ctn id="Marseille_Sophia"/></route>
+      <route src="marseille" dst="toulouse">
+        <link_ctn id="Marseille_Toulouse"/></route>
     </AS>
     <AS id="AS_bordeaux" routing="Full">
       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr" radical="1-51" speed="5.2297E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
@@ -50,20 +58,20 @@
       <link id="link_gw_bordeaux" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_bordeplage" dst="AS_bordereau" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr">
-          <link_ctn id="link_bordeplage"/><link_ctn id="link_bordereau"/>
+         <link_ctn id="link_bordeplage"/><link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="AS_bordereau" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr">
-          <link_ctn id="link_borderline"/><link_ctn id="link_bordereau"/>
+        <link_ctn id="link_borderline"/><link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="AS_bordeplage" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr">
-          <link_ctn id="link_borderline"/><link_ctn id="link_bordeplage"/>
+        <link_ctn id="link_borderline"/><link_ctn id="link_bordeplage"/>
       </ASroute>
 
       <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
-          <link_ctn id="link_bordereau"/>
+        <link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_bordeplage" dst="gw_AS_bordeaux" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
-          <link_ctn id="link_bordeplage"/>
+        <link_ctn id="link_bordeplage"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="gw_AS_bordeaux" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
           <link_ctn id="link_borderline"/>
@@ -86,23 +94,26 @@
       <link id="link_gw_grenoble" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_genepi" dst="AS_adonis" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr">
-          <link_ctn id="link_genepi"/><link_ctn id="link_adonis"/>
+        <link_ctn id="link_genepi"/>
+        <link_ctn id="link_adonis"/>
       </ASroute>
       <ASroute src="AS_edel" dst="AS_adonis" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr">
-          <link_ctn id="link_edel"/><link_ctn id="link_adonis"/>
+        <link_ctn id="link_edel"/>
+        <link_ctn id="link_adonis"/>
       </ASroute>
       <ASroute src="AS_edel" dst="AS_genepi" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr">
-          <link_ctn id="link_edel"/><link_ctn id="link_genepi"/>
+        <link_ctn id="link_edel"/>
+        <link_ctn id="link_genepi"/>
       </ASroute>
 
       <ASroute src="AS_adonis" dst="gw_AS_grenoble" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
-          <link_ctn id="link_adonis"/>
+        <link_ctn id="link_adonis"/>
       </ASroute>
       <ASroute src="AS_genepi" dst="gw_AS_grenoble" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
-          <link_ctn id="link_genepi"/>
+        <link_ctn id="link_genepi"/>
       </ASroute>
       <ASroute src="AS_edel" dst="gw_AS_grenoble" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
-          <link_ctn id="link_edel"/>
+        <link_ctn id="link_edel"/>
       </ASroute>
     </AS>
 
@@ -125,35 +136,41 @@
       <link id="link_gw_lille" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_chirloute" dst="AS_chinqchint" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
-          <link_ctn id="link_chirloute"/><link_ctn id="link_chinqchint"/>
+        <link_ctn id="link_chirloute"/>
+        <link_ctn id="link_chinqchint"/>
       </ASroute>
       <ASroute src="AS_chimint" dst="AS_chinqchint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
-          <link_ctn id="link_chimint"/><link_ctn id="link_chinqchint"/>
+        <link_ctn id="link_chimint"/>
+        <link_ctn id="link_chinqchint"/>
       </ASroute>
       <ASroute src="AS_chimint" dst="AS_chirloute" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr">
-          <link_ctn id="link_chimint"/><link_ctn id="link_chirloute"/>
+        <link_ctn id="link_chimint"/><link_ctn id="link_chirloute"/>
       </ASroute>
+ 
       <ASroute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
-          <link_ctn id="link_chicon"/><link_ctn id="link_chinqchint"/>
+        <link_ctn id="link_chicon"/>
+        <link_ctn id="link_chinqchint"/>
       </ASroute>
       <ASroute src="AS_chicon" dst="AS_chirloute" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr">
-          <link_ctn id="link_chicon"/><link_ctn id="link_chirloute"/>
+        <link_ctn id="link_chicon"/>
+        <link_ctn id="link_chirloute"/>
       </ASroute>
       <ASroute src="AS_chicon" dst="AS_chimint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr">
-          <link_ctn id="link_chicon"/><link_ctn id="link_chimint"/>
+        <link_ctn id="link_chicon"/>
+        <link_ctn id="link_chimint"/>
       </ASroute>
 
       <ASroute src="AS_chinqchint" dst="gw_AS_lille" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="gw_lille">
-          <link_ctn id="link_chinqchint"/>
+        <link_ctn id="link_chinqchint"/>
       </ASroute>
       <ASroute src="AS_chirloute" dst="gw_AS_lille" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="gw_lille">
-          <link_ctn id="link_chirloute"/>
+        <link_ctn id="link_chirloute"/>
       </ASroute>
       <ASroute src="AS_chimint" dst="gw_AS_lille" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="gw_lille">
-          <link_ctn id="link_chimint"/>
+        <link_ctn id="link_chimint"/>
       </ASroute>
       <ASroute src="AS_chicon" dst="gw_AS_lille" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="gw_lille">
-          <link_ctn id="link_chicon"/>
+        <link_ctn id="link_chicon"/>
       </ASroute>
     </AS>
 

diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml
index 6563df4..9c41850 100644 (file)
--- a/examples/platforms/simulacrum_7_hosts.xml
+++ b/examples/platforms/simulacrum_7_hosts.xml
@@ -36,27 +36,79 @@
     <link id="l172" bandwidth="125MBps" latency="100us"/>
     <link id="l173" bandwidth="125MBps" latency="100us"/>
 
-    <route src="Host 26" dst="Host 27"><link_ctn id="l155"/></route>
-    <route src="Host 26" dst="Host 28"><link_ctn id="l155"/> <link_ctn id="l154"/><link_ctn id="l156"/></route>
-    <route src="Host 26" dst="Host 29"><link_ctn id="l152"/><link_ctn id="l157"/></route>
-    <route src="Host 26" dst="Host 30"><link_ctn id="l152"/><link_ctn id="l161"/></route>
-    <route src="Host 26" dst="Host 31"><link_ctn id="l166"/></route>
-    <route src="Host 26" dst="Host 32"><link_ctn id="l152"/><link_ctn id="l169"/></route>
-    <route src="Host 27" dst="Host 28"><link_ctn id="l154"/><link_ctn id="l156"/></route>
-    <route src="Host 27" dst="Host 29"><link_ctn id="l159"/></route>
-    <route src="Host 27" dst="Host 30"><link_ctn id="l162"/></route>
-    <route src="Host 27" dst="Host 31"><link_ctn id="l167"/></route>
-    <route src="Host 27" dst="Host 32"><link_ctn id="l154"/><link_ctn id="l170"/></route>
-    <route src="Host 28" dst="Host 29"><link_ctn id="l160"/></route>
-    <route src="Host 28" dst="Host 30"><link_ctn id="l163"/></route>
-    <route src="Host 28" dst="Host 31"><link_ctn id="l163"/><link_ctn id="l168"/></route>
-    <route src="Host 28" dst="Host 32"><link_ctn id="l156"/><link_ctn id="l170"/></route>
-    <route src="Host 29" dst="Host 30"><link_ctn id="l164"/></route>
-    <route src="Host 29" dst="Host 31"><link_ctn id="l159"/><link_ctn id="l167"/></route>
-    <route src="Host 29" dst="Host 32"><link_ctn id="l171"/></route>
-    <route src="Host 30" dst="Host 31"><link_ctn id="l168"/></route>
-    <route src="Host 30" dst="Host 32"><link_ctn id="l172"/></route>
-    <route src="Host 31" dst="Host 32"><link_ctn id="l173"/></route>
+    <route src="Host 26" dst="Host 27">
+      <link_ctn id="l155"/>
+    </route>
+    <route src="Host 26" dst="Host 28">
+      <link_ctn id="l155"/> 
+      <link_ctn id="l154"/>
+      <link_ctn id="l156"/>
+    </route>
+    <route src="Host 26" dst="Host 29">
+      <link_ctn id="l152"/>
+      <link_ctn id="l157"/>
+    </route>
+    <route src="Host 26" dst="Host 30">
+      <link_ctn id="l152"/>
+      <link_ctn id="l161"/>
+    </route>
+    <route src="Host 26" dst="Host 31">
+      <link_ctn id="l166"/>
+    </route>
+    <route src="Host 26" dst="Host 32">
+      <link_ctn id="l152"/>
+      <link_ctn id="l169"/>
+    </route>
+    <route src="Host 27" dst="Host 28">
+      <link_ctn id="l154"/>
+      <link_ctn id="l156"/>
+    </route>
+    <route src="Host 27" dst="Host 29">
+      <link_ctn id="l159"/>
+    </route>
+    <route src="Host 27" dst="Host 30">
+      <link_ctn id="l162"/>
+    </route>
+    <route src="Host 27" dst="Host 31">
+      <link_ctn id="l167"/>
+    </route>
+    <route src="Host 27" dst="Host 32">
+      <link_ctn id="l154"/>
+      <link_ctn id="l170"/>
+    </route>
+    <route src="Host 28" dst="Host 29">
+      <link_ctn id="l160"/>
+    </route>
+    <route src="Host 28" dst="Host 30">
+      <link_ctn id="l163"/>
+    </route>
+    <route src="Host 28" dst="Host 31">
+      <link_ctn id="l163"/>
+      <link_ctn id="l168"/>
+    </route>
+    <route src="Host 28" dst="Host 32">
+      <link_ctn id="l156"/>
+      <link_ctn id="l170"/>
+    </route>
+    <route src="Host 29" dst="Host 30">
+      <link_ctn id="l164"/>
+    </route>
+    <route src="Host 29" dst="Host 31">
+      <link_ctn id="l159"/>
+      <link_ctn id="l167"/>
+    </route>
+    <route src="Host 29" dst="Host 32">
+      <link_ctn id="l171"/>
+    </route>
+    <route src="Host 30" dst="Host 31">
+      <link_ctn id="l168"/>
+    </route>
+    <route src="Host 30" dst="Host 32">
+      <link_ctn id="l172"/>
+    </route>
+    <route src="Host 31" dst="Host 32">
+      <link_ctn id="l173"/>
+    </route>
   </AS>
 </platform>
 

diff --git a/examples/platforms/small_platform.xml b/examples/platforms/small_platform.xml
index 9621240..0f6c5f5 100644 (file)
--- a/examples/platforms/small_platform.xml
+++ b/examples/platforms/small_platform.xml
@@ -35,33 +35,160 @@
     <link id="80" bandwidth="15.376875MBps" latency="35.083019ms"/>
     <link id="loopback" bandwidth="498MBps" latency="15us" sharing_policy="FATPIPE"/>
 
-    <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
-    <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
-    <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
-    <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
-    <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="9"/></route>
-    <route src="Tremblay" dst="Fafard"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Tremblay" dst="Ginette"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Tremblay" dst="Bourassa"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-
-    <route src="Jupiter" dst="Fafard"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Jupiter" dst="Bourassa"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Fafard" dst="Ginette"><link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/></route>
-    <route src="Jupiter" dst="Jacquelin"><link_ctn id="145"/></route>
-    <route src="Jupiter" dst="Boivin"><link_ctn id="47"/></route>
-    <route src="Jupiter" dst="Ginette"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Fafard" dst="Bourassa"><link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Ginette" dst="Bourassa"><link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Ginette" dst="Jacquelin"><link_ctn id="145"/></route>
-    <route src="Ginette" dst="Boivin"><link_ctn id="47"/></route>
-    <route src="Bourassa" dst="Jacquelin"><link_ctn id="145"/></route>
-    <route src="Bourassa" dst="Boivin"><link_ctn id="47"/></route>
-
-    <route src="Jacquelin" dst="Boivin"><link_ctn id="145"/><link_ctn id="59"/><link_ctn id="56"/><link_ctn id="54"/><link_ctn id="17"/><link_ctn id="16"/><link_ctn id="10"/><link_ctn id="11"/><link_ctn id="44"/><link_ctn id="47"/></route>
-    <route src="Jacquelin" dst="Fafard"><link_ctn id="145"/><link_ctn id="59"/><link_ctn id="56"/><link_ctn id="54"/><link_ctn id="17"/><link_ctn id="16"/><link_ctn id="10"/><link_ctn id="6"/><link_ctn id="9"/><link_ctn id="79"/><link_ctn id="78"/></route>
-    <route src="Jacquelin" dst="Tremblay"><link_ctn id="145"/><link_ctn id="59"/><link_ctn id="56"/><link_ctn id="54"/><link_ctn id="2"/><link_ctn id="3"/></route>
-    <route src="Boivin" dst="Tremblay"><link_ctn id="47"/><link_ctn id="44"/><link_ctn id="11"/><link_ctn id="10"/><link_ctn id="16"/><link_ctn id="0"/><link_ctn id="3"/></route>
-    <route src="Boivin" dst="Fafard"><link_ctn id="47"/><link_ctn id="44"/><link_ctn id="11"/><link_ctn id="6"/><link_ctn id="9"/><link_ctn id="79"/><link_ctn id="78"/><link_ctn id="80"/></route>
+    <route src="Tremblay" dst="Tremblay">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Jupiter" dst="Jupiter">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Fafard" dst="Fafard">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Ginette" dst="Ginette">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Bourassa" dst="Bourassa">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="9"/>
+    </route>
+    <route src="Tremblay" dst="Fafard">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Tremblay" dst="Ginette">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Tremblay" dst="Bourassa">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Jupiter" dst="Fafard">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Jupiter" dst="Bourassa">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Fafard" dst="Ginette">
+      <link_ctn id="8"/>
+      <link_ctn id="1"/>
+      <link_ctn id="0"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Jupiter" dst="Jacquelin">
+      <link_ctn id="145"/>
+    </route>
+    <route src="Jupiter" dst="Boivin">
+      <link_ctn id="47"/>
+    </route>
+    <route src="Jupiter" dst="Ginette">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Fafard" dst="Bourassa">
+      <link_ctn id="8"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Ginette" dst="Bourassa">
+      <link_ctn id="5"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Ginette" dst="Jacquelin">
+      <link_ctn id="145"/>
+    </route>
+    <route src="Ginette" dst="Boivin">
+      <link_ctn id="47"/>
+    </route>
+    <route src="Bourassa" dst="Jacquelin">
+      <link_ctn id="145"/>
+    </route>
+    <route src="Bourassa" dst="Boivin">
+      <link_ctn id="47"/>
+    </route>
+    <route src="Jacquelin" dst="Boivin">
+      <link_ctn id="145"/>
+      <link_ctn id="59"/>
+      <link_ctn id="56"/>
+      <link_ctn id="54"/>
+      <link_ctn id="17"/>
+      <link_ctn id="16"/>
+      <link_ctn id="10"/>
+      <link_ctn id="11"/>
+      <link_ctn id="44"/>
+      <link_ctn id="47"/>
+    </route>
+    <route src="Jacquelin" dst="Fafard">
+      <link_ctn id="145"/>
+      <link_ctn id="59"/>
+      <link_ctn id="56"/>
+      <link_ctn id="54"/>
+      <link_ctn id="17"/>
+      <link_ctn id="16"/>
+      <link_ctn id="10"/>
+      <link_ctn id="6"/>
+      <link_ctn id="9"/>
+      <link_ctn id="79"/>
+      <link_ctn id="78"/>
+    </route>
+    <route src="Jacquelin" dst="Tremblay">
+      <link_ctn id="145"/>
+      <link_ctn id="59"/>
+      <link_ctn id="56"/>
+      <link_ctn id="54"/>
+      <link_ctn id="2"/>
+      <link_ctn id="3"/>
+    </route>
+    <route src="Boivin" dst="Tremblay">
+      <link_ctn id="47"/>
+      <link_ctn id="44"/>
+      <link_ctn id="11"/>
+      <link_ctn id="10"/>
+      <link_ctn id="16"/>
+      <link_ctn id="0"/>
+      <link_ctn id="3"/>
+    </route>
+    <route src="Boivin" dst="Fafard">
+      <link_ctn id="47"/>
+      <link_ctn id="44"/>
+      <link_ctn id="11"/>
+      <link_ctn id="6"/>
+      <link_ctn id="9"/>
+      <link_ctn id="79"/>
+      <link_ctn id="78"/>
+      <link_ctn id="80"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/small_platform_one_link_routes.xml b/examples/platforms/small_platform_one_link_routes.xml
index e1d93cb..0be82e2 100644 (file)
--- a/examples/platforms/small_platform_one_link_routes.xml
+++ b/examples/platforms/small_platform_one_link_routes.xml
@@ -25,20 +25,50 @@
     <link id="13" bandwidth="1.792625MBps" latency="7.877863ms"/>
     <link id="14" bandwidth="1.792625MBps" latency="7.877863ms"/>
 
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="0"/></route>
-    <route src="Tremblay" dst="Fafard"><link_ctn id="1"/></route>
-    <route src="Tremblay" dst="Ginette"><link_ctn id="2"/></route>
-    <route src="Tremblay" dst="Bourassa"><link_ctn id="3"/></route>
-    <route src="Tremblay" dst="Lovelace"><link_ctn id="4"/></route>
-    <route src="Jupiter" dst="Fafard"><link_ctn id="5"/></route>
-    <route src="Jupiter" dst="Ginette"><link_ctn id="6"/></route>
-    <route src="Jupiter" dst="Bourassa"><link_ctn id="7"/></route>
-    <route src="Jupiter" dst="Lovelace"><link_ctn id="8"/></route>
-    <route src="Fafard" dst="Ginette"><link_ctn id="9"/></route>
-    <route src="Fafard" dst="Bourassa"><link_ctn id="10"/></route>
-    <route src="Fafard" dst="Lovelace"><link_ctn id="11"/></route>
-    <route src="Ginette" dst="Bourassa"><link_ctn id="12"/></route>
-    <route src="Ginette" dst="Lovelace"><link_ctn id="13"/></route>
-    <route src="Bourassa" dst="Lovelace"><link_ctn id="14"/></route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="0"/>
+    </route>
+    <route src="Tremblay" dst="Fafard">
+      <link_ctn id="1"/>
+    </route>
+    <route src="Tremblay" dst="Ginette">
+      <link_ctn id="2"/>
+    </route>
+    <route src="Tremblay" dst="Bourassa">
+      <link_ctn id="3"/>
+    </route>
+    <route src="Tremblay" dst="Lovelace">
+      <link_ctn id="4"/>
+    </route>
+    <route src="Jupiter" dst="Fafard">
+      <link_ctn id="5"/>
+    </route>
+    <route src="Jupiter" dst="Ginette">
+      <link_ctn id="6"/>
+    </route>
+    <route src="Jupiter" dst="Bourassa">
+      <link_ctn id="7"/>
+    </route>
+    <route src="Jupiter" dst="Lovelace">
+      <link_ctn id="8"/>
+    </route>
+    <route src="Fafard" dst="Ginette">
+      <link_ctn id="9"/>
+    </route>
+    <route src="Fafard" dst="Bourassa">
+      <link_ctn id="10"/>
+    </route>
+    <route src="Fafard" dst="Lovelace">
+      <link_ctn id="11"/>
+    </route>
+    <route src="Ginette" dst="Bourassa">
+      <link_ctn id="12"/>
+    </route>
+    <route src="Ginette" dst="Lovelace">
+      <link_ctn id="13"/>
+    </route>
+    <route src="Bourassa" dst="Lovelace">
+      <link_ctn id="14"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_with_failures.xml
index 6664ab5..6dc6f93 100644 (file)
--- a/examples/platforms/small_platform_with_failures.xml
+++ b/examples/platforms/small_platform_with_failures.xml
@@ -21,20 +21,50 @@
     <link id="loopback_FATPIPE" bandwidth="10MBps" latency="0" sharing_policy="FATPIPE"/>
     <link id="loopback" bandwidth="100MBps" latency="0"/>
 
-    <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
-    <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
-    <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
-    <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
-    <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="1"/></route>
-    <route src="Tremblay" dst="Fafard"><link_ctn id="2"/></route>
-    <route src="Tremblay" dst="Ginette"><link_ctn id="3"/></route>
-    <route src="Tremblay" dst="Bourassa"><link_ctn id="4"/></route>
-    <route src="Jupiter" dst="Fafard"><link_ctn id="5"/></route>
-    <route src="Jupiter" dst="Ginette"><link_ctn id="6"/></route>
-    <route src="Jupiter" dst="Bourassa"><link_ctn id="7"/></route>
-    <route src="Fafard" dst="Ginette"><link_ctn id="8"/></route>
-    <route src="Fafard" dst="Bourassa"><link_ctn id="9"/></route>
-    <route src="Ginette" dst="Bourassa"><link_ctn id="10"/></route>
+    <route src="Tremblay" dst="Tremblay">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Jupiter" dst="Jupiter">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Fafard" dst="Fafard">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Ginette" dst="Ginette">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Bourassa" dst="Bourassa">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="1"/>
+    </route>
+    <route src="Tremblay" dst="Fafard">
+      <link_ctn id="2"/>
+    </route>
+    <route src="Tremblay" dst="Ginette">
+      <link_ctn id="3"/>
+    </route>
+    <route src="Tremblay" dst="Bourassa">
+      <link_ctn id="4"/>
+    </route>
+    <route src="Jupiter" dst="Fafard">
+      <link_ctn id="5"/>
+    </route>
+    <route src="Jupiter" dst="Ginette">
+      <link_ctn id="6"/>
+    </route>
+    <route src="Jupiter" dst="Bourassa">
+      <link_ctn id="7"/>
+    </route>
+    <route src="Fafard" dst="Ginette">
+      <link_ctn id="8"/>
+    </route>
+    <route src="Fafard" dst="Bourassa">
+      <link_ctn id="9"/>
+    </route>
+    <route src="Ginette" dst="Bourassa">
+      <link_ctn id="10"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/small_platform_with_routers.xml b/examples/platforms/small_platform_with_routers.xml
index 1310835..91f619c 100644 (file)
--- a/examples/platforms/small_platform_with_routers.xml
+++ b/examples/platforms/small_platform_with_routers.xml
@@ -30,31 +30,119 @@
     <link id="5"  bandwidth="27.94625MBps" latency="278.066us"/>
     <link id="loopback" bandwidth="498MBps" latency="15us" sharing_policy="FATPIPE"/>
 
-    <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
-    <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
-    <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
-    <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
-    <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
+    <route src="Tremblay" dst="Tremblay">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Jupiter" dst="Jupiter">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Fafard" dst="Fafard">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Ginette" dst="Ginette">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Bourassa" dst="Bourassa">
+      <link_ctn id="loopback"/>
+    </route>
  
-    <route src="Tremblay" dst="R.4-3"><link_ctn id="4"/></route>
-    <route src="R.3-2-5" dst="Ginette"><link_ctn id="5"/></route>
-    <route src="R.4-3" dst="R.3-2-5"><link_ctn id="3"/></route>
-    <route src="R.3-2-5" dst="R.2-0"><link_ctn id="2"/></route>
-    <route src="R.2-0" dst="R.1-0"><link_ctn id="0"/></route>
-    <route src="Fafard" dst="R.1-8-6"><link_ctn id="8"/></route>
-    <route src="R.1-0" dst="R.1-8-6"><link_ctn id="1"/></route>
-    <route src="R.1-8-6" dst="R.6-7"><link_ctn id="6"/></route>
-    <route src="R.6-7" dst="Bourassa"><link_ctn id="7"/></route>
+    <route src="Tremblay" dst="R.4-3">
+      <link_ctn id="4"/>
+    </route>
+    <route src="R.3-2-5" dst="Ginette">
+      <link_ctn id="5"/>
+    </route>
+    <route src="R.4-3" dst="R.3-2-5">
+      <link_ctn id="3"/>
+    </route>
+    <route src="R.3-2-5" dst="R.2-0">
+      <link_ctn id="2"/>
+    </route>
+    <route src="R.2-0" dst="R.1-0">
+      <link_ctn id="0"/>
+    </route>
+    <route src="Fafard" dst="R.1-8-6">
+      <link_ctn id="8"/>
+    </route>
+    <route src="R.1-0" dst="R.1-8-6">
+      <link_ctn id="1"/>
+    </route>
+    <route src="R.1-8-6" dst="R.6-7">
+      <link_ctn id="6"/>
+    </route>
+    <route src="R.6-7" dst="Bourassa">
+      <link_ctn id="7"/>
+    </route>
  
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="9"/></route>
-    <route src="Tremblay" dst="Fafard"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Tremblay" dst="Ginette"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Tremblay" dst="Bourassa"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Jupiter" dst="Fafard"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Jupiter" dst="Ginette"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Jupiter" dst="Bourassa"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Fafard" dst="Ginette"><link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/></route>
-    <route src="Fafard" dst="Bourassa"><link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Ginette" dst="Bourassa"><link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="9"/>
+    </route>
+    <route src="Tremblay" dst="Fafard">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Tremblay" dst="Ginette">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Tremblay" dst="Bourassa">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Jupiter" dst="Fafard">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Jupiter" dst="Ginette">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Jupiter" dst="Bourassa">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Fafard" dst="Ginette">
+      <link_ctn id="8"/>
+      <link_ctn id="1"/>
+      <link_ctn id="0"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Fafard" dst="Bourassa">
+      <link_ctn id="8"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Ginette" dst="Bourassa">
+      <link_ctn id="5"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
   </AS>
 </platform>

diff --git a/examples/platforms/two_hosts_platform_shared.xml b/examples/platforms/two_hosts_platform_shared.xml
index 3d93800..23e1d82 100644 (file)
--- a/examples/platforms/two_hosts_platform_shared.xml
+++ b/examples/platforms/two_hosts_platform_shared.xml
@@ -1,14 +1,20 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS  id="AS0" routing="Full">
-  <host id="cpu0" speed="4Gf"/>
-  <host id="cpu1" speed="4Gf"/>
+  <AS  id="AS0" routing="Full">
+    <host id="cpu0" speed="4Gf"/>
+    <host id="cpu1" speed="4Gf"/>
 
-  <link id="link0" bandwidth="125MBps" latency="100us" sharing_policy="SHARED"/>
+    <link id="link0" bandwidth="125MBps" latency="100us" sharing_policy="SHARED"/>
 
-  <route src="cpu0" dst="cpu0"><link_ctn id="link0"/></route>
-  <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
-  <route src="cpu1" dst="cpu1"><link_ctn id="link0"/></route>
-</AS>
+    <route src="cpu0" dst="cpu0">
+      <link_ctn id="link0"/>
+    </route>
+    <route src="cpu0" dst="cpu1">
+      <link_ctn id="link0"/>
+    </route>
+    <route src="cpu1" dst="cpu1">
+      <link_ctn id="link0"/>
+    </route>
+  </AS>
 </platform>

diff --git a/examples/simdag/scheduling/Montage_25.xml b/examples/simdag/scheduling/Montage_25.xml
index d7fe6c4..ecf6e0f 100644 (file)
--- a/examples/simdag/scheduling/Montage_25.xml
+++ b/examples/simdag/scheduling/Montage_25.xml
@@ -189,24 +189,89 @@
     <uses file="shrunken_ID00023_ID00023.jpg" link="output" register="true" transfer="true" optional="false" type="data" size="204856"/>
   </job>
 <!-- part 3: list of control-flow dependencies (may be empty) -->
-  <child ref="ID00005"><parent ref="ID00001"/><parent ref="ID00000"/></child>
-  <child ref="ID00006"><parent ref="ID00001"/><parent ref="ID00000"/></child>
-  <child ref="ID00007"><parent ref="ID00001"/><parent ref="ID00003"/></child>
-  <child ref="ID00008"><parent ref="ID00002"/><parent ref="ID00000"/></child>
-  <child ref="ID00009"><parent ref="ID00002"/><parent ref="ID00001"/></child>
-  <child ref="ID00010"><parent ref="ID00002"/></child>
-  <child ref="ID00011"><parent ref="ID00001"/><parent ref="ID00003"/></child>
-  <child ref="ID00012"><parent ref="ID00001"/><parent ref="ID00004"/></child>
-  <child ref="ID00013"><parent ref="ID00004"/><parent ref="ID00003"/></child>
-  <child ref="ID00014"><parent ref="ID00012"/><parent ref="ID00013"/><parent ref="ID00010"/><parent ref="ID00011"/><parent ref="ID00006"/><parent ref="ID00005"/><parent ref="ID00009"/><parent ref="ID00008"/><parent ref="ID00007"/></child>
-  <child ref="ID00015"><parent ref="ID00014"/></child>
-  <child ref="ID00016"><parent ref="ID00000"/><parent ref="ID00015"/></child>
-  <child ref="ID00017"><parent ref="ID00001"/><parent ref="ID00015"/></child>
-  <child ref="ID00018"><parent ref="ID00002"/><parent ref="ID00015"/></child>
-  <child ref="ID00019"><parent ref="ID00003"/><parent ref="ID00015"/></child>
-  <child ref="ID00020"><parent ref="ID00004"/><parent ref="ID00015"/></child>
-  <child ref="ID00021"><parent ref="ID00020"/><parent ref="ID00016"/><parent ref="ID00017"/><parent ref="ID00018"/><parent ref="ID00019"/></child>
-  <child ref="ID00022"><parent ref="ID00021"/></child>
-  <child ref="ID00023"><parent ref="ID00022"/></child>
-  <child ref="ID00024"><parent ref="ID00023"/></child>
+  <child ref="ID00005">
+    <parent ref="ID00001"/>
+    <parent ref="ID00000"/>
+  </child>
+  <child ref="ID00006">
+    <parent ref="ID00001"/>
+    <parent ref="ID00000"/>
+  </child>
+  <child ref="ID00007">
+    <parent ref="ID00001"/>
+    <parent ref="ID00003"/>
+  </child>
+  <child ref="ID00008">
+    <parent ref="ID00002"/>
+    <parent ref="ID00000"/>
+  </child>
+  <child ref="ID00009">
+    <parent ref="ID00002"/>
+    <parent ref="ID00001"/>
+  </child>
+  <child ref="ID00010">
+    <parent ref="ID00002"/>
+  </child>
+  <child ref="ID00011">
+    <parent ref="ID00001"/>
+    <parent ref="ID00003"/>
+  </child>
+  <child ref="ID00012">
+    <parent ref="ID00001"/>
+    <parent ref="ID00004"/>
+  </child>
+  <child ref="ID00013">
+    <parent ref="ID00004"/>
+    <parent ref="ID00003"/>
+  </child>
+  <child ref="ID00014">
+    <parent ref="ID00012"/>
+    <parent ref="ID00013"/>
+    <parent ref="ID00010"/>
+    <parent ref="ID00011"/>
+    <parent ref="ID00006"/>
+    <parent ref="ID00005"/>
+    <parent ref="ID00009"/>
+    <parent ref="ID00008"/>
+    <parent ref="ID00007"/>
+  </child>
+  <child ref="ID00015">
+    <parent ref="ID00014"/>
+  </child>
+  <child ref="ID00016">
+    <parent ref="ID00000"/>
+    <parent ref="ID00015"/>
+  </child>
+  <child ref="ID00017">
+    <parent ref="ID00001"/>
+    <parent ref="ID00015"/>
+  </child>
+  <child ref="ID00018">
+    <parent ref="ID00002"/>
+    <parent ref="ID00015"/>
+  </child>
+  <child ref="ID00019">
+    <parent ref="ID00003"/>
+    <parent ref="ID00015"/>
+  </child>
+  <child ref="ID00020">
+    <parent ref="ID00004"/>
+    <parent ref="ID00015"/>
+  </child>
+  <child ref="ID00021">
+    <parent ref="ID00020"/>
+    <parent ref="ID00016"/>
+    <parent ref="ID00017"/>
+    <parent ref="ID00018"/>
+    <parent ref="ID00019"/>
+  </child>
+  <child ref="ID00022">
+    <parent ref="ID00021"/>
+  </child>
+  <child ref="ID00023">
+    <parent ref="ID00022"/>
+  </child>
+  <child ref="ID00024">
+    <parent ref="ID00023"/>
+  </child>
 </adag>