From 2ca4207fd770aaeed0ba356516eea6cfe13da1ce Mon Sep 17 00:00:00 2001 From: glax Date: Sun, 9 Apr 2023 18:37:45 +0200 Subject: [PATCH] renamed currentNode --- Pathfinding/Pathfinder_Distance.cs | 8 ++++---- Pathfinding/Pathfinder_Time.cs | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Pathfinding/Pathfinder_Distance.cs b/Pathfinding/Pathfinder_Distance.cs index a747828..2a5d9b9 100644 --- a/Pathfinding/Pathfinder_Distance.cs +++ b/Pathfinding/Pathfinder_Distance.cs @@ -20,17 +20,17 @@ public static partial class Pathfinder while (toVisit.Count > 0) { - OsmNode closestNodeToGoal = toVisit.Dequeue(); + OsmNode currentNode = toVisit.Dequeue(); - foreach (OsmEdge edge in closestNodeToGoal.edges) + foreach (OsmEdge edge in currentNode.edges) { OsmNode? neighbor = regionManager.GetNode(edge.neighborId, edge.neighborRegion); if (neighbor is not null) { - double newPotentialLength = closestNodeToGoal.currentPathLength + Utils.DistanceBetween(closestNodeToGoal, neighbor); + double newPotentialLength = currentNode.currentPathLength + Utils.DistanceBetween(currentNode, neighbor); if (newPotentialLength < neighbor.currentPathLength) { - neighbor.previousPathNode = closestNodeToGoal; + neighbor.previousPathNode = currentNode; neighbor.currentPathLength = newPotentialLength; neighbor.directDistanceToGoal = Utils.DistanceBetween(neighbor, goalNode); diff --git a/Pathfinding/Pathfinder_Time.cs b/Pathfinding/Pathfinder_Time.cs index ed9effc..7391f3e 100644 --- a/Pathfinding/Pathfinder_Time.cs +++ b/Pathfinding/Pathfinder_Time.cs @@ -21,20 +21,20 @@ public static partial class Pathfinder while (toVisit.Count > 0) { - OsmNode closestNodeToGoal = toVisit.Dequeue(); + OsmNode currentNode = toVisit.Dequeue(); - foreach (OsmEdge edge in closestNodeToGoal.edges.Where( - edge => regionManager.TestValidConnectionForType(closestNodeToGoal, edge, vehicle))) + foreach (OsmEdge edge in currentNode.edges.Where( + edge => regionManager.TestValidConnectionForType(currentNode, edge, vehicle))) { OsmNode? neighbor = regionManager.GetNode(edge.neighborId, edge.neighborRegion); if (neighbor is not null) { - double newPotentialWeight = closestNodeToGoal.currentPathWeight + - EdgeWeight(closestNodeToGoal, edge, vehicle, regionManager); + double newPotentialWeight = currentNode.currentPathWeight + + EdgeWeight(currentNode, edge, vehicle, regionManager); if (newPotentialWeight < neighbor.currentPathWeight) { - neighbor.previousPathNode = closestNodeToGoal; - neighbor.currentPathLength = closestNodeToGoal.currentPathLength + Utils.DistanceBetween(closestNodeToGoal, neighbor); + neighbor.previousPathNode = currentNode; + neighbor.currentPathLength = currentNode.currentPathLength + Utils.DistanceBetween(currentNode, neighbor); neighbor.currentPathWeight = newPotentialWeight; neighbor.directDistanceToGoal = Utils.DistanceBetween(neighbor, goalNode);