Skip to content
Snippets Groups Projects
Unverified Commit a1521699 authored by Kolya Opahle's avatar Kolya Opahle
Browse files

switched typical to minimum attenuation in risk calculation

parent 895a58e9
No related branches found
No related tags found
No related merge requests found
...@@ -171,7 +171,7 @@ class DefaultRiskLevels @Inject constructor( ...@@ -171,7 +171,7 @@ class DefaultRiskLevels @Inject constructor(
attenuationFilters.any { attenuationFilter -> attenuationFilters.any { attenuationFilter ->
// Get total seconds at attenuation in exposure window // Get total seconds at attenuation in exposure window
val secondsAtAttenuation: Double = scanInstances val secondsAtAttenuation: Double = scanInstances
.filter { attenuationFilter.attenuationRange.inRange(it.typicalAttenuationDb) } .filter { attenuationFilter.attenuationRange.inRange(it.minAttenuationDb) }
.fold(.0) { acc, scanInstance -> acc + scanInstance.secondsSinceLastScan } .fold(.0) { acc, scanInstance -> acc + scanInstance.secondsSinceLastScan }
val minutesAtAttenuation = secondsAtAttenuation / 60 val minutesAtAttenuation = secondsAtAttenuation / 60
...@@ -218,7 +218,7 @@ class DefaultRiskLevels @Inject constructor( ...@@ -218,7 +218,7 @@ class DefaultRiskLevels @Inject constructor(
scanInstances.fold(.0) { seconds, scanInstance -> scanInstances.fold(.0) { seconds, scanInstance ->
val weight: Double = val weight: Double =
minutesAtAttenuationWeight minutesAtAttenuationWeight
.filter { it.attenuationRange.inRange(scanInstance.typicalAttenuationDb) } .filter { it.attenuationRange.inRange(scanInstance.minAttenuationDb) }
.map { it.weight } .map { it.weight }
.firstOrNull() ?: .0 .firstOrNull() ?: .0
seconds + scanInstance.secondsSinceLastScan * weight seconds + scanInstance.secondsSinceLastScan * weight
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment