core: improve MRSP code a bit after migration to kotlin

after #8599 IDEA suggested a few improvements Signed-off-by: Pierre-Etienne Bougué <[email protected]>
OpenRailAssociation · Nov 19, 2024 · e00920e · e00920e
1 parent e0ec0fc
commit e00920e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/core/src/main/kotlin/fr/sncf/osrd/envelope_sim_infra/EnvelopeTrainPath.kt b/core/src/main/kotlin/fr/sncf/osrd/envelope_sim_infra/EnvelopeTrainPath.kt
@@ -12,7 +12,6 @@ import fr.sncf.osrd.sim_infra.api.RawSignalingInfra
 import fr.sncf.osrd.utils.DistanceRangeMap
 import fr.sncf.osrd.utils.buildElectrificationMap
 import fr.sncf.osrd.utils.units.Distance.Companion.toMeters
-import java.util.function.BiFunction
 
 object EnvelopeTrainPath {
     /** Create EnvelopePath from a path and a ElectricalProfileMapping */
@@ -59,13 +58,12 @@ object EnvelopeTrainPath {
         val res = mutableMapOf<String, DistanceRangeMap<Electrification>>()
         for (entry in profileMap.entries) {
             val electrificationMapWithProfiles = electrificationMap.clone()
-            electrificationMapWithProfiles.updateMap<String>(
-                entry.value,
-                BiFunction { obj: Electrification, profile: String ->
-                    obj.withElectricalProfile(profile)
-                }
-            )
-            res.put(entry.key, electrificationMapWithProfiles)
+            electrificationMapWithProfiles.updateMap(entry.value) {
+                obj: Electrification,
+                profile: String ->
+                obj.withElectricalProfile(profile)
+            }
+            res[entry.key] = electrificationMapWithProfiles
         }
         return res
     }
@@ -76,9 +74,9 @@ object EnvelopeTrainPath {
     ): ImmutableRangeMap<Double, Electrification> {
         val res = TreeRangeMap.create<Double, Electrification>()
         for (entry in map.asList()) {
-            res.put(Range.closed<Double>(toMeters(entry.lower), toMeters(entry.upper)), entry.value)
+            res.put(Range.closed(toMeters(entry.lower), toMeters(entry.upper)), entry.value)
         }
-        return ImmutableRangeMap.copyOf<Double, Electrification>(res)
+        return ImmutableRangeMap.copyOf(res)
     }
 
     /** Converts an ElectrificationMapByPowerClass as a DistanceRangeMap into a RangeMap */
@@ -87,7 +85,7 @@ object EnvelopeTrainPath {
     ): Map<String, ImmutableRangeMap<Double, Electrification>> {
         val res = mutableMapOf<String, ImmutableRangeMap<Double, Electrification>>()
         for (entry in electrificationMapByPowerClass.entries) {
-            res.put(entry.key, convertElectrificationMap(entry.value))
+            res[entry.key] = convertElectrificationMap(entry.value)
         }
         return res
     }

diff --git a/core/src/main/kotlin/fr/sncf/osrd/envelope_sim_infra/MRSP.kt b/core/src/main/kotlin/fr/sncf/osrd/envelope_sim_infra/MRSP.kt
@@ -89,14 +89,16 @@ fun computeMRSP(
             attrs.add(speedLimitProp.source)
         }
         if (attrs.any { it is UnknownTag }) attrs.add(HasMissingSpeedTag)
-        if (speed != 0.0) // Add the envelope part corresponding to the restricted speed section
+        if (speed != 0.0) {
+            // Add the envelope part corresponding to the restricted speed section
             builder.addPart(
                 EnvelopePart.generateTimes(
                     attrs,
                     doubleArrayOf(start, end),
                     doubleArrayOf(speed, speed)
                 )
             )
+        }
     }
 
     // Add a limit corresponding to the hardware's maximum operational speed