fofana/Be_Graphe
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

VerifVD

Browse source
This commit is contained in:
Bensouda Idriss 2023-05-19 11:38:36 +02:00
parent 7624518c7e
commit 0b0d107956
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
View file

@ -8,6 +8,7 @@ import org.insa.graphs.algorithm.utils.BinaryHeap;
import org.insa.graphs.model.Arc; import org.insa.graphs.model.Arc;
import org.insa.graphs.model.Node; import org.insa.graphs.model.Node;
import org.insa.graphs.model.Path; import org.insa.graphs.model.Path;
import org.insa.graphs.model.Point;
public class DijkstraAlgorithm extends ShortestPathAlgorithm { public class DijkstraAlgorithm extends ShortestPathAlgorithm {
@ -82,10 +83,8 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
} }
} }
} }
Label dest =List_Label.get(data.getDestination().getId()); Label dest =List_Label.get(data.getDestination().getId());
while (dest.getParent() != null){ while (dest.getParent() != null){
Arcs.add(dest.getParent()); Arcs.add(dest.getParent());
dest = List_Label.get(dest.getParent().getOrigin().getId()); dest = List_Label.get(dest.getParent().getOrigin().getId());
@ -98,11 +97,11 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
} }
solutionNodes.add(data.getDestination()); solutionNodes.add(data.getDestination());
ShortestVerif(solution, solutionNodes, data); ShortestVerif(solution, solutionNodes, data);
volDoiseauVerif(data, solution);
return solution; return solution;
} }
//Permet de vérifier si le chemin obtenu par la solution est bien le plus court
public void ShortestVerif(ShortestPathSolution solution,ArrayList<Node> solutionNodes , ShortestPathData data) public void ShortestVerif(ShortestPathSolution solution,ArrayList<Node> solutionNodes , ShortestPathData data)
{ {
Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes); Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
@ -112,4 +111,13 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
} }
} }
// Permet de vérifier si la distance de la solution est plus long que la distance à vol d'oiseau
public void volDoiseauVerif(ShortestPathData data, ShortestPathSolution solution){
double distanceV = Point.distance(data.getGraph().get(data.getOrigin().getId()).getPoint(), data.getDestination().getPoint());
if (distanceV > solution.getPath().getLength()){
System.out.println("La solution n'est pas réalisable");
} else {
System.out.println("La solution est réalisable");
}
}
} }

BIN
be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class
View file

Binary file not shown.