core: spacing-requirements: add tests

Author: eckter

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

@@ -1,15 +1,15 @@
 package fr.sncf.osrd.conflicts
 
-import fr.sncf.osrd.standalone_sim.EnvelopeStopWrapper
-import fr.sncf.osrd.train.RollingStock
+import fr.sncf.osrd.envelope.EnvelopeTimeInterpolate
+import fr.sncf.osrd.envelope_sim.PhysicsRollingStock
 import fr.sncf.osrd.utils.units.Offset
 import fr.sncf.osrd.utils.units.meters
 import kotlin.math.max
 import kotlin.math.min
 
 class IncrementalRequirementEnvelopeAdapter(
-    private val rollingStock: RollingStock,
-    private val envelopeWithStops: EnvelopeStopWrapper,
+    private val rollingStock: PhysicsRollingStock,
+    private val envelopeWithStops: EnvelopeTimeInterpolate,
     override var simulationComplete: Boolean,
 ) : IncrementalRequirementCallbacks {
     override fun arrivalTimeInRange(
@@ -41,9 +41,6 @@ class IncrementalRequirementEnvelopeAdapter(
         if (criticalPoint >= 0.0 && criticalPoint <= envelopeWithStops.endPos)
             return envelopeWithStops.interpolateTotalTime(criticalPoint)
 
-        if (arrivalTimeInRange(pathBeginOff, pathEndOff).isFinite())
-            return envelopeWithStops.totalTime
-
         return Double.POSITIVE_INFINITY
     }
 

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

@@ -3,7 +3,6 @@ package fr.sncf.osrd.conflicts
 import fr.sncf.osrd.signaling.SignalingSimulator
 import fr.sncf.osrd.signaling.ZoneStatus
 import fr.sncf.osrd.sim_infra.api.*
-import fr.sncf.osrd.sim_infra_adapter.SimInfraAdapter
 import fr.sncf.osrd.standalone_sim.result.ResultTrain.SpacingRequirement
 import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf
 import fr.sncf.osrd.utils.units.Offset
@@ -36,11 +35,11 @@ data class PendingSpacingRequirement(
 
 class SpacingRequirementAutomaton(
     // context
-    val rawInfra: SimInfraAdapter,
+    val rawInfra: RawInfra,
     val loadedSignalInfra: LoadedSignalInfra,
     val blockInfra: BlockInfra,
     val simulator: SignalingSimulator,
-    val callbacks: IncrementalRequirementCallbacks,
+    var callbacks: IncrementalRequirementCallbacks,
     val incrementalPath: IncrementalPath,
 ) {
     private var nextProcessedBlock = 0
@@ -188,8 +187,8 @@ class SpacingRequirementAutomaton(
         // there may be more zone states than what's contained in the path's blocks, which shouldn't
         // matter
         val zoneStartIndex = incrementalPath.getBlockStartZone(incrementalPath.beginBlockIndex)
-        val zoneCount =
-            incrementalPath.getBlockEndZone(incrementalPath.endBlockIndex - 1) - zoneStartIndex
+        val zoneEndIndex = incrementalPath.getBlockEndZone(incrementalPath.endBlockIndex - 1)
+        val zoneCount = zoneEndIndex - zoneStartIndex
         val zoneStates = MutableList(zoneCount) { ZoneStatus.CLEAR }
 
         // for all signals, update zone requirement times until a signal is found for which
@@ -215,10 +214,9 @@ class SpacingRequirementAutomaton(
 
             // find the first zone after the signal which can be occupied without disturbing the
             // train
-            var lastConstrainingZone = -1
             zoneProbingLoop@ while (true) {
                 // if we reached the last zone, just quit
-                if (nextProbedZoneForSignal == incrementalPath.endZonePathIndex) {
+                if (nextProbedZoneForSignal == zoneEndIndex) {
                     if (incrementalPath.pathComplete) break@zoneProbingLoop
                     return NotEnoughPath
                 }
@@ -249,13 +247,6 @@ class SpacingRequirementAutomaton(
                 // FIXME: Have a better way to check if the signal is constraining
                 if (signalState.getEnum("aspect") == "VL") break
                 addSignalRequirements(signalProtectedZone, zoneIndex, sightTime)
-                lastConstrainingZone = zoneIndex
-            }
-
-            if (lastConstrainingZone == -1) {
-                logger.error {
-                    "signal ${rawInfra.getLogicalSignalName(pathSignal.signal)} does not react to zone occupation"
-                }
             }
             pendingSignals.removeFirst()
             nextProbedZoneForSignal = -1
@@ -318,6 +309,6 @@ class SpacingRequirementAutomaton(
 
 sealed interface SpacingResourceUpdate
 
-class SpacingRequirements(val requirements: List<SpacingRequirement>) : SpacingResourceUpdate
+data class SpacingRequirements(val requirements: List<SpacingRequirement>) : SpacingResourceUpdate
 
 data object NotEnoughPath : SpacingResourceUpdate

core/src/main/java/fr/sncf/osrd/standalone_sim/result/ResultTrain.java

@@ -4,6 +4,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
 public class ResultTrain {
@@ -78,8 +79,7 @@ public static final class SpacingRequirement {
         public double endTime;
 
         // whether the requirement end_time is final. it's metadata, and **shouldn't be used for conflict detection**
-        @Json(name = "is_complete")
-        public boolean isComplete;
+        public transient boolean isComplete;
 
         public SpacingRequirement(String zone, double beginTime, double endTime, boolean isComplete) {
             this.zone = zone;
@@ -95,6 +95,28 @@ public SpacingRequirement(String zone, double beginTime, double endTime, boolean
         public SpacingRequirement withAddedTime(double timeToAdd) {
             return new SpacingRequirement(zone, beginTime + timeToAdd, endTime + timeToAdd, isComplete);
         }
+
+        @Override
+        public String toString() {
+            return "SpacingRequirement{" + "zone='" + zone + '\'' + ", beginTime=" + beginTime + ", endTime=" + endTime
+                    + '}';
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            final SpacingRequirement that = (SpacingRequirement) o;
+            return Double.compare(beginTime, that.beginTime) == 0
+                    && Double.compare(endTime, that.endTime) == 0
+                    && isComplete == that.isComplete
+                    && Objects.equals(zone, that.zone);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(zone, beginTime, endTime, isComplete);
+        }
     }
 
     @Json(name = "spacing_requirements")