Feature/TASK 3483 risk calculation v2

src/xcode/ENA/ENA/Resources/Info.plist

@@ -19,7 +19,7 @@
  <key>ENDeveloperRegion</key>
  <string>DE</string>
  <key>ENAPIVersion</key>
- <integer>1</integer>
+ <integer>2</integer>
  <key>CFBundleName</key>
  <string>ENA</string>
  <key>CFBundlePackageType</key>

src/xcode/ENA/ENA/Resources/Info_Debug.plist

@@ -38,7 +38,7 @@
  <key>CFBundleVersion</key>
  <string>$(CURRENT_PROJECT_VERSION)</string>
  <key>ENAPIVersion</key>
- <integer>1</integer>
+ <integer>2</integer>
  <key>ENDeveloperRegion</key>
  <string>TEST_DE_0</string>
  <key>ITSAppUsesNonExemptEncryption</key>

src/xcode/ENA/ENA/Resources/Info_Testflight.plist

@@ -21,7 +21,7 @@
  <key>ENDeveloperRegion</key>
  <string>TEST_DE_0</string>
  <key>ENAPIVersion</key>
- <integer>1</integer>
+ <integer>2</integer>
  <key>CFBundlePackageType</key>
  <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
  <key>CFBundleShortVersionString</key>

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/CWARiskLevel.swift

@@ -0,0 +1,51 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+
+enum CWARiskLevel: Int, Decodable {
+
+ // MARK: - Init
+
+ init(from riskLevel: SAP_Internal_V2_NormalizedTimeToRiskLevelMapping.RiskLevel) {
+ switch riskLevel {
+ case .low:
+ self = .low
+ case .high:
+ self = .high
+ default:
+ fatalError("Only low and high risk levels are supported")
+ }
+ }
+
+ // MARK: - Internal
+
+ case low = 1
+ case high = 2
+
+ var eitherLowOrIncreasedRiskLevel: EitherLowOrIncreasedRiskLevel {
+ switch self {
+ case .low:
+ return .low
+ case .high:
+ return .increased
+ }
+ }
+
+}

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/ENARange.swift

@@ -0,0 +1,63 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+
+struct ENARange: Decodable {
+
+ // MARK: - Init
+
+ init(from range: SAP_Internal_V2_Range) {
+ self.min = range.min
+ self.max = range.max
+ self.minExclusive = range.minExclusive
+ self.maxExclusive = range.maxExclusive
+ }
+
+ // MARK: - Internal
+
+ func contains(_ value: Double) -> Bool {
+ let minExclusive = self.minExclusive ?? false
+ let maxExclusive = self.maxExclusive ?? false
+
+ if minExclusive && value <= min { return false }
+ if !minExclusive && value < min { return false }
+ if maxExclusive && value >= max { return false }
+ if !maxExclusive && value > max { return false }
+
+ return true
+ }
+
+ func contains(_ value: Int) -> Bool {
+ contains(Double(value))
+ }
+
+ func contains(_ value: UInt8) -> Bool {
+ contains(Double(value))
+ }
+
+ // MARK: - Private
+
+ private let min: Double
+ private let max: Double
+
+ private let minExclusive: Bool?
+ private let maxExclusive: Bool?
+
+}

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/ExposureWindow.swift

@@ -0,0 +1,57 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+import ExposureNotification
+
+struct ExposureWindow {
+
+ // MARK: - Init
+
+ init(
+ calibrationConfidence: ENCalibrationConfidence,
+ date: Date,
+ reportType: ENDiagnosisReportType,
+ infectiousness: ENInfectiousness,
+ scanInstances: [ScanInstance]
+ ) {
+ self.calibrationConfidence = calibrationConfidence
+ self.date = date
+ self.reportType = reportType
+ self.infectiousness = infectiousness
+ self.scanInstances = scanInstances
+ }
+
+ init(from exposureWindow: ENExposureWindow) {
+ self.calibrationConfidence = exposureWindow.calibrationConfidence
+ self.date = exposureWindow.date
+ self.reportType = exposureWindow.diagnosisReportType
+ self.infectiousness = exposureWindow.infectiousness
+ self.scanInstances = exposureWindow.scanInstances.map { ScanInstance(from: $0) }
+ }
+
+ // MARK: - Internal
+
+ let calibrationConfidence: ENCalibrationConfidence
+ let date: Date
+ let reportType: ENDiagnosisReportType
+ let infectiousness: ENInfectiousness
+ let scanInstances: [ScanInstance]
+
+}

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/MinutesAtAttenuationFilter.swift

