1 files changed, 9 insertions, 4 deletions
diff --git a/main/Main.java b/main/Main.java
index f8941e6..0e6b0de 100644
--- a/main/Main.java
+++ b/main/Main.java
@@ -19,13 +19,18 @@ import structure.Router;
 public class Main {
 
 	public static void main(String[] args) {
+<<<<<<< HEAD
 		Grid g=new Grid(Grid.Protocol.DSDV);
+=======
+		Grid g=new Grid(Grid.Protocol.AODV);
+>>>>>>> bd27005eadf8c9526bf0167ea19a2d949bcca1f9
 
+		// Build Graph for graphstream
 		MyGraph gr=new MyGraph("Routage Oportuniste", g);
-
-		
-		 
 		gr.display();
+		
+		
+		// Update Graph
 		while(true){
 			try {
 				Thread.sleep(1000);
@@ -33,7 +38,7 @@ public class Main {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			g.buildRandomLink();
+			g.buildEdgeWithRandomWeigth();
 			System.out.println("Update !");
 			gr.update();
 		}