Commit Graph

379 Commits (fb577bc9adf8c970f0b74464dbeacf1b8982b1e2)

Author SHA1 Message Date
nikunjgoel95 94c72e3172 Added more keyboard features. 2021-04-01 20:54:13 -04:00
Meng Li 1ea5b74eff Fix the bug of utils.py when one participant have multi timezones 2021-03-31 19:34:14 -04:00
JulioV c48c1c8f24 Optimize Barnett's computation multi-day segments 2021-03-28 15:29:07 -04:00
JulioV d0858f8833 Fix overlapping periodic time segments 2021-03-28 15:29:07 -04:00
nikunjgoel95 cfc5039918 Fixed the empty dataframe case in infer_home_locations.py and added array condition in doryab location 2021-03-19 11:15:57 -04:00
Meng Li 294d84277d Fix bug of sleep intraday PRICE provider when the dataframe of a segment is empty 2021-03-17 15:21:31 -04:00
JulioV 4c2f60fffd Fix bugs in readable datetime and screen episodes 2021-03-16 20:01:43 -04:00
JulioV 4528ab3641 Replace SRC LANGUAGE and FOLDER with SCRIPT 2021-03-14 22:14:13 -04:00
Meng Li d529490999 Migrate fitbit features to new data stream 2021-03-12 12:38:36 -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
Meng Li aac87311e8 Update socialjetlag feature of sleep intraday: replace bedtime with midpoint sleep 2021-03-04 15:49:25 -05:00
Meng Li 7b4598357d Update the PRICE provider's example in sleep intraday docs 2021-02-26 17:47:01 -05:00
Meng Li 716ff3c592 Fix PRICE provider's bug when input is an empty dataframe 2021-02-26 17:47:01 -05:00
Meng Li d74196cab4 Add sleep intraday features with PRICE provider 2021-02-26 17:47:01 -05:00
Meng Li bedf7106e5 Fix sleep episodes bug 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 faefca8b9a Fix extra index column when dataset is empty 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 a26a44819a Add stats features for empatica bvp, eda, ibi, temp
Fix Snakefile file indentention
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
JulioV 8c726f5d4f Start empatica support 2021-02-21 17:32:41 -05:00
Meng Li b67f990816 Add new `FITBIT_DATA_YIELD` `RAPIDS` provider 2021-02-02 18:30:21 -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
nikunjgoel95 0bbf15f52e Fixed the features dependent on time duration. 2021-02-02 11:36:14 -05:00
Meng Li f83c5a585e Fix HR intraday bug: minutesonZONE features are 0 2021-02-01 13:57:12 -05:00
abhineethreddyk dbf57f43f3 Updated battery feature and its testing for periodic 2021-01-31 20:24:43 -05:00
Meng Li 25a3492eba Drop rows without "assigned_segments" column before feature extraction 2021-01-21 19:41:17 -05:00
Meng Li 797de54b34 Fix merge bug of fetch_provider_features() function 2021-01-21 14:58:31 -05:00
JulioV d0fe4d4c28 Add ALL_RESAMPLED flag and accuracy limit 2021-01-14 14:34:25 -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 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 614e759551 Refactor day segments to time segments 2020-12-02 18:41:03 -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 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
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
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
Meng Li ed7585c2bf Update heartrate features for segments 2020-10-27 17:55:57 -04:00
Meng Li 25e1f1fbb5 Update Python chunk_episodes 2020-10-26 18:47:57 -04:00
JulioV f0a551164a Fix AR names 2020-10-26 15:44:21 -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 86509207ac Turn off warnings for tidyverse and dplyr 2020-10-23 10:41:00 -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
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
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
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 06bb2b9c73 Fix accuracy bug in barnett location features 2020-09-18 11:26:10 -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
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
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
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
nikunjgoel95 a3cd341bf2 Fixed the zero conversation time issues. 2020-08-11 20:24:21 -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
nikunjgoel95 2f4c137bc1 fixed the bug "Radius of Gyration" 2020-08-03 18:28:02 -04:00
kaguillera dbc51de4e3 Updated WIFI testing, bugfix and docs 2020-07-29 14:14:47 -04:00
JulioV 388f09a003 Add missing wifi table 2020-07-24 16:35:41 -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
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
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
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