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: stdcm: minor improvements #7807

Merged
merged 2 commits into from
Jun 20, 2024
Merged

core: stdcm: minor improvements #7807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13c7a9
core: stdcm: filter out edges with infinite weight
eckter Jun 20, 2024
19eba8a
core: stdcm: fix crash on malformed steps
eckter Jun 20, 2024
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
11 changes: 8 additions & 3 deletions core/src/main/kotlin/fr/sncf/osrd/stdcm/graph/STDCMPathfinding.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ class STDCMPathfinding(
if (Duration.between(start, Instant.now()).toSeconds() >= pathfindingTimeout)
throw OSRDError(ErrorType.PathfindingTimeoutError)
val edge = queue.poll() ?: return null
if (edge.weight!!.isInfinite()) {
Erashin marked this conversation as resolved.
Show resolved Hide resolved
// TODO: filter with max running time, can't be done with abstract weight
return null
}
// TODO: we mostly reason in terms of endNode, we should probably change the queue.
val endNode = graph.getEdgeEnd(edge)
if (endNode.waypointIndex >= graph.steps.size - 1) {
Expand Down Expand Up @@ -204,9 +208,10 @@ class STDCMPathfinding(
step.locations
.filter { it.edge == edge.block }
.mapNotNull { edge.edgeOffsetFromBlock(it.offset) }
assert(locationOnEdge.size <= 1)
if (locationOnEdge.isNotEmpty()) {
res.add(EdgeLocation(edge, locationOnEdge.first()))
.minOrNull()
// Sometimes a step has several locations on the same edge, we just pick the first
bougue-pe marked this conversation as resolved.
Show resolved Hide resolved
if (locationOnEdge != null) {
Erashin marked this conversation as resolved.
Show resolved Hide resolved
res.add(EdgeLocation(edge, locationOnEdge))
nextStepIndex++
} else {
currentEdgeIndex++
Expand Down
24 changes: 24 additions & 0 deletions core/src/test/kotlin/fr/sncf/osrd/stdcm/STDCMPathfindingTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,4 +514,28 @@ class STDCMPathfindingTests {
.run()
assertNull(res)
}

/**
* This is mostly a malformed input, but it can happen on misplaced operational points. It's
* actually really hard to handle it *perfectly* but we should at least not crash.
*/
@Test
fun repeatedLocationsOnEdge() {
/*
a --> b --> c
*/
val infra = DummyInfra()
val firstBlock = infra.addBlock("a", "b")
val secondBlock = infra.addBlock("b", "c")
STDCMPathfindingBuilder()
.setInfra(infra.fullInfra())
.setStartLocations(
setOf(
EdgeLocation(firstBlock, Offset(0.meters)),
EdgeLocation(firstBlock, Offset(10.meters)),
)
)
.setEndLocations(setOf(EdgeLocation(secondBlock, Offset(50.meters))))
.run()!!
}
}
Loading