Improve plate solver for similar stars

kylecorry31 · Dec 21, 2024 · 0897fad · 0897fad
1 parent 33b40a6
commit 0897fad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("com.vanniktech.maven.publish") version "0.30.0"
 }
 
-val versionName = "10.1.1"
+val versionName = "10.1.2"
 
 mavenPublishing {
     coordinates("com.kylecorry", "sol", versionName)

diff --git a/src/main/kotlin/com/kylecorry/sol/science/astronomy/stars/PlateSolver.kt b/src/main/kotlin/com/kylecorry/sol/science/astronomy/stars/PlateSolver.kt
@@ -1,7 +1,6 @@
 package com.kylecorry.sol.science.astronomy.stars
 
 import com.kylecorry.sol.math.analysis.Trigonometry
-import com.kylecorry.sol.math.sumOfFloat
 import com.kylecorry.sol.science.astronomy.Astronomy
 import com.kylecorry.sol.time.Time
 import com.kylecorry.sol.units.Coordinate
@@ -36,7 +35,7 @@ internal class PlateSolver(
         while (queue.isNotEmpty()) {
             val reading = queue.removeAt(0)
             val possibleMatches = catalogQuads.sortedBy {
-                reading.second.zip(it.second.second).sumOfFloat { (a, b) ->
+                reading.second.zip(it.second.second).maxOf { (a, b) ->
                     (a - b).absoluteValue
                 }
             }.take(6)
@@ -45,7 +44,7 @@ internal class PlateSolver(
             var minDistanceMatch: Pair<Star, Pair<AltitudeAzimuth, FloatArray>>? = null
             for (possibleMatch in possibleMatches) {
                 val distance =
-                    reading.second.zip(possibleMatch.second.second).sumOfFloat { (a, b) ->
+                    reading.second.zip(possibleMatch.second.second).maxOf { (a, b) ->
                         (a - b).absoluteValue
                     }
                 if (matches.none { it.second == possibleMatch.first } || distance < matches.first { it.second == possibleMatch.first }.third) {
@@ -70,7 +69,7 @@ internal class PlateSolver(
                     Triple(
                         reading.first,
                         minDistanceMatch.first,
-                        reading.second.zip(minDistanceMatch.second.second).sumOfFloat { (a, b) ->
+                        reading.second.zip(minDistanceMatch.second.second).maxOf { (a, b) ->
                             (a - b).absoluteValue
                         })
                 )
@@ -112,7 +111,8 @@ internal class PlateSolver(
             currentSeparation += degreesStep
         }
 
-        return quads.distinct()
+        // Remove duplicates (based on the start and distance array)
+        return quads.distinctBy { it.first to it.second.second.toList() }.toList()
     }
 
     private fun getQuads(
@@ -164,7 +164,7 @@ internal class PlateSolver(
             val maxDistance = distances.maxOrNull() ?: 0f
 
             // Normalize the distances
-            val normalizedDistances = distances.map { it / maxDistance }.sorted().toFloatArray()
+            val normalizedDistances = distances.map { it / maxDistance }.toFloatArray()
 
             quads.add(Pair(reading, normalizedDistances))
         }