core: stdcm: add speed limit composition parameter

Author: eckter

api/openapi.yaml

@@ -997,6 +997,9 @@ components:
           description: |
             How much longer the total run time can be compared to the shortest path on an empty timetable.
             Defaults to 2 if unspecified, meaning that the result can't take more than twice the minimum time.
+        speed_limit_composition:
+          type: string
+          description: Train category for speed limits
     Path:
       properties:
         id:

api/osrd_infra/views/stdcm.py

@@ -88,6 +88,7 @@ def make_stdcm_core_payload(request):
     optional_forwarded_parameters = [
         "maximum_departure_delay",
         "maximum_relative_run_time",
+        "speed_limit_composition"
     ]
     for parameter in optional_forwarded_parameters:
         if parameter in request:

core/openapi.yaml

@@ -554,6 +554,9 @@ components:
           description: |
             How much longer the total run time can be compared to the shortest path on an empty timetable.
             Defaults to 2 if unspecified, meaning that the result can't take more than twice the minimum time.
+        speed_limit_composition:
+          type: string
+          description: Train composition used for speed limit
     SimulationRequest:
       required:
         - infra

core/src/main/java/fr/sncf/osrd/api/stdcm/STDCMEndpoint.java

@@ -79,6 +79,9 @@ public Response act(Request req) throws
             var occupancies = request.routeOccupancies;
             var startLocations = findRoutes(infra, request.startPoints);
             var endLocations = findRoutes(infra, request.endPoints);
+            Set<String> tags = Set.of();
+            if (request.speedLimitComposition != null)
+                tags = Set.of(request.speedLimitComposition);
 
             assert Double.isFinite(startTime);
 
@@ -100,7 +103,8 @@ public Response act(Request req) throws
                     unavailableSpace,
                     request.timeStep,
                     request.maximumDepartureDelay,
-                    request.maximumRelativeRunTime * minRunTime
+                    request.maximumRelativeRunTime * minRunTime,
+                    tags
             );
             if (res == null) {
                 var error = new NoPathFoundError("No path could be found");
@@ -110,7 +114,7 @@ public Response act(Request req) throws
             // Build the response
             var simResult = new StandaloneSimResult();
             simResult.speedLimits.add(ResultEnvelopePoint.from(
-                    MRSP.from(res.trainPath(), rollingStock, false, Set.of())
+                    MRSP.from(res.trainPath(), rollingStock, false, tags)
             ));
             simResult.baseSimulations.add(ScheduleMetadataExtractor.run(
                     res.envelope(),

core/src/main/java/fr/sncf/osrd/api/stdcm/STDCMRequest.java

@@ -91,6 +91,12 @@ public final class STDCMRequest {
     @Json(name = "maximum_relative_run_time")
     public double maximumRelativeRunTime = 2;
 
+    /**
+     * Train category for speed limits
+     */
+    @Json(name = "speed_limit_composition")
+    public String speedLimitComposition = null;
+
     /**
      * Create a default STDCMRequest
      */
@@ -103,7 +109,8 @@ public STDCMRequest() {
                 null,
                 null,
                 Double.NaN,
-                Double.NaN
+                Double.NaN,
+                null
         );
     }
 
@@ -118,7 +125,8 @@ public STDCMRequest(
             Collection<PathfindingWaypoint> startPoints,
             Collection<PathfindingWaypoint> endPoints,
             double startTime,
-            double endTime
+            double endTime,
+            String speedLimitComposition
     ) {
         this.infra = infra;
         this.expectedVersion = expectedVersion;
@@ -128,6 +136,7 @@ public STDCMRequest(
         this.endPoints = endPoints;
         this.startTime = startTime;
         this.endTime = endTime;
+        this.speedLimitComposition = speedLimitComposition;
     }
 
     public static class RouteOccupancy {

core/src/main/java/fr/sncf/osrd/api/stdcm/graph/STDCMEdgeBuilder.java

@@ -126,7 +126,8 @@ public Collection<STDCMEdge> makeAllEdges() {
                     startOffset,
                     graph.rollingStock,
                     graph.timeStep,
-                    STDCMUtils.getStopsOnRoute(graph, route, startOffset)
+                    STDCMUtils.getStopsOnRoute(graph, route, startOffset),
+                    graph.tags
             );
         if (envelope == null)
             return List.of();

core/src/main/java/fr/sncf/osrd/api/stdcm/graph/STDCMGraph.java

@@ -28,6 +28,7 @@ public class STDCMGraph implements Graph<STDCMNode, STDCMEdge> {
     final DelayManager delayManager;
     final AllowanceManager allowanceManager;
     final BacktrackingManager backtrackingManager;
+    final Set<String> tags;
 
     /** Constructor */
     public STDCMGraph(
@@ -37,7 +38,8 @@ public STDCMGraph(
             Multimap<SignalingRoute, OccupancyBlock> unavailableTimes,
             double maxRunTime,
             double minScheduleTimeStart,
-            Set<Pathfinding.EdgeLocation<SignalingRoute>> endLocations
+            Set<Pathfinding.EdgeLocation<SignalingRoute>> endLocations,
+            Set<String> tags
     ) {
         this.infra = infra;
         this.rollingStock = rollingStock;
@@ -46,6 +48,7 @@ public STDCMGraph(
         this.delayManager = new DelayManager(minScheduleTimeStart, maxRunTime, unavailableTimes);
         this.allowanceManager = new AllowanceManager(this);
         this.backtrackingManager = new BacktrackingManager(this);
+        this.tags = tags;
     }
 
     @Override

core/src/main/java/fr/sncf/osrd/api/stdcm/graph/STDCMPathfinding.java

@@ -38,7 +38,8 @@ public static STDCMResult findPath(
             Multimap<SignalingRoute, OccupancyBlock> unavailableTimes,
             double timeStep,
             double maxDepartureDelay,
-            double maxRunTime
+            double maxRunTime,
+            Set<String> tags
     ) {
         var graph = new STDCMGraph(
                 infra,
@@ -47,7 +48,8 @@ public static STDCMResult findPath(
                 unavailableTimes,
                 maxRunTime,
                 startTime,
-                endLocations
+                endLocations,
+                tags
         );
 
         // Initializes the constraints

core/src/main/java/fr/sncf/osrd/api/stdcm/graph/STDCMUtils.java

@@ -81,15 +81,16 @@ public static Envelope simulateRoute(
             double start,
             RollingStock rollingStock,
             double timeStep,
-            double[] stops
+            double[] stops,
+            Set<String> tags
     ) {
         try {
             var context = makeSimContext(List.of(route), start, rollingStock, timeStep);
             var mrsp = MRSP.from(
                     route.getInfraRoute().getTrackRanges(start, start + context.path.getLength()),
                     rollingStock,
                     false,
-                    Set.of()
+                    tags
             );
             var maxSpeedEnvelope = MaxSpeedEnvelope.from(context, stops, mrsp);
             return MaxEffortEnvelope.from(context, initialSpeed, maxSpeedEnvelope);

core/src/test/java/fr/sncf/osrd/api/STDCMEndpointTest.java

@@ -35,7 +35,8 @@ public void simpleEmptyTimetable() throws Exception {
                         EdgeDirection.START_TO_STOP
                 )),
                 0,
-                0
+                0,
+                "foo"
         ));
 
         var result = readBodyResponse(