core: stdcm: use the correct block length in unavailable space builder

OpenRailAssociation · Oct 17, 2023 · d09c49e · d09c49e
1 parent 74e4c51
commit d09c49e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...rc/main/java/fr/sncf/osrd/stdcm/preprocessing/implementation/UnavailableSpaceBuilder.java b/...rc/main/java/fr/sncf/osrd/stdcm/preprocessing/implementation/UnavailableSpaceBuilder.java
@@ -67,7 +67,7 @@ public static Multimap<Integer, OccupancySegment> computeUnavailableSpace(
                         var secPreBlockLength = blockInfra.getBlockLength(secondPredecessorBlock);
                         unavailableSpace.put(secondPredecessorBlock, new OccupancySegment(
                                 timeRange.lowerEndpoint(), timeRange.upperEndpoint(),
-                                Math.max(0, secPreBlockLength - SIGHT_DISTANCE), preBlockLength
+                                Math.max(0, secPreBlockLength - SIGHT_DISTANCE), secPreBlockLength
                         ));
                     }
                 }
@@ -83,6 +83,14 @@ public static Multimap<Integer, OccupancySegment> computeUnavailableSpace(
                 }
             }
         }
+        // validation
+        for (var entry : unavailableSpace.entries()) {
+            assert entry.getValue().distanceStart() <= entry.getValue().distanceEnd();
+            assert entry.getValue().timeStart() <= entry.getValue().timeEnd();
+            assert entry.getValue().distanceEnd() <= blockInfra.getBlockLength(entry.getKey());
+            assert 0 <= entry.getValue().distanceStart();
+            assert 0 <= entry.getValue().timeEnd();
+        }
         return unavailableSpace;
     }