Kill more duplicate routes in platform files.

diff --git a/examples/lua/multi_matrix/quicksort_platform.xml b/examples/lua/multi_matrix/quicksort_platform.xml
index 1267916..3bf658f 100644 (file)
--- a/examples/lua/multi_matrix/quicksort_platform.xml
+++ b/examples/lua/multi_matrix/quicksort_platform.xml
@@ -40,9 +40,6 @@
    <route src="Inmos" dst="Bourassa">
      <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Bellevue" dst="Inmos">
-     <link_ctn id="9"/>
-   </route>
    <route src="Bellevue" dst="Fafard">
      <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
    </route>
@@ -52,41 +49,14 @@
    <route src="Bellevue" dst="Bourassa">
      <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Fafard" dst="Inmos">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Fafard" dst="Bellevue">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
    <route src="Fafard" dst="Ginette">
      <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
    </route>
    <route src="Fafard" dst="Bourassa">
      <link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Ginette" dst="Inmos">
-     <link_ctn id="5"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Ginette" dst="Bellevue">
-     <link_ctn id="5"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Ginette" dst="Fafard">
-     <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
-   </route>
    <route src="Ginette" dst="Bourassa">
      <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Bourassa" dst="Inmos">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Bourassa" dst="Bellevue">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Bourassa" dst="Fafard">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="8"/>
-   </route>
-   <route src="Bourassa" dst="Ginette">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
-   </route>
  </AS>
  </platform>

diff --git a/examples/msg/token_ring/two_clusters.xml b/examples/msg/token_ring/two_clusters.xml
index 271e660..0260611 100644 (file)
--- a/examples/msg/token_ring/two_clusters.xml
+++ b/examples/msg/token_ring/two_clusters.xml
@@ -19,12 +19,6 @@
         gw_dst="alicealice_cluster_router.crepe.fr">
                <link_ctn id="backbone"/>
      </ASroute>
-        
-     <ASroute src="alice_cluster" dst="bob_cluster" 
-        gw_src="alicealice_cluster_router.crepe.fr" 
-        gw_dst="bobbob_cluster_router.hamburger.edu">
-               <link_ctn id="backbone"/>
-     </ASroute>   
      
  </AS>
  </platform>

diff --git a/examples/msg/tracing/platform.xml b/examples/msg/tracing/platform.xml
index 4b72f54..81a1d91 100644 (file)
--- a/examples/msg/tracing/platform.xml
+++ b/examples/msg/tracing/platform.xml
@@ -29,9 +29,6 @@
    <route src="Tremblay" dst="Bourassa">
      <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Jupiter" dst="Tremblay">
-     <link_ctn id="9"/>
-   </route>
    <route src="Jupiter" dst="Fafard">
      <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
    </route>
@@ -41,41 +38,14 @@
    <route src="Jupiter" dst="Bourassa">
      <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Fafard" dst="Tremblay">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Fafard" dst="Jupiter">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
    <route src="Fafard" dst="Ginette">
      <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
    </route>
    <route src="Fafard" dst="Bourassa">
      <link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Ginette" dst="Tremblay">
-     <link_ctn id="5"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Ginette" dst="Jupiter">
-     <link_ctn id="5"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Ginette" dst="Fafard">
-     <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
-   </route>
    <route src="Ginette" dst="Bourassa">
      <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
-   <route src="Bourassa" dst="Tremblay">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Bourassa" dst="Jupiter">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Bourassa" dst="Fafard">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="8"/>
-   </route>
-   <route src="Bourassa" dst="Ginette">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
-   </route>
  </AS>
  </platform>

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index 7f08d78..7c7d356 100644 (file)
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -27,6 +27,5 @@
      <prop id="type" value="ethernet"/>
    </link>
    <route src="host1" dst="host2"><link_ctn id="l1"/><link_ctn id="l2"/></route>
-   <route src="host2" dst="host1"><link_ctn id="l2"/><link_ctn id="l1"/></route>
  </AS>
  </platform>

diff --git a/examples/simdag/2clusters.xml b/examples/simdag/2clusters.xml
index 970f917..50d3651 100644 (file)
--- a/examples/simdag/2clusters.xml
+++ b/examples/simdag/2clusters.xml
@@ -36,7 +36,6 @@
    <route src="C2-06" dst="C1-04"><link_ctn id="6"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C2-06" dst="C1-00"><link_ctn id="6"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C2-06" dst="C2-05"><link_ctn id="6"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C1-03" dst="C2-06"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
    <route src="C1-03" dst="C2-07"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
    <route src="C1-03" dst="C2-09"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
    <route src="C1-03" dst="C1-02"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
