Merge pull request #756 from daisuke-nogami/daisuke-nogami-parameter-…

…improve ENv2パラメータとリスクスコア閾値条件の変更
cocoa-mhlw · Jan 18, 2022 · dfd44d4 · dfd44d4
2 parents 854238a + 3d77abb
commit dfd44d4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Covid19Radar/Covid19Radar/Repository/ExposureConfigurationRepository.cs b/Covid19Radar/Covid19Radar/Repository/ExposureConfigurationRepository.cs
@@ -215,14 +215,14 @@ private static ExposureConfiguration CreateDefaultConfiguration()
                 GoogleDailySummariesConfig = new DailySummariesConfig()
                 {
                     AttenuationBucketThresholdDb = new List<int>() {
-                        50,
-                        54,
+                        46,
+                        60,
                         65
                     },
                     AttenuationBucketWeights = new List<double>() {
+                        1.0,
                         2.5,
                         1.3,
-                        0.6,
                         0.01
                     },
                     DaysSinceExposureThreshold = 0,
@@ -282,13 +282,13 @@ private static ExposureConfiguration CreateDefaultConfiguration()
                     InfectiousnessWhenDaysSinceOnsetMissing = Infectiousness.High,
                     ReportTypeNoneMap = ReportType.ConfirmedTest,
                     AttenuationDurationThresholds = new int[] {
-                        50,
-                        54,
+                        46,
+                        60,
                         65
                     },
-                    ImmediateDurationWeight = 250.0,
-                    NearDurationWeight = 130.0,
-                    MediumDurationWeight = 60.0,
+                    ImmediateDurationWeight = 100.0,
+                    NearDurationWeight = 250.0,
+                    MediumDurationWeight = 130.0,
                     OtherDurationWeight = 1.0,
                     DaysSinceLastExposureThreshold = 0,
                     InfectiousnessForDaysSinceOnsetOfSymptoms = new Dictionary<long, Infectiousness>()

diff --git a/documents/static/exposure_configuration/configuration.json b/documents/static/exposure_configuration/configuration.json
@@ -87,14 +87,14 @@
   },
   "google_daily_summaries_config": {
     "attenuation_bucket_threshold_db": [
-      50,
-      54,
+      46,
+      60,
       65
     ],
     "attenuation_bucket_weights": [
+      1.0,
       2.5,
       1.3,
-      0.6,
       0.01
     ],
     "days_since_exposure_threshold": 0,
@@ -157,13 +157,13 @@
   "apple_exposure_config_v2": {
     "infectiousness_when_days_since_onset_missing": 2,
     "attenuation_duration_thresholds": [
-      50,
-      54,
+      46,
+      60,
       65
     ],
-    "immediate_duration_weight": 250.0,
-    "near_duration_weight": 130.0,
-    "medium_duration_weight": 60.0,
+    "immediate_duration_weight": 100.0,
+    "near_duration_weight": 250.0,
+    "medium_duration_weight": 130.0,
     "other_duration_weight": 1.0,
     "DaysSinceLastExposureThreshold": 0,
     "infectiousness_for_days_since_onset_of_symptoms": {

diff --git a/documents/static/exposure_configuration/risk_calculation_configuration.json b/documents/static/exposure_configuration/risk_calculation_configuration.json
@@ -2,15 +2,15 @@
   "format_version": 1,
   "DailySummary_DaySummary_ScoreSum": {
     "op": ">=",
-    "value": 1170.0
+    "value": 1350.0
   },
   "DailySummary_DaySummary_WeightedDurationAverage": {
     "op": "NOP",
     "value": 0.0
   },
   "ExposureWindow_ScanInstance_SecondsSinceLastScanSum": {
-    "op": "NOP",
-    "value": 0.0
+    "op": ">=",
+    "value": 900.0
   },
   "ExposureWindow_ScanInstance_TypicalAttenuationDb_Max": {
     "op": "NOP",