ahamdy/BE_Graphes_AHAMDY
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes to be committed:

Browse source 
modified:   be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
This commit is contained in:
Jdihadi Ahamdy 2020-04-22 17:07:01 +02:00
parent 376fe2fc56
commit 50ddcd938c
1 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
View file

@ -35,7 +35,31 @@ public class Path {
public static Path createFastestPathFromNodes(Graph graph, List<Node> nodes) public static Path createFastestPathFromNodes(Graph graph, List<Node> nodes)
throws IllegalArgumentException { throws IllegalArgumentException {
List<Arc> arcs = new ArrayList<Arc>(); List<Arc> arcs = new ArrayList<Arc>();
// TODO: if(nodes.size()==1) {
return new Path(graph, nodes.get(0));
}
for(int i=0; i<nodes.size()-1; i++) { // Parcours des noeuds dans l'orde
Node node_actuel= nodes.get(i);
if(node_actuel.hasSuccessors()) { // Véridie si le noeud a une succeseur
List<Arc> arc_suiv = node_actuel.getSuccessors();
double travel_time = 10000000;
int num=0;
boolean successor_found = false ;
for(int j=0; j<arc_suiv.size();j++) {
if((arc_suiv.get(j).getDestination().compareTo(nodes.get(i+1)) == 0 ) && (arc_suiv.get(j).getMinimumTravelTime()< travel_time)) {
num=j;
travel_time=arc_suiv.get(num).getMinimumTravelTime();
successor_found = true;
}
}
if(successor_found== false) {
throw new IllegalArgumentException();
}
arcs.add(arc_suiv.get(num));
}else {
throw new IllegalArgumentException();
}
}
return new Path(graph, arcs); return new Path(graph, arcs);
} }
@ -56,7 +80,31 @@ public class Path {
public static Path createShortestPathFromNodes(Graph graph, List<Node> nodes) public static Path createShortestPathFromNodes(Graph graph, List<Node> nodes)
throws IllegalArgumentException { throws IllegalArgumentException {
List<Arc> arcs = new ArrayList<Arc>(); List<Arc> arcs = new ArrayList<Arc>();
// TODO: if(nodes.size()==1) {
return new Path(graph, nodes.get(0));
}
for(int i=0; i<nodes.size()-1; i++) { // Parcours des noeuds dans l'orde
Node node_actuel= nodes.get(i);
if(node_actuel.hasSuccessors()) { // Véridie si le noeud a une succeseur
List<Arc> arc_suiv = node_actuel.getSuccessors();
int num=0;
double length = 1000000;
boolean successor_found = false ;
for(int j=0; j<arc_suiv.size();j++) {
if((arc_suiv.get(j).getDestination().compareTo(nodes.get(i+1)) == 0) && (arc_suiv.get(j).getLength() < length)) {
num = j;
length = arc_suiv.get(num).getLength();
successor_found = true;
}
}
if(successor_found== false) {
throw new IllegalArgumentException();
}
arcs.add(arc_suiv.get(num));
}else {
throw new IllegalArgumentException();
}
}
return new Path(graph, arcs); return new Path(graph, arcs);
} }