Routing conflict detection

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope/EnvelopeTimeInterpolate.java

@@ -12,6 +12,9 @@ public interface EnvelopeTimeInterpolate {
      * clamping the position to [0, envelope length] first */
     double interpolateTotalTimeClamp(double position);
 
+    /** Returns the start position of the envelope */
+    double getBeginPos();
+
     /** Returns the end position of the envelope */
     double getEndPos();
 

core/envelope-sim/src/testFixtures/java/fr/sncf/osrd/envelope_sim/MaxEffortEnvelopeBuilder.java

@@ -11,10 +11,10 @@ public class MaxEffortEnvelopeBuilder {
     /** Builds max effort envelope with the specified stops, on a flat MRSP */
     public static Envelope makeSimpleMaxEffortEnvelope(
             EnvelopeSimContext context,
-            double speed,
+            double maxSpeed,
             double[] stops
     ) {
-        var flatMRSP = makeSimpleMRSP(context, speed);
+        var flatMRSP = makeSimpleMRSP(context, maxSpeed);
         var maxSpeedEnvelope = MaxSpeedEnvelope.from(context, stops, flatMRSP);
         return MaxEffortEnvelope.from(context, 0, maxSpeedEnvelope);
     }

core/kt-osrd-signaling/src/test/kotlin/fr/sncf/osrd/signaling/BlockBuilderTest.kt

@@ -24,13 +24,13 @@ class BlockBuilderTest {
         //           \
         // w       x  \    y       z
         // I---B---I---C---I---D---I
-        //
+        //             S
         //  <-- reverse     normal -->
 
         // region build the test infrastructure
         val builder = RawInfraBuilder()
         // region switches
-        val switch = builder.movableElement(delay = 10L.milliseconds) {
+        val switch = builder.movableElement("S", delay = 10L.milliseconds) {
             config("xy", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
             config("vy", Pair(TrackNodePortId(0u), TrackNodePortId(2u)))
         }

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/api/TrackNetworkInfra.kt

@@ -49,6 +49,8 @@ interface TrackNetworkInfra {
     /** Returns the time it takes for the node to change configuration */
     fun getTrackNodeDelay(trackNode: TrackNodeId): Duration
     fun getTrackNodeConfigName(trackNode: TrackNodeId, config: TrackNodeConfigId): String
+    fun getTrackNodeName(trackNode: TrackNodeId): String
+
 
     val trackNodes: StaticIdxSpace<TrackNode>
     val trackSections: StaticIdxSpace<TrackSection>

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/RawInfraBuilder.kt

@@ -16,20 +16,21 @@ interface MovableElementDescriptorBuilder {
 }
 
 class MovableElementDescriptorBuilderImpl(
+    private val name: String,
     private val delay: Duration,
     private val ports: StaticPool<TrackNodePort, EndpointTrackSectionId>,
-    private val configs: StaticPool<TrackNodeConfig, MovableElementConfigDescriptor>,
+    private val configs: StaticPool<TrackNodeConfig, TrackNodeConfigDescriptor>,
 ) : MovableElementDescriptorBuilder {
     override fun port(endpoint: EndpointTrackSectionId): TrackNodePortId {
         return ports.add(endpoint)
     }
 
     override fun config(name: String, portLink: Pair<TrackNodePortId, TrackNodePortId>): TrackNodeConfigId {
-        return configs.add(MovableElementConfigDescriptor(name, portLink))
+        return configs.add(TrackNodeConfigDescriptor(name, portLink))
     }
 
-    fun build(): MovableElementDescriptor {
-        return MovableElementDescriptor(delay, ports, configs)
+    fun build(): TrackNodeDescriptor {
+        return TrackNodeDescriptor(name, delay, ports, configs)
     }
 }
 
@@ -163,7 +164,7 @@ class RouteDescriptorImpl(
 ) : RouteDescriptor
 
 interface RestrictedRawInfraBuilder {
-    fun movableElement(delay: Duration, init: MovableElementDescriptorBuilder.() -> Unit): TrackNodeId
+    fun movableElement(name: String, delay: Duration, init: MovableElementDescriptorBuilder.() -> Unit): TrackNodeId
     fun detector(name: String?): DetectorId
     fun linkZones(zoneA: ZoneId, zoneB: ZoneId): DetectorId
     fun linkZones(detector: DetectorId, zoneA: ZoneId, zoneB: ZoneId)
@@ -232,7 +233,7 @@ interface RawInfraBuilder : RestrictedRawInfraBuilder {
 }
 
 class RawInfraBuilderImpl : RawInfraBuilder {
-    private val trackNodePool = StaticPool<TrackNode, MovableElementDescriptor>()
+    private val trackNodePool = StaticPool<TrackNode, TrackNodeDescriptor>()
     private val trackSectionPool = StaticPool<TrackSection, TrackSectionDescriptor>()
     private val trackChunkPool = StaticPool<TrackChunk, TrackChunkDescriptor>()
     private val nextNode = IdxMap<DirTrackSectionId, TrackNodeId>()
@@ -246,8 +247,8 @@ class RawInfraBuilderImpl : RawInfraBuilder {
     private val zonePathMap = mutableMapOf<ZonePathSpec, ZonePathId>()
     private val operationalPointPartPool = StaticPool<OperationalPointPart, OperationalPointPartDescriptor>()
 
-    override fun movableElement(delay: Duration, init: MovableElementDescriptorBuilder.() -> Unit): TrackNodeId {
-        val movableElementBuilder = MovableElementDescriptorBuilderImpl(delay, StaticPool(), StaticPool())
+    override fun movableElement(name: String, delay: Duration, init: MovableElementDescriptorBuilder.() -> Unit): TrackNodeId {
+        val movableElementBuilder = MovableElementDescriptorBuilderImpl(name, delay, StaticPool(), StaticPool())
         movableElementBuilder.init()
         val movableElement = movableElementBuilder.build()
         return trackNodePool.add(movableElement)

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/RawInfraImpl.kt

@@ -8,15 +8,16 @@ import fr.sncf.osrd.utils.units.*
 import kotlin.time.Duration
 
 
-class MovableElementConfigDescriptor(
+class TrackNodeConfigDescriptor(
     val name: String,
     val portLink: Pair<TrackNodePortId, TrackNodePortId>,
 )
 
-class MovableElementDescriptor(
+class TrackNodeDescriptor(
+    val name: String,
     val delay: Duration,
     val ports: StaticPool<TrackNodePort, EndpointTrackSectionId>,
-    val configs: StaticPool<TrackNodeConfig, MovableElementConfigDescriptor>,
+    val configs: StaticPool<TrackNodeConfig, TrackNodeConfigDescriptor>,
 )
 
 class TrackSectionDescriptor(
@@ -117,7 +118,7 @@ class NeutralSection(
 
 
 class RawInfraImpl(
-    val trackNodePool: StaticPool<TrackNode, MovableElementDescriptor>,
+    val trackNodePool: StaticPool<TrackNode, TrackNodeDescriptor>,
     val trackSectionPool: StaticPool<TrackSection, TrackSectionDescriptor>,
     val trackChunkPool: StaticPool<TrackChunk, TrackChunkDescriptor>,
     val nextNode: IdxMap<DirTrackSectionId, TrackNodeId>,
@@ -273,6 +274,10 @@ class RawInfraImpl(
         return trackNodePool[trackNode].configs[config].name
     }
 
+    override fun getTrackNodeName(trackNode: TrackNodeId): String {
+        return trackNodePool[trackNode].name
+    }
+
     override val zones: StaticIdxSpace<Zone>
         get() = zonePool.space()
 

core/kt-osrd-sim-interlocking/src/test/kotlin/fr/sncf/osrd/sim/TestLocation.kt

@@ -19,7 +19,7 @@ class TestLocation {
         // setup test data
         val infra = rawInfra {
             // create a test switch
-            val switchA = movableElement(delay = 42L.milliseconds) {
+            val switchA = movableElement("A", delay = 42L.milliseconds) {
                 config("a", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
                 config("b", Pair(TrackNodePortId(0u), TrackNodePortId(2u)))
             }

core/kt-osrd-sim-interlocking/src/test/kotlin/fr/sncf/osrd/sim/TestMovableElement.kt

@@ -18,7 +18,7 @@ class TestMovableElements {
     fun lockMoveTest() = runTest {
         // setup test data
         val infra = rawInfra {
-            movableElement(delay = 42L.milliseconds) {
+            movableElement("A", delay = 42L.milliseconds) {
                 config("a", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
                 config("b", Pair(TrackNodePortId(0u), TrackNodePortId(2u)))
             }

core/kt-osrd-sim-interlocking/src/test/kotlin/fr/sncf/osrd/sim/TestReservation.kt

@@ -37,7 +37,7 @@ class TestReservation {
 
         // region build the test infrastructure
         val builder = RawInfraBuilder()
-        val switch = builder.movableElement(delay = 42L.milliseconds) {
+        val switch = builder.movableElement("A", delay = 42L.milliseconds) {
             config("a", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
             config("b", Pair(TrackNodePortId(0u), TrackNodePortId(2u)))
         }

core/kt-osrd-sim-interlocking/src/test/kotlin/fr/sncf/osrd/sim/TestRouting.kt

@@ -36,13 +36,13 @@ class TestRouting {
         //           \
         // w       x  \    y       z
         // I---B---I---C---I---D---I
-        //
+        //             S
         //  <-- reverse     normal -->
 
         // region build the test infrastructure
         val builder = RawInfraBuilder()
         // region switches
-        val switch = builder.movableElement(delay = 10L.milliseconds) {
+        val switch = builder.movableElement("S", delay = 10L.milliseconds) {
             config("xy", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
             config("vy", Pair(TrackNodePortId(0u), TrackNodePortId(2u)))
         }

core/kt-osrd-sncf-signaling/src/test/kotlin/fr/sncf/osrd/signaling/bal/TestBALtoBAL.kt

@@ -25,13 +25,13 @@ class TestBALtoBAL {
         //           \
         // w       x  \    y       z
         // I---B---I---C---I---D---I
-        //
+        //             S
         //  <-- reverse     normal -->
 
         // region build the test infrastructure
         val builder = RawInfraBuilder()
         // region switches
-        val switch = builder.movableElement(delay = 10L.milliseconds) {
+        val switch = builder.movableElement("S", delay = 10L.milliseconds) {
             config("xy", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
             config("vy", Pair(TrackNodePortId(0u), TrackNodePortId(1u)))
         }

core/src/main/java/fr/sncf/osrd/api/ConflictDetectionEndpoint.java

@@ -87,6 +87,8 @@ public static class Conflict {
             public enum ConflictType {
                 @Json(name = "Spacing")
                 SPACING,
+                @Json(name = "Routing")
+                ROUTING,
             }
 
             @Json(name = "conflict_type")