glax/OSMServer
Archived
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Cleanup variable rename

Browse Source
This commit is contained in:
glax 2023-04-23 12:58:32 +02:00
parent 7fd9047ac4
commit 465d40a475
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Pathfinding/Pathfinder.cs
View File

@ -71,8 +71,7 @@ public class Pathfinder
gScore[neighbor] = tentativeGScore; gScore[neighbor] = tentativeGScore;
double h = Heuristic(currentNode, neighbor, goalNode, edge, double h = Heuristic(currentNode, neighbor, goalNode, edge,
heuristicRoadLevelPriority, heuristicFewJunctionsPriority, heuristicSameRoadPriority, angleWeightFactor); heuristicRoadLevelPriority, heuristicFewJunctionsPriority, heuristicSameRoadPriority, angleWeightFactor);
//Console.WriteLine($"Queue: {openSetfScore.Count:00000} Current Distance: {Utils.DistanceBetween(currentNode, goalNode):000000.00} Visited: {cameFromDict.Count:00000} Current heuristic: {h:00000.00}"); openSetfScore.Enqueue(neighbor, tentativeGScore + h); //Currently set includes a lot of duplicates
openSetfScore.Enqueue(neighbor, tentativeGScore + h);
} }
} }
} }
@ -86,18 +85,19 @@ public class Pathfinder
{ {
double distance = Utils.DistanceBetween(currentNode, neighborNode); double distance = Utils.DistanceBetween(currentNode, neighborNode);
double speed = regionManager.GetSpeedForEdge(currentNode, edge.wayId, _speedType); double speed = regionManager.GetSpeedForEdge(currentNode, edge.wayId, _speedType);
double angle = 1; double nodeAngle = 1;
if (_cameFromDict!.ContainsKey(currentNode)) if (_cameFromDict!.ContainsKey(currentNode))
{ {
OsmNode previousNode = _cameFromDict[currentNode]; OsmNode previousNode = _cameFromDict[currentNode];
Vector v1 = new(currentNode, previousNode); Vector v1 = new(currentNode, previousNode);
Vector v2 = new(currentNode, neighborNode); Vector v2 = new(currentNode, neighborNode);
double nodeAngle = v1.Angle(v2); double angle = v1.Angle(v2);
angle = (nodeAngle / 180); nodeAngle = (angle + 1) / 181;
} }
double prio = regionManager.GetPriorityForVehicle(_speedType,edge, currentNode); double prio = regionManager.GetPriorityForVehicle(_speedType,edge, currentNode);
return distance / (1 + speed * angle);
return distance / (speed * nodeAngle + prio + 1);
} }
private double Heuristic(OsmNode currentNode, OsmNode neighborNode, OsmNode goalNode, OsmEdge edge, double roadPriorityFactor, double junctionFactor, double sameRoadFactor, double nodeAngleFactor) private double Heuristic(OsmNode currentNode, OsmNode neighborNode, OsmNode goalNode, OsmEdge edge, double roadPriorityFactor, double junctionFactor, double sameRoadFactor, double nodeAngleFactor)