I comment all the calls to used_routing, in order to use global routing.

[simgrid.git] / src / surf / simgrid.dtd

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index 7074c55..ab5fb0a 100644 (file)
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -106,12 +106,27 @@
 
 <!-- start added by DAVID -->
 
 
 <!-- start added by DAVID -->
 

-<!ELEMENT AS ((AS|host|gateway|router|link|route)*)>
+<!ELEMENT AS (((AS|link)*,ASroute*)|((host|router|link)*,route*))>
+<!ATTLIST AS id CDATA #REQUIRED>
+<!ATTLIST AS routing CDATA #REQUIRED>
+
+<!--<!ELEMENT route (link:ctn*)>
+<!ATTLIST route src CDATA #REQUIRED>
+<!ATTLIST route dst CDATA #REQUIRED>-->
+
+<!ELEMENT ASroute (link:ctn*)>
+<!ATTLIST ASroute src CDATA #REQUIRED>
+<!ATTLIST ASroute dst CDATA #REQUIRED>
+<!ATTLIST ASroute gw_src CDATA #REQUIRED>
+<!ATTLIST ASroute gw_dst CDATA #REQUIRED>
+
+
+<!--<!ELEMENT AS ((AS|host|gateway|router|link|route)*)>

 <!ATTLIST AS id CDATA #REQUIRED>
 <!ATTLIST AS routing CDATA #REQUIRED>
 
 <!ELEMENT gateway EMPTY>
 <!ATTLIST AS id CDATA #REQUIRED>
 <!ATTLIST AS routing CDATA #REQUIRED>
 
 <!ELEMENT gateway EMPTY>

-<!ATTLIST gateway id CDATA #REQUIRED>
+<!ATTLIST gateway id CDATA #REQUIRED>-->

 
 <!-- 
 
 
 <!--