wip

Author: emersion

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

@@ -90,11 +90,15 @@ public enum ConflictType {
             @Json(name = "conflict_type")
             public final ConflictType conflictType;
 
-            public Conflict(Collection<Long> trainIds, double startTime, double endTime, ConflictType conflictType) {
+            @Json(name = "requirements")
+            public final Collection<String> requirements;
+
+            public Conflict(Collection<Long> trainIds, double startTime, double endTime, ConflictType conflictType, Collection<String> requirements) {
                 this.trainIds = trainIds;
                 this.startTime = startTime;
                 this.endTime = endTime;
                 this.conflictType = conflictType;
+                this.requirements = requirements;
             }
         }
 

core/src/main/java/fr/sncf/osrd/conflicts/Conflicts.kt

@@ -171,12 +171,12 @@ class IncrementalConflictDetectorImpl(trainRequirements: List<TrainRequirements>
         // look for requirement times overlaps.
         // as spacing requirements are exclusive, any overlap is a conflict
         val res = mutableListOf<Conflict>()
-        for (requirements in spacingZoneRequirements.values) {
-            for (conflictGroup in detectRequirementConflicts(requirements) { _, _ -> true }) {
+        for (entry in spacingZoneRequirements) {
+            for (conflictGroup in detectRequirementConflicts(entry.value) { _, _ -> true }) {
                 val trains = conflictGroup.map { it.trainId }
                 val beginTime = conflictGroup.minBy { it.beginTime }.beginTime
                 val endTime = conflictGroup.maxBy { it.endTime }.endTime
-                res.add(Conflict(trains, beginTime, endTime, ConflictType.SPACING))
+                res.add(Conflict(trains, beginTime, endTime, ConflictType.SPACING, listOf(entry.key)))
             }
         }
         return res
@@ -185,13 +185,13 @@ class IncrementalConflictDetectorImpl(trainRequirements: List<TrainRequirements>
     private fun detectRoutingConflicts(): List<Conflict> {
         // for each zone, check compatibility of overlapping requirements
         val res = mutableListOf<Conflict>()
-        for (requirements in routingZoneRequirements.values) {
+        for (entry in routingZoneRequirements) {
             for (conflictGroup in
-                detectRequirementConflicts(requirements) { a, b -> a.config != b.config }) {
+                detectRequirementConflicts(entry.value) { a, b -> a.config != b.config }) {
                 val trains = conflictGroup.map { it.trainId }
                 val beginTime = conflictGroup.minBy { it.beginTime }.beginTime
                 val endTime = conflictGroup.maxBy { it.endTime }.endTime
-                res.add(Conflict(trains, beginTime, endTime, ConflictType.ROUTING))
+                res.add(Conflict(trains, beginTime, endTime, ConflictType.ROUTING, listOf(entry.key)))
             }
         }
         return res
@@ -220,7 +220,7 @@ class IncrementalConflictDetectorImpl(trainRequirements: List<TrainRequirements>
             val endTime = min(req.endTime, otherReq.endTime)
             if (beginTime < endTime)
                 res.add(
-                    Conflict(listOf(otherReq.trainId), beginTime, endTime, ConflictType.SPACING)
+                    Conflict(listOf(otherReq.trainId), beginTime, endTime, ConflictType.SPACING, listOf(req.zone))
                 )
         }
 
@@ -240,7 +240,7 @@ class IncrementalConflictDetectorImpl(trainRequirements: List<TrainRequirements>
                 val endTime = min(zoneReq.endTime, otherReq.endTime)
                 if (beginTime < endTime)
                     res.add(
-                        Conflict(listOf(otherReq.trainId), beginTime, endTime, ConflictType.ROUTING)
+                        Conflict(listOf(otherReq.trainId), beginTime, endTime, ConflictType.ROUTING, listOf(zoneReq.zone))
                     )
             }
         }
@@ -447,6 +447,12 @@ fun mergeMap(
             events.add(Event(EventType.END, conflict.endTime))
         }
 
+        // TODO
+        val reqZones = mutableListOf<String>()
+        for (conflict in conflicts) {
+            reqZones.addAll(conflict.requirements);
+        }
+
         events.sort()
         var eventCount = 0
         var eventBeginning = 0.0
@@ -462,7 +468,8 @@ fun mergeMap(
                                 trainIds.toMutableList(),
                                 eventBeginning,
                                 event.time,
-                                conflictType
+                                conflictType,
+                                reqZones
                             )
                         )
                 }

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionEndpointV2.kt

@@ -52,7 +52,9 @@ private fun makeConflictDetectionResponse(
                 it.trainIds,
                 startTime.plus(Duration.ofMillis((it.startTime * 1000).toLong())),
                 startTime.plus(Duration.ofMillis((it.endTime * 1000).toLong())),
-                it.conflictType
+                it.conflictType,
+                // TODO
+                listOf(ConflictRequirement(listOf(), it.requirements))
             )
         }
     )

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt

@@ -18,6 +18,12 @@ class Conflict(
     @Json(name = "end_time") val endTime: ZonedDateTime,
     @Json(name = "conflict_type")
     val conflictType: ConflictDetectionEndpoint.ConflictDetectionResult.Conflict.ConflictType,
+    @Json(name = "requirements") val requirements: Collection<ConflictRequirement>,
+)
+
+class ConflictRequirement(
+    @Json(name = "time_range") val timeRange: Collection<Int>,
+    @Json(name = "zones") val zones: Collection<String>,
 )
 
 val conflictResponseAdapter: JsonAdapter<ConflictDetectionResponse> =

editoast/src/core/v2/conflict_detection.rs

@@ -13,6 +13,7 @@ use super::simulation::SpacingRequirement;
 editoast_common::schemas! {
     ConflictDetectionResponse,
     Conflict,
+    ConflictRequirement,
 }
 
 #[derive(Debug, Serialize)]
@@ -48,6 +49,13 @@ pub struct Conflict {
     /// Type of the conflict
     #[schema(inline)]
     pub conflict_type: ConflictType,
+    pub requirements: Vec<ConflictRequirement>,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, ToSchema)]
+pub struct ConflictRequirement {
+    pub time_range: Vec<i64>,
+    pub zones: Vec<String>,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, ToSchema)]