fixup

Co-authored-by: bougue-pe <[email protected]> tmp
OpenRailAssociation · Jan 6, 2025 · d9a0f84 · d9a0f84
1 parent 693a0cf
commit d9a0f84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/fr/sncf/osrd/conflicts/IncrementalConflictDetector.kt b/core/src/main/java/fr/sncf/osrd/conflicts/IncrementalConflictDetector.kt
@@ -72,7 +72,7 @@ class IncrementalConflictDetector(requirements: List<Requirements>) {
     }
 
     /**
-     * Check for any conflicts between the initial requirements and the ones given here as method
+     * Checks for any conflict between the initial requirements and the ones given here as method
      * input. Returns a polymorphic response with different extra data for either case (conflict /
      * no conflict).
      */
@@ -103,7 +103,7 @@ class IncrementalConflictDetector(requirements: List<Requirements>) {
     }
 
     /**
-     * Returns the earliest time at which there is a conflict (a ressource is used by the new train
+     * Returns the earliest time at which there is a conflict (a resource is used by the new train
      * and in the initial requirements).
      */
     private fun earliestConflictTime(

diff --git a/core/src/test/kotlin/fr/sncf/osrd/conflicts/IncrementalConflictDetectorTests.kt b/core/src/test/kotlin/fr/sncf/osrd/conflicts/IncrementalConflictDetectorTests.kt
@@ -6,7 +6,7 @@ import kotlin.test.assertEquals
 
 class IncrementalConflictDetectorTests {
     data class SimpleRequirement(
-        val id: Int,
+        val zoneId: Int,
         val start: Double,
         val end: Double,
     )
@@ -42,7 +42,7 @@ class IncrementalConflictDetectorTests {
                 Requirements(
                     RequirementId(0, RequirementType.TRAIN),
                     requirements.map {
-                        ResultTrain.SpacingRequirement(it.id.toString(), it.start, it.end, true)
+                        ResultTrain.SpacingRequirement(it.zoneId.toString(), it.start, it.end, true)
                     },
                     listOf()
                 )
@@ -56,7 +56,7 @@ class IncrementalConflictDetectorTests {
     ): IncrementalConflictResponse {
         return detector.analyseConflicts(
             requirements.map {
-                ResultTrain.SpacingRequirement(it.id.toString(), it.start, it.end, true)
+                ResultTrain.SpacingRequirement(it.zoneId.toString(), it.start, it.end, true)
             },
         )
     }