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

private field naming _cameFromDict

Browse Source
This commit is contained in:
glax 2023-04-20 22:58:50 +02:00
parent 2bd6c5d9c4
commit d456275fc1
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

@ -13,7 +13,7 @@ public class Pathfinder
public readonly string workingDir; public readonly string workingDir;
public PathResult? pathResult; public PathResult? pathResult;
public Dictionary<OsmNode, double>? gScore; public Dictionary<OsmNode, double>? gScore;
private Dictionary<OsmNode, OsmNode>? cameFromDict; private Dictionary<OsmNode, OsmNode>? _cameFromDict;
private SpeedType _speedType; private SpeedType _speedType;
public Pathfinder(string workingDirectory) public Pathfinder(string workingDirectory)
@ -42,7 +42,7 @@ public class Pathfinder
PriorityQueue<OsmNode, double> openSetfScore = new(); PriorityQueue<OsmNode, double> openSetfScore = new();
openSetfScore.Enqueue(startNode, 0); openSetfScore.Enqueue(startNode, 0);
gScore = new() { { startNode, 0 } }; gScore = new() { { startNode, 0 } };
cameFromDict = new(); _cameFromDict = new();
while (openSetfScore.Count > 0) while (openSetfScore.Count > 0)
{ {
@ -64,8 +64,8 @@ public class Pathfinder
gScore.TryAdd(neighbor, double.MaxValue); gScore.TryAdd(neighbor, double.MaxValue);
if (tentativeGScore < gScore[neighbor]) if (tentativeGScore < gScore[neighbor])
{ {
if(!cameFromDict.TryAdd(neighbor, currentNode)) if(!_cameFromDict.TryAdd(neighbor, currentNode))
cameFromDict[neighbor] = currentNode; _cameFromDict[neighbor] = currentNode;
gScore[neighbor] = tentativeGScore; gScore[neighbor] = tentativeGScore;
double h = Heuristic(currentNode, neighbor, goalNode, edge, double h = Heuristic(currentNode, neighbor, goalNode, edge,
heuristicRoadLevelPriority, heuristicFewJunctionsPriority, heuristicSameRoadPriority); heuristicRoadLevelPriority, heuristicFewJunctionsPriority, heuristicSameRoadPriority);
@ -92,15 +92,15 @@ public class Pathfinder
{ {
List<PathNode> path = new(); List<PathNode> path = new();
OsmNode currentNode = goalNode; OsmNode currentNode = goalNode;
while (cameFromDict!.ContainsKey(cameFromDict[currentNode])) while (_cameFromDict!.ContainsKey(_cameFromDict[currentNode]))
{ {
OsmEdge? currentEdge = cameFromDict[currentNode].edges.First(edge => edge.neighborId == currentNode.nodeId); OsmEdge? currentEdge = _cameFromDict[currentNode].edges.First(edge => edge.neighborId == currentNode.nodeId);
HashSet<Tag>? tags = HashSet<Tag>? tags =
regionManager.GetRegion(currentNode.coordinates)!.tagManager.GetTagsForWayId(currentEdge.wayId); regionManager.GetRegion(currentNode.coordinates)!.tagManager.GetTagsForWayId(currentEdge.wayId);
PathNode? newNode = PathNode.FromOsmNode(currentNode, tags); PathNode? newNode = PathNode.FromOsmNode(currentNode, tags);
if(newNode is not null) if(newNode is not null)
path.Add(newNode); path.Add(newNode);
currentNode = cameFromDict[currentNode]; currentNode = _cameFromDict[currentNode];
} }
path.Reverse(); path.Reverse();