From c769ef6b617297d666ee4d5dd9c40f19f8ee8a5f Mon Sep 17 00:00:00 2001 From: Assasinnys Date: Mon, 11 May 2020 16:11:48 +0300 Subject: [PATCH] init: initial commit --- src/main/kotlin/elite/Main.kt | 8 ++++---- src/main/kotlin/elite/algorithm/AStarMain.kt | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/elite/Main.kt b/src/main/kotlin/elite/Main.kt index 54aba93..b70d936 100644 --- a/src/main/kotlin/elite/Main.kt +++ b/src/main/kotlin/elite/Main.kt @@ -180,7 +180,7 @@ fun calcTime(timeStart: Long): Double = System.currentTimeMillis().minus(timeSta }*/ //TODO alternative MAIN with work in file -/*fun main(args: Array) { +fun main(args: Array) { println("Start A Star with file table") val time = System.currentTimeMillis() @@ -190,10 +190,10 @@ fun calcTime(timeStart: Long): Double = System.currentTimeMillis().minus(timeSta aStar.activateAStarAlgorithm() println("Complete with time: ${calcTime(time)}") -}*/ +} //TODO MAIN METHOD -fun main(args: Array) { +/*fun main(args: Array) { println("Start!") val timeStartProgram = System.currentTimeMillis() @@ -204,7 +204,7 @@ fun main(args: Array) { algorithm.activateAStarAlgorithm() println("Work complete. Time spent ${calcTime(timeStartProgram)}") -} +}*/ // systems const val SOL = "Sol" diff --git a/src/main/kotlin/elite/algorithm/AStarMain.kt b/src/main/kotlin/elite/algorithm/AStarMain.kt index fd0b583..0a21622 100644 --- a/src/main/kotlin/elite/algorithm/AStarMain.kt +++ b/src/main/kotlin/elite/algorithm/AStarMain.kt @@ -18,6 +18,7 @@ import java.sql.ResultSet //TODO check neighbors StarPoint's for better way (lower cost) [ready 50%] class AStarMain(private val startSystem: String, private val finishSystem: String) { +/* private val database = Database() private val finishStarPoint: StarPoint = createFinishStarPoint() private val startStarPoint: StarPoint = createStartStarPoint() @@ -33,7 +34,9 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin // println("finishStarPoint=${finishStarPoint.systemId64}") } - fun activateAStarAlgorithm()/*: Pair*/ { + fun activateAStarAlgorithm()*/ +/*: Pair*//* + { findNeighbours(startStarPoint) @@ -230,6 +233,7 @@ class AStarMain(private val startSystem: String, private val finishSystem: Strin val id64: Long, val coords: Coordinates ) +*/ companion object { const val CORRIDOR = "coridor3"