Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Balance the ways when finding the way from 2 sides

Browse source
This commit is contained in:
Pavol Zibrita 2012-04-05 09:29:26 +02:00
parent d7fa9786dd
commit 3bb873b304
1 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java
View file

@ -231,7 +231,7 @@ public class BinaryRoutePlanner {
int startX = start.road.getPoint31XTile(start.segmentStart);
int startY = start.road.getPoint31YTile(start.segmentStart);
// for start : f(start) = g(start) + h(start) = 0 + h(start) = h(start)
start.distanceToEnd = squareRootDist(startX, startY, targetEndX, targetEndY) / ctx.getRouter().getMaxDefaultSpeed();
start.distanceToEnd = h(ctx, targetEndX, targetEndY, startX, startY);
end.distanceToEnd = start.distanceToEnd;
// because first point of the start is not visited do the same as in cycle but only for one point
@ -278,6 +278,11 @@ public class BinaryRoutePlanner {
}
if(ctx.planRouteIn2Directions()){
inverse = nonHeuristicSegmentsComparator.compare(graphDirectSegments.peek(), graphReverseSegments.peek()) > 0;
if (graphDirectSegments.size() * 1.3 > graphReverseSegments.size()) {
inverse = true;
} else if (graphDirectSegments.size() < 1.3 * graphReverseSegments.size()) {
inverse = false;
}
// make it more simmetrical with dynamic prioritizing it makes big sense
// inverse = !inverse;
} else {
@ -294,6 +299,32 @@ public class BinaryRoutePlanner {
}
private double h(final RoutingContext ctx, int targetEndX, int targetEndY,
int startX, int startY) {
double distance = squareRootDist(startX, startY, targetEndX, targetEndY);
return distance / ctx.getRouter().getMaxDefaultSpeed(); // + distance * 0.5;
}
protected static double h(RoutingContext ctx, double distToFinalPoint, RouteSegment next) {
double result = distToFinalPoint / ctx.getRouter().getMaxDefaultSpeed();
if(ctx.isUseDynamicRoadPrioritising() && next != null){
double priority = ctx.getRouter().getRoadPriorityToCalculateRoute(next.road);
result /= priority;
}
return result; // + distToFinalPoint * 0.5;
}
private double g(RoutingContext ctx, double distOnRoadToPass,
RouteSegment segment, int segmentEnd, double obstaclesTime,
RouteSegment next, double speed) {
double result = segment.distanceFromStart + distOnRoadToPass / speed; // + distOnRoadToPass*0.5;
// calculate turn time
result += ctx.getRouter().calculateTurnTime(segment, next, segmentEnd);
// add obstacles time
result += obstaclesTime;
return result;
}
private void visitAllStartSegments(final RoutingContext ctx, RouteSegment start, PriorityQueue<RouteSegment> graphDirectSegments,
TLongObjectHashMap<RouteSegment> visitedSegments, int startX, int startY) throws IOException {
// mark as visited code seems to be duplicated
@ -494,11 +525,7 @@ public class BinaryRoutePlanner {
return oppSegment;
}
double distanceToEnd = distToFinalPoint / ctx.getRouter().getMaxDefaultSpeed();
if(ctx.isUseDynamicRoadPrioritising()){
double priority = ctx.getRouter().getRoadPriorityToCalculateRoute(next.road);
distanceToEnd /= priority;
}
double distanceToEnd = h(ctx, distToFinalPoint, next);
// Using A* routing algorithm
// g(x) - calculate distance to that point and calculate time
@ -507,12 +534,7 @@ public class BinaryRoutePlanner {
speed = ctx.getRouter().getMinDefaultSpeed();
}
double distanceFromStart = segment.distanceFromStart + distOnRoadToPass / speed;
// calculate turn time
distanceFromStart += ctx.getRouter().calculateTurnTime(segment, next, segmentEnd);
// add obstacles time
distanceFromStart += obstaclesTime;
double distanceFromStart = g(ctx, distOnRoadToPass, segment, segmentEnd, obstaclesTime, next, speed);
// segment.getRoad().getId() >> 1
if (next.parentRoute == null