@@ -45,8 +44,6 @@
    <route src="C1-03" dst="C1-04"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C1-03" dst="C1-00"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C1-03" dst="C2-05"><link_ctn id="3"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C2-07" dst="C2-06"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C2-07" dst="C1-03"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
    <route src="C2-07" dst="C2-09"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
    <route src="C2-07" dst="C1-02"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
    <route src="C2-07" dst="C2-08"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
@@ -54,68 +51,26 @@
    <route src="C2-07" dst="C1-04"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C2-07" dst="C1-00"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C2-07" dst="C2-05"><link_ctn id="7"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C2-09" dst="C2-06"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C2-09" dst="C1-03"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C2-09" dst="C2-07"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
    <route src="C2-09" dst="C1-02"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
    <route src="C2-09" dst="C2-08"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
    <route src="C2-09" dst="C1-01"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="1"/>  </route>
    <route src="C2-09" dst="C1-04"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C2-09" dst="C1-00"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C2-09" dst="C2-05"><link_ctn id="9"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C1-02" dst="C2-06"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C1-02" dst="C1-03"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C1-02" dst="C2-07"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
-   <route src="C1-02" dst="C2-09"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
    <route src="C1-02" dst="C2-08"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
    <route src="C1-02" dst="C1-01"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="1"/>  </route>
    <route src="C1-02" dst="C1-04"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C1-02" dst="C1-00"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C1-02" dst="C2-05"><link_ctn id="2"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C2-08" dst="C2-06"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C2-08" dst="C1-03"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C2-08" dst="C2-07"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
-   <route src="C2-08" dst="C2-09"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
-   <route src="C2-08" dst="C1-02"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
    <route src="C2-08" dst="C1-01"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="1"/>  </route>
    <route src="C2-08" dst="C1-04"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C2-08" dst="C1-00"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C2-08" dst="C2-05"><link_ctn id="8"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C1-01" dst="C2-06"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C1-01" dst="C1-03"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C1-01" dst="C2-07"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
-   <route src="C1-01" dst="C2-09"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
-   <route src="C1-01" dst="C1-02"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
-   <route src="C1-01" dst="C2-08"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
    <route src="C1-01" dst="C1-04"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C1-01" dst="C1-00"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C1-01" dst="C2-05"><link_ctn id="1"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C1-04" dst="C2-06"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C1-04" dst="C1-03"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C1-04" dst="C2-07"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
-   <route src="C1-04" dst="C2-09"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
-   <route src="C1-04" dst="C1-02"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
-   <route src="C1-04" dst="C2-08"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
-   <route src="C1-04" dst="C1-01"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="1"/>  </route>
    <route src="C1-04" dst="C1-00"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
    <route src="C1-04" dst="C2-05"><link_ctn id="4"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C1-00" dst="C2-06"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C1-00" dst="C1-03"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C1-00" dst="C2-07"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
-   <route src="C1-00" dst="C2-09"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
-   <route src="C1-00" dst="C1-02"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
-   <route src="C1-00" dst="C2-08"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
-   <route src="C1-00" dst="C1-01"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="1"/>  </route>
-   <route src="C1-00" dst="C1-04"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
    <route src="C1-00" dst="C2-05"><link_ctn id="0"/><link_ctn id="10"/><link_ctn id="12"/><link_ctn id="14"/><link_ctn id="13"/><link_ctn id="11"/><link_ctn id="5"/>  </route>
-   <route src="C2-05" dst="C2-06"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="6"/>  </route>
-   <route src="C2-05" dst="C1-03"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="3"/>  </route>
-   <route src="C2-05" dst="C2-07"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="7"/>  </route>
-   <route src="C2-05" dst="C2-09"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="9"/>  </route>
-   <route src="C2-05" dst="C1-02"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="2"/>  </route>
-   <route src="C2-05" dst="C2-08"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="8"/>  </route>
-   <route src="C2-05" dst="C1-01"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="1"/>  </route>
-   <route src="C2-05" dst="C1-04"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="4"/>  </route>
-   <route src="C2-05" dst="C1-00"><link_ctn id="5"/><link_ctn id="11"/><link_ctn id="13"/><link_ctn id="14"/><link_ctn id="12"/><link_ctn id="10"/><link_ctn id="0"/>  </route>
  </AS>
  </platform>

