Porównaj commity

..

2 commits

Autor SHA1 Wiadomość Data
728f069973 Verif fastest 2023-05-19 11:42:26 +02:00
51b28efa2d VerifFastest 2023-05-19 11:40:11 +02:00
6 zmienionych plików z 24 dodań i 12 usunięć

Wyświetl plik

@ -22,7 +22,17 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
System.out.println("shortest path : " + p.getLength());
if (p.getLength()-solution.getPath().getLength() < 1.00){
System.out.println("le chemin Astar est le shortest");
System.out.println("le chemin Astar bien est le shortest");
}
}
@Override
public void fastestVerif(ShortestPathSolution solution,ArrayList<Node> solutionNodes,ShortestPathData data){
Path p= Path.createFastestPathFromNodes(data.getGraph(), solutionNodes);
System.out.println("fastest path : " + p.getMinimumTravelTime());
if (p.getMinimumTravelTime()-solution.getPath().getMinimumTravelTime() < 1.00){
System.out.println("le chemin Astar est bien le fastest");
}
}

Wyświetl plik

@ -97,6 +97,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
}
solutionNodes.add(data.getDestination());
ShortestVerif(solution, solutionNodes, data);
fastestVerif(solution, solutionNodes, data);
volDoiseauVerif(data, solution);
return solution;
@ -107,7 +108,17 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
System.out.println("shortest path : " + p.getLength());
if (p.getLength()-solution.getPath().getLength() < 1.00){
System.out.println("le chemin Dijkstra est le shortest");
System.out.println("le chemin Dijkstra est bien le shortest");
}
}
public void fastestVerif(ShortestPathSolution solution,ArrayList<Node> solutionNodes,ShortestPathData data){
Path p= Path.createFastestPathFromNodes(data.getGraph(), solutionNodes);
System.out.println("fastest path : " + p.getMinimumTravelTime());
if (p.getMinimumTravelTime()-solution.getPath().getMinimumTravelTime() < 1.00){
System.out.println("le chemin Dijkstra est bien le fastest");
}
}

Wyświetl plik

@ -266,7 +266,6 @@ public class Path {
*
*/
public float getLength() {
// TODO:
float length=0;
for (Arc arc : arcs) {
length += arc.getLength();
@ -282,14 +281,6 @@ public class Path {
* @return Time (in seconds) required to travel this path at the given speed (in
* kilometers-per-hour).
*
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
*/
public double getTravelTime(double speed) {
double TotalTime = 0;
@ -305,7 +296,7 @@ public class Path {
*
* @return Minimum travel time to travel this path (in seconds).
*
* @deprecated Need to be implemented.
*
*/
public double getMinimumTravelTime() {
double minTime = 0;