diff options
| -rw-r--r-- | main/Main.java | 4 | ||||
| -rw-r--r-- | structure/MyGraph.java (renamed from structure/Graph.java) | 0 | ||||
| -rw-r--r-- | structure/Router.java | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/main/Main.java b/main/Main.java index eaa8d41..0e6b0de 100644 --- a/main/Main.java +++ b/main/Main.java @@ -19,7 +19,11 @@ 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); diff --git a/structure/Graph.java b/structure/MyGraph.java index 1c2dc0f..1c2dc0f 100644 --- a/structure/Graph.java +++ b/structure/MyGraph.java diff --git a/structure/Router.java b/structure/Router.java index fce5977..3a8d8f9 100644 --- a/structure/Router.java +++ b/structure/Router.java @@ -22,7 +22,6 @@ public class Router { public void buildLink(Router router, int weight){ this.links.remove(router); router.removeLink(this); - this.links.put(router, weight); router.addLink(this, weight); |