diff --git a/examples/simdag/scheduling/simulacrum_7_hosts.xml b/examples/simdag/scheduling/simulacrum_7_hosts.xml
index 7a863db..dc979c2 100644 (file)
--- a/examples/simdag/scheduling/simulacrum_7_hosts.xml
+++ b/examples/simdag/scheduling/simulacrum_7_hosts.xml
@@ -61,10 +61,6 @@
      <link_ctn id="l169"/>
    </route>
  
-   <route src="Host 27" dst="Host 26">
-     <link_ctn id="l155"/>
-   </route>
- 
    <route src="Host 27" dst="Host 28">
      <link_ctn id="l154"/>
      <link_ctn id="l156"/>
@@ -87,17 +83,6 @@
      <link_ctn id="l170"/>
    </route>
  
-   <route src="Host 28" dst="Host 26">
-     <link_ctn id="l156"/>
-     <link_ctn id="l154"/>
-     <link_ctn id="l155"/>
-   </route>
- 
-   <route src="Host 28" dst="Host 27">
-     <link_ctn id="l156"/>
-     <link_ctn id="l154"/>
-   </route>
- 
    <route src="Host 28" dst="Host 29">
      <link_ctn id="l160"/>
    </route>
@@ -116,19 +101,6 @@
      <link_ctn id="l170"/>
    </route>
  
-   <route src="Host 29" dst="Host 26">
-     <link_ctn id="l157"/>
-     <link_ctn id="l152"/>
-   </route>
- 
-   <route src="Host 29" dst="Host 27">
-     <link_ctn id="l159"/>
-   </route>
- 
-   <route src="Host 29" dst="Host 28">
-     <link_ctn id="l160"/>
-   </route>
- 
    <route src="Host 29" dst="Host 30">
      <link_ctn id="l164"/>
    </route>
@@ -142,23 +114,6 @@
      <link_ctn id="l171"/>
    </route>
  
-   <route src="Host 30" dst="Host 26">
-     <link_ctn id="l161"/>
-     <link_ctn id="l152"/>
-   </route>
- 
-   <route src="Host 30" dst="Host 27">
-     <link_ctn id="l162"/>
-   </route>
- 
-   <route src="Host 30" dst="Host 28">
-     <link_ctn id="l163"/>
-   </route>
- 
-   <route src="Host 30" dst="Host 29">
-     <link_ctn id="l164"/>
-   </route>
- 
    <route src="Host 30" dst="Host 31">
      <link_ctn id="l168"/>
    </route>
@@ -167,59 +122,10 @@
      <link_ctn id="l172"/>
    </route>
  
-   <route src="Host 31" dst="Host 26">
-     <link_ctn id="l166"/>
-   </route>
- 
-   <route src="Host 31" dst="Host 27">
-     <link_ctn id="l167"/>
-   </route>
- 
-   <route src="Host 31" dst="Host 28">
-     <link_ctn id="l168"/>
-     <link_ctn id="l163"/>
-   </route>
- 
-   <route src="Host 31" dst="Host 29">
-     <link_ctn id="l167"/>
-     <link_ctn id="l159"/>
-   </route>
- 
-   <route src="Host 31" dst="Host 30">
-     <link_ctn id="l168"/>
-   </route>
- 
    <route src="Host 31" dst="Host 32">
      <link_ctn id="l173"/>
    </route>
  
-   <route src="Host 32" dst="Host 26">
-     <link_ctn id="l169"/>
-     <link_ctn id="l152"/>
-   </route>
- 
-   <route src="Host 32" dst="Host 27">
-     <link_ctn id="l170"/>
-     <link_ctn id="l154"/>
-   </route>
- 
-   <route src="Host 32" dst="Host 28">
-     <link_ctn id="l170"/>
-     <link_ctn id="l156"/>
-   </route>
- 
-   <route src="Host 32" dst="Host 29">
-     <link_ctn id="l171"/>
-   </route>
- 
-   <route src="Host 32" dst="Host 30">
-     <link_ctn id="l172"/>
-   </route>
- 
-   <route src="Host 32" dst="Host 31">
-     <link_ctn id="l173"/>
-   </route>
- 
  </AS>
  </platform>
  

diff --git a/teshsuite/simdag/basic_platform.xml b/teshsuite/simdag/basic_platform.xml
index 8f548e8..e43a89e 100644 (file)
--- a/teshsuite/simdag/basic_platform.xml
+++ b/teshsuite/simdag/basic_platform.xml
@@ -13,9 +13,6 @@
    <route src="cpu0" dst="cpu1">
      <link_ctn id="link0"/>
    </route>
