Commit Graph

680 Commits (eaf4340afd7db8a43174a4789cfb9ba5a831dac4)

Author SHA1 Message Date
JulioV 4926497ae2 Fix bugs in Fitbit data parsing
- Fix the script that was breaking with an empty file
- Fix the script that was breaking when start/end dates were empty
- Ambigous and nonexistent DST times are handled now
- Remove unnecessary else clause
2021-01-06 11:43:01 -05:00
JulioV 5203aa60d1 Fix bugs in create participants files script
- The PHONE and FITBIT flags were mixed up
- The start/end dates from the CSV file weren't being parsed correctly
2021-01-06 11:14:15 -05:00
JulioV 3a80f93771 Fix segment error when device ids is empty 2021-01-06 11:12:10 -05:00
JulioV 51c7739bfc Revert "Start support for phone_keyboard"
This reverts commit dd95b4f941.
2020-12-20 16:29:40 -05:00
JulioV dd95b4f941 Start support for phone_keyboard 2020-12-14 13:42:22 -05:00
JulioV 63202c62cc Fix BT doryab bug and update change log 2020-12-12 17:11:48 -05:00
JulioV 05627296f4 Fix filter_data_by_segment bug 2020-12-12 17:10:59 -05:00
JulioV 5bd1bfe856 Add new bluetooth doryab features and deprecate rapids provider 2020-12-12 17:01:46 -05:00
JulioV 266dd28d02 Add bluetooth doryab features 2020-12-11 12:03:22 -05:00
JulioV ae21c076cd Fix conversation data bug 2020-12-04 15:23:08 -05:00
JulioV 9a02e93b25 Swap RMySQL for RMariaDB 2020-12-04 14:57:13 -05:00
Meng Li 9a0e57301b Update 4 plots for time_segments 2020-12-03 21:00:32 -05:00
JulioV 614e759551 Refactor day segments to time segments 2020-12-02 18:41:03 -05:00
JulioV c24cba8679 Event segments' device id can be one of any assigned to a participant 2020-12-02 17:17:55 -05:00
Meng Li 0bd43c139c Update plot#1: histogram_phone_data_yield 2020-12-01 14:21:33 -05:00
Meng Li 016bdbfe8c Update Python feature scripts to add sensor and provider names automatically 2020-11-30 14:42:19 -05:00
Meng Li 70991d6667 Add dates filter while parsing fitbit data 2020-11-30 12:34:14 -05:00
Meng Li 5178be585d Rename modeling.py to modelling.py & Update example_config.yaml 2020-11-25 22:35:38 -05:00
JulioV 5f51c94ac6 Separate device data configuration and update docs 2020-11-25 19:42:11 -05:00
Meng Li b4a512faf3 Add analysis example workflow 2020-11-25 16:34:05 -05:00
JulioV ced3305ddb Update R feature scripts to add sensor and provider names automatically 2020-11-25 14:49:42 -05:00
JulioV f02ca2624d Add phone yield sensor 2020-11-24 19:12:16 -05:00
JulioV 555811211d Fix column check in day segment compute 2020-11-24 14:51:06 -05:00
Meng Li 767e838c87 Fix HR&Sleep bugs 2020-11-24 13:43:24 -05:00
Meng Li deba6b9e4f Update sleep summary features for segments 2020-11-23 12:01:00 -05:00
Meng Li 10384204a1 Update Fitbit HR feature name 2020-11-20 11:31:16 -05:00
Meng Li d3241c79f1 Update filter_data_by_segment() function: call chunk_episodes() inside the filter function 2020-11-19 17:27:53 -05:00
JulioV 895b70719e Update minimal example and fix create participants bug 2020-11-17 17:27:48 -05:00
Meng Li a71efd6b85 Split FITBIT_STEPS into FITBIT_STEPS_SUMMARY and FITBIT_STEPS_INTRADAY 2020-11-11 21:16:48 -05:00
Meng Li 9fc36f67e2 Split FITBIT_HEARTRATE into FITBIT_HEARTRATE_SUMMARY and FITBIT_HEARTRATE_INTRADAY 2020-11-11 17:27:46 -05:00
Meng Li 39632c66f5 Update steps features for segments 2020-10-30 18:57:04 -04:00
JulioV 7f7eac0769 Merge branch 'ds2' into day_segments 2020-10-28 17:53:00 -04:00
JulioV c5197b6c5f Merge branch 'master' into ds2 2020-10-28 17:50:37 -04:00
Meng Li 93055dacee Update HR main.py 2020-10-28 17:02:21 -04:00
JulioV f36a7052b3 Add config update file to create participants file 2020-10-28 14:11:41 -04:00
Meng Li 84068ab33c Update fitbit_parse_steps.py: add summary data 2020-10-28 13:07:35 -04:00
Meng Li ed7585c2bf Update heartrate features for segments 2020-10-27 17:55:57 -04:00
JulioV d5931c75d8 Refactor script to create participants files 2020-10-27 17:13:16 -04:00
Meng Li 25e1f1fbb5 Update Python chunk_episodes 2020-10-26 18:47:57 -04:00
JulioV b986599226 Add support to read fitbit data from csv files 2020-10-26 17:17:53 -04:00
JulioV f0a551164a Fix AR names 2020-10-26 15:44:21 -04:00
JulioV e10e030baf Unify AR iOS walking and running conversion 2020-10-26 15:44:09 -04:00
JulioV 234588c94d Expose episode threshold between rows parameter 2020-10-26 15:28:19 -04:00
JulioV 2fe5a0d822 Update R chunk_episodes 2020-10-26 15:10:32 -04:00
JulioV c78ccfced7 Remove microseconds from chuncked date times 2020-10-26 15:03:31 -04:00
Meng Li 2b7bd0ae6e Modify output format of chunk_episodes() function 2020-10-26 13:00:53 -04:00
JulioV 1d04aa6807 Add check for non-overlapping event day segments 2020-10-23 12:15:26 -04:00
JulioV 86509207ac Turn off warnings for tidyverse and dplyr 2020-10-23 10:41:00 -04:00
JulioV c41d24df45 Fix bug when there are no event segments for participants 2020-10-22 16:41:26 -04:00
JulioV 47adb8bc4b Add tz support to fitbit 2020-10-22 14:38:40 -04:00
JulioV cff83a7ceb Implement parse fitbit data 2020-10-22 13:08:52 -04:00
JulioV c266f6dd10 Update participant files structure and fitbit download rule 2020-10-20 19:12:01 -04:00
Meng Li 8c0f6a000d Fix chunk_episodes() bugs: set segment_start_timestamp as int 2020-10-19 19:36:26 -04:00
JulioV 24bf62a7ab Update file names 2020-10-19 15:07:12 -04:00
Meng Li ac9cf92732 Add accelerometer features of PANDA provider 2020-10-13 17:54:53 -04:00
Meng Li 29dcd1f284 Add accelerometer features of RAPIDS provider 2020-10-13 11:42:36 -04:00
nikunjgoel95 dcf1255b4b Fix runtime bug in Radius of Gyration of Doryab Location. 2020-10-10 13:26:06 -04:00
JulioV 3996e0ab17 Fix bug when episodes are empty 2020-10-09 17:00:20 -04:00
JulioV 2c7beec1da Fix NAs are now 0 in some calls and msgs features 2020-10-08 12:23:54 -04:00
Meng Li 236b1cd809 Update AR module for segments; Refactor input format 2020-10-07 18:11:06 -04:00
JulioV 6b1e006b82 Refactor fused location resampling 2020-10-07 11:51:31 -04:00
nikunjgoel95 80ff3f4229 Cleaning the Doryab location features code to fix the bug of Emoty dataframe in ClusterAndLabel 2020-10-01 11:34:41 -04:00
JulioV c0c32d9f9e Fix bug in assign date segment when file is empty 2020-09-30 14:53:59 -04:00
Meng Li bccc9a0697 Move deduplicate_episodes() function into chunk_episodes() function; rename "time_diff" with duration 2020-09-29 18:05:25 -04:00
JulioV 39f6e3841c Update AR episode computation 2020-09-29 17:26:43 -04:00
JulioV 10b0386c8f Merge branch 'day_segments' of https://github.com/carissalow/rapids into day_segments 2020-09-29 17:24:41 -04:00
Meng Li f1717e59e7 Update screen&battery episodes features with different segment format 2020-09-29 17:13:34 -04:00
JulioV 499b92e240 Fix missing R library 2020-09-29 15:35:44 -04:00
JulioV 0dafdd1340 Redo resample episodes in R, new battery episodes 2020-09-29 15:18:48 -04:00
JulioV a6b99259f7 Fix bug when filtering by day segment and there are no rows belonging to that segment 2020-09-28 15:53:38 -04:00
nikunjgoel95 4f64f7eeef Fix the bug on ClusterAndLabel when recieving empty data. 2020-09-28 15:02:03 -04:00
JulioV 9e15f46fc3 Update day segment format 2020-09-28 11:38:47 -04:00
JulioV 303d1472ed Change how we compute AR episodes 2020-09-22 17:32:51 -04:00
JulioV a851a460e4 Change the way we compute battery episodes 2020-09-22 16:53:51 -04:00
JulioV 47ab0a2ce5 Fix phone_sensed_bins when there is no data 2020-09-21 10:28:42 -04:00
Meng Li f806cb44ac Fix the bug of screen duration features for different segments 2020-09-18 20:25:29 -04:00
kaguillera ca14eba8e1 Initial testing restructure for 30mins segments 2020-09-18 19:14:07 -04:00
JulioV 3022a60fe9 Fix day segment error with no rows 2020-09-18 17:19:11 -04:00
JulioV 3c27bb2d18 Refactor frequency segments and fix periodic labels 2020-09-18 16:29:48 -04:00
JulioV 06bb2b9c73 Fix accuracy bug in barnett location features 2020-09-18 11:26:10 -04:00
JulioV 4dc8d38c66 Optimise assign to day segment 2020-09-16 14:54:20 -04:00
JulioV c577229f18 Optimise assign to day segment 2020-09-14 17:56:04 -04:00
JulioV a665aedbe8 Optimise assign day segment 2020-09-14 16:19:42 -04:00
JulioV 132e52aeeb Fix day segment 2020-09-14 15:14:41 -04:00
JulioV 3c45f6b152 Refactor assign to day segment 2020-09-14 14:21:36 -04:00
kaguillera e7db230426 New Application_foreground testing & bugfixes 2020-09-11 17:55:09 -04:00
kaguillera d4c56642c7 New testing and bug fix for conversation features 2020-09-10 14:01:32 -04:00
JulioV a25849f7a4 Fix timeattop location name bug 2020-09-09 11:17:49 -04:00
JulioV 6436bf79db Fix overall heatmap bug 2020-09-09 11:17:05 -04:00
Meng Li b1baf6d9df Update overall compliance heatmap: x-axis label; plot title 2020-09-08 16:21:46 -04:00
kaguillera cf2a8f13a3 New testing and minor bug fix for light 2020-09-04 12:33:13 -04:00
JulioV 1ed85f1180 Delete unused files 2020-09-02 14:12:53 -04:00
JulioV 98ebf9bd13 Migrate conversation to new file structure 2020-09-01 17:07:07 -04:00
JulioV 8d87f6e497 Migrate app foreground to new file structure 2020-09-01 15:25:35 -04:00
JulioV 681a77f23c Clean utils.py 2020-09-01 12:02:31 -04:00
JulioV d674010e08 Rename param to provider 2020-09-01 12:01:45 -04:00
JulioV e643881058 Migrate light to new file structure 2020-09-01 12:01:24 -04:00
JulioV eda58d9d2c Migrate wifi to new file structure 2020-08-31 18:51:06 -04:00
JulioV 77d9d8f025 Migrate bluetooth to new file structure 2020-08-31 17:08:26 -04:00
JulioV 132311da77 Migrate messages to new file structure 2020-08-31 13:34:15 -04:00
kaguillera 148301d468 Testing, test docs and bugfixes for conversation 2020-08-28 18:28:00 -04:00
JulioV e269062439 Migrate calls to new provider file structure 2020-08-28 17:50:49 -04:00
JulioV 011b9736d5 Refactor the function to fetch provider features 2020-08-28 17:40:23 -04:00
JulioV b0f1477d7e Migrate location providers to new file structure and segments 2020-08-28 13:53:00 -04:00
JulioV 3052693573 Add missing entropy lib to call features 2020-08-26 13:04:02 -04:00
JulioV c3a6b1f9a2 Fix to calls change segment label column name 2020-08-26 13:02:27 -04:00
JulioV 14d2d694ce Migrate messages to new segments 2020-08-26 13:01:58 -04:00
JulioV 31ec5b0da4 Finalise new day segment structure with calls as example 2020-08-26 12:09:53 -04:00
nikunjgoel95 6a5470e338 Splitting Energy Feature in Conversation to Voice and Noise. 2020-08-23 13:20:19 -04:00
Yasaman Sefidgar 4b6ba12e62 raise exception for invalid frequency segmentation info; fixed inconsistency in frequency segmentation output columns 2020-08-20 14:51:22 -04:00
Yasaman Sefidgar 5f672b1f39 verification and creation of frequency segments 2020-08-20 14:51:22 -04:00
JulioV c2d011fb6a Add base functions to compute_day_segments.py 2020-08-20 14:51:22 -04:00
JulioV 026d056378 Simplify window workflow 2020-08-20 14:51:22 -04:00
JulioV a0b5b5982b Setup rules and files to support multiple 2020-08-20 14:45:09 -04:00
Meng Li b116accb6d Disable error message and add prints for restore_sql_file 2020-08-18 17:39:25 -04:00
Meng Li 75deaf7c26 Fix sql file name for restore_sql_file.py 2020-08-18 14:32:26 -04:00
Meng Li 0b2abc692c Fix restore_sql_file bug: table already exists 2020-08-18 14:18:30 -04:00
Meng Li b3fbc79195 Minor fix of metrics section 2020-08-17 17:27:58 -04:00
Meng Li 00385dc54d Discard useless parameters and related code of example 2020-08-17 10:48:15 -04:00
Meng Li 123b78d438 Fix minor bugs of modeling.py: f1-macro and proba 2020-08-16 16:08:51 -04:00
kaguillera f5ea5c3116 Conversation testing, testing_docs & minor bugfix 2020-08-13 18:36:38 -04:00
kaguillera 1ad8bb0365 Add testing, test docs and minor fixes for AR 2020-08-13 13:41:45 -04:00
nikunjgoel95 622d2997c3 Fixed the time first and last conversation features bug. 2020-08-13 12:45:08 -04:00
Meng Li b3b16bdb73 Minor fix of heatmap_days_by_sensors.py 2020-08-12 16:29:33 -04:00
Meng Li 5c25002507 Return an empty html file of heatmap_days_by_sensor when there are no records for any sensors. 2020-08-12 16:26:11 -04:00
nikunjgoel95 a3cd341bf2 Fixed the zero conversation time issues. 2020-08-11 20:24:21 -04:00
JulioV 08ce250839 Unify conversation timestamp for ios 2020-08-11 16:18:06 -04:00
JulioV b04088f11f Fix valid sensed days with 0 valid bins 2020-08-07 11:07:37 -04:00
Meng Li 18d220d6c0 Fix data cleaning bug: days threshold 2020-08-06 17:26:37 -04:00
nikunjgoel95 2859a53202 Small necessary changes in Location Doryab Features. 2020-08-05 13:39:37 -04:00
nikunjgoel95 38b3f55ab8 Added 'sampling_frequency' in Documentation. 2020-08-05 13:14:31 -04:00
nikunjgoel95 df7a52cd6c Added Sampling Frequency to Doryab Location Features. 2020-08-05 13:02:34 -04:00
nikunjgoel95 8cfe2dabb7 Improved code for radius of gyration in location features. 2020-08-05 12:06:39 -04:00
Meng Li 973e1669fa Move baselines into a folder; rename column of "num_of_participants" with "num_of_rows" in modeling.py 2020-08-05 07:51:35 -04:00
nikunjgoel95 2f4c137bc1 fixed the bug "Radius of Gyration" 2020-08-03 18:28:02 -04:00
Meng Li e13b89b125 Add restore_sql_file rule; notsummarised module; diff platforms for heatmap_days_by_sensors 2020-08-03 13:09:16 -04:00
kaguillera dbc51de4e3 Updated WIFI testing, bugfix and docs 2020-07-29 14:14:47 -04:00
Meng Li 93157db210 Data cleaning section: replace "day_type" with "day_idx" 2020-07-27 18:27:36 -04:00
Meng Li 84d4ea9258 HEATMAP_DAYS_BY_SENSORS: shows all dates when EXPECTED_NUM_OF_DAYS = -1 2020-07-26 20:37:24 -04:00
JulioV 388f09a003 Add missing wifi table 2020-07-24 16:35:41 -04:00
Meng Li b3aa4d82e1 Overall compliance heatmap: shows all dates for all participants (only supports last certain dates previously) 2020-07-24 12:58:48 -04:00
JulioV 5f771618ae Add screen episode filter parameters 2020-07-23 14:38:59 -04:00
nikunjgoel95 faad8f5a8f Added minutes of data in a day/epoch. 2020-07-23 14:23:32 -04:00
Meng Li b0354393ae Add "corr_method" param to heatmap_features_correlations.py 2020-07-22 20:00:14 -04:00
Meng Li c135b6ef78 Add visualization for data exploration 2020-07-22 16:47:32 -04:00
Meng Li 124843f96e Make phone_valid_sensed_days rule works for different min_valid_hours_per_day thresholds 2020-07-21 20:41:24 -04:00
nikunjgoel95 0ada1292ed Added maximum_gap_allowed parameter 2020-07-21 18:56:43 -04:00
Meng Li c86efb19d6 Fix location_doryab bug: same location all day 2020-07-21 15:47:48 -04:00
nikunjgoel95 1614d577b8 Fixed the Conversation Duration bug. 2020-07-20 16:52:21 -04:00
JulioV be6df7ebdb Fix missed outgoing calls unification in iOS 2020-07-20 15:16:42 -04:00
Meng Li 4f885ef7b7 Modify dropDatesSameLocationAllDay() function in Doryab's location section 2020-07-20 09:58:34 -04:00
Meng Li 6c1b93efa9 Update function name of location_base.py 2020-07-19 21:50:12 -04:00
Meng Li 923a5213ef Fix warning of location_doryab 2020-07-17 20:18:48 -04:00
nikunjgoel95 024ae1a549 Added Doryab's location features to rapids.
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-07-16 14:26:43 -04:00
kaguillera 4f256115c5 Apps_foreground, bugfixes, testing & testcase docs 2020-07-16 13:14:28 -04:00
kaguillera 6d37402ee4 Added Light Bugfix, testing and testcase docs 2020-07-10 14:01:19 -04:00
JulioV d2704296f3 Refactor valid sensed bins and days 2020-07-09 13:01:50 -04:00
kaguillera 9ca54f930d WIFI Bug fix and testing 2020-07-07 17:15:32 -04:00
kaguillera f24d2876fc Fixed bluetooth bug and added feeature testing 2020-07-06 18:11:28 -04:00
JulioV 06edf53016 Add support for multi-platform participants 2020-06-30 17:34:18 -04:00
JulioV 9811b8a34c Fix screen firstuseafter feature 2020-06-30 14:52:23 -04:00
Meng Li 234dfec1fa Fix minor bug of conversation_base.py 2020-06-29 20:29:49 -04:00
Meng Li 47369c4b2d Fix minor bug of applications_forground_base.py 2020-06-29 20:24:00 -04:00
Meng Li 29b04b0601 Fix step bouts features 2020-06-26 17:33:30 -04:00
kaguillera 533d0adab3 Updated sms sensor to messages 2020-06-26 12:20:47 -04:00
Meng Li 17f41588d8 Fix the bug of feature extraction code for some sensors: break when there is no data for an epoch 2020-06-26 11:25:25 -04:00
Meng Li e66ed6a79b Fix the accelerometer bug: without evening data 2020-06-25 18:43:24 -04:00
Meng Li 84b9bd4e12 Merge branch 'master' of https://github.com/carissalow/rapids 2020-06-25 16:23:04 -04:00
Meng Li d48db18f95 Fix the bug of missing sleep features of some dates 2020-06-25 16:22:49 -04:00
nikunjgoel95 929db5515c Adding countConversation and Fixing duplicate bugs in data.
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-06-24 17:02:47 -04:00
Meng Li b795d1a022 Refactor wifi features 2020-06-24 15:46:27 -04:00
Meng Li b2347ecf03 Refactor bluetooth features 2020-06-24 15:10:42 -04:00
JulioV 1bdb52dd65 Add functionality to exlcude step data based on sleep 2020-06-24 13:33:58 -04:00
Meng Li fd3aedf634 Fix the bug of step features: concat two dataframes with different index datatype 2020-06-24 13:02:12 -04:00
kaguillera 211aec1234 Merge branch 'master' of https://github.com/carissalow/rapids
Refactoring tests
2020-06-23 18:29:32 -04:00
kaguillera 7bcf674793 Refactored testing after pipeline refactoring 2020-06-23 18:29:01 -04:00
Meng Li a47eb6823b Fix warning of conversation features; replace ' with " 2020-06-23 14:12:38 -04:00
JulioV 36017d5dca Refactor Snakefile and docs. Rename SMS scripts 2020-06-23 11:33:34 -04:00
kaguillera 9da4fb165c Update test suite (sms, calls and screen) 2020-06-22 20:47:56 -04:00
Meng Li 4d1ff10701 Rename heartrate zone features 2020-06-22 14:15:56 -04:00
Meng Li 99fe86ac2a Rename accelerometer features names 2020-06-22 13:47:25 -04:00
Meng Li a121c0fe7b Split accelerometer features in config file; drop count; add more stats features 2020-06-22 12:01:17 -04:00
nikunjgoel95 78a9d82a74 Modified the UNIX time to minutes from Midnight in timeFirstConversation and timeLastConversation 2020-06-21 16:49:29 -04:00
Meng Li fa9d047eb1 Fix warning of accelerometer features 2020-06-19 19:05:57 -04:00
Meng Li f07ba22f98 Minor fix for applications_foreground sensor 2020-06-19 16:22:57 -04:00
nikunjgoel95 1409de2832 Added Converstion Features.
Updated config.yaml, Snakefile, Features.Snakefile and documentation.
2020-06-19 01:27:28 -04:00
Meng Li 08a78f6622 Fix screen's episodepersensedminutes bug 2020-06-17 09:09:39 -04:00
kaguillera 996e7307d7 Added brackets screen time_diff 2020-06-16 18:44:51 -04:00
kaguillera f0b1d70828 Minor fix for screen delta 2020-06-16 18:36:34 -04:00
kaguillera 77110be43b Changed screen and battery deltas to minutes 2020-06-16 15:30:34 -04:00
Meng Li ee6ddf7677 Convert time difference to minutes for feature_utils.py script 2020-06-16 15:18:58 -04:00
Meng Li 343b8366c0 Remove useless packages 2020-06-16 14:49:33 -04:00
Meng Li e133b8b530 Refactor fitbit sleep features 2020-06-12 18:44:05 -04:00
Meng Li dcc7ca14e3 Refactor fitbit heartrate features 2020-06-12 16:04:03 -04:00
JulioV 3287866f4b Update tidyr and fix resample pivot_longer bug 2020-06-12 14:51:38 -04:00
Meng Li 48591a4bd3 Add exception for screen feature extraction 2020-06-12 13:28:41 -04:00
JulioV 8fbafcbe0c Fix location bug and improve fused resampling 2020-06-11 12:25:49 -04:00
Meng Li 0115fd14f6 Refactor fitbit step features 2020-06-05 21:29:39 -04:00
Meng Li 925e986c1e Update fitbit_sleep_features.py: return empty file when epoch is not daily 2020-06-05 19:50:22 -04:00
Meng Li 9c1f2f6bbe Update fitbit_parse_sleep.py 2020-06-05 17:28:43 -04:00
Meng Li 7a32acdd45 Fix count active/sedentary bout bug 2020-06-05 14:33:23 -04:00
Meng Li aa1baaf948 Refactor activity recognition features 2020-06-04 19:32:28 -04:00
Meng Li ff1bc33c34 Update fitbit_parse_heartrate.py 2020-06-04 18:07:15 -04:00
JulioV b14ddcdea6
Update fitbit_parse_steps.py 2020-06-04 18:03:40 -04:00
Meng Li 2d0ef98f26 Refactor screen features 2020-06-03 18:55:36 -04:00
Meng Li 6562754777 Refactor battery features 2020-06-03 17:36:52 -04:00
Meng Li a8eb5a83f8 Fix overlap in tick label issue 2020-06-03 17:18:57 -04:00
nikunjgoel95 4c835cde37 Fixed the Duration for the Classic Sleep type in Version 1.2 of FItbit.
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-06-03 16:40:42 -04:00
JulioV bf6f1f0bda Fix call bug 2020-06-03 16:29:01 -04:00
JulioV d0bff906e4 Fix call bug 2020-06-03 12:44:23 -04:00
JulioV 3c1bdb8aa7 Fix calls bug 2020-06-02 19:13:01 -04:00
JulioV 91c24a652a Refactor call features and fix bug with countmostfrequentcontact 2020-06-02 17:49:55 -04:00
Meng Li 9048c06fc4 Refactor application foreground features 2020-05-29 17:04:24 -04:00
JulioV cf272793a2 Fix countmostfrequentcontact bug 2020-05-29 14:29:35 -04:00
JulioV c1e25ac1ad Change SMS first and last metrics from hours to minutes 2020-05-29 13:28:39 -04:00
JulioV f344c14e92 Fix bug in SMS features 2020-05-29 11:41:17 -04:00
Meng Li 9c889938fb Refactor accelerometer features 2020-05-28 17:17:25 -04:00
nikunjgoel95 e952e27350 Adding the code to parse the FITBIT sleep data for API version 1.2
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-05-27 14:29:28 -04:00
Meng Li 34ffe4abaf Add the rule to merge population model results 2020-05-15 18:49:14 -04:00
Meng Li 8df8a5c2b3 Add baseline 2020-05-15 18:45:45 -04:00
Meng Li 8c8378f74a Split modeling module into two rules; Add RandomOverSampler for resampling; Add log; Fix bug of AUC 2020-05-15 18:42:03 -04:00
Meng Li 5fab99d8df Add one rule to calculate the ratio of cells with missing values for cleaned features 2020-05-15 18:25:07 -04:00
Meng Li 78cd8159be Fix bug of clean_features_for_model 2020-05-15 17:53:43 -04:00
Meng Li 915bdd04b1 Parse Fitbit summary and intraday data; Extract Fitbit daily features from summary data 2020-05-15 17:51:00 -04:00
JulioV f0674122ff Replace packrat with renv 2020-05-01 19:46:04 -04:00
Meng Li 6ed52e7d1a Change the method of computing missing value cells 2020-04-30 15:40:55 -04:00
Meng Li 2720b24c0a Make screen_features.py script compatible with both Pandas 0.25.2 and 1.0.3. 2020-04-30 10:49:49 -04:00
Meng Li 7cbb227214 Add modeling module 2020-04-29 18:53:54 -04:00
Meng Li f292ba3bff Merge branch 'master' of https://github.com/carissalow/rapids 2020-04-29 15:05:18 -04:00
Meng Li 9ddb50ed59 Split days threshold of data cleaning into days_before_surgery and days_after_discharge
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-29 14:37:40 -04:00
JulioV 5a2049f533 Replace NAs with 0 for bluetooth countscansmostuniquedevice 2020-04-27 21:55:23 +00:00
Meng Li 3314040912 Consider "walking" for AR mobile episodes 2020-04-20 18:09:05 -04:00
Meng Li 490599c742 Implement AR features for iOS
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-20 18:05:54 -04:00
Meng Li 5696b4f6d4 Add merge module for demographic features and target 2020-04-16 14:20:16 -04:00
Meng Li eac721de84 Add demographic_features and targets module; refactor analysis code
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-16 12:38:28 -04:00
Meng Li 695984586f Add calories module for fitbit_readable_datetime.py 2020-04-15 16:01:02 -04:00
Mingze Cao 8671f8db68 Modified condition to extract feature "heartrate_zones"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-15 09:26:16 -05:00
JulioV cdd10578b3 Ignore NA values for dropping zero variance columns 2020-04-13 16:59:33 -04:00
JulioV 010114c1aa Add wifi features 2020-04-13 13:24:52 -04:00
Mingze Cao 8cc93c8791 Refactor battery feature: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-09 15:06:25 -05:00
Mingze Cao 2d7d3bfccf Refactor location_barnett features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-09 12:20:39 -05:00
JulioV fa67359b5f Fix return in iOS battery deltas 2020-04-09 12:13:00 -04:00
JulioV e2b2643ba9 Fix bug that unified battery status for iOS client v2 2020-04-09 12:10:03 -04:00
JulioV 5d68b5052c Fix bug where no deltas where created for Android 2020-04-09 12:07:35 -04:00
Mingze Cao c2fbc3ad7a Refactor sms feature: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 15:02:58 -05:00
Mingze Cao 97c83caebc Refactor fitbit_heartrate feature: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 14:31:43 -05:00
Mingze Cao a53ba242f8 Refactor google_activity_recognition feature: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 13:36:36 -05:00
Mingze Cao 0809001dfa Refactor light features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 13:02:53 -05:00
Mingze Cao f46e8c0666 Refactor applications_foreground features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 12:31:43 -05:00
Mingze Cao d1c38016de Refactor call features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 10:51:18 -05:00
Mingze Cao e0d19cbc1b Refactor screen features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-08 10:05:16 -05:00
Meng Li 8d4a0718e8 Fix bug of Barnett's location features 2020-04-07 11:22:04 -04:00
Mingze Cao 3986f4e185 Refactor fitbit_step features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-03 16:03:45 -05:00
Mingze Cao 595bdd6f5b Refactor bluetooth features: replace "metrics" with "features"
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-03 12:07:09 -05:00
Mingze Cao 106f552442 replace "metrics" with "features" of the accelerometer 2020-04-02 16:40:40 -05:00
Mingze Cao 6045df494d Modify the Accelerometer ‘Metrics’ to Accelerometer ‘Features’
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-04-02 16:36:28 -05:00
JulioV 9d27431e3b Speed up raw csv reads and writes in R 2020-04-02 16:28:19 -04:00
Mingze Cao 7d770c91f3 Add sumdurationsedentarybout of the fitbit_step sensor
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-04-02 13:36:54 -05:00
Meng Li 1ce76a5380 Refactor light features 2020-04-01 18:29:53 -04:00
Meng Li ac9fb487a6 Fix bug of select_days_to_analyse.py 2020-03-31 14:51:08 -04:00
JulioV 09753905f2 Refactor SMS features 2020-03-31 13:33:03 -04:00
Meng Li ea46df63d5 Get targets
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-03-26 17:27:23 -04:00
Meng Li ac758e3776 Reduce the plot size by excluding plotlyjs 2020-03-23 18:24:19 -04:00
JulioV 0e173872df Refactor select_days_to_analyse, fix merge bugs, add clean metrics for model 2020-03-17 21:15:53 -04:00
Meng Li 7c240a9613 Select days to analyse
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-03-17 17:26:30 -04:00
JulioV 3d4c26754e Rename merge metrics for models and add filter valid sensed days
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-03-12 17:31:46 -04:00
JulioV c4d9702a5c Add location_barnett prefix to location features 2020-03-12 13:18:36 -04:00
Meng Li c6ff0346f4 Fix bug of screen_metrics.py when df is empty 2020-03-12 11:26:42 -04:00
JulioV 23085aac2a Replace NA with 0 in most frequent contact SMS metric 2020-03-12 11:22:31 -04:00
JulioV ed5d938316 Replace NA with 0 in most frequent contact call metric 2020-03-12 11:18:32 -04:00
Meng Li 9069cffa0e Fix encoding error for apps features 2020-03-11 16:48:37 -04:00
Meng Li b23bb0e402 Add INCLUDE_ZERO_STEP_ROWS flag for step sensor 2020-03-09 15:59:51 -04:00
Meng Li 1c413838ad Replace NA with 0 for count features of apps sensor 2020-03-09 14:04:51 -04:00
Meng Li e106bb3190 Do not fill NA with 0 for light metrics 2020-03-09 13:57:09 -04:00
Meng Li 490ff43fbf Replace [] with 0 for mostcommonactivity of GAR sensor 2020-03-09 13:54:28 -04:00
Meng Li aba9f13332 Add merge metrics module for analysis rules 2020-03-09 13:32:14 -04:00
Meng Li 2ea599e262 Replace NA with 0 for heart rate zone features 2020-03-05 16:49:06 -05:00
JulioV dba2664ae5
Fix bug where location_barnett_metrics wouldn't include local_date 2020-03-05 14:48:48 -05:00
Meng Li c2a74b1cba Fix fitbit_readable_datetime.py to handle empty table 2020-03-05 14:39:05 -05:00
JulioV f25dd026fd Fix download_dataset.R to handle non sensor tables 2020-03-05 14:10:36 -05:00
JulioV 2548539dc4 Fix bug when application foreground list was empty 2020-03-05 13:23:21 -05:00
Meng Li c8b7275084 Add firstuseafterTIME feature for screen sensor 2020-03-04 12:21:36 -05:00
Meng Li 85f4ec2ab6 Delete screen event features and add countepisode and episodepersensedminutes 2020-03-03 17:31:15 -05:00
JulioV 2c856f1cfc Fix condition to require at least 2 rows to compute screen metrics 2020-03-03 12:20:36 -05:00
JulioV f4367806f3 Fix screen deltas to keep only consecutive UNLOCK/OFF pairs 2020-03-03 12:09:18 -05:00
JulioV e058820309 Fix encoding issues when reading participant files 2020-03-03 11:08:57 -05:00
JulioV 619a6e6e2b Fix screen delta extraction for iOS and Android 2020-03-02 19:26:20 -05:00
Meng Li fa9029b090 Add overall compliance heatmap for last 7 days 2020-02-25 13:27:17 -05:00
JulioV f22d1834ee Add metric filter to barnett location features 2020-02-21 10:58:35 -05:00
Meng Li 579df6325f Add date filter for download_dataset 2020-02-20 15:51:22 -05:00
Meng Li 3369a97d0e Add device_id and label to heatmaps 2020-02-20 10:16:03 -05:00
Meng Li 76888b412d Add label and dates for external files 2020-02-18 16:41:10 -05:00
JulioV 6bbc916702 Add download_participants functionality 2020-02-10 16:45:34 -05:00
Meng d6f2e2d7a3 Fixed mode issue of heartrate features 2020-02-07 13:22:47 -05:00
Meng Li 0840235280 Add applications_foreground features 2020-02-07 11:52:55 -05:00
Meng Li 770764ec8a Add heartrate features 2020-02-07 11:35:15 -05:00
Meng Li 6c5ace5611 Fixed fitbit preprocess issue#28 and added heartrate_zone column for heartrate 2020-02-07 11:26:35 -05:00
Meng Li 2798a957be Fixed heatmap issue#25 2020-02-07 11:19:56 -05:00
Meng Li 3d13940bd3 Fixed heatmap issue#27 2020-02-07 11:14:19 -05:00
Echhit Joshi d82fa0d217 Add Fitbit steps feature extraction 2020-01-29 16:22:53 -05:00
Echhit Joshi db2f3dc50f Fixed 2 Issues: Feature Names, Implementation of metrics in Config File 2020-01-17 11:39:30 -05:00
JulioV 4aec2c4032 Combine all fitbit sensors in one script and one rule 2020-01-16 17:20:04 -05:00
JulioV 9d00f14f7f Add category (genre) to foreground apps 2020-01-15 18:28:56 -05:00
Meng Li 34c4586e4d Add fitbit raw data and datetime 2020-01-15 17:18:10 -05:00
Meng Li ad514b5d40 Add accelerometer features 2020-01-15 14:15:24 -05:00
Meng Li 2b4e29ce6e Add light features 2020-01-14 09:51:39 -05:00
JulioV 3fbc1b5b92 Add html compliance report 2019-12-18 15:23:42 -05:00
Meng Li 96394a0468 Replace ZERO with NaN for heatmap 2019-12-17 17:07:35 -05:00
JulioV 545d8a5ffe Add support for multi device participants 2019-12-17 13:41:27 -05:00
Meng Li 3aa037f031 Fixed encoding 2019-12-16 11:13:32 -05:00
JulioV e777bf171f Make extension upper case for resample fused location 2019-12-12 14:40:19 -05:00
JulioV 3947f1ec29 Refactor resample fused location to filter fused rows earlier 2019-12-09 19:15:57 -05:00
JulioV cb2ee1ec82 Add switch to barnet_locations.R to use all, all except fused or resample fused locations 2019-12-09 19:15:10 -05:00
JulioV 0ba88203f4 Add resampling for fused location 2019-12-09 18:23:00 -05:00
JulioV 6a79fbe1e8 Fix bug in iOS battery (different status compared to Android) 2019-12-05 16:24:05 -05:00
Meng Li a4e39ad451 Add bin_size parameter for compliance_heatmap and screen_metrics 2019-12-05 11:07:40 -05:00
Meng Li e6b096c6ad Fixed empty event features of screen sensor 2019-12-04 16:37:38 -05:00
Meng Li 4390979143 Add unlocksperminute feature and remove countdiff for screen sensor 2019-12-04 16:04:37 -05:00
Meng Li 975dc80c4b Change the input of compliance_heatmap.py 2019-12-04 15:32:20 -05:00
JulioV 4d52e2d980 Fix bugs with empty dataframes in screen and gar metrics 2019-12-04 12:04:20 -05:00
JulioV 0bd946b53c Delete row names from sensed bins and valid sensed days 2019-12-04 11:39:40 -05:00
JulioV 15a9e33728 Add phone sensed bins (sensor row count for every n min bin) 2019-12-04 11:33:25 -05:00
Meng Li dbe2e236a9 Fixed issue #16 2019-12-03 10:46:03 -05:00
Meng Li c7ca35d13e Fixed issue #17 and #18 2019-12-02 11:22:50 -05:00
Echhit Joshi 80376f0c35 Add Episodes GAR Metrics 2019-11-27 18:06:31 -05:00
JulioV e5390ee0e2 Fix column name for gar deltas 2019-11-27 16:06:30 -05:00
JulioV e6d418cd14 Add google activity recognition deltas 2019-11-27 15:53:37 -05:00
JulioV 037420457d Fix index name for screen metrics 2019-11-27 15:36:37 -05:00
JulioV 9750353f5b Add screen deltas 2019-11-27 15:27:48 -05:00
Meng Li 71e4ab3e5c Extract screen features 2019-11-27 14:25:17 -05:00
Meng Li 5a32050295 Add fixed_cols for epoch segment function 2019-11-27 12:08:53 -05:00
Meng Li 9eaa48c7dd create features_utils.py with epoch split function 2019-11-26 11:14:03 -05:00
Meng Li 2230421167 fix battery consumption rates bar chart 2019-11-25 15:44:10 -05:00
Meng Li 99d387a7a4 Add day epochs to battery metrics and fix some of them 2019-11-25 12:53:32 -05:00
JulioV d8421575ba Add start and end day segment to battery deltas 2019-11-21 12:39:52 -05:00
JulioV 34532a719b Merge branch 'master' of https://github.com/JulioV/moshi-aware 2019-11-21 11:34:39 -05:00
JulioV 30f814887d Add local_day_segment to battery deltas 2019-11-21 11:34:30 -05:00
Echhit Joshi c5a0c1e0d6 Updated G_A_R features with epochs 2019-11-18 14:22:08 -05:00
JulioV f7be15ea9e Update compliance_heatmap to handle empty dataframes from all sensors 2019-11-13 14:55:22 -05:00
JulioV d24c62392a Fix small bug on battery_consumption plot script 2019-11-13 14:54:44 -05:00
JulioV 44bbe17435 Update location_barnett_metrics.R to handle empty dataframes and location sequences without flights 2019-11-13 14:54:24 -05:00
JulioV d2e9b79af6 Update battery_deltas.R to handle empty dataframes 2019-11-13 14:53:28 -05:00
JulioV 209a9232a3 Fix return error in call metrics script 2019-11-12 15:54:12 -05:00
JulioV 6cf39ad9c4 Add three more features to sms 2019-11-12 15:53:59 -05:00
JulioV 031ceb00e3 Add three more features to calls 2019-11-12 15:40:48 -05:00
JulioV bea791a106 Add unify ios and android rule and script 2019-11-12 14:57:27 -05:00
JulioV 384f401062 Avoid recording row names in download dataset and readable datetime 2019-11-12 14:56:31 -05:00
Echhit Joshi 336ce12270 Added "activity_change_count" feature 2019-11-12 14:48:19 -05:00
JulioV 1d242abbe1 Add min, max, std, and mode to calls metrics 2019-11-11 15:15:20 -05:00
Meng Li b16702561c Rename plot title 2019-11-11 15:03:56 -05:00