Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: fix max speed in concatenated envelopes #10312

Merged
merged 1 commit into from
Jan 10, 2025
+8 −5
Merged

core: fix max speed in concatenated envelopes #10312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions core/envelope-sim/src/main/java/fr/sncf/osrd/envelope/EnvelopeConcat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
Loading