-   <route src="cpu1" dst="cpu0">
-     <link_ctn id="link0"/>
-   </route>
    <route src="cpu1" dst="cpu1">
      <link_ctn id="link0"/>
    </route>

diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
index 52b81c5..c4f0d55 100644 (file)
--- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
+++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
@@ -33,12 +33,6 @@
      <link_ctn id="link3"/>
    </route>
  
-   <route src="cpu1" dst="cpu0">
-     <link_ctn id="link1"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link0"/>
-   </route>
- 
    <route src="cpu1" dst="cpu2">
      <link_ctn id="link1"/>
      <link_ctn id="switch"/>
@@ -51,41 +45,11 @@
      <link_ctn id="link3"/>
    </route>
    
-   <route src="cpu2" dst="cpu0">
-     <link_ctn id="link2"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link0"/>
-   </route>
- 
-   <route src="cpu2" dst="cpu1">
-     <link_ctn id="link2"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link1"/>
-   </route>
- 
    <route src="cpu2" dst="cpu3">
      <link_ctn id="link2"/>
      <link_ctn id="switch"/>
      <link_ctn id="link3"/>
    </route>
  
-   <route src="cpu3" dst="cpu0">
-     <link_ctn id="link3"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link0"/>
-   </route>
- 
-   <route src="cpu3" dst="cpu1">
-     <link_ctn id="link3"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link1"/>
-   </route>
- 
-   <route src="cpu3" dst="cpu2">
-     <link_ctn id="link3"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link2"/>
-   </route>
-   
  </AS>
  </platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
index 5ed486a..072a417 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
@@ -21,9 +21,5 @@
                <link_ctn id="link0" />
        </route>
        
-       <route src="cpu1" dst="cpu0">
-               <link_ctn id="link0" />
-       </route>
-       
  </AS>
  </platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
index 6fb0eed..d6eeccb 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
@@ -10,8 +10,5 @@
    <route src="cpu0" dst="cpu1">
      <link_ctn id="link0"/>
    </route>
-   <route src="cpu1" dst="cpu0">
-     <link_ctn id="link0"/>
-   </route>
  </AS>
  </platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
index 8239beb..fc0bde9 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
@@ -10,8 +10,5 @@
    <route src="cpu0" dst="cpu1">
      <link_ctn id="link0"/>
    </route>
-   <route src="cpu1" dst="cpu0">
-     <link_ctn id="link0"/>
-   </route>
  </AS>
  </platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
index 540266a..a722639 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
@@ -17,11 +17,5 @@
      <link_ctn id="link1"/>
    </route>
    
-   <route src="cpu1" dst="cpu0">
-     <link_ctn id="link1"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link0"/>
-   </route>
-   
  </AS>
  </platform>

diff --git a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
index aa418b3..185871a 100644 (file)
--- a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
+++ b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
@@ -11,8 +11,5 @@
        <route src="cpu0" dst="cpu1">
                <link_ctn id="link0" />
        </route>
-       <route src="cpu1" dst="cpu0">
-               <link_ctn id="link0" />
-       </route>
  </AS>
  </platform>

diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml
index 271e660..0260611 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -19,12 +19,6 @@
         gw_dst="alicealice_cluster_router.crepe.fr">
                <link_ctn id="backbone"/>
      </ASroute>
-        
-     <ASroute src="alice_cluster" dst="bob_cluster" 
-        gw_src="alicealice_cluster_router.crepe.fr" 
-        gw_dst="bobbob_cluster_router.hamburger.edu">
-               <link_ctn id="backbone"/>
-     </ASroute>   
      
  </AS>
  </platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
index 1ba5d7a..c92e9ba 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
+++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
@@ -15,11 +15,5 @@
      <link_ctn id="switch"/>
      <link_ctn id="link_alice"/>
    </route>
- 
-   <route src="alice" dst="bob">
-     <link_ctn id="link_alice"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link_bob"/>
-   </route>
  </AS>
  </platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml
index edec521..fd22b5f 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_one_link.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml
@@ -10,10 +10,5 @@
    <route src="bob" dst="alice">
      <link_ctn id="link1"/>
    </route>
-   
-   <route src="alice" dst="bob">
-     <link_ctn id="link1"/>
-   </route>
-
  </AS>
  </platform>