core: sim: ignore overlapping scheduled points

Update core/src/main/kotlin/fr/sncf/osrd/standalone_sim/StandaloneSimulation.kt Co-authored-by: bougue-pe <150040524+bougue-pe@users.noreply.github.com>
OpenRailAssociation · Jun 18, 2024 · a85eb96 · a85eb96
1 parent 76b4250
commit a85eb96
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/SimulationScheduleItemsParser.kt b/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/SimulationScheduleItemsParser.kt
@@ -3,6 +3,9 @@ package fr.sncf.osrd.api.api_v2
 import fr.sncf.osrd.api.api_v2.standalone_sim.SimulationScheduleItem
 import fr.sncf.osrd.utils.units.TimeDelta
 import java.lang.Long.min
+import mu.KotlinLogging
+
+val simulationScheduleItemParserLogger = KotlinLogging.logger {}
 
 /**
  * Merge consecutive schedule items which are at the same location, i.e. have the same path offset.
@@ -44,9 +47,12 @@ fun parseRawSimulationScheduleItems(
             onStopSignal = onStopSignal || rawSimulationScheduleItems[i + 1].onStopSignal
             i++
         }
-        simulationScheduleItems.add(
-            SimulationScheduleItem(pathOffset, arrival, stopFor, onStopSignal)
-        )
+        val newItem = SimulationScheduleItem(pathOffset, arrival, stopFor, onStopSignal)
+        if (simulationScheduleItems.lastOrNull() == newItem) {
+            simulationScheduleItemParserLogger.warn { "duplicated schedule items: $newItem" }
+        } else {
+            simulationScheduleItems.add(newItem)
+        }
         i++
     }
     return simulationScheduleItems.sortedBy { it.pathOffset }

diff --git a/core/src/main/kotlin/fr/sncf/osrd/standalone_sim/StandaloneSimulation.kt b/core/src/main/kotlin/fr/sncf/osrd/standalone_sim/StandaloneSimulation.kt
@@ -33,6 +33,10 @@ import fr.sncf.osrd.utils.indexing.StaticIdxList
 import fr.sncf.osrd.utils.units.Distance
 import fr.sncf.osrd.utils.units.Offset
 import fr.sncf.osrd.utils.units.meters
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+val standaloneSimLogger: Logger = LoggerFactory.getLogger("StandaloneSimulation")
 
 /** Run a simulation for a single train. */
 fun runStandaloneSimulation(
@@ -216,6 +220,7 @@ fun buildFinalEnvelope(
         var extraTime = point.arrival.seconds - arrivalTime
         if (extraTime < 0.0) {
             // TODO: raise a warning
+            standaloneSimLogger.warn("impossible scheduled point")
             extraTime = 0.0
         }
         marginRanges.addAll(
@@ -271,6 +276,12 @@ fun distributeAllowance(
     startOffset: Offset<TravelledPath>,
     endOffset: Offset<TravelledPath>
 ): List<AllowanceRange> {
+    assert(startOffset <= endOffset)
+    if (startOffset == endOffset) {
+        // TODO: raise warning (overlapping scheduled points)
+        standaloneSimLogger.info("Warning: different scheduled points at the same location")
+        return listOf()
+    }
     fun rangeTime(
         from: Offset<TravelledPath>,
         to: Offset<TravelledPath>,