core: add a virtual final clear zone

OpenRailAssociation · Apr 13, 2023 · edd6608 · edd6608
1 parent a1130e8
commit edd6608
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/core/kt-osrd-signaling/src/main/kotlin/fr/sncf/osrd/signaling/SignalingSimulator.kt b/core/kt-osrd-signaling/src/main/kotlin/fr/sncf/osrd/signaling/SignalingSimulator.kt
@@ -47,6 +47,7 @@ interface SignalingSimulator {
         fullPath: StaticIdxList<Block>,
         evaluatedPathBegin: Int,
         evaluatedPathEnd: Int,
-        zoneStates: List<ZoneStatus>
+        zoneStates: List<ZoneStatus>,
+        followingZoneState: ZoneStatus,
     ): IdxMap<LogicalSignalId, SigState>
 }
diff --git a/core/kt-osrd-signaling/src/main/kotlin/fr/sncf/osrd/signaling/impl/SignalingSimulatorImpl.kt b/core/kt-osrd-signaling/src/main/kotlin/fr/sncf/osrd/signaling/impl/SignalingSimulatorImpl.kt
@@ -100,7 +100,8 @@ class SignalingSimulatorImpl(override val sigModuleManager: SigSystemManager) :
         fullPath: StaticIdxList<Block>,
         evaluatedPathBegin: Int,
         evaluatedPathEnd: Int,
-        zoneStates: List<ZoneStatus>
+        zoneStates: List<ZoneStatus>,
+        followingZoneState: ZoneStatus,
     ): IdxMap<LogicalSignalId, SigState> {
         assert(evaluatedPathBegin >= 0)
         assert(evaluatedPathEnd > evaluatedPathBegin)
@@ -131,7 +132,7 @@ class SignalingSimulatorImpl(override val sigModuleManager: SigSystemManager) :
         if (!lastBlockEndsAtBufferStop) {
             val blockSignals = blocks.getBlockSignals(lastBlock)
             val lastSignal = blockSignals[blockSignals.size - 1]
-            signalEvalSequence.add(SignalEvalTask(lastSignal, ProtectionStatus.INCOMPATIBLE))
+            signalEvalSequence.add(SignalEvalTask(lastSignal, followingZoneState.toProtectionStatus()))
         }
 
         for (blockIndex in (0 until evaluatedPath.size).reversed()) {

diff --git a/core/kt-osrd-sncf-signaling/src/test/kotlin/fr/sncf/osrd/signaling/bal/TestBALtoBAL.kt b/core/kt-osrd-sncf-signaling/src/test/kotlin/fr/sncf/osrd/signaling/bal/TestBALtoBAL.kt
@@ -117,7 +117,7 @@ class TestBALtoBAL {
         fullPath.add(blockInfra.getBlocksAtDetector(detectorU.normal).first())
         fullPath.add(blockInfra.getBlocksAtDetector(detectorV.normal).first())
         val zoneStates = mutableListOf(ZoneStatus.CLEAR, ZoneStatus.CLEAR, ZoneStatus.CLEAR)
-        val res = simulator.evaluate(infra, loadedSignalInfra, blockInfra, fullPath, 0, fullPath.size, zoneStates)
+        val res = simulator.evaluate(infra, loadedSignalInfra, blockInfra, fullPath, 0, fullPath.size, zoneStates, ZoneStatus.INCOMPATIBLE)
         assertEquals("A", res[loadedSignalInfra.getLogicalSignals(signalV).first()]!!.getEnum("aspect"))
     }
 }
diff --git a/core/kt-osrd-sncf-signaling/src/test/kotlin/fr/sncf/osrd/signaling/bal/TestBAPRtoBAL.kt b/core/kt-osrd-sncf-signaling/src/test/kotlin/fr/sncf/osrd/signaling/bal/TestBAPRtoBAL.kt
@@ -99,7 +99,7 @@ class TestBAPRtoBAL {
         fullPath.add(blockInfra.getBlocksAtDetector(detectorX.normal).first())
         fullPath.add(blockInfra.getBlocksAtDetector(detectorY.normal).first())
         val zoneStates = mutableListOf(ZoneStatus.CLEAR, ZoneStatus.CLEAR, ZoneStatus.INCOMPATIBLE)
-        val res = simulator.evaluate(infra, loadedSignalInfra, blockInfra, fullPath, 0, fullPath.size, zoneStates)
+        val res = simulator.evaluate(infra, loadedSignalInfra, blockInfra, fullPath, 0, fullPath.size, zoneStates, ZoneStatus.INCOMPATIBLE)
         val logicalSignals = listOf(signalm, signalM, signaln, signalN).map{loadedSignalInfra.getLogicalSignals(it).first()}
         val expectedAspects = listOf("VL", "VL", "A", "C")
         asserSignalListAspectEquals(expectedAspects, res, logicalSignals)

diff --git a/core/src/main/java/fr/sncf/osrd/standalone_sim/SignalProjection.kt b/core/src/main/java/fr/sncf/osrd/standalone_sim/SignalProjection.kt
@@ -130,7 +130,9 @@ private fun computeSignalAspectChangeEvents(
             zoneStates[zoneToPathIndexMap[event.zone]!!] = ZoneStatus.CLEAR
 
         val simulatedSignalStates = simulator.evaluate(
-            rawInfra, loadedSignalInfra, blockInfra, blockPath, 0, blockPath.size, zoneStates
+            rawInfra, loadedSignalInfra, blockInfra,
+            blockPath, 0, blockPath.size,
+            zoneStates, ZoneStatus.CLEAR
         )
         val simulatedAspects = simulatedSignalStates.map { it.getEnum("aspect") }
         for (pathSignal in pathSignals) {