core: etcs: move files to envelope_sim module

Signed-off-by: Eloi Charpentier <[email protected]>
OpenRailAssociation · Dec 3, 2024 · ba1bc5f · ba1bc5f
1 parent 9dedb37
commit ba1bc5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/envelope-sim/build.gradle b/core/envelope-sim/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     // PLEASE ADD AND UPDATE DEPENDENCIES USING libs.versions.toml
 
     implementation project(':osrd-reporting')
+    implementation project(":kt-osrd-sim-infra")
     api project(":kt-osrd-utils")
     implementation libs.guava
     implementation libs.slf4j

diff --git a/...f/osrd/ertms/etcs/ETCSBrakingSimulator.kt → ...envelope_sim/etcs/ETCSBrakingSimulator.kt b/...f/osrd/ertms/etcs/ETCSBrakingSimulator.kt → ...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 {