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: consider skipped stops #6525

Merged
merged 1 commit into from
Feb 2, 2024
Merged

core: consider skipped stops #6525

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion core/src/main/java/fr/sncf/osrd/standalone_sim/EnvelopeStopWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public List<EnvelopePoint> iteratePoints() {
point.speed(), point.position()
);
res.add(shiftedPoint);
if (stopIndex < stops.size() && arePositionsEqual(point.position(), stops.get(stopIndex).position)) {
if (stopIndex < stops.size() && point.position() >= stops.get(stopIndex).position) {
var stopDuration = stops.get(stopIndex).duration;
stopIndex++;
sumPreviousStopDuration += stopDuration;
Expand Down
50 changes: 50 additions & 0 deletions core/src/test/java/fr/sncf/osrd/standalone_sim/EnvelopeStopWrapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package fr.sncf.osrd.standalone_sim;

import fr.sncf.osrd.envelope.EnvelopeTimeInterpolate;
import fr.sncf.osrd.envelope.Envelope;
import fr.sncf.osrd.envelope.EnvelopeTestUtils;
import fr.sncf.osrd.train.TrainStop;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.List;

public class EnvelopeStopWrapperTests {
@Test
public void iteratePointsWithoutStops() {
var envelopeFloor = Envelope.make(EnvelopeTestUtils.generateTimes(
new double[]{0, 1, 2, 3, 4, 5, 6},
new double[]{1, 1, 1, 1, 1, 1, 1}
));
var envelopeStopWrapper = new EnvelopeStopWrapper(envelopeFloor, List.of());
Assertions.assertEquals(List.of(
new EnvelopeTimeInterpolate.EnvelopePoint(0, 1, 0),
new EnvelopeTimeInterpolate.EnvelopePoint(1, 1, 1),
new EnvelopeTimeInterpolate.EnvelopePoint(2, 1, 2),
new EnvelopeTimeInterpolate.EnvelopePoint(3, 1, 3),
new EnvelopeTimeInterpolate.EnvelopePoint(4, 1, 4),
new EnvelopeTimeInterpolate.EnvelopePoint(5, 1, 5),
new EnvelopeTimeInterpolate.EnvelopePoint(6, 1, 6)
), envelopeStopWrapper.iteratePoints());
}

@Test
public void iteratePointsWithStops() {
var envelopeFloor = Envelope.make(EnvelopeTestUtils.generateTimes(
new double[]{0, 1, 2, 3, 4, 5, 6},
new double[]{1, 1, 1, 0, 1, 1, 1}
));
var envelopeStopWrapper = new EnvelopeStopWrapper(envelopeFloor, List.of(
new TrainStop(1.5, 0),
new TrainStop(3, 10)
));
Assertions.assertEquals(List.of(
new EnvelopeTimeInterpolate.EnvelopePoint(0, 1, 0),
new EnvelopeTimeInterpolate.EnvelopePoint(1, 1, 1),
new EnvelopeTimeInterpolate.EnvelopePoint(2, 1, 2),
new EnvelopeTimeInterpolate.EnvelopePoint(4, 0, 3),
new EnvelopeTimeInterpolate.EnvelopePoint(6 + 10, 1, 4),
new EnvelopeTimeInterpolate.EnvelopePoint(7 + 10, 1, 5),
new EnvelopeTimeInterpolate.EnvelopePoint(8 + 10, 1, 6)
), envelopeStopWrapper.iteratePoints());
}
}
Loading