loic/routage-optimiste
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:manzerbredes/routage-optimiste into develop

Browse source
This commit is contained in:
manzerbredes 2016-03-21 16:34:06 +01:00
commit c03d794605
2 changed files with 62 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
main/Main.java
View file

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import org.graphstream.graph.Edge;
import org.graphstream.graph.Graph;
import org.graphstream.graph.implementations.SingleGraph;
@ -21,11 +22,14 @@ public class Main {
Graph graph = new SingleGraph("Tutorial 1");
graph.addAttribute("ui.stylesheet", "url('resources/style.css')");
ArrayList<Router> grid=g.getGrid();
for(Router r : grid){
graph.addNode(r.name);
}
ArrayList<Integer> bestLink=g.getLinks().get(g.getBestLinkIndex());
for(Router r : grid){
String current=r.name;
HashMap<Router, Integer> relier=r.getLinks();
@ -36,8 +40,17 @@ public class Main {
String currentRouterName=currentRouter.name;
try{
//graph.addEdge(current+currentRouter, current, currentRouter).addAttribute("ui.style", "fill-color: rgb(0,100,255);");
graph.addEdge(current+currentRouterName, current, currentRouterName).setAttribute("ui.label", relier.get(currentRouter));
if(g.isEdgeOfLink(bestLink, r, currentRouter)){
Edge toAdd=graph.addEdge(current+currentRouterName, current, currentRouterName);
toAdd.setAttribute("ui.label", relier.get(currentRouter));
toAdd.setAttribute("ui.style", "fill-color:red;");
}else{
graph.addEdge(current+currentRouterName, current, currentRouterName).setAttribute("ui.label", relier.get(currentRouter));
}
}
@ -48,6 +61,8 @@ public class Main {
}
}
g.printLinkWeight();
graph.display();
}
}

49
structure/Grid.java
View file

@ -131,7 +131,7 @@ public class Grid {
return currentBestLink;
}
private int getMaxBottleneck(ArrayList<Integer> link){
/*private int getMaxBottleneck(ArrayList<Integer> link){
int max=this.getWeigthOfLink(link.get(0), link.get(1));
for(int j=1;j<link.size()-1;j++){
int currentMax=this.getWeigthOfLink(link.get(j), link.get(j+1));
@ -139,6 +139,17 @@ public class Grid {
max=currentMax;
}
}
return max;
}*/
private int getMaxBottleneck(ArrayList<Integer> link){
int max=this.getWeigthOfLink(link.get(0), link.get(1));
for(int j=1;j<link.size()-1;j++){
int currentMax=this.getWeigthOfLink(link.get(j), link.get(j+1));
if(max>currentMax){
max=currentMax;
}
}
return max;
}
@ -153,14 +164,46 @@ public class Grid {
ArrayList<Integer> link=this.links.get(i);
System.out.print("Link number " + i + " ==> ");
for(int j=0;j<link.size()-1;j++){
//System.out.print(this.getWeigthOfLink(link.get(j), link.get(j+1)) + " ");
System.out.print(this.getWeigthOfLink(link.get(j), link.get(j+1)) + " ");
}
System.out.println(this.getMaxBottleneck(link));
System.out.println(" Goulot :"+this.getMaxBottleneck(link));
//System.out.println();
}
}
public boolean isEdgeOfLink(ArrayList<Integer>link, Router src, Router dest){
for(int j=0;j<link.size()-1;j++){
Router current=this.grid.get(link.get(j));
if(src.name.equals(current.name)){
if(j<link.size()-1){
Router currentDest=this.grid.get(link.get(j+1));
if(currentDest.name.equals(dest.name)){
return true;
}
}
}
}
for(int j=0;j<link.size()-1;j++){
Router current=this.grid.get(link.get(j));
if(dest.name.equals(current.name)){
if(j<link.size()-1){
Router currentDest=this.grid.get(link.get(j+1));
if(currentDest.name.equals(src.name)){
return true;
}
}
}
}
return false;
}
public ArrayList<Router> getGrid() {
return grid;
}