Commit Graph

367 Commits (c24cba8679c88d60f4268d12f1ae5ee2250c78e5)

Author SHA1 Message Date
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