From 9c087ea6425277e18640910a283d1d27c93f1664 Mon Sep 17 00:00:00 2001 From: Bryson Zimmerman Date: Thu, 14 Nov 2024 21:43:33 -0500 Subject: [PATCH] Update main to utilize changes to World, commented out HashMap-backed pathfinder to increase testing speed --- src/main/kotlin/Main.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt index 3d4c0f9..6a98156 100644 --- a/src/main/kotlin/Main.kt +++ b/src/main/kotlin/Main.kt @@ -4,8 +4,8 @@ import technology.zim.data.Directions import technology.zim.data.Tile class HierarchicalPathfinding { - companion object { + //TODO: Run tests of World with nested ArrayList vs TileNavigatedArray @JvmStatic fun main(args: Array) { val n = 1000 @@ -22,17 +22,13 @@ class HierarchicalPathfinding { endTime = System.currentTimeMillis() val ArrayBackedPathfinderTime = endTime - startTime - World.tiles.scrubDirections(listOf(Directions.FRONTIER, Directions.INPATH, Directions.NOPATH)) + //World.scrubDirections(listOf(Directions.FRONTIER, Directions.INPATH, Directions.NOPATH)) startTime = System.currentTimeMillis() - MapBackedPathfinder.generatePath(Tile(0, 0), Tile(n-1, (n-1))) + //MapBackedPathfinder.generatePath(Tile(0, 0), Tile(n-1, (n-1))) endTime = System.currentTimeMillis() val MapBackedPathfinderTime = endTime - startTime - - - - println(World.toString()) println(n*n) println("Maze build time: ${buildMazeTime} ms") @@ -42,7 +38,7 @@ class HierarchicalPathfinding { //Clear the maze of pathfinding markers before running another pathfinding algorithm fun clearMaze() { - World.tiles.scrubDirections(listOf(Directions.FRONTIER, Directions.INPATH)) + World.scrubDirections(listOf(Directions.FRONTIER, Directions.INPATH)) } fun buildMaze(n: Int) { @@ -57,9 +53,6 @@ class HierarchicalPathfinding { println(World.toString()) println(e.message) } - - } } - } \ No newline at end of file