Merge branch 'master' of https://github.com/LucasChezToi/ISE

naima-upmc · Feb 18, 2014 · 3a1dfde · 3a1dfde
2 parents 8c680ea + fc43901
commit 3a1dfde
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@ Rendu1/*.log
 Rendu1/*.aux
 Rendu1/*.out
 Rendu1/*.toc
+/bin
+.classpath
+.project
diff --git a/xml_files/example1.xml → xml/example1.xml b/xml_files/example1.xml → xml/example1.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE netconf SYSTEM "netconf.dtd">
 <netconf>
-  <link>
+  <links>
     <maxTime>1</maxTime>
     <minTime>1</minTime>
-  </link>
+  </links>
   <nodes>
     <!-- Note : les attributs ne peuvent pas commencer par des chiffre -->
     <node id="n1">

diff --git a/xml_files/netconf.dtd → xml/netconf.dtd b/xml_files/netconf.dtd → xml/netconf.dtd
@@ -1,16 +1,16 @@
-<!ELEMENT netconf (nodes,link,flows)>
+<!ELEMENT netconf (links,nodes,flows)>
+<!ELEMENT links (maxTime, minTime?)>
 <!ELEMENT nodes (node+)>
-<!ELEMENT link (maxTime, minTime?)>
 <!ELEMENT flows (flow+)>
 
 <!ELEMENT node (computeTime)>
 <!ATTLIST node id ID #REQUIRED>
 
 <!ELEMENT computeTime (#PCDATA)>
 <!-- Si forFlow pas mis => Valeur par défault -->
-<!ATTLIST computTime forFlow (IDREF|all) #REQUIRED> 
+<!ATTLIST computeTime forFlow (IDREF|all) #REQUIRED> 
 
-<!ELEMENT flow (#PCDATA)>
+<!ELEMENT flow (priority,deadline,path)>
 <!ATTLIST flow id ID #REQUIRED>
 
 <!ELEMENT priority (#PCDATA)>
@@ -23,3 +23,4 @@
 
 
 
+
diff --git a/xml_files/netconf.rnc → xml/netconf.rnc b/xml_files/netconf.rnc → xml/netconf.rnc
@@ -4,6 +4,8 @@
 # Projet 1 - Analyse de pire temps de réponse sur des réseaux avioniques
 # ******************************************************************
 
+# NB : Ce format n'as pas encore été testé
+
 start = netconf
 
 netconf = element netconf{