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

Removed/Replaced unnecessary checks in AStar.

Browse Source
This commit is contained in:
glax 2023-04-20 22:53:23 +02:00
parent b87d8a0300
commit 90a09e84c5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Pathfinding/Pathfinder.cs
View File

@ -62,14 +62,9 @@ public class Pathfinder
gScore.TryAdd(neighbor, double.MaxValue); gScore.TryAdd(neighbor, double.MaxValue);
if (tentativeGScore < gScore[neighbor]) if (tentativeGScore < gScore[neighbor])
{ {
if (cameFromDict.ContainsKey(neighbor)) if(!cameFromDict.TryAdd(neighbor, currentNode))
cameFromDict[neighbor] = currentNode; cameFromDict[neighbor] = currentNode;
else gScore[neighbor] = tentativeGScore;
cameFromDict.Add(neighbor, currentNode);
if (gScore.ContainsKey(neighbor))
gScore[neighbor] = tentativeGScore;
else
gScore.Add(neighbor, tentativeGScore);
double h = Heuristic(currentNode, neighbor, goalNode, edge, vehicle, double h = Heuristic(currentNode, neighbor, goalNode, edge, vehicle,
heuristicRoadLevelPriority, heuristicFewJunctionsPriority, heuristicSameRoadPriority); heuristicRoadLevelPriority, heuristicFewJunctionsPriority, heuristicSameRoadPriority);
//Console.WriteLine($"Queue: {openSetfScore.Count:00000} Current Distance: {Utils.DistanceBetween(currentNode, goalNode):000000.00} Visited: {cameFromDict.Count:00000} Current heuristic: {h:00000.00}"); //Console.WriteLine($"Queue: {openSetfScore.Count:00000} Current Distance: {Utils.DistanceBetween(currentNode, goalNode):000000.00} Visited: {cameFromDict.Count:00000} Current heuristic: {h:00000.00}");