From 8507bec1bc4a359efa462ffac2d3e7fb8adbe32d Mon Sep 17 00:00:00 2001 From: Simon O'Shea Date: Tue, 8 Aug 2023 19:27:43 -0400 Subject: [PATCH] still trying to fix astar --- Pathfinding Visualizer/Assets/Scripts/PathNode.cs | 1 + Pathfinding Visualizer/Assets/Scripts/Pathfinder.cs | 7 ++----- .../Assets/UI Elements/UI/Scripts/nMain.cs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Pathfinding Visualizer/Assets/Scripts/PathNode.cs b/Pathfinding Visualizer/Assets/Scripts/PathNode.cs index b1b1aa1..8682070 100644 --- a/Pathfinding Visualizer/Assets/Scripts/PathNode.cs +++ b/Pathfinding Visualizer/Assets/Scripts/PathNode.cs @@ -99,6 +99,7 @@ using UnityEngine; onSample = CanSample(); if (onSample.x == 1) { + Debug.Log("SAMPLING"); Node child = new Node(this, this.agent, this.samples, 'S', this.distanceTraveled + 1, this.heuristic); child.samples.RemoveAt(onSample.y); diff --git a/Pathfinding Visualizer/Assets/Scripts/Pathfinder.cs b/Pathfinding Visualizer/Assets/Scripts/Pathfinder.cs index a3fe8e0..212d6d2 100644 --- a/Pathfinding Visualizer/Assets/Scripts/Pathfinder.cs +++ b/Pathfinding Visualizer/Assets/Scripts/Pathfinder.cs @@ -67,6 +67,7 @@ public class Pathfinder for(int i = 0; i < result.Count; i++) { Node n = result[i]; + Debug.Log("Agent at: " + n.agent.x + ", " + n.agent.y); Debug.Log(n.lastMove); } } @@ -79,9 +80,6 @@ public class Pathfinder List open = new List(); - - //PriorityQueue open = new PriorityQueue(); - open.Add(initialState); int cap = 1000; while (true && cap > 0) @@ -100,7 +98,6 @@ public class Pathfinder { while (currentNode.parent != null) { - Debug.Log("Agent at: " + currentNode.agent.x + ", " + currentNode.agent.y); solution.Add(currentNode); currentNode = currentNode.parent; } @@ -139,7 +136,7 @@ public class Pathfinder sorted.Add(children[i]); } - sorted = sorted.OrderBy(Node => Node.fn).ToList(); + //sorted = sorted.OrderBy(Node => Node.fn).ToList(); return sorted; } diff --git a/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs index cd4c5df..9aebc18 100644 --- a/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs +++ b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs @@ -150,7 +150,7 @@ public class nMain : MonoBehaviour if (true) { Pathfinder astar = new Pathfinder(world, agent, obstacles, samples, algorithm, 0); - astar.go(); + } }