Comply with "recent" DTD modifications (i.e. routers come before routes).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5984 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/gtnets/r-n200-f50-s4-2-p.xml b/examples/msg/gtnets/r-n200-f50-s4-2-p.xml
index c12a2ff..f47fb31 100644 (file)
--- a/examples/msg/gtnets/r-n200-f50-s4-2-p.xml
+++ b/examples/msg/gtnets/r-n200-f50-s4-2-p.xml
@@ -571,6 +571,120 @@
   <router id="R88"/>
   <router id="R150"/>
   <router id="R147"/>
+  <router id="R174"/>
+  <router id="R138"/>
+  <router id="R39"/>
+  <router id="R163"/>
+  <router id="R10"/>
+  <router id="R5"/>
+  <router id="R116"/>
+  <router id="R113"/>
+  <router id="R162"/>
+  <router id="R9"/>
+  <router id="R30"/>
+  <router id="R123"/>
+  <router id="R122"/>
+  <router id="R73"/>
+  <router id="R199"/>
+  <router id="R23"/>
+  <router id="R35"/>
+  <router id="R19"/>
+  <router id="R161"/>
+  <router id="R99"/>
+  <router id="R196"/>
+  <router id="R142"/>
+  <router id="R100"/>
+  <router id="R192"/>
+  <router id="R188"/>
+  <router id="R121"/>
+  <router id="R184"/>
+  <router id="R140"/>
+  <router id="R160"/>
+  <router id="R86"/>
+  <router id="R93"/>
+  <router id="R134"/>
+  <router id="R106"/>
+  <router id="R63"/>
+  <router id="R37"/>
+  <router id="R168"/>
+  <router id="R38"/>
+  <router id="R28"/>
+  <router id="R177"/>
+  <router id="R145"/>
+  <router id="R157"/>
+  <router id="R118"/>
+  <router id="R112"/>
+  <router id="R40"/>
+  <router id="R133"/>
+  <router id="R115"/>
+  <router id="R141"/>
+  <router id="R31"/>
+  <router id="R197"/>
+  <router id="R129"/>
+  <router id="R96"/>
+  <router id="R170"/>
+  <router id="R7"/>
+  <router id="R117"/>
+  <router id="R4"/>
+  <router id="R94"/>
+  <router id="R32"/>
+  <router id="R98"/>
+  <router id="R71"/>
+  <router id="R178"/>
+  <router id="R149"/>
+  <router id="R190"/>
+  <router id="R0"/>
+  <router id="R176"/>
+  <router id="R6"/>
+  <router id="R43"/>
+  <router id="R172"/>
+  <router id="R34"/>
+  <router id="R95"/>
+  <router id="R125"/>
+  <router id="R78"/>
+  <router id="R59"/>
+  <router id="R124"/>
+  <router id="R103"/>
+  <router id="R45"/>
+  <router id="R152"/>
+  <router id="R108"/>
+  <router id="R169"/>
+  <router id="R186"/>
+  <router id="R109"/>
+  <router id="R24"/>
+  <router id="R153"/>
+  <router id="R159"/>
+  <router id="R104"/>
+  <router id="R53"/>
+  <router id="R102"/>
+  <router id="R89"/>
+  <router id="R110"/>
+  <router id="R107"/>
+  <router id="R82"/>
+  <router id="R64"/>
+  <router id="R151"/>
+  <router id="R119"/>
+  <router id="R143"/>
+  <router id="R80"/>
+  <router id="R187"/>
+  <router id="R137"/>
+  <router id="R50"/>
+  <router id="R185"/>
+  <router id="R79"/>
+  <router id="R72"/>
+  <router id="R21"/>
+  <router id="R48"/>
+  <router id="R11"/>
+  <router id="R75"/>
+  <router id="R12"/>
+  <router id="R14"/>
+  <router id="R68"/>
+  <router id="R194"/>
+  <router id="R84"/>
+  <router id="R92"/>
+  <router id="R130"/>
+  <router id="R126"/>
+  <router id="R132"/>
   <route src="S1" dst="C1">
      <link:ctn id="458"/>
      <link:ctn id="362"/>
@@ -605,11 +719,6 @@
   <route src="R147" dst="C1">
      <link:ctn id="446"/>
   </route>
