diff options
| author | Loic Guegan <16000511@e105m10.istic.univ-rennes1.fr> | 2016-03-29 10:46:36 +0200 |
|---|---|---|
| committer | Loic Guegan <16000511@e105m10.istic.univ-rennes1.fr> | 2016-03-29 10:46:36 +0200 |
| commit | fa261c3042b3fce1cc88cea3b67381bae9f7c747 (patch) | |
| tree | 75d42658a9b1c62e666c262bc6492bf45f19531f | |
| parent | f9ae5db9f646709419d6d54ab36bd38875235452 (diff) | |
Test
| -rw-r--r-- | main/Main.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/Main.java b/main/Main.java index 0e6b0de..b843336 100644 --- a/main/Main.java +++ b/main/Main.java @@ -19,11 +19,9 @@ 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); |