Fix one Detekt issue in RoutingGraph.kt

JordanLongstaff · Sep 9, 2024 · 41fb8a1 · 41fb8a1
1 parent a04a93f
commit 41fb8a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/app/detekt-baseline.xml b/app/detekt-baseline.xml
@@ -2,7 +2,6 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
-    <ID>ComplexCondition:RoutingGraph.kt$RoutingGraph.Companion$sourceX.isNaN() || sourceZ.isNaN() || destX.isNaN() || destZ.isNaN()</ID>
     <ID>CyclomaticComplexMethod:AgentViewModel.kt$AgentViewModel$private suspend fun updateObjects()</ID>
     <ID>CyclomaticComplexMethod:AlliesFragment.kt$AlliesFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
     <ID>CyclomaticComplexMethod:AlliesFragment.kt$AlliesFragment.AllyInfoBinder$fun bind(entry: Ally, viewModel: AgentViewModel)</ID>

diff --git a/app/src/main/kotlin/artemis/agent/cpu/RoutingGraph.kt b/app/src/main/kotlin/artemis/agent/cpu/RoutingGraph.kt
@@ -879,26 +879,27 @@ internal class RoutingGraph(
             sourceZ: Float,
             destX: Float,
             destZ: Float
-        ): Float {
-            if (sourceX.isNaN() || sourceZ.isNaN() || destX.isNaN() || destZ.isNaN()) {
-                return Float.NaN
-            }
-
-            val dx = destX - sourceX
-            val dz = destZ - sourceZ
-            val simpleDistance = sqrt(dx * dx + dz * dz)
-            return if (this == null || viewModel.playerShip?.driveType?.value != DriveType.WARP) {
-                simpleDistance
-            } else {
-                calculateAvoidanceRouteCost(
-                    sourceX,
-                    sourceZ,
-                    destX,
-                    destZ,
+        ): Float =
+            if (allDefined(sourceX, sourceX, destX, destZ)) {
+                val dx = destX - sourceX
+                val dz = destZ - sourceZ
+                val simpleDistance = sqrt(dx * dx + dz * dz)
+                if (this == null || viewModel.playerShip?.driveType?.value != DriveType.WARP) {
                     simpleDistance
-                )
+                } else {
+                    calculateAvoidanceRouteCost(
+                        sourceX,
+                        sourceZ,
+                        destX,
+                        destZ,
+                        simpleDistance
+                    )
+                }
+            } else {
+                Float.NaN
             }
-        }
+
+        private fun allDefined(vararg coordinates: Float): Boolean = coordinates.none(Float::isNaN)
 
         /**
          * Generates a "route key" representing a path from one object to another, encapsulating