-  <router id="R174"/>
-  <router id="R138"/>
-  <router id="R39"/>
-  <router id="R163"/>
-  <router id="R10"/>
   <route src="S2" dst="C2">
      <link:ctn id="455"/>
      <link:ctn id="348"/>
@@ -636,14 +745,6 @@
   <route src="R10" dst="C2">
      <link:ctn id="405"/>
   </route>
-  <router id="R5"/>
-  <router id="R116"/>
-  <router id="R113"/>
-  <router id="R162"/>
-  <router id="R9"/>
-  <router id="R30"/>
-  <router id="R123"/>
-  <router id="R122"/>
   <route src="S3" dst="C3">
      <link:ctn id="401"/>
      <link:ctn id="10"/>
@@ -682,11 +783,6 @@
   <route src="R122" dst="C3">
      <link:ctn id="440"/>
   </route>
-  <router id="R73"/>
-  <router id="R199"/>
-  <router id="R23"/>
-  <router id="R35"/>
-  <router id="R19"/>
   <route src="S4" dst="C4">
      <link:ctn id="423"/>
      <link:ctn id="147"/>
@@ -713,9 +809,6 @@
   <route src="R19" dst="C4">
      <link:ctn id="408"/>
   </route>
-  <router id="R161"/>
-  <router id="R99"/>
-  <router id="R196"/>
   <route src="S5" dst="C5">
      <link:ctn id="450"/>
      <link:ctn id="322"/>
@@ -740,10 +833,6 @@
   <route src="R44" dst="C5">
      <link:ctn id="409"/>
   </route>
-  <router id="R142"/>
-  <router id="R100"/>
-  <router id="R192"/>
-  <router id="R188"/>
   <route src="S6" dst="C6">
      <link:ctn id="458"/>
      <link:ctn id="362"/>
@@ -771,13 +860,6 @@
   <route src="R188" dst="C6">
      <link:ctn id="460"/>
   </route>
-  <router id="R121"/>
-  <router id="R184"/>
-  <router id="R140"/>
-  <router id="R160"/>
-  <router id="R86"/>
-  <router id="R93"/>
-  <router id="R134"/>
   <route src="S7" dst="C7">
      <link:ctn id="439"/>
      <link:ctn id="243"/>
@@ -812,9 +894,6 @@
   <route src="R134" dst="C7">
      <link:ctn id="445"/>
   </route>
-  <router id="R106"/>
-  <router id="R63"/>
-  <router id="R37"/>
   <route src="S8" dst="C8">
      <link:ctn id="430"/>
      <link:ctn id="212"/>
@@ -839,10 +918,6 @@
   <route src="R174" dst="C8">
      <link:ctn id="455"/>
   </route>
-  <router id="R168"/>
-  <router id="R38"/>
-  <router id="R28"/>
-  <router id="R177"/>
   <route src="S9" dst="C9">
      <link:ctn id="455"/>
      <link:ctn id="349"/>
@@ -869,10 +944,6 @@
   <route src="R177" dst="C9">
      <link:ctn id="457"/>
   </route>
-  <router id="R145"/>
-  <router id="R157"/>
-  <router id="R118"/>
-  <router id="R112"/>
   <route src="S10" dst="C10">
      <link:ctn id="440"/>
      <link:ctn id="244"/>
@@ -903,8 +974,6 @@
   <route src="R112" dst="C10">
      <link:ctn id="436"/>
   </route>
-  <router id="R40"/>
-  <router id="R133"/>
   <route src="S11" dst="C11">
      <link:ctn id="450"/>
      <link:ctn id="322"/>
@@ -926,10 +995,6 @@
   <route src="R133" dst="C11">
      <link:ctn id="444"/>
   </route>
-  <router id="R115"/>
-  <router id="R141"/>
-  <router id="R31"/>
-  <router id="R197"/>
   <route src="S12" dst="C12">
      <link:ctn id="438"/>
      <link:ctn id="230"/>
@@ -960,9 +1025,6 @@
   <route src="R197" dst="C12">
      <link:ctn id="462"/>
   </route>
-  <router id="R129"/>
-  <router id="R96"/>
-  <router id="R170"/>
   <route src="S13" dst="C13">
      <link:ctn id="442"/>
      <link:ctn id="259"/>
