aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Guegan <16000511@e105m10.istic.univ-rennes1.fr>2016-03-29 11:42:05 +0200
committerLoic Guegan <16000511@e105m10.istic.univ-rennes1.fr>2016-03-29 11:42:05 +0200
commit996c9fc3464cbec9ee8ac7e0d4a5b27879a70ece (patch)
treef5d1d1fd79abfe0ccfbd568b32baf044d1f2c2eb
parent04c6618a68d48f8c095bcf692110de3085e98040 (diff)
Test
-rw-r--r--main/Main.java8
-rw-r--r--structure/Grid.java8
2 files changed, 8 insertions, 8 deletions
diff --git a/main/Main.java b/main/Main.java
index 0fea318..c9bdd24 100644
--- a/main/Main.java
+++ b/main/Main.java
@@ -20,14 +20,14 @@ public class Main {
public static void main(String[] args) {
- Grid g=new Grid(Grid.Protocol.AODV);
+ Grid g=new Grid(Grid.Protocol.DSDV);
// Build Graph for graphstream
MyGraph gr=new MyGraph("Routage Oportuniste", g);
gr.display();
- gr.update();
- /*
+ //gr.update();
+
// Update Graph
while(true){
@@ -40,7 +40,7 @@ public class Main {
g.buildEdgeWithRandomWeigth();
System.out.println("Update !");
gr.update();
- }*/
+ }
}
}
diff --git a/structure/Grid.java b/structure/Grid.java
index 00c3b52..73c034e 100644
--- a/structure/Grid.java
+++ b/structure/Grid.java
@@ -37,7 +37,8 @@ public class Grid {
this.buildEdgeWithRandomWeigth();
-
+ //Build fixed link
+ this.buildPath();
this.protocol=protocol;
@@ -48,7 +49,7 @@ public class Grid {
case DSDV:
case CUSTOM:
HashMap<Integer,Integer> currentBestLink=new HashMap<>();
- for(int i=0;i<100000;i++){
+ for(int i=0;i<1000;i++){
int current=this.getBestLinkIndex();
if(currentBestLink.containsKey(current)){
currentBestLink.put(current, currentBestLink.get(current)+1);
@@ -87,8 +88,7 @@ public class Grid {
public void buildEdgeWithRandomWeigth(){
- //Build fixed link
- this.buildPath();
+