Merge if statements.

[simgrid.git] / teshsuite / simdag / platforms / four_hosts_floyd.xml

diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml
index b9054e2..eaa710a 100644 (file)
--- a/teshsuite/simdag/platforms/four_hosts_floyd.xml
+++ b/teshsuite/simdag/platforms/four_hosts_floyd.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="Floyd">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Floyd">
     <host id="host1" speed="1Gf"/>
     <host id="host2" speed="1Gf"/>
     <host id="host3" speed="1Gf"/>
@@ -12,9 +12,17 @@
     <link id="link3" bandwidth="125MBps" latency="50us"/>
     <link id="link4" bandwidth="125MBps" latency="50us"/>  
 
-    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
-    <route src="host1" dst="host3"><link_ctn id="link2"/></route>
-    <route src="host2" dst="host3"><link_ctn id="link3"/></route>
-    <route src="host3" dst="host4"><link_ctn id="link4"/></route>
-  </AS>
+    <route src="host1" dst="host2">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="host1" dst="host3">
+      <link_ctn id="link2"/>
+    </route>
+    <route src="host2" dst="host3">
+      <link_ctn id="link3"/>
+    </route>
+    <route src="host3" dst="host4">
+      <link_ctn id="link4"/>
+    </route>
+  </zone>
 </platform>