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

Conflicts:
	TASK_Raphael

Rendu2/pseudo_code_delta.tex

@@ -0,0 +1,90 @@
+\documentclass{article}
+
+\usepackage[utf8]{inputenc}
+\usepackage[frenchb]{babel}
+\usepackage[T1]{fontenc}
+\usepackage{algorithm2e}
+
+\begin{document}
+% \fbox{
+\begin{algorithm}[H]
+%  \SetLine % For v3.9
+%  %\SetAlgoLined % For previous releases [?]
+  \KwData{\\
+    Input
+    \begin{itemize}
+      \item $i$ flow id
+      \item $L_{min}$
+      \item $L_{max}$
+      \item $h_{final}$ 
+      \item $P_i$ le path jusqu'à $h_{final}$
+    \end{itemize}
+    Local
+    \begin{itemize}
+      \item $lp_i$ 
+      \item $first_i$
+      \item ensemble des $C_k^l$ avec $k \in lp_i$ et $l \in P_i$
+    \end{itemize}
+  }  
+  \KwResult{
+    \begin{itemize}
+      \item $\delta_i^{h_{final}}$
+    \end{itemize}
+  }
+  \BlankLine
+  $x = 0;$\\ 
+  \For{$j \in lp_i$}{
+      \If{ $first_i = first_{j,i}$}{
+	  $tabPart1[x] = C_j^{first_i};$\\
+	  $x++;$
+      }
+  }
+  \If{$max(tabPart1)-1 < 0)$}{
+      $result = 0;$
+  }
+  \Else{
+      $result = max(tabPart1) - 1;$
+  }
+
+  \For{$h \in P_i$}{
+      $resultPart2 = 0;$\\
+      $tabPart2 = 0;$\\
+      \If {$h \neq first_i$}{
+	  \If {$h = first_{j,i}$}{
+	      $m =0;$\\
+	      \For{$j \in lp_i$}{
+		  $tabPart2[m] = C_j^h;$\\
+	      }
+	      $resultPart2 += max(tabPart2) - 1;$
+	  }
+	  \uElseIf {$h \in (first_{j,i} ; last_{j,i}] $ and $first_{j,i} \neq 
+first_{i,j} $}{
+	      $m =0;$\\
+	      \For{$j \in lp_i$}{
+		  $tabPart2[m] = C_j^h;$\\
+	      }
+	      $resultPart2 += max(tabPart2) - 1;$
+	  }
+	  \uElseIf {$lp_i \neq \emptyset$}{
+	      $m =0;$\\
+	      \For{$j \in lp_i$}{
+		  $tabPart2[m] = C_j^h;$\\
+	      }
+	      $resultPart2 += max(tabPart2) - C_i^{pre_i(h)} + L_{max} - 
+L_{min};$
+	  }
+	  \Else{
+	      $resultPart2 = 0;$\\
+	  }
+	  \If {$tabPart2 \ge 0$}{
+	      $result += resultPart2;$\\
+	      $resultPart2 = 0;$\\
+	  }
+      }
+  }
+
+%   \textbf{Return} $W[last_i]$\;
+%   \caption{Pseudo Code pour le calcul de $\delta_i^{h_{final}}$}
+\end{algorithm}
+% }
+\end{document}

TASK_Clément

@@ -0,0 +1,6 @@
+Algorithm.java :
+    - firstNodeVisitedByJonI
+    - lastNodeVisitedByJonI
+    - minTimetakenFromSourceToH
+    - maxTimeTakenFromSourceToH
+    - slowestNodeVisitedByJonI

TASK_Damien

@@ -0,0 +1,2 @@
+Algorithm.java :
+    - computeW

TASK_Darren

@@ -0,0 +1,2 @@
+Algorithm.java:
+    - ComputeDelta

TASK_Lucas

@@ -1 +1,6 @@
-Network.init() : initialise pour chaque flux leur hpf, spf et lpf	
+Network.init() : 
+    - initialise pour chaque flux leur hpf, spf et lpf	
+
+Algorithm.java :
+    - computeM
+    - computeA

TASK_Mark-Henri

@@ -0,0 +1,2 @@
+Algorithm.java :
+    - computeDelta

TASK_Naima

@@ -0,0 +1,2 @@
+Algorithm.java :
+    - computeWorstCaseEndToEndResponse

TASK_Raphael

@@ -1 +1,6 @@
+<<<<<<< HEAD
 Réaliser le xmlParser
+=======
+XMLParser.java
+
+>>>>>>> e3bb473cc8ba9832069ceae2a30b158b5f5d041d

src/xml/XmlParser.java

@@ -26,46 +26,38 @@ public XmlParser(String file) {
 		   document = sxb.build(new File(file));
 	  } catch(Exception e){}
 	   network = new Network();
+	   setFlows();
    }
 
   private void setFlows() {
-	  racine = document.getRootElement();
-	  for(Element e : racine.getChildren("flows")) {
+	  racine = document.getRootElement().getChild("flows");
+	  for(Element e : racine.getChildren("flow")) {
 		  Flow flow = new Flow();
-		  try {
-			flow.setDeadline(e.getAttribute("deadline").getIntValue());
-		} catch (DataConversionException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+		  System.out.println(e.getChildText("deadline"));
+		  flow.setDeadline(Integer.parseInt(e.getChildText("deadline")));
 		  flow.setJitter(0);
 		  for(int i = 0; i < racine.getChildren("flows").size(); i++) {
 			  Node node = new Node();
 			  //node.setId(racine.getChildren("flows").get(i));
 		  }
 		  // A revoir ici la période = deadline
-		  try {
-			flow.setPeriod(e.getAttribute("deadline").getIntValue());
-		} catch (DataConversionException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		  try {
-			flow.setPriority(e.getAttribute("priority").getIntValue());
-		} catch (DataConversionException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+		  flow.setPeriod(Integer.parseInt(e.getChildText("deadline")));
+
+		  flow.setPriority(Integer.parseInt(e.getChildText("priority")));
 		  network.addFlow(flow);
 	  }
   }
 
-  List firstStep = racine.getChildren("??");
+  //List firstStep = racine.getChildren("??");
 
-  Iterator i = firstStep.iterator();
+  //Iterator i = firstStep.iterator();
   /*while(i.hasNext()) {
      Element courant = (Element)i.next();
      System.out.println(courant.getChild("??").getText());
       }
    }*/
+
+  public static void main (String [] arg) {
+	  XmlParser parser = new XmlParser("/home/raphael/M2_SAR/ISE/ISE/xml/example1.xml");
+  }
 }

xml/example1.xml

@@ -8,7 +8,7 @@
   <nodes>
     <!-- Note : les attributs ne peuvent pas commencer par des chiffre -->
     <node id="n1">
-      <!-- Si -->
+      <!-- Si l'attribut forFlow n'est pas defini, on a un compute time par default-->
       <computeTime forFlow="f1">4</computeTime>
       <computeTime>4</computeTime>
     </node>