@@ -0,0 +1,36 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+
+struct MinutesAtAttenuationFilter: Decodable {
+
+ // MARK: - Init
+
+ init(from minutesAtAttenuationFilter: SAP_Internal_V2_MinutesAtAttenuationFilter) {
+ self.attenuationRange = ENARange(from: minutesAtAttenuationFilter.attenuationRange)
+ self.dropIfMinutesInRange = ENARange(from: minutesAtAttenuationFilter.dropIfMinutesInRange)
+ }
+
+ // MARK: - Internal
+
+ let attenuationRange: ENARange
+ let dropIfMinutesInRange: ENARange
+
+}

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/MinutesAtAttenuationWeight.swift

@@ -0,0 +1,36 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+
+struct MinutesAtAttenuationWeight: Decodable {
+
+ // MARK: - Init
+
+ init(from minutesAtAttenuationWeight: SAP_Internal_V2_MinutesAtAttenuationWeight) {
+ self.attenuationRange = ENARange(from: minutesAtAttenuationWeight.attenuationRange)
+ self.weight = minutesAtAttenuationWeight.weight
+ }
+
+ // MARK: - Internal
+
+ let attenuationRange: ENARange
+ let weight: Double
+
+}

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/NormalizedTimePerEWToRiskLevelMapping.swift

@@ -0,0 +1,36 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+
+struct NormalizedTimeToRiskLevelMapping: Decodable {
+
+ // MARK: - Init
+
+ init(from normalizedTimeToRiskLevelMapping: SAP_Internal_V2_NormalizedTimeToRiskLevelMapping) {
+ self.normalizedTimeRange = ENARange(from: normalizedTimeToRiskLevelMapping.normalizedTimeRange)
+ self.riskLevel = CWARiskLevel(from: normalizedTimeToRiskLevelMapping.riskLevel)
+ }
+
+ // MARK: - Internal
+
+ let normalizedTimeRange: ENARange
+ let riskLevel: CWARiskLevel
+
+}

src/xcode/ENA/ENA/Source/Services/Risk/CalculationV2/Models/RiskCalculationConfiguration.swift

@@ -0,0 +1,46 @@
+//
+// Corona-Warn-App
+//
+// SAP SE and all other contributors
+// copyright owners license this file to you under the Apache
+// License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+import Foundation
+
+struct RiskCalculationConfiguration: Decodable {
+
+ // MARK: - Init
+
+ init(from riskCalculationParameters: SAP_Internal_V2_RiskCalculationParameters) {
+ self.minutesAtAttenuationFilters = riskCalculationParameters.minutesAtAttenuationFilters.map { MinutesAtAttenuationFilter(from: $0) }
+ self.trlFilters = riskCalculationParameters.trlFilters.map { TrlFilter(from: $0) }
+ self.minutesAtAttenuationWeights = riskCalculationParameters.minutesAtAttenuationWeights.map { MinutesAtAttenuationWeight(from: $0) }
+ self.normalizedTimePerEWToRiskLevelMapping = riskCalculationParameters.normalizedTimePerEwtoRiskLevelMapping.map { NormalizedTimeToRiskLevelMapping(from: $0) }
+ self.normalizedTimePerDayToRiskLevelMapping = riskCalculationParameters.normalizedTimePerDayToRiskLevelMapping.map { NormalizedTimeToRiskLevelMapping(from: $0) }
+ self.trlEncoding = TrlEncoding(from: riskCalculationParameters.trlEncoding)
+ self.transmissionRiskLevelMultiplier = riskCalculationParameters.transmissionRiskLevelMultiplier
+ }
+
+ // MARK: - Internal
+
+ let minutesAtAttenuationFilters: [MinutesAtAttenuationFilter]
+ let trlFilters: [TrlFilter]
+ let minutesAtAttenuationWeights: [MinutesAtAttenuationWeight]
+ let normalizedTimePerEWToRiskLevelMapping: [NormalizedTimeToRiskLevelMapping]
+ let normalizedTimePerDayToRiskLevelMapping: [NormalizedTimeToRiskLevelMapping]
+ let trlEncoding: TrlEncoding
+ let transmissionRiskLevelMultiplier: Double
+
+}