X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e0de15ba970f2aa894e5f4d2b3c6df863957768..b1d63a0675cd3977c8da862007ba8461ca10db88:/examples/platforms/simulacrum_7_hosts.xml

diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml
index c5ba991d25..6563df4ab4 100644
--- a/examples/platforms/simulacrum_7_hosts.xml
+++ b/examples/platforms/simulacrum_7_hosts.xml
@@ -1,28 +1,26 @@
 <?xml version='1.0'?>
-
-<!-- This is a random platform, generated with Simulacrum. 
-        http://pda.gforge.inria.fr/tools/download.html     
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+<!-- This is a random platform, generated with Simulacrum.
+        http://pda.gforge.inria.fr/tools/download.html
      Unfortunately, the generation parameters were lost with the years. -->
 
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
   <AS  id="AS0" routing="Full">
-    <host id="Host 26" power="3.300140519709234Gf"/>
-    <host id="Host 27" power="3.867398877553016Gf"/>
-    <host id="Host 28" power="1.6522665718098645Gf"/>
-    <host id="Host 29" power="1.0759376792481766Gf"/>
-    <host id="Host 30" power="2.4818410475340424Gf"/>
-    <host id="Host 31" power="1.773869555571436Gf"/>
-    <host id="Host 32" power="1.7843609176927505Gf"/>
-    
+    <host id="Host 26" speed="3.300140519709234Gf"/>
+    <host id="Host 27" speed="3.867398877553016Gf"/>
+    <host id="Host 28" speed="1.6522665718098645Gf"/>
+    <host id="Host 29" speed="1.0759376792481766Gf"/>
+    <host id="Host 30" speed="2.4818410475340424Gf"/>
+    <host id="Host 31" speed="1.773869555571436Gf"/>
+    <host id="Host 32" speed="1.7843609176927505Gf"/>
+
     <link id="l152" bandwidth="125MBps" latency="100us"/>
     <link id="l153" bandwidth="125MBps" latency="100us"/>
     <link id="l154" bandwidth="125MBps" latency="100us"/>
     <link id="l155" bandwidth="125MBps" latency="100us"/>
     <link id="l156" bandwidth="125MBps" latency="100us"/>
     <link id="l157" bandwidth="125MBps" latency="100us"/>
-    <link id="l159" bandwidth="125MBps" latency="100us"
-	  bandwidth_file="trace/linkBandwidth7.bw"/>
+    <link id="l159" bandwidth="125MBps" latency="100us" bandwidth_file="trace/linkBandwidth7.bw"/>
     <link id="l160" bandwidth="125MBps" latency="100us"/>
     <link id="l161" bandwidth="125MBps" latency="100us"/>
     <link id="l162" bandwidth="125MBps" latency="100us"/>
@@ -37,70 +35,28 @@
     <link id="l171" bandwidth="125MBps" latency="100us"/>
     <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>