Commit Graph

443 Commits (35c1a762e7179c7b11f8f1154c1a4f4133402324)

Author SHA1 Message Date
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
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
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
JulioV 09753905f2 Refactor SMS features 2020-03-31 13:33:03 -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 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 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 619a6e6e2b Fix screen delta extraction for iOS and Android 2020-03-02 19:26:20 -05:00
JulioV f22d1834ee Add metric filter to barnett location features 2020-02-21 10:58:35 -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
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
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 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
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
JulioV 4d52e2d980 Fix bugs with empty dataframes in screen and gar metrics 2019-12-04 12:04:20 -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 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 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
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 54d8084db6 Add battery daily features and daily consumption rate plot 2019-11-08 12:18:21 -05:00
JulioV 867624657b Remove row names column in battery deltas 2019-11-08 12:05:41 -05:00
JulioV c4291620c7 Rename call metrics R script 2019-11-06 15:43:41 -05:00
JulioV cf9de4dedd Refactor sms metrics to produce a single file 2019-11-06 15:38:08 -05:00
JulioV 1d1c8e6bf1 Refactor call features to produce a single file 2019-11-06 14:47:33 -05:00
JulioV 79e126bc92 Rename activity recognition rule and script and update conda env 2019-11-06 14:46:23 -05:00
Echhit Joshi bdbb1904c2 Add google activity recognition features 2019-11-06 13:34:47 -05:00
JulioV 911e183c26 Add bluetooth features 2019-11-06 12:19:30 -05:00
JulioV d062502aa5 Make barnett_location_metrics.R load packrat env 2019-11-05 16:22:46 -05:00
JulioV 13a6537b14 Add Barnett's location features 2019-11-05 15:17:20 -05:00
JulioV c9764d322c Add charging cycles to battery deltas 2019-11-05 11:35:01 -05:00
JulioV 8030624e0a Add battery deltas 2019-11-05 10:47:55 -05:00
JulioV 6287afcb4c Add call features 2019-10-25 10:21:09 -04:00
JulioV ca5e8b6a34 Add communication sms metrics 2019-10-24 16:27:43 -04:00
JulioV 41c233e4ed First commit 2019-10-22 13:11:01 -04:00