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: tvm: fix condition for constraining signals #7164

Merged
merged 1 commit into from
Apr 10, 2024
Merged

core: tvm: fix condition for constraining signals #7164

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
7 changes: 6 additions & 1 deletion core/kt-osrd-sncf-signaling/src/main/kotlin/fr/sncf/osrd/signaling/tvm300/TVM300.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ object TVM300 : SignalingSystemDriver {
}

override fun isConstraining(signalState: SigState, trainState: SignalingTrainState): Boolean {
return trainState.speed <= maxSpeedForState(signalState)
if (signalState.getEnum("aspect").contains("VL")) {
// VL should never be considered constraining,
// it would cause infinite loops in spacing resource generation
return false
}
return trainState.speed > maxSpeedForState(signalState)
}

override fun checkBlock(reporter: BlockDiagReporter, block: SigBlock) {
Expand Down
Loading