@@ -985,9 +1047,6 @@
   <route src="R170" dst="C13">
      <link:ctn id="452"/>
   </route>
-  <router id="R7"/>
-  <router id="R117"/>
-  <router id="R4"/>
   <route src="S14" dst="C14">
      <link:ctn id="403"/>
      <link:ctn id="14"/>
@@ -1014,10 +1073,6 @@
   <route src="R4" dst="C14">
      <link:ctn id="400"/>
   </route>
-  <router id="R94"/>
-  <router id="R32"/>
-  <router id="R98"/>
-  <router id="R71"/>
   <route src="S15" dst="C15">
      <link:ctn id="455"/>
      <link:ctn id="349"/>
@@ -1062,9 +1117,6 @@
   <route src="R44" dst="C16">
      <link:ctn id="409"/>
   </route>
-  <router id="R178"/>
-  <router id="R149"/>
-  <router id="R190"/>
   <route src="S17" dst="C17">
      <link:ctn id="438"/>
      <link:ctn id="230"/>
@@ -1090,8 +1142,6 @@
   <route src="R190" dst="C17">
      <link:ctn id="461"/>
   </route>
-  <router id="R0"/>
-  <router id="R176"/>
   <route src="S18" dst="C18">
      <link:ctn id="438"/>
      <link:ctn id="230"/>
@@ -1115,8 +1165,6 @@
   <route src="R176" dst="C18">
      <link:ctn id="456"/>
   </route>
-  <router id="R6"/>
-  <router id="R43"/>
   <route src="S19" dst="C19">
      <link:ctn id="402"/>
      <link:ctn id="12"/>
@@ -1144,10 +1192,6 @@
   <route src="R147" dst="C19">
      <link:ctn id="446"/>
   </route>
-  <router id="R172"/>
-  <router id="R34"/>
-  <router id="R95"/>
-  <router id="R125"/>
   <route src="S20" dst="C20">
      <link:ctn id="453"/>
      <link:ctn id="345"/>
@@ -1178,12 +1222,6 @@
   <route src="R106" dst="C20">
      <link:ctn id="430"/>
   </route>
-  <router id="R78"/>
-  <router id="R59"/>
-  <router id="R124"/>
-  <router id="R103"/>
-  <router id="R45"/>
-  <router id="R152"/>
   <route src="S21" dst="C21">
      <link:ctn id="408"/>
      <link:ctn id="39"/>
@@ -1235,7 +1273,6 @@
   <route src="R181" dst="C22">
      <link:ctn id="458"/>
   </route>
-  <router id="R108"/>
   <route src="S23" dst="C23">
      <link:ctn id="423"/>
      <link:ctn id="146"/>
@@ -1259,7 +1296,6 @@
   <route src="R108" dst="C23">
      <link:ctn id="432"/>
   </route>
-  <router id="R169"/>
   <route src="S24" dst="C24">
      <link:ctn id="440"/>
      <link:ctn id="244"/>
@@ -1280,7 +1316,6 @@
   <route src="R169" dst="C24">
      <link:ctn id="451"/>
   </route>
-  <router id="R186"/>
   <route src="S25" dst="C25">
      <link:ctn id="442"/>
      <link:ctn id="259"/>
@@ -1304,8 +1339,6 @@
   <route src="R134" dst="C25">
      <link:ctn id="445"/>
   </route>
-  <router id="R109"/>
-  <router id="R24"/>
   <route src="S26" dst="C26">
      <link:ctn id="433"/>
      <link:ctn id="219"/>
@@ -1332,8 +1365,6 @@
   <route src="R108" dst="C26">
      <link:ctn id="432"/>
   </route>
-  <router id="R153"/>
-  <router id="R159"/>
   <route src="S27" dst="C27">
      <link:ctn id="462"/>
      <link:ctn id="394"/>
@@ -1358,7 +1389,6 @@
   <route src="R134" dst="C27">
      <link:ctn id="445"/>
   </route>
-  <router id="R104"/>
   <route src="S28" dst="C28">
      <link:ctn id="428"/>
      <link:ctn id="209"/>
@@ -1399,10 +1429,6 @@
   <route src="R169" dst="C29">
      <link:ctn id="451"/>
   </route>
