vergnet/BE-GRAPH
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improved A* time estimation

Browse source
This commit is contained in:
Arnaud Vergnet 2020-05-22 14:53:37 +02:00
parent d68a7e5ca9
commit e8331864ab
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,6 @@
package org.insa.graphs.algorithm.shortestpath; package org.insa.graphs.algorithm.shortestpath;
import org.insa.graphs.algorithm.AbstractInputData;
import org.insa.graphs.model.Graph; import org.insa.graphs.model.Graph;
import org.insa.graphs.model.Node;
import org.insa.graphs.model.Point;
import org.insa.graphs.model.RoadInformation;
public class AStarAlgorithm extends DijkstraAlgorithm { public class AStarAlgorithm extends DijkstraAlgorithm {
@ -23,7 +19,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
final double distance = graph.getNodes().get(i).getPoint().distanceTo( final double distance = graph.getNodes().get(i).getPoint().distanceTo(
data.getDestination().getPoint() data.getDestination().getPoint()
); );
final double maxSpeed = data.getMaximumSpeed(); final double maxSpeed = graph.getGraphInformation().getMaximumSpeed();
double estimatedCost = distance; double estimatedCost = distance;
if (data.getMode() == ShortestPathData.Mode.TIME) if (data.getMode() == ShortestPathData.Mode.TIME)
estimatedCost /= maxSpeed; estimatedCost /= maxSpeed;