From 015ec584ea9c3d9017614b058cff136a8fd77c02 Mon Sep 17 00:00:00 2001 From: Eloi Charpentier Date: Tue, 3 Dec 2024 15:06:04 +0100 Subject: [PATCH] core: etcs: move files to envelope_sim module --- .../sncf/osrd/envelope_sim}/etcs/ETCSBrakingSimulator.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename core/{src/main/kotlin/fr/sncf/osrd/ertms => envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim}/etcs/ETCSBrakingSimulator.kt (86%) diff --git a/core/src/main/kotlin/fr/sncf/osrd/ertms/etcs/ETCSBrakingSimulator.kt b/core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingSimulator.kt similarity index 86% rename from core/src/main/kotlin/fr/sncf/osrd/ertms/etcs/ETCSBrakingSimulator.kt rename to core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingSimulator.kt index becac3ef2f4..2359216762e 100644 --- a/core/src/main/kotlin/fr/sncf/osrd/ertms/etcs/ETCSBrakingSimulator.kt +++ b/core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingSimulator.kt @@ -1,14 +1,14 @@ -package fr.sncf.osrd.ertms.etcs +package fr.sncf.osrd.envelope_sim.etcs import fr.sncf.osrd.envelope.Envelope +import fr.sncf.osrd.envelope_sim.PhysicsRollingStock import fr.sncf.osrd.sim_infra.api.Path import fr.sncf.osrd.sim_infra.api.PathProperties -import fr.sncf.osrd.train.RollingStock import fr.sncf.osrd.utils.units.Offset interface ETCSBrakingSimulator { val trainPath: PathProperties - val rollingStock: RollingStock + val rollingStock: PhysicsRollingStock val timeStep: Double /** Compute the ETCS braking envelope from the MRSP, for each LOA and EOA. */ @@ -39,7 +39,7 @@ data class EndOfAuthority( class ETCSBrakingSimulatorImpl( override val trainPath: PathProperties, - override val rollingStock: RollingStock, + override val rollingStock: PhysicsRollingStock, override val timeStep: Double ) : ETCSBrakingSimulator {