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: explicitely output route path #10521

Merged
merged 1 commit into from
Jan 24, 2025
Merged

core: stdcm: explicitely output route path #10521

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
11 changes: 11 additions & 0 deletions core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/Extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package fr.sncf.osrd.utils

import fr.sncf.osrd.utils.indexing.StaticIdx
import fr.sncf.osrd.utils.indexing.StaticIdxList
import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf

fun <T> List<StaticIdx<T>>.toIdxList(): StaticIdxList<T> {
val res = mutableStaticIdxArrayListOf<T>()
res.addAll(this)
return res
}
4 changes: 2 additions & 2 deletions core/src/main/kotlin/fr/sncf/osrd/api/api_v2/stdcm/STDCMEndpointV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import fr.sncf.osrd.sim_infra.api.Block
import fr.sncf.osrd.sim_infra.api.DirTrackChunkId
import fr.sncf.osrd.sim_infra.api.SpeedLimitProperty
import fr.sncf.osrd.sim_infra.impl.TemporarySpeedLimitManager
import fr.sncf.osrd.sim_infra.utils.chunksToRoutes
import fr.sncf.osrd.standalone_sim.makeElectricalProfiles
import fr.sncf.osrd.standalone_sim.makeMRSPResponse
import fr.sncf.osrd.standalone_sim.result.ElectrificationRange
Expand All @@ -42,6 +41,7 @@ import fr.sncf.osrd.utils.Direction
import fr.sncf.osrd.utils.DistanceRangeMap
import fr.sncf.osrd.utils.DistanceRangeMap.RangeMapEntry
import fr.sncf.osrd.utils.distanceRangeMapOf
import fr.sncf.osrd.utils.toIdxList
import fr.sncf.osrd.utils.units.*
import io.opentelemetry.api.trace.SpanKind
import io.opentelemetry.instrumentation.annotations.WithSpan
Expand Down Expand Up @@ -177,7 +177,7 @@ class STDCMEndpointV2(private val infraManager: InfraManager) : Take {
path.trainPath,
path.chunkPath,
infra,
infra.blockInfra.chunksToRoutes(infra.rawInfra, path.chunkPath.chunks),
path.routePath.toIdxList(),
rollingStock,
parseSimulationScheduleItems(path.stopResults),
listOf(),
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/kotlin/fr/sncf/osrd/stdcm/STDCMResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import fr.sncf.osrd.envelope_sim.PhysicsPath
import fr.sncf.osrd.graph.PathfindingResultId
import fr.sncf.osrd.sim_infra.api.Block
import fr.sncf.osrd.sim_infra.api.PathProperties
import fr.sncf.osrd.sim_infra.api.RouteId
import fr.sncf.osrd.sim_infra.impl.ChunkPath
import fr.sncf.osrd.train.TrainStop

Expand All @@ -18,6 +19,7 @@ data class STDCMResult(
val trainPath: PathProperties,
val chunkPath: ChunkPath,
val physicsPath: PhysicsPath,
val routePath: List<RouteId>,
val departureTime: Double,
val stopResults: List<TrainStop>
)
1 change: 1 addition & 0 deletions core/src/main/kotlin/fr/sncf/osrd/stdcm/graph/STDCMPostProcessing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class STDCMPostProcessing(private val graph: STDCMGraph) {
trainPath,
chunkPath,
physicsPath,
routes,
updatedTimeData.departureTime,

// Allow us to display OP, a hack that will be fixed
Expand Down
7 changes: 0 additions & 7 deletions core/src/test/kotlin/fr/sncf/osrd/utils/Helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import fr.sncf.osrd.utils.indexing.MutableDirStaticIdxArrayList
import fr.sncf.osrd.utils.indexing.MutableStaticIdxArrayList
import fr.sncf.osrd.utils.indexing.StaticIdx
import fr.sncf.osrd.utils.indexing.StaticIdxList
import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf
import fr.sncf.osrd.utils.moshi.MoshiUtils
import fr.sncf.osrd.utils.units.Offset
import java.io.File
Expand Down Expand Up @@ -188,9 +187,3 @@ object Helpers {
return buildChunkPath(infra, chunks, startOffset!!, endOffset!!)
}
}

fun <T> List<StaticIdx<T>>.toIdxList(): StaticIdxList<T> {
val res = mutableStaticIdxArrayListOf<T>()
res.addAll(this)
return res
}
Loading