From f7d940672a244984f524466408cb3aaea9a32c3d Mon Sep 17 00:00:00 2001 From: TrafficCop <103712563+TrafficCop@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:29:39 -0800 Subject: [PATCH 1/4] Changes to CGM Generator --- wearipedia/devices/nutrisense/cgm_gen.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wearipedia/devices/nutrisense/cgm_gen.py b/wearipedia/devices/nutrisense/cgm_gen.py index c7ed4dd..8437a67 100644 --- a/wearipedia/devices/nutrisense/cgm_gen.py +++ b/wearipedia/devices/nutrisense/cgm_gen.py @@ -27,7 +27,7 @@ def gen_data(start_date, end_date, seed=0): summary = gen_summary(Y) stat = { "today": gen_stats(Y), - "average": gen_stats(Y, weekly=True), + "average": gen_stats(Y, weekly=True, seed=seed), } return (scores, continuous, summary, stat) @@ -81,9 +81,9 @@ def gen_glucose(t, index, seed=0): Y.append(y) added = local_rng.normal(scale=1) * 10 + 0.01 * (160 / y) - if y < 80: + if y < 95: added = abs(added) - elif y > 130: + elif y > 120: added = -1 * abs(added) y += added @@ -149,7 +149,7 @@ def gen_scores(): return score -def gen_stats(Y, weekly=False): +def gen_stats(Y, weekly=False, seed=0): """Generate random scores for the daily statistics :param Y: the synthetic sensor data @@ -188,8 +188,8 @@ def gen_stats(Y, weekly=False): "healthyRange": first, "range": second, "timeWithinRange": timeWithinRange, - "min": max(70, low), - "max": min(140, high), + "min": low, + "max": high, "mean": avg, "median": median, "standardDeviation": std, From 4e791a6e4de04f1f482d249b21691364cf98b733 Mon Sep 17 00:00:00 2001 From: TrafficCop <103712563+TrafficCop@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:49:15 -0800 Subject: [PATCH 2/4] Changed CGM generator range --- wearipedia/devices/nutrisense/cgm_gen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wearipedia/devices/nutrisense/cgm_gen.py b/wearipedia/devices/nutrisense/cgm_gen.py index 8437a67..70a7d5b 100644 --- a/wearipedia/devices/nutrisense/cgm_gen.py +++ b/wearipedia/devices/nutrisense/cgm_gen.py @@ -81,9 +81,9 @@ def gen_glucose(t, index, seed=0): Y.append(y) added = local_rng.normal(scale=1) * 10 + 0.01 * (160 / y) - if y < 95: + if y < 80: added = abs(added) - elif y > 120: + elif y > 130: added = -1 * abs(added) y += added @@ -149,7 +149,7 @@ def gen_scores(): return score -def gen_stats(Y, weekly=False, seed=0): +def gen_stats(Y, weekly=False): """Generate random scores for the daily statistics :param Y: the synthetic sensor data From 0b9fa0a893f10f85f2e7c8f68577e8976620115f Mon Sep 17 00:00:00 2001 From: TrafficCop <103712563+TrafficCop@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:52:05 -0800 Subject: [PATCH 3/4] Fixed a bug in CGM --- wearipedia/devices/nutrisense/cgm_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wearipedia/devices/nutrisense/cgm_gen.py b/wearipedia/devices/nutrisense/cgm_gen.py index 70a7d5b..6dc065b 100644 --- a/wearipedia/devices/nutrisense/cgm_gen.py +++ b/wearipedia/devices/nutrisense/cgm_gen.py @@ -27,7 +27,7 @@ def gen_data(start_date, end_date, seed=0): summary = gen_summary(Y) stat = { "today": gen_stats(Y), - "average": gen_stats(Y, weekly=True, seed=seed), + "average": gen_stats(Y, weekly=True), } return (scores, continuous, summary, stat) From 11be7102155ee1ee3670fbd87604c38e72e66069 Mon Sep 17 00:00:00 2001 From: TrafficCop <103712563+TrafficCop@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:55:46 -0800 Subject: [PATCH 4/4] Increased generation range in CGM --- wearipedia/devices/nutrisense/cgm_gen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wearipedia/devices/nutrisense/cgm_gen.py b/wearipedia/devices/nutrisense/cgm_gen.py index 6dc065b..e01c0c0 100644 --- a/wearipedia/devices/nutrisense/cgm_gen.py +++ b/wearipedia/devices/nutrisense/cgm_gen.py @@ -81,9 +81,9 @@ def gen_glucose(t, index, seed=0): Y.append(y) added = local_rng.normal(scale=1) * 10 + 0.01 * (160 / y) - if y < 80: + if y < 75: added = abs(added) - elif y > 130: + elif y > 135: added = -1 * abs(added) y += added