-  <router id="R53"/>
-  <router id="R102"/>
-  <router id="R89"/>
-  <router id="R110"/>
   <route src="S30" dst="C30">
      <link:ctn id="415"/>
      <link:ctn id="107"/>
@@ -1430,8 +1456,6 @@
   <route src="R110" dst="C30">
      <link:ctn id="434"/>
   </route>
-  <router id="R107"/>
-  <router id="R82"/>
   <route src="S31" dst="C31">
      <link:ctn id="431"/>
      <link:ctn id="215"/>
@@ -1451,7 +1475,6 @@
   <route src="R177" dst="C31">
      <link:ctn id="457"/>
   </route>
-  <router id="R64"/>
   <route src="S32" dst="C32">
      <link:ctn id="450"/>
      <link:ctn id="322"/>
@@ -1472,9 +1495,6 @@
   <route src="R64" dst="C32">
      <link:ctn id="417"/>
   </route>
-  <router id="R151"/>
-  <router id="R119"/>
-  <router id="R143"/>
   <route src="S33" dst="C33">
      <link:ctn id="448"/>
      <link:ctn id="302"/>
@@ -1498,7 +1518,6 @@
   <route src="R64" dst="C33">
      <link:ctn id="417"/>
   </route>
-  <router id="R80"/>
   <route src="S34" dst="C34">
      <link:ctn id="425"/>
      <link:ctn id="160"/>
@@ -1515,8 +1534,6 @@
   <route src="R44" dst="C34">
      <link:ctn id="409"/>
   </route>
-  <router id="R187"/>
-  <router id="R137"/>
   <route src="S35" dst="C35">
      <link:ctn id="459"/>
      <link:ctn id="374"/>
@@ -1541,9 +1558,6 @@
   <route src="R151" dst="C35">
      <link:ctn id="448"/>
   </route>
-  <router id="R50"/>
-  <router id="R185"/>
-  <router id="R79"/>
   <route src="S36" dst="C36">
      <link:ctn id="412"/>
      <link:ctn id="101"/>
@@ -1586,7 +1600,6 @@
   <route src="R106" dst="C37">
      <link:ctn id="430"/>
   </route>
-  <router id="R72"/>
   <route src="S38" dst="C38">
      <link:ctn id="422"/>
      <link:ctn id="144"/>
@@ -1610,8 +1623,6 @@
   <route src="R7" dst="C38">
      <link:ctn id="403"/>
   </route>
-  <router id="R21"/>
-  <router id="R48"/>
   <route src="S39" dst="C39">
      <link:ctn id="462"/>
      <link:ctn id="395"/>
@@ -1653,7 +1664,6 @@
   <route src="R176" dst="C40">
      <link:ctn id="456"/>
   </route>
-  <router id="R11"/>
   <route src="S41" dst="C41">
      <link:ctn id="450"/>
      <link:ctn id="322"/>
@@ -1688,8 +1698,6 @@
   <route src="R134" dst="C42">
      <link:ctn id="445"/>
   </route>
-  <router id="R75"/>
-  <router id="R12"/>
   <route src="S43" dst="C43">
      <link:ctn id="442"/>
      <link:ctn id="259"/>
@@ -1711,8 +1719,6 @@
   <route src="R12" dst="C43">
      <link:ctn id="407"/>
   </route>
-  <router id="R14"/>
-  <router id="R68"/>
   <route src="S44" dst="C44">
      <link:ctn id="409"/>
      <link:ctn id="89"/>
@@ -1757,8 +1763,6 @@
   <route src="R172" dst="C45">
      <link:ctn id="453"/>
   </route>
-  <router id="R194"/>
-  <router id="R84"/>
   <route src="S46" dst="C46">
      <link:ctn id="451"/>
      <link:ctn id="338"/>
@@ -1825,7 +1829,6 @@
   <route src="R112" dst="C48">
      <link:ctn id="436"/>
   </route>
-  <router id="R92"/>
   <route src="S49" dst="C49">
      <link:ctn id="427"/>
      <link:ctn id="184"/>
@@ -1843,9 +1846,6 @@
   <route src="R187" dst="C49">
      <link:ctn id="459"/>
   </route>
-  <router id="R130"/>
-  <router id="R126"/>
-  <router id="R132"/>
   <route src="S50" dst="C50">
      <link:ctn id="443"/>
      <link:ctn id="261"/>