simon/pathfinding-visualizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated algorithms / heuristics

Browse Source
This commit is contained in:
Simon O'Shea
2023-08-09 12:14:10 -04:00
parent 3f5e0a28f1
commit 53d3bee642
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pathfinding Visualizer/Assets/Scripts/CellMesh.cs
+1 -1
View File
@@ -84,7 +84,7 @@ public class CellMesh : MonoBehaviour
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
Node n = result.Pop(); Node n = result.Pop();
Debug.Log("Agent at: " + n.agent.x + ", " + n.agent.y); //Debug.Log("Agent at: " + n.agent.x + ", " + n.agent.y);
Debug.Log(n.lastMove); Debug.Log(n.lastMove);
grid.SetValue(n.agent.x, n.agent.y, 3); grid.SetValue(n.agent.x, n.agent.y, 3);
Pathfinding Visualizer/Assets/Scripts/Pathfinder.cs
+10 -4
View File
@@ -74,7 +74,12 @@ public class Pathfinder
{ {
result = StartDFS(initialState, -1); result = StartDFS(initialState, -1);
} }
} // Run IDS
if (algorithm == 2)
{
result = StartIDS(initialState);
}
}
public static Stack<Node> StartAStar(Node initialState, int heuristic) public static Stack<Node> StartAStar(Node initialState, int heuristic)
{ {
@@ -117,7 +122,7 @@ public class Pathfinder
List<Node> children = currentNode.expand(-1); List<Node> children = currentNode.expand(-1);
if (heuristic == 0) if (heuristic == 0)
h2(children); h0(children);
else if (heuristic == 1) else if (heuristic == 1)
h1(children); h1(children);
else if (heuristic == 2) else if (heuristic == 2)
@@ -203,7 +208,7 @@ public class Pathfinder
List<Node> open = new List<Node>(); List<Node> open = new List<Node>();
open.Add(initialState); open.Add(initialState);
int cap = 100000; int cap = 90000;
while (true && cap > 0) while (true && cap > 0)
{ {
// if open is empty, we have exhausted all of our options and there is no solution // if open is empty, we have exhausted all of our options and there is no solution
@@ -211,6 +216,7 @@ public class Pathfinder
return solution; return solution;
Node currentNode = open[0]; Node currentNode = open[0];
open.RemoveAt(0);
// check if agent is in goal state // check if agent is in goal state
if (currentNode.samples.Count == 0) if (currentNode.samples.Count == 0)
@@ -234,7 +240,7 @@ public class Pathfinder
Debug.Log("Too much work :("); Debug.Log("Too much work :(");
return solution; return solution;
} }
public static Stack<Node> ids(Node initialState) public static Stack<Node> StartIDS(Node initialState)
{ {
Debug.Log("RUNNING IDS"); Debug.Log("RUNNING IDS");
Stack<Node> result = new Stack<Node>(); Stack<Node> result = new Stack<Node>();