X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d830be0a1bae5f138f8458a2d931fcaba8ae9ee..1a4fbd7770910a461be806b05bff0dfdf9a87e5e:/examples/msg/gtnets/dogbone-p.xml

diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml
index 3b0f7ca4a1..2e9b2eb363 100644
--- a/examples/msg/gtnets/dogbone-p.xml
+++ b/examples/msg/gtnets/dogbone-p.xml
@@ -1,67 +1,28 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<!--- 
-  dogbone
--->
-
-<platform_description version="1">
-  <cpu name="S1" power="1000000000"/>
-  <cpu name="C1" power="1000000000"/>
-  <cpu name="S2" power="1000000000"/>
-  <cpu name="C2" power="1000000000"/>
-  <router name="R1"/>
-  <router name="R2"/>
-
-  <network_link name="1" bandwidth="100000000" latency="0.01"/>
-  <network_link name="2" bandwidth="100000" latency="0.02"/>
-  <network_link name="3" bandwidth="100000000" latency="0.01"/>
-  <network_link name="4" bandwidth="100000000" latency="0.01"/>
-  <network_link name="5" bandwidth="100000000" latency="0.05"/>
-
-
-  <route src="S1" dst="C1">
-     <route_element name="1"/>
-     <route_element name="2"/>
-     <route_element name="3"/>
-  </route>
-
-  <route src="S2" dst="C2">
-     <route_element name="4"/>
-     <route_element name="2"/>
-     <route_element name="5"/>
-  </route>
-
-  <route src="S1" dst="C2">
-     <route_element name="1"/>
-     <route_element name="2"/>
-     <route_element name="5"/>
-  </route>
-
-  <route src="S2" dst="C1">
-     <route_element name="4"/>
-     <route_element name="2"/>
-     <route_element name="3"/>
-  </route>
-
-
-  <route src="S1" dst="R1">
-     <route_element name="1"/>
-  </route>
-
-  <route src="R1" dst="R2">
-     <route_element name="2"/>
-  </route>
-
-  <route src="R2" dst="C1">
-     <route_element name="3"/>
-  </route>
-
-  <route src="S2" dst="R1">
-     <route_element name="4"/>
-  </route>
-
-  <route src="R2" dst="C2">
-     <route_element name="5"/>
-  </route>
-
-</platform_description>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+<AS  id="AS0"  routing="Full">
+  <host id="S1" speed="1Gf"/>
+  <host id="C1" speed="1Gf"/>
+  <host id="S2" speed="1Gf"/>
+  <host id="C2" speed="1Gf"/>
+  <router id="R1"/>
+  <router id="R2"/>
+
+  <link id="1" bandwidth="100MBps" latency="10ms"/>
+  <link id="2" bandwidth="100MBps" latency="10ms"/>
+  <link id="3" bandwidth="100MBps" latency="10ms"/>
+  <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>
+</AS>
+</platform>