core: tvm: fix condition for constraining signals

eckter · eckter · commit 24aee6918ea2 · 2024-04-10T12:13:41.000Z
The condition was inverted. Additionally, VL now always
returns false as a safety measure.
diff --git a/core/kt-osrd-sncf-signaling/src/main/kotlin/fr/sncf/osrd/signaling/tvm300/TVM300.kt b/core/kt-osrd-sncf-signaling/src/main/kotlin/fr/sncf/osrd/signaling/tvm300/TVM300.kt
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,12 @@ object TVM300 : SignalingSystemDriver {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`override fun isConstraining(signalState: SigState, trainState: SignalingTrainState): Boolean {`
`42`		`- return trainState.speed <= maxSpeedForState(signalState)`
	`42`	`+ if (signalState.getEnum("aspect").contains("VL")) {`
	`43`	`+ // VL should never be considered constraining,`
	`44`	`+ // it would cause infinite loops in spacing resource generation`
	`45`	`+ return false`
	`46`	`+ }`
	`47`	`+ return trainState.speed > maxSpeedForState(signalState)`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`override fun checkBlock(reporter: BlockDiagReporter, block: SigBlock) {`