aboutsummaryrefslogtreecommitdiff
path: root/main/Main.java
diff options
context:
space:
mode:
authorLoic Guegan <16000511@e105m10.istic.univ-rennes1.fr>2016-03-29 10:43:52 +0200
committerLoic Guegan <16000511@e105m10.istic.univ-rennes1.fr>2016-03-29 10:43:52 +0200
commitf9ae5db9f646709419d6d54ab36bd38875235452 (patch)
treefdd0b0c4c867483144b25252297bd5c1efb6f3f8 /main/Main.java
parent3f97f9d8ac20bef90f05397dcf4971bc94d8edfb (diff)
parentbd27005eadf8c9526bf0167ea19a2d949bcca1f9 (diff)
Test
Diffstat (limited to 'main/Main.java')
-rw-r--r--main/Main.java13
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();
}