core: fix max speed in concatenated envelopes

Signed-off-by: Eloi Charpentier <[email protected]>
OpenRailAssociation · Jan 10, 2025 · 3ce4cde · 3ce4cde
1 parent cdb6f92
commit 3ce4cde
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/core/envelope-sim/src/main/java/fr/sncf/osrd/envelope/EnvelopeConcat.java b/core/envelope-sim/src/main/java/fr/sncf/osrd/envelope/EnvelopeConcat.java
@@ -1,6 +1,8 @@
 package fr.sncf.osrd.envelope;
 
 import static fr.sncf.osrd.envelope_utils.DoubleUtils.clamp;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -157,26 +159,27 @@ public double maxSpeedInRange(double beginPos, double endPos) {
         var firstEnvelopeIndex = findEnvelopeIndexAt(beginPos, false);
         assert firstEnvelopeIndex != -1 : "Trying to interpolate time outside of the envelope";
         var firstEnvelope = envelopes.get(firstEnvelopeIndex);
-        var beginSpeed = firstEnvelope.envelope.maxSpeedInRange(
-                beginPos - firstEnvelope.startOffset, firstEnvelope.envelope.getEndPos());
+        var firstEnvelopeMaxSpeed = firstEnvelope.envelope.maxSpeedInRange(
+                beginPos - firstEnvelope.startOffset,
+                min(firstEnvelope.envelope.getEndPos(), endPos - firstEnvelope.startOffset));
 
         var lastEnvelopeIndex = findEnvelopeIndexAt(endPos, true);
+        if (lastEnvelopeIndex == firstEnvelopeIndex) return firstEnvelopeMaxSpeed;
         assert lastEnvelopeIndex != -1 : "Trying to interpolate time outside of the envelope";
         var lastEnvelope = envelopes.get(lastEnvelopeIndex);
         var endOffset = endPos - lastEnvelope.startOffset;
         if (Math.abs(endOffset - lastEnvelope.envelope.getEndPos()) < 1e-6) {
             endOffset = lastEnvelope.envelope.getEndPos();
         }
-        var endSpeed = lastEnvelope.envelope.maxSpeedInRange(0, endOffset);
+        var lastEnvelopeMaxSpeed = lastEnvelope.envelope.maxSpeedInRange(0, endOffset);
 
-        var maxSpeed = beginSpeed;
+        var maxSpeed = max(firstEnvelopeMaxSpeed, lastEnvelopeMaxSpeed);
         for (var i = firstEnvelopeIndex + 1; i < lastEnvelopeIndex; i++) {
             var envelope = envelopes.get(i);
             var speed = envelope.envelope.maxSpeedInRange(0, envelope.envelope.getEndPos());
             if (speed > maxSpeed) maxSpeed = speed;
         }
 
-        if (endSpeed > maxSpeed) maxSpeed = endSpeed;
         return maxSpeed;
     }