From 767e838c87b1ea6d821268939007534fbeb47788 Mon Sep 17 00:00:00 2001 From: Meng Li <34143965+Meng6@users.noreply.github.com> Date: Tue, 24 Nov 2020 13:43:24 -0500 Subject: [PATCH] Fix HR&Sleep bugs --- src/data/fitbit_parse_sleep.py | 2 +- src/features/fitbit_heartrate_summary/rapids/main.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/fitbit_parse_sleep.py b/src/data/fitbit_parse_sleep.py index 6c673f95..c9a79521 100644 --- a/src/data/fitbit_parse_sleep.py +++ b/src/data/fitbit_parse_sleep.py @@ -132,7 +132,7 @@ def parseOneRecordForV12(record, device_id, d_is_main_sleep, records_summary, re record["minutesAfterWakeup"], record["minutesAsleep"], record["minutesAwake"], record["minutesToFallAsleep"], record["timeInBed"], d_is_main_sleep, sleep_record_type, d_start_datetime, d_end_datetime, - 0,0) + 0) records_summary.append(row_summary) diff --git a/src/features/fitbit_heartrate_summary/rapids/main.py b/src/features/fitbit_heartrate_summary/rapids/main.py index 69025815..8114047c 100644 --- a/src/features/fitbit_heartrate_summary/rapids/main.py +++ b/src/features/fitbit_heartrate_summary/rapids/main.py @@ -29,13 +29,13 @@ def statsFeatures(heartrate_data, features, features_type, heartrate_features): if "summarymedian" + features_type in features: heartrate_features["heartrate_rapids_summarymedian" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].median() if "summarymode" + features_type in features: - heartrate_features["heartrate_rapids_summarymode" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(lambda x: pd.Series.mode(x)[0]) + heartrate_features["heartrate_rapids_summarymode" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(lambda x: None if len(pd.Series.mode(x)) == 0 else pd.Series.mode(x)[0]) if "summarystd" + features_type in features: heartrate_features["heartrate_rapids_summarystd" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].std() if "summarydiffmaxmode" + features_type in features: - heartrate_features["heartrate_rapids_summarydiffmaxmode" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].max() - heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(lambda x: pd.Series.mode(x)[0]) + heartrate_features["heartrate_rapids_summarydiffmaxmode" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].max() - heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(lambda x: None if len(pd.Series.mode(x)) == 0 else pd.Series.mode(x)[0]) if "summarydiffminmode" + features_type in features: - heartrate_features["heartrate_rapids_summarydiffminmode" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(lambda x: pd.Series.mode(x)[0]) - heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].min() + heartrate_features["heartrate_rapids_summarydiffminmode" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(lambda x: None if len(pd.Series.mode(x)) == 0 else pd.Series.mode(x)[0]) - heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].min() if "summaryentropy" + features_type in features: heartrate_features["heartrate_rapids_summaryentropy" + features_type] = heartrate_data[["local_segment", col_name]].groupby(["local_segment"])[col_name].agg(entropy)