Commit Graph

343 Commits (master)

Author SHA1 Message Date
junos 2fb068cb8b Do not calculate accelerometer features.
Add data cleaning.
2022-01-07 12:20:51 +01:00
junos 5a9252e46e Merge remote-tracking branch 'origin/master' 2021-12-15 18:32:36 +01:00
junos e5cc02501f Set the timezone.csv path in config.
Take into account that TZCODES_FILE can be created with a rule.
2021-12-15 18:09:30 +01:00
junos 15653b6e70 Add forgotten line for hashed app names in config. 2021-12-15 17:26:54 +01:00
junos 4485c4c95e Delete columns we don't have.
Rename light table.
Correct timesegments.
2021-12-08 20:02:47 +01:00
junos 633384c6a9 Use all available sensors for PHONE_YIELD. 2021-12-08 19:04:19 +01:00
junos 8e2222f307 Bring back deleted lines which are required. 2021-12-08 18:59:10 +01:00
junos 712ff74898 Set table names and calculate all relevant features. 2021-12-08 18:37:34 +01:00
junos 1f54195437 Configure timezone file to be created automatically. 2021-12-08 18:21:29 +01:00
junos 2b52f686b3 Define daily segments. 2021-12-08 18:20:22 +01:00
junos f0d29d0d1a Incorporate DB query for usernames into snakemake workflow. 2021-12-01 18:14:27 +01:00
junos da5ff0f36e Correct small errors in settings. 2021-11-29 18:04:06 +01:00
junos 39bd244511 [WIP] Prepare yaml files.
These will be used to create participants files.
2021-11-24 19:11:19 +01:00
Meng Li 5bad3eb8b5
Data cleaning (#166)
* Refactor data cleaning module: move it from example workflow to main directory

* Replace NAs with 0 in selected event-based features

* Add one step to drop highly correlated features

Co-authored-by: Weiyu <weiyuhuang7@gmail.com>
2021-11-19 10:34:36 -05:00
Meng Li 3d34036eae
Add firststeptime and laststeptime features to FITBIT_STEPS_INTRADAY RAPIDS provider (#168)
* Add firststeptime and laststeptime features to FITBIT_STEPS_INTRADAY RAPIDS provider

* Update test config files
2021-11-18 18:35:27 -05:00
junos 4829b155d5 Make config changes for minimal workflow. 2021-11-17 18:53:44 +01:00
Meng Li 7f4683e0fe
Feature/screen default maxlength (#164)
Updated the default IGNORE_EPISODES_LONGER_THAN to be 6 hours for screen RAPIDS provider
2021-10-14 09:26:06 -04:00
Meng Li a3fb718aea Refactor PHONE_LOCATIONS DORYAB provider to compute features based on location episodes 2021-09-23 17:40:06 -04:00
Meng Li a8a178486b Refactor PHONE_CALLS RAPIDS provider to compute features based on call episodes or events 2021-09-15 10:28:37 -04:00
Meng Li e1cfcd46e4 Update example workflow for app episode features 2021-07-01 18:08:33 -04:00
JulioV 065a926a87 Change own to custom categories name 2021-07-01 16:20:16 -04:00
JulioV e74c745f86 Add own categories to app foreground features 2021-07-01 16:20:16 -04:00
kirtirajk 4b8698a4c6 adding app_episode with the changes as mentioned in the comments 2021-06-10 14:17:56 -04:00
Meng Li 0d6f51be8b Refactor location features from Doryab provider & add a new strategy to infer home location & fix bugs 2021-05-26 17:36:52 -04:00
Meng Li edf71e055d Add the EXCLUDE_SLEEP module for steps intraday features 2021-05-21 15:23:21 -04:00
Nikunj Goel 5e451f99b0
Added phone keyboard features including docs/tests (#134) 2021-05-21 11:45:27 -04:00
Meng Li 809845143f Test & fix bugs of sleep intraday features 2021-04-27 14:40:14 -04:00
Meng Li 66d9a9d640 Update params & docs of sleep features 2021-04-27 14:33:19 -04:00
JulioV 1fa9481933 Rlease v1.1.0 2021-04-20 15:14:29 -04:00
JulioV 9c56422529 Add calories intraday features 2021-04-20 12:00:38 -04:00
JulioV 636b64c61a Revert "Added more keyboard features."
This reverts commit 94c72e3172.
2021-04-05 11:25:00 -04:00
nikunjgoel95 94c72e3172 Added more keyboard features. 2021-04-01 20:54:13 -04:00
Meng Li e177aa6386 Update create participant files section 2021-03-25 11:39:31 -04:00
Meng Li a5eb535126 Update visualizations docs & add time flag for heatmap of overall data yield 2021-03-23 21:40:55 -04:00
JulioV c7e834d654 Update default value for DBSCAN_EPS 2021-03-19 12:04:12 -04:00
JulioV 4528ab3641 Replace SRC LANGUAGE and FOLDER with SCRIPT 2021-03-14 22:14:13 -04:00
JulioV 42cee67664 Add aware_influxdb in beta 2021-03-14 13:33:43 -04:00
JulioV 3ee8199574 Update docs 2021-03-14 11:42:29 -04:00
JulioV fae0c2ac05 Swap TABLE for CONTAINER 2021-03-12 18:14:49 -05:00
JulioV 8e9a3bf4c5 Update location accuracy default 2021-03-12 17:18:08 -05:00
JulioV 6e898beca5 Add aware_csv 2021-03-11 19:32:11 -05:00
JulioV 1b8453bec4 Remove unused params from config.yaml 2021-03-11 14:57:34 -05:00
JulioV 13174b0c2a Fix a bug when fitbit data is empty 2021-03-11 14:51:16 -05:00
JulioV 2ee45995f2 Update config docs and create participant files script 2021-03-11 14:40:33 -05:00
JulioV a79997e0ac Add empatica_zip docs 2021-03-11 14:39:26 -05:00
JulioV d48194fc07 Add fitbitparsed_csv 2021-03-11 14:39:26 -05:00
JulioV b97b70e3a1 Add fitbitjson_csv 2021-03-11 14:39:26 -05:00
JulioV 470f4276af Add fitbitparsed_mysql 2021-03-11 14:39:26 -05:00
JulioV 1b0ee4bbf0 Add sleep intraday to fitbitjson_mysql 2021-03-11 14:39:20 -05:00
JulioV a420f5ef92 Add sleep summary to fitbitjson_mysql 2021-03-11 14:37:22 -05:00
Meng Li cf0afeb08d Update docs & links in config.yaml 2021-03-11 14:37:22 -05:00
Meng Li 35968e2fd0 Migrate phone log sensor to new data stream 2021-03-11 14:37:22 -05:00
JulioV 1063b4ca65 Add steps summary to fitbitjson_mysql 2021-03-11 14:35:34 -05:00
JulioV 41711fcdb7 Rename download_data add support for py containers 2021-03-11 14:35:34 -05:00
JulioV f65e3c8b1a Migrate empatica sensors to new data stream 2021-03-11 14:35:34 -05:00
JulioV fb054b539f Add support for multiple time zones 2021-03-11 14:35:34 -05:00
JulioV dc11cb593d Add support for smartphone sources and schemas.
Initial support for accelerometer
Update docs for automatically create participants
Update docs for initial multiple time zones
2021-03-11 14:35:33 -05:00
Meng Li aac87311e8 Update socialjetlag feature of sleep intraday: replace bedtime with midpoint sleep 2021-03-04 15:49:25 -05:00
Meng Li d74196cab4 Add sleep intraday features with PRICE provider 2021-02-26 17:47:01 -05:00
Meng Li 2d5e966530 Update fitbit sleep intraday docs & config file 2021-02-26 17:47:01 -05:00
Meng Li 8377c12efb Add sleep intraday features with RAPIDS provider 2021-02-26 17:47:01 -05:00
nikunjgoel95 3d6caea6c4 Added the timeathome feature using infer_home_location.py as interim file. 2021-02-24 16:57:25 -05:00
JulioV 5abca8bb0f Missing config validations 2021-02-21 19:57:21 -05:00
Weiyu 327b015206 Add validation for config keys 2021-02-21 19:55:55 -05:00
JulioV 9668dfac7a Update docs to support Empatica 2021-02-21 17:32:41 -05:00
JulioV 2e46f56111 Empatica zips must be placed in pid folder and small fixes 2021-02-21 17:32:41 -05:00
Joe Kim 4469cfd6bb add stats features for bvp, eda, ibi, temp 2021-02-21 17:32:41 -05:00
JulioV c6dc7e675a Add stats features for empatica heartrate
Turn off all empatica compute features
2021-02-21 17:32:41 -05:00
JulioV 3bb0230bac Add statistic features for empatica accelerometer 2021-02-21 17:32:41 -05:00
Juseong Kim 5f5f19866f implement extract_empatica_data script
add support for all data types

Fix name comparison of zipped files
2021-02-21 17:32:41 -05:00
JulioV 4b9857562b Add support for zip input files 2021-02-21 17:32:41 -05:00
JulioV 8c726f5d4f Start empatica support 2021-02-21 17:32:41 -05:00
JulioV 47bd695249 Deprecate Doryab circadian movement feature until it is fixed 2021-02-03 09:46:29 -05:00
Meng Li b67f990816 Add new `FITBIT_DATA_YIELD` `RAPIDS` provider 2021-02-02 18:30:21 -05:00
JulioV 1685b5cba6 Change default value for CLUSTER_ON 2021-02-02 12:04:48 -05:00
nikunjgoel95 9b248c449d Fixing and adding MAXIMUM_ROW_DURATION. 2021-02-02 11:38:13 -05:00
nikunjgoel95 e7fc8f44f2 Removing Sampling Frequency and fixing ROG, location entropy and normalized location entropy. 2021-02-02 11:38:08 -05:00
JulioV d0fe4d4c28 Add ALL_RESAMPLED flag and accuracy limit 2021-01-14 14:34:25 -05:00
JulioV 585bf7bc5d Add code so new feature providers can be added for the new four sensors 2021-01-14 14:31:40 -05:00
JulioV 8fd1d9dc29 Add four new sensors without providers 2021-01-14 14:31:40 -05:00
JulioV 38fadbf202
Feature/doryab location clustering (#111)
* Added OPTICS -  lightweight clustering algorithm.

* Changed the error message for inconsistent parameters in CONFIG

* Removing hardcoded values and changing default EPS value in the clustering algorithm.

* Added Observation in Doryab Feature docs.

Co-authored-by: nikunjgoel95 <nikunjgoel2009@gmail.com>
2021-01-14 14:22:51 -05:00
JulioV b7ba3c6407
Feature/location doryab fix (#109)
* Fixing the doryab location features for context of clustering.

* Fixed the wrong shifting while calculating the distance.

* Refractoring the haversine function

* Removed comments.

* Cleaning parts of the code.

* Updated the documentation for CLUSTER_ON parameter.

Co-authored-by: nikunjgoel95 <nikunjgoel2009@gmail.com>
2021-01-07 16:20:46 -05:00
JulioV 51c7739bfc Revert "Start support for phone_keyboard"
This reverts commit dd95b4f941.
2020-12-20 16:29:40 -05:00
JulioV d39b700b5f Update git flow docs, set keyboard flag to false 2020-12-20 13:55:41 -05:00
JulioV dd95b4f941 Start support for phone_keyboard 2020-12-14 13:42:22 -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 083e10dc38 Comment fixes in config.yaml 2020-12-04 16:49:29 -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
Meng Li 0bd43c139c Update plot#1: histogram_phone_data_yield 2020-12-01 14:21:33 -05:00
JulioV 5f51c94ac6 Separate device data configuration and update docs 2020-11-25 19:42:11 -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
Meng Li deba6b9e4f Update sleep summary features for segments 2020-11-23 12:01:00 -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
JulioV 432f11fbcb Add bluetooth, calls, sms and wifi docs 2020-11-04 19:37:24 -05:00
JulioV 2aa44fc504 Change SENSOR_DATA to DEVICE_DATA 2020-11-04 17:16:46 -05:00
JulioV 1ea2730afd Update minimal workflow example docs 2020-11-04 13:27:58 -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
JulioV 8f74d3f3b7 Minor updates to config and Snakefile 2020-10-28 14:03:02 -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
JulioV b986599226 Add support to read fitbit data from csv files 2020-10-26 17:17:53 -04:00
JulioV f1ddfae04f Fix missing params battery and AR 2020-10-26 15:51:22 -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
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
Meng Li 236b1cd809 Update AR module for segments; Refactor input format 2020-10-07 18:11:06 -04:00
Meng Li f1717e59e7 Update screen&battery episodes features with different segment format 2020-09-29 17:13:34 -04:00
Meng Li f806cb44ac Fix the bug of screen duration features for different segments 2020-09-18 20:25:29 -04:00
JulioV 4dc8d38c66 Optimise assign to day segment 2020-09-16 14:54:20 -04:00
JulioV 3c45f6b152 Refactor assign to day segment 2020-09-14 14:21:36 -04:00
kaguillera 441cdf69c3 Fix Travis attempt 4 2020-09-03 14:36:42 -04:00
kaguillera 67d11e449f Fix Travis attempt 3 2020-09-03 14:18:01 -04:00
kaguillera 4be8accc45 Attempt to fix Travis 2 2020-09-03 13:44:07 -04:00
kaguillera 0613bcb4b8 Attempt to fix Travis 1 2020-09-03 13:19:44 -04:00
kaguillera 5d3e6efc41 New Bluetooth Testing 2020-09-03 12:04:29 -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 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
JulioV e269062439 Migrate calls to new provider file structure 2020-08-28 17:50:49 -04:00
JulioV b0f1477d7e Migrate location providers to new file structure and segments 2020-08-28 13:53:00 -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
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 7a4218a3ce Delete analysis section of config.yaml 2020-08-13 17:12:05 -04:00
JulioV 3f48a47a14 Fix optional input files for phone sensed bins 2020-08-11 18:02:52 -04:00
nikunjgoel95 df7a52cd6c Added Sampling Frequency to Doryab Location Features. 2020-08-05 13:02:34 -04:00
Meng Li c2b25a146d Replace sensor name with table name in heatmap_days_by_sensors section 2020-08-03 15:19:45 -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
Meng Li 93157db210 Data cleaning section: replace "day_type" with "day_idx" 2020-07-27 18:27:36 -04:00
Meng Li af6678c70c Update visualization section: add MIN_VALID_BINS_PER_HOUR 2020-07-26 20:11:25 -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