X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..23eef5ffa2ad4a1d6a5bed99ed932e2592d47793:/examples/platforms/small_platform_with_routers.xml

diff --git a/examples/platforms/small_platform_with_routers.xml b/examples/platforms/small_platform_with_routers.xml
index 1310835706..688d71c01b 100644
--- a/examples/platforms/small_platform_with_routers.xml
+++ b/examples/platforms/small_platform_with_routers.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
     <host id="Tremblay" speed="98.095Mf"/>
     <host id="Jupiter" speed="76.296Mf"/>
     <host id="Fafard" speed="76.296Mf"/>
@@ -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>
-  </AS>
+    <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>
+  </zone>
 </platform>