X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04c44fbe77163cca75366d10e35ba400b804eaef..048b8c7e8cec5ab24e17e087b5cf2a7571b97a1e:/examples/msg/parallel_task/test_ptask_platform.xml

diff --git a/examples/msg/parallel_task/test_ptask_platform.xml b/examples/msg/parallel_task/test_ptask_platform.xml
index 6a878800ae..cbcd074dd6 100644
--- a/examples/msg/parallel_task/test_ptask_platform.xml
+++ b/examples/msg/parallel_task/test_ptask_platform.xml
@@ -1,57 +1,39 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "simgrid.dtd">
- <platform version="2">
+ <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+ <platform version="3">
  <AS  id="AS0"  routing="Full">
    <!-- ljlkj -->
-   <host id="Tremblay" power="1e9"/>
-   <host id="Jupiter" power="1e9"/>
-   <host id="Fafard" power="1e9"/>
-   <host id="Ginette" power="1e9"/>
-   <link id="0" bandwidth="1e8" latency="100e-6"/>
-   <link id="1" bandwidth="1e8" latency="100e-6"/>
-   <link id="2" bandwidth="1e8" latency="100e-6"/>
-   <link id="3" bandwidth="1e8" latency="100e-6"/>
-   <link id="switch" bandwidth="1e8" latency="100e-6" sharing_policy="FATPIPE"/>
-   <link id="loopback" bandwidth="1e10" latency="1e-6" 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>
+   <host id="Tremblay" power="1Gf"/>
+   <host id="Jupiter" power="1Gf"/>
+   <host id="Fafard" power="1Gf"/>
+   <host id="Ginette" power="1Gf"/>
+   <link id="0" bandwidth="100MBps" latency="100us"/>
+   <link id="1" bandwidth="100MBps" latency="100us"/>
+   <link id="2" bandwidth="100MBps" latency="100us"/>
+   <link id="3" bandwidth="100MBps" latency="100us"/>
+   <link id="switch" bandwidth="100MBps" latency="100us" sharing_policy="FATPIPE"/>
+   <link id="loopback" bandwidth="10GBps" latency="1us" 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="Tremblay" dst="Jupiter">
-     <link:ctn id="0"/><link:ctn id="switch"/><link:ctn id="1"/>
+     <link_ctn id="0"/><link_ctn id="switch"/><link_ctn id="1"/>
    </route>
    <route src="Tremblay" dst="Fafard">
-     <link:ctn id="0"/><link:ctn id="switch"/><link:ctn id="2"/>
+     <link_ctn id="0"/><link_ctn id="switch"/><link_ctn id="2"/>
    </route>
    <route src="Tremblay" dst="Ginette">
-     <link:ctn id="0"/><link:ctn id="switch"/><link:ctn id="3"/>
-   </route>
-   <route src="Jupiter" dst="Tremblay">
-     <link:ctn id="1"/><link:ctn id="switch"/><link:ctn id="0"/>
+     <link_ctn id="0"/><link_ctn id="switch"/><link_ctn id="3"/>
    </route>
    <route src="Jupiter" dst="Fafard">
-     <link:ctn id="1"/><link:ctn id="switch"/><link:ctn id="2"/>
+     <link_ctn id="1"/><link_ctn id="switch"/><link_ctn id="2"/>
    </route>
    <route src="Jupiter" dst="Ginette">
-     <link:ctn id="1"/><link:ctn id="switch"/><link:ctn id="3"/>
-   </route>
-   <route src="Fafard" dst="Tremblay">
-     <link:ctn id="2"/><link:ctn id="switch"/><link:ctn id="0"/>
-   </route>
-   <route src="Fafard" dst="Jupiter">
-     <link:ctn id="2"/><link:ctn id="switch"/><link:ctn id="1"/>
+     <link_ctn id="1"/><link_ctn id="switch"/><link_ctn id="3"/>
    </route>
    <route src="Fafard" dst="Ginette">
-     <link:ctn id="2"/><link:ctn id="switch"/><link:ctn id="3"/>
-   </route>
-   <route src="Ginette" dst="Tremblay">
-     <link:ctn id="3"/><link:ctn id="switch"/><link:ctn id="0"/>
-   </route>
-   <route src="Ginette" dst="Jupiter">
-     <link:ctn id="3"/><link:ctn id="switch"/><link:ctn id="1"/>
-   </route>
-   <route src="Ginette" dst="Fafard">
-     <link:ctn id="3"/><link:ctn id="switch"/><link:ctn id="2"/>
+     <link_ctn id="2"/><link_ctn id="switch"/><link_ctn id="3"/>
    </route>
  </AS>
  </platform>