refactor: change func findStarPointWithMinCost

2025-04-12 14:37:13 +03:00 · 2020-05-10 02:12:41 +03:00 · 2020-05-10 02:12:41 +03:00 · d66058daa8
commit d66058daa8
parent 670e833120
71 changed files with 8 additions and 17 deletions
--- a/.gradle/5.2.1/executionHistory/executionHistory.bin
+++ b/.gradle/5.2.1/executionHistory/executionHistory.bin
--- a/.gradle/5.2.1/executionHistory/executionHistory.lock
+++ b/.gradle/5.2.1/executionHistory/executionHistory.lock
--- a/.gradle/5.2.1/fileHashes/fileHashes.bin
+++ b/.gradle/5.2.1/fileHashes/fileHashes.bin
--- a/.gradle/5.2.1/fileHashes/fileHashes.lock
+++ b/.gradle/5.2.1/fileHashes/fileHashes.lock
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/build/classes/kotlin/main/elite/MainKt.class
+++ b/build/classes/kotlin/main/elite/MainKt.class
--- a/build/classes/kotlin/main/elite/algorithm/AStarMain$Companion.class
+++ b/build/classes/kotlin/main/elite/algorithm/AStarMain$Companion.class
--- a/build/classes/kotlin/main/elite/algorithm/AStarMain$TempPoint.class
+++ b/build/classes/kotlin/main/elite/algorithm/AStarMain$TempPoint.class
--- a/build/classes/kotlin/main/elite/algorithm/AStarMain.class
+++ b/build/classes/kotlin/main/elite/algorithm/AStarMain.class
--- a/build/classes/kotlin/main/elite/alternative/AStarMainFile$Companion.class
+++ b/build/classes/kotlin/main/elite/alternative/AStarMainFile$Companion.class
--- a/build/classes/kotlin/main/elite/alternative/AStarMainFile$findNeighbours$1.class
+++ b/build/classes/kotlin/main/elite/alternative/AStarMainFile$findNeighbours$1.class
--- a/build/classes/kotlin/main/elite/alternative/AStarMainFile.class
+++ b/build/classes/kotlin/main/elite/alternative/AStarMainFile.class
--- a/build/classes/kotlin/main/elite/database/Database$Companion.class
+++ b/build/classes/kotlin/main/elite/database/Database$Companion.class
--- a/build/classes/kotlin/main/elite/database/Database.class
+++ b/build/classes/kotlin/main/elite/database/Database.class
--- a/build/kotlin/compileKotlin/build-history.bin
+++ b/build/kotlin/compileKotlin/build-history.bin
--- a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
--- a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@ -1,2 +1,2 @@
-21
-4
+37
+19
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
--- a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
+++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
--- a/build/kotlin/compileKotlin/last-build.bin
+++ b/build/kotlin/compileKotlin/last-build.bin
--- a/src/main/kotlin/elite/algorithm/AStarMain.kt
+++ b/src/main/kotlin/elite/algorithm/AStarMain.kt
@ -74,14 +74,10 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
    }

    private fun findStarPointWithMinCost(): StarPoint {
-        var nextStarPoint = openedList[0]
-        openedList.forEach { point ->
-            when {
-//                point.isNeutronStar -> return point
-                point.costF < nextStarPoint.costF -> nextStarPoint = point
-            }
+        return openedList.minBy { starPoint -> starPoint.costF }!!.also { nextStarPoint ->
+            println("Min cost star point: G = ${nextStarPoint.costG}, F = ${nextStarPoint.costF}, " +
+                    "dist = ${nextStarPoint.distance}, start = ${nextStarPoint.previousStarPoint == startStarPoint}")
        }
-        return nextStarPoint
    }

    private fun findNeighbours(starPoint: StarPoint) {
--- a/src/main/kotlin/elite/alternative/AStarMainFile.kt
+++ b/src/main/kotlin/elite/alternative/AStarMainFile.kt
@ -69,15 +69,10 @@ class AStarMainFile {
    }

    private fun findStarPointWithMinCost(): StarPoint {
-        var nextStarPoint = openedList[0]
-        openedList.forEach { point ->
-            when {
-//                point.isNeutronStar -> return point
-                point.costF < nextStarPoint.costF -> nextStarPoint = point
-            }
+        return openedList.minBy { starPoint -> starPoint.costF }!!.also { nextStarPoint ->
+            println("Min cost star point: G = ${nextStarPoint.costG}, F = ${nextStarPoint.costF}, " +
+                    "dist = ${nextStarPoint.distance}, start = ${nextStarPoint.previousStarPoint == startStarPoint}")
        }
-        println("Min cost star point: G = ${nextStarPoint.costG}, F = ${nextStarPoint.costF}, dist = ${nextStarPoint.distance}, start = ${nextStarPoint.previousStarPoint == startStarPoint}")
-        return nextStarPoint
    }

    private fun findNeighbours(starPoint: StarPoint) {