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 baddb55..eaa710a 100644 (file)
--- a/teshsuite/simdag/platforms/four_hosts_floyd.xml
+++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml
@@ -1,34 +1,28 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- 
- 
- <AS  id="AS0"  routing="Floyd">
-       <host id="host1" speed="1Gf"/>
-       <host id="host2" speed="1Gf"/>
-       <host id="host3" speed="1Gf"/>
-       <host id="host4" speed="1Gf"/>
- 
-       <link id="link1" bandwidth="125MBps" latency="50us"/>
-       <link id="link2" bandwidth="125MBps" latency="50us"/>
-       <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>
+<platform version="4.1">
+  <zone  id="AS0"  routing="Floyd">
+    <host id="host1" speed="1Gf"/>
+    <host id="host2" speed="1Gf"/>
+    <host id="host3" speed="1Gf"/>
+    <host id="host4" speed="1Gf"/>
 
- </AS>
- </platform>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <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>
+  </zone>
+</platform>