Dijkstra would have like symmetry too

diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml
index 64b39c8..9e39b06 100644 (file)
--- a/teshsuite/simdag/platforms/Dijkstra.xml
+++ b/teshsuite/simdag/platforms/Dijkstra.xml
@@ -1,32 +1,24 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-
- <AS  id="AS0"  routing="Dijkstra">
-
+ <AS id="AS0" routing="Dijkstra">

    <host id="NODO01" speed="10Mf"/>
    <host id="NODO02" speed="10Mf"/>
    <host id="NODO01" speed="10Mf"/>
    <host id="NODO02" speed="10Mf"/>

-   
-   <router id="ROUTER" />
-   
+
+   <router id="ROUTER"/>
+

    <link id="1" bandwidth="1MBps" latency="1ms"/>
    <link id="2" bandwidth="1MBps" latency="1ms"/>
    <link id="1" bandwidth="1MBps" latency="1ms"/>
    <link id="2" bandwidth="1MBps" latency="1ms"/>

-   
+

    <link id="10" bandwidth="1MBps" latency="1ms"/>
    <link id="11" bandwidth="1MBps" latency="1ms"/>
    <link id="12" bandwidth="1MBps" latency="1ms"/>
    <link id="10" bandwidth="1MBps" latency="1ms"/>
    <link id="11" bandwidth="1MBps" latency="1ms"/>
    <link id="12" bandwidth="1MBps" latency="1ms"/>

-      
-   <route src="NODO01" dst="ROUTER" symmetrical="NO"><link_ctn id="1"/></route>
-   <route src="NODO02" dst="ROUTER" symmetrical="NO"><link_ctn id="2"/></route>
-   
-   <route src="ROUTER" dst="NODO01" symmetrical="NO"><link_ctn id="1"/></route>
-   <route src="ROUTER" dst="NODO02" symmetrical="NO"><link_ctn id="2"/></route>
+
+   <route src="NODO01" dst="ROUTER"><link_ctn id="1"/></route>
+   <route src="NODO02" dst="ROUTER"><link_ctn id="2"/></route>

 
    <route src="NODO01" dst="NODO02" symmetrical="NO">
 
    <route src="NODO01" dst="NODO02" symmetrical="NO">

-       <link_ctn id="10"/>
-       <link_ctn id="11"/>
-       <link_ctn id="12"/>
+     <link_ctn id="10"/><link_ctn id="11"/><link_ctn id="12"/>

    </route>
    </route>

-

  </AS>
 </platform>
  </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
index 58ca334..b293a8a 100644 (file)
--- a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
+++ b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <AS  id="AS0"  routing="Dijkstra">
+  <AS id="AS0" routing="Dijkstra">

     <host id="host1" speed="1Gf"/>
     <host id="host2" speed="1Gf"/>
     <host id="host3" speed="1Gf"/>
     <host id="host1" speed="1Gf"/>
     <host id="host2" speed="1Gf"/>
     <host id="host3" speed="1Gf"/>


@@ -10,11 +10,9 @@
     <link id="link1" bandwidth="125GBps" latency="50us"/>
     <link id="link2" bandwidth="125MBps" latency="5us"/>
     <link id="link3" bandwidth="125kBps" latency="500ns"/>
     <link id="link1" bandwidth="125GBps" latency="50us"/>
     <link id="link2" bandwidth="125MBps" latency="5us"/>
     <link id="link3" bandwidth="125kBps" latency="500ns"/>

-    <link id="link4" bandwidth="125Bps" latency="5ns"/>  
+    <link id="link4" bandwidth="125Bps" latency="5ns"/>

 
 

-    <route src="host1" dst="host2" symmetrical="NO"><link_ctn id="link1"/></route>
-    <route src="host2" dst="host1" symmetrical="NO"><link_ctn id="link1"/></route> 
-    <route src="host1" dst="host3" symmetrical="NO"><link_ctn id="link2"/></route>
-    <route src="host3" dst="host1" symmetrical="NO"><link_ctn id="link2"/></route>
+    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
+    <route src="host1" dst="host3"><link_ctn id="link2"/></route>

   </AS>
 </platform>
   </AS>
 </platform>