third-party-mirrors/ED-AStar-Galaxy-Router
1
0
Fork 0
mirror of https://github.com/Assasinnys/ED-AStar-Galaxy-Router synced 2025-04-13 06:47:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: delete unused code

Browse Source
This commit is contained in:
Assasinnys 2020-05-15 19:13:48 +03:00
parent 1aaf6c9da4
commit 9f544a4272
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/kotlin/elite/algorithm/AStarMain.kt
View File

@ -1,7 +1,5 @@
package elite.algorithm package elite.algorithm
import elite.algorithm.StarPoint
import elite.algorithm.StarPoint.Companion.NEUTRON_COF
import elite.database.Database import elite.database.Database
import elite.database.Database.Companion.C_ID64 import elite.database.Database.Companion.C_ID64
import elite.database.Database.Companion.C_SUBTYPE import elite.database.Database.Companion.C_SUBTYPE
@ -14,8 +12,6 @@ import elite.replaces
import elite.utils.* import elite.utils.*
import java.sql.ResultSet import java.sql.ResultSet
import java.util.concurrent.Executors import java.util.concurrent.Executors
import java.util.concurrent.Future
import java.util.concurrent.FutureTask
//TODO check for neutron as a second star //TODO check for neutron as a second star
//TODO check neighbors StarPoint's for better way (lower cost) [ready 50%] //TODO check neighbors StarPoint's for better way (lower cost) [ready 50%]
@ -26,14 +22,13 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
private val startStarPoint: StarPoint = createStartStarPoint() private val startStarPoint: StarPoint = createStartStarPoint()
private val openedList = /*mutableListOf<StarPoint>()*/ hashMapOf<Long, StarPoint>() private val openedList = hashMapOf<Long, StarPoint>()
private val closedList = /*mutableListOf<StarPoint>()*/ hashMapOf<Long, StarPoint>() private val closedList = hashMapOf<Long, StarPoint>()
private val stopwatch = Stopwatch() private val stopwatch = Stopwatch()
private val threadPool = Executors.newSingleThreadExecutor() private val threadPool = Executors.newSingleThreadExecutor()
init { init {
// openedList.add(startStarPoint)
openedList[startStarPoint.systemId64] = startStarPoint openedList[startStarPoint.systemId64] = startStarPoint
// println("startStarPoint=${startStarPoint.systemId64}") // println("startStarPoint=${startStarPoint.systemId64}")
// println("finishStarPoint=${finishStarPoint.systemId64}") // println("finishStarPoint=${finishStarPoint.systemId64}")
@ -48,7 +43,6 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
return return
} }
// openedList.remove(startStarPoint)
openedList.remove(startStarPoint.systemId64) openedList.remove(startStarPoint.systemId64)
closedList[startStarPoint.systemId64] = startStarPoint closedList[startStarPoint.systemId64] = startStarPoint
@ -62,7 +56,6 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
val selectedStarPoint = findStarPointWithMinCost() val selectedStarPoint = findStarPointWithMinCost()
multithreatingFindNeighbours(selectedStarPoint) multithreatingFindNeighbours(selectedStarPoint)
// openedList.remove(selectedStarPoint)
openedList.remove(selectedStarPoint.systemId64) openedList.remove(selectedStarPoint.systemId64)
closedList[selectedStarPoint.systemId64] = selectedStarPoint closedList[selectedStarPoint.systemId64] = selectedStarPoint
@ -77,12 +70,6 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
finishStarPoint.previousStarPoint = openedList[finishStarPoint.systemId64] finishStarPoint.previousStarPoint = openedList[finishStarPoint.systemId64]
return true return true
} }
// openedList.forEach { id64, point ->
// if (point == finishStarPoint) {
// finishStarPoint.previousStarPoint = point
// return true
// }
// }
return false return false
} }
@ -97,13 +84,6 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
) )
stopwatch.stopWithConsoleOutput("Min cost find time: ") stopwatch.stopWithConsoleOutput("Min cost find time: ")
} }
// 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}"
// )
// stopwatch.stopWithConsoleOutput("Min cost find time: ")
// }
} }
private fun multithreatingFindNeighbours(starPoint: StarPoint) { private fun multithreatingFindNeighbours(starPoint: StarPoint) {
@ -136,8 +116,6 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin
getString(C_SYS_NAME), starPoint.jumpCounter.plus(1), finishStarPoint.coords getString(C_SYS_NAME), starPoint.jumpCounter.plus(1), finishStarPoint.coords
) )
if (closedList.notContains(newStarPoint.systemId64)) { if (closedList.notContains(newStarPoint.systemId64)) {
// openedList.addIfAbsent(newStarPoint)
// openedList.smartAdd(newStarPoint)
openedList.smartAdd2(newStarPoint) openedList.smartAdd2(newStarPoint)
} }