diff --git a/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters-1.15.yaml b/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters-1.15.yaml index f133c34711..cdcaf90696 100644 --- a/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters-1.15.yaml +++ b/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters-1.15.yaml @@ -15,32 +15,32 @@ minutes-at-attenuation-weights: - attenuation-range: min: 0 - max: 55 - max-exclusive: true - weight: 1.0 - - - attenuation-range: - min: 55 max: 63 max-exclusive: true - weight: 0.5 + weight: 0.8 - attenuation-range: min: 63 max: 73 max-exclusive: true - weight: 0.3 + weight: 1.0 + - + attenuation-range: + min: 73 + max: 79 + max-exclusive: true + weight: 0.1 normalized-time-per-e-w-to-risk-level-mapping: - normalized-time-range: min: 0 - max: 15 + max: 13 max-exclusive: true risk-level: 1 - normalized-time-range: - min: 15 + min: 13 max: 9999 risk-level: 2 @@ -48,12 +48,12 @@ normalized-time-per-day-to-risk-level-mapping: - normalized-time-range: min: 5 - max: 15 + max: 13 max-exclusive: true risk-level: 1 - normalized-time-range: - min: 15 + min: 13 max: 99999 risk-level: 2 diff --git a/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters.yaml b/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters.yaml index 78f86b45f8..616be0ed5e 100644 --- a/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters.yaml +++ b/services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters.yaml @@ -11,7 +11,7 @@ minutes-at-attenuation-filters: - attenuation-range: min: 0 - max: 73 + max: 79 max-exclusive: true drop-if-minutes-in-range: min: 0 @@ -28,26 +28,32 @@ minutes-at-attenuation-weights: - attenuation-range: min: 0 - max: 55 + max: 63 + max-exclusive: true + weight: 0.8 + - + attenuation-range: + min: 63 + max: 73 max-exclusive: true weight: 1.0 - attenuation-range: - min: 55 - max: 63 + min: 73 + max: 79 max-exclusive: true - weight: 0.5 + weight: 0.1 normalized-time-per-e-w-to-risk-level-mapping: - normalized-time-range: min: 0 - max: 15 + max: 13 max-exclusive: true risk-level: 1 - normalized-time-range: - min: 15 + min: 13 max: 9999 risk-level: 2 @@ -55,12 +61,12 @@ normalized-time-per-day-to-risk-level-mapping: - normalized-time-range: min: 0 - max: 15 + max: 13 max-exclusive: true risk-level: 1 - normalized-time-range: - min: 15 + min: 13 max: 99999 risk-level: 2