Add tests

Author: clarani

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

@@ -75,7 +75,7 @@ public final class STDCMRequest {
     public double endTime;
 
     /**
-     * Time step used in simulations
+     * Time step used in simulations (defaults to 2)
      */
     @Json(name = "time_step")
     public double timeStep = 2.;
@@ -102,15 +102,15 @@ public final class STDCMRequest {
     public String speedLimitComposition = null;
 
     /**
-     * Margin of x seconds before the train passage,
+     * Grid margin of x seconds before the train passage,
      * which means that the path used by the train should be free and available
      * at least x seconds before its passage.
      */
     @Json(name = "margin_before")
     public double marginBefore = 0;
 
     /**
-     * Margin of y seconds after the train passage,
+     * Grid margin of y seconds after the train passage,
      * which means that the path used by the train should be free and available
      * at least y seconds after its passage.
      */
@@ -131,8 +131,8 @@ public STDCMRequest() {
                 Double.NaN,
                 Double.NaN,
                 null,
-                Double.NaN,
-                Double.NaN
+                0,
+                0
         );
     }
 

core/src/test/java/fr/sncf/osrd/stdcm/UnavailableSpaceBuilderTests.java

@@ -152,4 +152,33 @@ public void testThirdRoute() {
                 res.get(thirdRoute)
         );
     }
+
+    @Test
+    public void testMargins() {
+        var infraBuilder = new DummyRouteGraphBuilder();
+        var firstRoute = infraBuilder.addRoute("a", "b", 1000);
+        var secondRoute = infraBuilder.addRoute("b", "c", 1000);
+        var infra = infraBuilder.build();
+        var res = computeUnavailableSpace(
+                infra,
+                Set.of(new STDCMRequest.RouteOccupancy("a->b", 100, 200)),
+                REALISTIC_FAST_TRAIN,
+                20,
+                60
+        );
+        // TimeStart and TimeEnd should be adjusted because of the margins
+        // (20s before and 60s after)
+        assertEquals(
+                Set.of(
+                        new OccupancyBlock(80, 260, 0, 1000)
+                ),
+                res.get(firstRoute)
+        );
+        assertEquals(
+                Set.of(
+                        new OccupancyBlock(80, 260, 0, 1000)
+                ),
+                res.get(secondRoute)
+        );
+    }
 }

tests/fuzzer/fuzzer.py

@@ -167,8 +167,6 @@ def make_stdcm_payload(base_url: str, infra_id: int, path: List[Tuple[str, float
             "track_section": last_edge,
             "offset": last_offset,
         }],
-        "margin_before": 0,
-        "margin_after": 0,
     }
 
 

tests/tests/stdcm/between_trains.py

@@ -27,8 +27,6 @@ def run(*args, **kwargs):
         "name": "foo",
         "start_points": [start],
         "end_points": [stop],
-        "margin_before": 0,
-        "margin_after": 0
     }
     r = requests.post(base_url + f"stdcm/", json=payload)
     delete_timetable(base_url, timetable)

tests/tests/stdcm/empty_timetable.py

@@ -21,8 +21,6 @@ def run(*args, **kwargs):
             "track_section": "TE0",
             "offset": 0
         }],
-        "margin_before": 0,
-        "margin_after": 0
     }
     r = requests.post(base_url + f"stdcm/", json=payload)
     delete_timetable(base_url, timetable)