core: incremental spacing resource generation

core/build.gradle

@@ -34,6 +34,7 @@ dependencies {
     testImplementation libs.kotlinx.coroutines.test
 
     implementation project(':kt-osrd-utils')
+    implementation project(':kt-fast-collections')
     implementation project(':kt-osrd-signaling')
     implementation project(":kt-osrd-sim-interlocking")
     implementation project(":kt-osrd-sim-infra")

core/kt-fast-collections-generator/src/main/kotlin/collections/RingBuffer.kt

@@ -12,13 +12,10 @@ private fun CollectionItemType.generateRingBuffer(context: GeneratorContext, cur
     val simpleName = type.simpleName
     val paramsDecl = type.paramsDecl
     val paramsUse = type.paramsUse
-    val paramsStar = type.paramsStar
     val fileName = "${simpleName}RingBuffer"
     val bufferType = "Mutable${simpleName}Array${paramsUse}"
-    val itemListType = "${simpleName}List${paramsUse}"
     val storageType = storageType!!
     val primitiveZero = storageType.primitiveZero()
-    val toPrimitive = storageType.toPrimitive
     val wrapperZero = storageType.fromPrimitive(primitiveZero)
     val file = context.codeGenerator.createNewFile(Dependencies(true, currentFile), generatedPackage, fileName)
     file.appendText("""
@@ -45,6 +42,12 @@ private fun CollectionItemType.generateRingBuffer(context: GeneratorContext, cur
 
                 val size get() = _size
 
+                fun isEmpty() = size == 0
+                fun isNotEmpty() = size != 0
+
+                val beginIndex get() = if (isEmpty()) -1 else startIndex
+                val endIndex get() = if (isEmpty()) -1 else startIndex + size
+
                 /** GENERATED CODE */
                 override fun iterator(): Iterator<$type> {
                     return object : Iterator<$type> {
@@ -167,6 +170,18 @@ private fun CollectionItemType.generateRingBuffer(context: GeneratorContext, cur
                     return oldValue
                 }
 
+                /** GENERATED CODE */
+                fun removeFrontUntil(cutoffIndex: Int) {
+                    val removedCount = cutoffIndex - startIndex
+                    if (removedCount == 0)
+                        return
+                    assert(removedCount > 0)
+                    assert(removedCount <= size)
+                    _size -= removedCount
+                    startIndex += removedCount
+                    offset = (offset + removedCount).mod(capacity)
+                }
+
                 /** GENERATED CODE */
                 fun clone() : Mutable${simpleName}RingBuffer${paramsUse} {
                     return Mutable${simpleName}RingBuffer${paramsUse}(size, buffer.copyOf())

core/kt-fast-collections/src/test/kotlin/TestRingBuffer.kt

@@ -113,4 +113,20 @@ class RingBufferTest {
         assertEquals(-2, deque.addFront(5))
         assertEquals(listOf(5, 3, 1, 2, 4), deque.toList())
     }
+
+    @Test
+    fun `test removeFrontUntil`() {
+        val deque = MutableIntRingBuffer()
+        assertEquals(0, deque.addFront(1))
+        assertEquals(1, deque.addBack(2))
+        assertEquals(-1, deque.addFront(3))
+        assertEquals(2, deque.addBack(4))
+        assertEquals(-2, deque.addFront(5))
+        assertEquals(listOf(5, 3, 1, 2, 4), deque.toList())
+        deque.removeFrontUntil(1) // 1 is the index of "2"
+        assertEquals(2, deque[1])
+        assertEquals(listOf(2, 4), deque.toList())
+        deque.removeFrontUntil(3) // 3 is the index of "2"
+        assertEquals(listOf(), deque.toList())
+    }
 }

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/api/InterlockingInfra.kt

@@ -54,6 +54,10 @@ interface ReservationInfra : LocationInfra {
     fun getZonePathChunks(zonePath: ZonePathId): DirStaticIdxList<TrackChunk>
 }
 
+fun ReservationInfra.getZonePathZone(zonePath: ZonePathId): ZoneId {
+    return getNextZone(getZonePathEntry(zonePath))!!
+}
+
 /** A zone path is a path inside a zone */
 sealed interface ZonePath
 typealias ZonePathId = StaticIdx<ZonePath>

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/BlockInfraBuilder.kt

@@ -16,7 +16,7 @@ interface BlockInfraBuilder {
 }
 
 
-class BlockInfraBuilderImpl : BlockInfraBuilder {
+class BlockInfraBuilderImpl(val loadedSignalInfra: LoadedSignalInfra, val rawInfra: RawInfra) : BlockInfraBuilder {
     private val blockSet = mutableMapOf<BlockDescriptor, BlockId>()
     private val blockPool = StaticPool<Block, BlockDescriptor>()
     override fun block(
@@ -27,11 +27,16 @@ class BlockInfraBuilderImpl : BlockInfraBuilder {
         signalsDistances: OffsetList<Block>,
     ): BlockId {
         assert(path.size != 0)
-        val newBlock = BlockDescriptor(startAtBufferStop, stopsAtBufferStop, path, signals, signalsDistances)
+
+        var length = Length<Block>(0.meters)
+        for (zonePath in path)
+            length += rawInfra.getZonePathLength(zonePath).distance
+
+        val newBlock = BlockDescriptor(length, startAtBufferStop, stopsAtBufferStop, path, signals, signalsDistances)
         return blockSet.getOrPut(newBlock) { blockPool.add(newBlock) }
     }
 
-    fun build(loadedSignalInfra: LoadedSignalInfra, rawInfra: RawInfra): BlockInfra {
+    fun build(): BlockInfra {
         return BlockInfraImpl(blockPool, loadedSignalInfra, rawInfra)
     }
 }
@@ -42,7 +47,7 @@ fun blockInfraBuilder(
     rawInfra: RawInfra,
     init: BlockInfraBuilder.() -> Unit,
 ): BlockInfra {
-    val builder = BlockInfraBuilderImpl()
+    val builder = BlockInfraBuilderImpl(loadedSignalInfra, rawInfra)
     builder.init()
-    return builder.build(loadedSignalInfra, rawInfra)
+    return builder.build()
 }

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/BlockInfraImpl.kt

@@ -6,6 +6,7 @@ import fr.sncf.osrd.utils.indexing.*
 import fr.sncf.osrd.utils.units.*
 
 class BlockDescriptor(
+    val length: Length<Block>,
     val startAtBufferStop: Boolean,
     val stopsAtBufferStop: Boolean,
     val path: StaticIdxList<ZonePath>,
@@ -117,10 +118,6 @@ class BlockInfraImpl(
     }
 
     override fun getBlockLength(block: BlockId): Length<Block> {
-        var length = Length<Block>(0.meters)
-        for (path in blockPool[block].path) {
-            length += rawInfra.getZonePathLength(path).distance
-        }
-        return length
+        return blockPool[block].length
     }
 }

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/PathPropertiesImpl.kt

@@ -7,7 +7,6 @@ import fr.sncf.osrd.utils.DistanceRangeMap
 import fr.sncf.osrd.utils.distanceRangeMapOf
 import fr.sncf.osrd.utils.indexing.DirStaticIdxList
 import fr.sncf.osrd.utils.units.Distance
-import fr.sncf.osrd.utils.units.Offset
 import fr.sncf.osrd.utils.units.meters
 import java.lang.RuntimeException
 

core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/indexing/StaticIdx.kt

@@ -3,7 +3,7 @@
     primitive = UInt::class,
     fromPrimitive = "StaticIdx(%s)",
     toPrimitive = "%s.index",
-    collections = ["Array", "ArrayList", "ArraySortedSet"],
+    collections = ["Array", "ArrayList", "ArraySortedSet", "RingBuffer"],
 )
 
 package fr.sncf.osrd.utils.indexing
@@ -187,4 +187,4 @@ class VirtualStaticPool<IndexT>(private var _size: UInt) : StaticIdxIterable<Ind
     fun space(): StaticIdxSpace<IndexT> {
         return StaticIdxSpace(size)
     }
-}
+}

core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/units/Distance.kt

@@ -3,15 +3,15 @@
     primitive = Long::class,
     fromPrimitive = "Distance(%s)",
     toPrimitive = "%s.millimeters",
-    collections = ["Array", "ArrayList"],
+    collections = ["Array", "ArrayList", "RingBuffer"],
 )
 
 @file:PrimitiveWrapperCollections(
     wrapper = Offset::class,
     primitive = Long::class,
     fromPrimitive = "Offset(Distance(%s))",
     toPrimitive = "%s.distance.millimeters",
-    collections = ["Array", "ArrayList"],
+    collections = ["Array", "ArrayList", "RingBuffer"],
 )
 
 package fr.sncf.osrd.utils.units