core: use when in getMostRestritivePriority

OpenRailAssociation · Jul 19, 2024 · 93c7099 · 93c7099
1 parent a8d22c3
commit 93c7099
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/core/src/main/kotlin/fr/sncf/osrd/stdcm/preprocessing/implementation/BlockAvailability.kt b/core/src/main/kotlin/fr/sncf/osrd/stdcm/preprocessing/implementation/BlockAvailability.kt
@@ -234,24 +234,28 @@ data class BlockAvailability(
         firstAvailability: BlockAvailabilityInterface.Availability,
         secondAvailability: BlockAvailabilityInterface.Availability
     ): BlockAvailabilityInterface.Availability {
-        if (
+        when {
             firstAvailability is BlockAvailabilityInterface.Unavailable &&
-                secondAvailability is BlockAvailabilityInterface.Unavailable
-        ) {
-            if (firstAvailability.duration >= secondAvailability.duration) return firstAvailability
-            return secondAvailability
-        } else if (firstAvailability is BlockAvailabilityInterface.Unavailable) {
-            return firstAvailability
-        } else if (secondAvailability is BlockAvailabilityInterface.Unavailable) {
-            return secondAvailability
-        } else {
-            if (
-                (firstAvailability as BlockAvailabilityInterface.Available).maximumDelay <=
-                    (secondAvailability as BlockAvailabilityInterface.Available).maximumDelay
-            )
+                secondAvailability is BlockAvailabilityInterface.Unavailable -> {
+                if (firstAvailability.duration >= secondAvailability.duration)
+                    return firstAvailability
+                return secondAvailability
+            }
+            firstAvailability is BlockAvailabilityInterface.Available &&
+                secondAvailability is BlockAvailabilityInterface.Available -> {
+                if (firstAvailability.maximumDelay <= secondAvailability.maximumDelay)
+                    return firstAvailability
+                return secondAvailability
+            }
+            firstAvailability is BlockAvailabilityInterface.Unavailable &&
+                secondAvailability is BlockAvailabilityInterface.Available -> {
                 return firstAvailability
-            return secondAvailability
+            }
+            else -> {
+                return secondAvailability
+            }
         }
+
     }
 
     /**