Commit Graph

330 Commits (3c058e446365c5767f074e97e07546d60409f34f)

Author SHA1 Message Date
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
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
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 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 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
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
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 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
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 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
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 5d68b5052c Fix bug where no deltas where created for Android 2020-04-09 12:07:35 -04:00