Merge pull request #57 from igloo-4002/fix-vaporized

Fix data type for `SumoTripInfo.vaporized`
igloo-4002 · Oct 15, 2023 · 43403c3 · 43403c3
2 parents 410829c + 09f6587
commit 43403c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/kotlin/app/urbanflo/urbanflosumoserver/model/output/tripinfo/SumoTripInfo.kt b/src/main/kotlin/app/urbanflo/urbanflosumoserver/model/output/tripinfo/SumoTripInfo.kt
@@ -44,5 +44,5 @@ data class SumoTripInfo(
     @field:JacksonXmlProperty(isAttribute = true)
     val speedFactor: Double,
     @field:JacksonXmlProperty(isAttribute = true)
-    val vaporized: Boolean?
+    val vaporized: String?
 )
diff --git a/src/main/kotlin/app/urbanflo/urbanflosumoserver/storage/FilesystemStorageService.kt b/src/main/kotlin/app/urbanflo/urbanflosumoserver/storage/FilesystemStorageService.kt
@@ -270,7 +270,7 @@ class FilesystemStorageService @Autowired constructor(properties: StoragePropert
         val averageTimeLoss = tripInfo.map { it.timeLoss }.average()
 
         // Total number of cars that reached their destination. Can work this out with vaporised variable
-        val totalNumberOfCarsThatCompleted = tripInfo.count() - tripInfo.count { it.vaporized == true }
+        val totalNumberOfCarsThatCompleted = tripInfo.count() - tripInfo.count { !it.vaporized.isNullOrEmpty() }
 
         val simulationLength = netState.lastOrNull()?.time ?: 0.0