From 14e9b991899eeaef4744bf67155272e1c86efc66 Mon Sep 17 00:00:00 2001
From: Bryson Zimmerman <brzimmer@nmu.edu>
Date: Wed, 23 Oct 2024 16:38:25 -0400
Subject: [PATCH] Optimizations, small bits of cleanup

---
 .idea/misc.xml                                |  2 +-
 .idea/workspace.xml                           | 19 ++++++-----------
 src/main/kotlin/Main.kt                       |  4 +++-
 .../kotlin/{Mazefinder.kt => MazeFinder.kt}   |  2 --
 src/main/kotlin/data/Directions.kt            |  8 +++----
 src/main/kotlin/data/Tile.kt                  | 21 ++++++++++++-------
 src/main/kotlin/data/TileProperties.kt        |  3 ---
 7 files changed, 28 insertions(+), 31 deletions(-)
 rename src/main/kotlin/{Mazefinder.kt => MazeFinder.kt} (97%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ee3319a..40daec2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="temurin-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="temurin-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7264ad1..98a458a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,22 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="741ceb24-e493-47c1-9f25-1dbd8b151381" name="Changes" comment="Implemented MazeFinder, significant changes to supporting data structures to match developed understanding of Kotlin and Object-Oriented philosophy">
-      <change afterPath="$PROJECT_DIR$/src/main/kotlin/util/TrimmableArrayList.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/kotlin/MazeFinderTest.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/kotlin/TileTest.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/kotlin/TrimmableArrayListTest.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/kotlin/Main.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/Main.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Mazefinder.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/Mazefinder.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/World.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/World.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Mazefinder.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/MazeFinder.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/kotlin/data/Directions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/data/Directions.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/kotlin/data/Tile.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/data/Tile.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/kotlin/data/TileProperties.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/data/TileProperties.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/data/WorldData.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/data/WorldData.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -122,7 +113,7 @@
     <setting file="file://$PROJECT_DIR$/src/main/kotlin/util/TrimmableArrayList.kt" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="ProblemsViewState">
-    <option name="selectedTabId" value="CurrentFile" />
+    <option name="selectedTabId" value="ProjectErrors" />
   </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 2
@@ -168,6 +159,7 @@
     "git-widget-placeholder": "main",
     "ignore.virus.scanning.warn.message": "true",
     "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Users/Bryson/Documents/GitHub/HierarchicalPathfinding",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -361,8 +353,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
-        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
+        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23726.103" />
+        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23726.103" />
       </set>
     </attachedChunks>
   </component>
@@ -379,6 +371,7 @@
       <workItem from="1729647683265" duration="4068000" />
       <workItem from="1729689482885" duration="6548000" />
       <workItem from="1729708627987" duration="3017000" />
+      <workItem from="1729712667391" duration="3180000" />
     </task>
     <task id="LOCAL-00001" summary="Project Setup">
       <option name="closed" value="true" />
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
index ef40c48..1aa8f33 100644
--- a/src/main/kotlin/Main.kt
+++ b/src/main/kotlin/Main.kt
@@ -14,8 +14,10 @@ class HierarchicalPathfinding {
     companion object {
         @JvmStatic
         fun main(args: Array<String>) {
-            val n = 1000
+            val n = 5000
+            println("Building world")
             World.setSize(n, n)
+            println("Start")
             val startTime = System.currentTimeMillis()
             MazeFinder.primsAlgorithm()
             val endTime = System.currentTimeMillis()
diff --git a/src/main/kotlin/Mazefinder.kt b/src/main/kotlin/MazeFinder.kt
similarity index 97%
rename from src/main/kotlin/Mazefinder.kt
rename to src/main/kotlin/MazeFinder.kt
index 1f56f3e..2459f69 100644
--- a/src/main/kotlin/Mazefinder.kt
+++ b/src/main/kotlin/MazeFinder.kt
@@ -6,8 +6,6 @@ import technology.zim.data.Tile
 import technology.zim.data.TileProperties
 import technology.zim.util.TrimmableArrayList
 import kotlin.collections.ArrayList
-import kotlin.collections.forEach
-import kotlin.random.Random
 
 
 //Build the maze
diff --git a/src/main/kotlin/data/Directions.kt b/src/main/kotlin/data/Directions.kt
index e7b8db4..fc02f80 100644
--- a/src/main/kotlin/data/Directions.kt
+++ b/src/main/kotlin/data/Directions.kt
@@ -25,10 +25,6 @@ enum class Directions(val value: Pair<Int, Int>) {
     //Return the opposite direction
     abstract fun opposite(): Directions
 
-    fun all(): MutableSet<Directions> {
-        return mutableSetOf(NORTH, SOUTH, EAST, WEST)
-    }
-
     fun x():Int {
         return value.first
     }
@@ -37,4 +33,8 @@ enum class Directions(val value: Pair<Int, Int>) {
         return value.second
     }
 
+    companion object {
+        val ALL = setOf(NORTH, EAST, WEST, SOUTH)
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/kotlin/data/Tile.kt b/src/main/kotlin/data/Tile.kt
index 717bc81..ad6e5a7 100644
--- a/src/main/kotlin/data/Tile.kt
+++ b/src/main/kotlin/data/Tile.kt
@@ -1,6 +1,5 @@
 package technology.zim.data
 
-import technology.zim.MazeFinder
 import technology.zim.World
 
 class Tile(val value: Pair<Int, Int>): Comparable<Tile> {
@@ -31,18 +30,26 @@ class Tile(val value: Pair<Int, Int>): Comparable<Tile> {
         }
     }
 
+    //Duplicating code from getAdjacent shaved off 100ms
+    //I'm keeping it
     fun getAdjacentTiles(explored:Boolean): Set<Tile> {
-        val result = mutableSetOf<Tile>()
-        getAdjacent(explored).forEach {
-            pair ->
-            result.add(pair.first)
+        val adj = mutableSetOf<Tile>()
+        val dirs = Directions.ALL
+
+        dirs.forEach { dir ->
+            val candidateTile = this + dir
+            //Ensure that the tile is within bounds
+            if(candidateTile.isInBounds() && candidateTile.getProperties().visited == explored)
+            {
+                adj.add(candidateTile)
+            }
         }
-        return result
+        return adj
     }
 
     fun getAdjacent(explored:Boolean): Set<Pair<Tile, Directions>> {
         val adj = mutableSetOf<Pair<Tile, Directions>>()
-        val dirs = Directions.NORTH.all()
+        val dirs = Directions.ALL
 
         dirs.forEach { dir ->
             val candidateTile = this + dir
diff --git a/src/main/kotlin/data/TileProperties.kt b/src/main/kotlin/data/TileProperties.kt
index eef983d..6b3c56a 100644
--- a/src/main/kotlin/data/TileProperties.kt
+++ b/src/main/kotlin/data/TileProperties.kt
@@ -1,8 +1,5 @@
 package technology.zim.data
 
-import technology.zim.World
-import technology.zim.World.tiles
-
 //Data holder for a Tile
 //Should contain a mutable set of connected directions
 //Later, can hold jumps to other locations other such fancy features