kill some dupplicate routes: now that we issue a warning, it breaks all tesh files

diff --git a/examples/msg/icomms/small_platform.xml b/examples/msg/icomms/small_platform.xml
index ff4da7f..1455f4c 100644 (file)
--- a/examples/msg/icomms/small_platform.xml
+++ b/examples/msg/icomms/small_platform.xml
@@ -11,10 +11,7 @@
    <link id="2" bandwidth="498000000" latency="0.00015" sharing_policy="FATPIPE"/>
    <link id="3" bandwidth="498000000" latency="0.00015" sharing_policy="FATPIPE"/>
    <route src="Tremblay" dst="Ruby"><link_ctn id="1"/></route>
-   <route src="Ruby" dst="Tremblay"><link_ctn id="1"/></route>
    <route src="Tremblay" dst="Perl"><link_ctn id="2"/></route>
-   <route src="Perl" dst="Tremblay"><link_ctn id="2"/></route>
    <route src="Tremblay" dst="Java"><link_ctn id="3"/></route>
-   <route src="Java" dst="Tremblay"><link_ctn id="3"/></route>
  </AS>
  </platform>

diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml
index eb81def..210e3e7 100644 (file)
--- a/examples/msg/mc/platform.xml
+++ b/examples/msg/mc/platform.xml
@@ -10,11 +10,8 @@
    <link id="2" bandwidth="3430125" latency="0.000536941"/>
    <link id="3" bandwidth="3430125" latency="0.000536941"/>
    <route src="HostA" dst="HostB"><link_ctn id="1"/></route>
-   <route src="HostB" dst="HostA"><link_ctn id="1"/></route>
    <route src="HostA" dst="HostC"><link_ctn id="2"/></route>
-   <route src="HostC" dst="HostA"><link_ctn id="2"/></route>
    <route src="HostA" dst="HostD"><link_ctn id="3"/></route>
-   <route src="HostD" dst="HostA"><link_ctn id="3"/></route>
  </AS>
  </platform>
  

diff --git a/examples/msg/parallel_task/test_ptask_platform.xml b/examples/msg/parallel_task/test_ptask_platform.xml
index a781d8d..6132794 100644 (file)
--- a/examples/msg/parallel_task/test_ptask_platform.xml
+++ b/examples/msg/parallel_task/test_ptask_platform.xml
@@ -26,32 +26,14 @@
    <route src="Tremblay" dst="Ginette">
      <link_ctn id="0"/><link_ctn id="switch"/><link_ctn id="3"/>
    </route>
-   <route src="Jupiter" dst="Tremblay">
-     <link_ctn id="1"/><link_ctn id="switch"/><link_ctn id="0"/>
-   </route>
    <route src="Jupiter" dst="Fafard">
      <link_ctn id="1"/><link_ctn id="switch"/><link_ctn id="2"/>
    </route>
    <route src="Jupiter" dst="Ginette">
      <link_ctn id="1"/><link_ctn id="switch"/><link_ctn id="3"/>
    </route>
-   <route src="Fafard" dst="Tremblay">
-     <link_ctn id="2"/><link_ctn id="switch"/><link_ctn id="0"/>
-   </route>
-   <route src="Fafard" dst="Jupiter">
-     <link_ctn id="2"/><link_ctn id="switch"/><link_ctn id="1"/>
-   </route>
    <route src="Fafard" dst="Ginette">
      <link_ctn id="2"/><link_ctn id="switch"/><link_ctn id="3"/>
    </route>
-   <route src="Ginette" dst="Tremblay">
-     <link_ctn id="3"/><link_ctn id="switch"/><link_ctn id="0"/>
-   </route>
-   <route src="Ginette" dst="Jupiter">
-     <link_ctn id="3"/><link_ctn id="switch"/><link_ctn id="1"/>
-   </route>
-   <route src="Ginette" dst="Fafard">
-     <link_ctn id="3"/><link_ctn id="switch"/><link_ctn id="2"/>
-   </route>
  </AS>
  </platform>

diff --git a/examples/msg/sendrecv/platform_sendrecv.xml b/examples/msg/sendrecv/platform_sendrecv.xml
index fa0eaff..82ba2f9 100644 (file)
--- a/examples/msg/sendrecv/platform_sendrecv.xml
+++ b/examples/msg/sendrecv/platform_sendrecv.xml
@@ -9,8 +9,5 @@
    <route src="Inmos" dst="Bellevue">
      <link_ctn id="link"/>
    </route>
-   <route src="Bellevue" dst="Inmos">
-     <link_ctn id="link"/>
-   </route>
  </AS>
  </platform>

diff --git a/examples/msg/small_platform.xml b/examples/msg/small_platform.xml
index badfb92..9823e34 100644 (file)
--- a/examples/msg/small_platform.xml
+++ b/examples/msg/small_platform.xml
@@ -39,9 +39,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>
@@ -51,41 +48,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/msg/small_platform_with_failures.xml b/examples/msg/small_platform_with_failures.xml
index 20daa3f..aae7507 100644 (file)
--- a/examples/msg/small_platform_with_failures.xml
+++ b/examples/msg/small_platform_with_failures.xml
@@ -40,9 +40,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>
@@ -52,41 +49,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/msg/small_platform_with_routers.xml b/examples/msg/small_platform_with_routers.xml
index b1b4532..fc3233f 100644 (file)
--- a/examples/msg/small_platform_with_routers.xml
+++ b/examples/msg/small_platform_with_routers.xml
@@ -55,9 +55,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>
@@ -67,41 +64,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/teshsuite/simdag/network/platform_2p_1sl.xml b/teshsuite/simdag/network/platform_2p_1sl.xml
index 1895fb1..e91239b 100644 (file)
--- a/teshsuite/simdag/network/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/platform_2p_1sl.xml
@@ -13,8 +13,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/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml
index 8239beb..fc0bde9 100644 (file)
--- a/teshsuite/simdag/partask/platform_2p_1sl.xml
+++ b/teshsuite/simdag/partask/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>