Commit Graph

682 Commits (7832d7d098cc0acc501a79a5a03a3f6985626d5e)

Author SHA1 Message Date
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
JulioV 0e173872df Refactor select_days_to_analyse, fix merge bugs, add clean metrics for model 2020-03-17 21:15:53 -04:00
Meng Li 7c240a9613 Select days to analyse
Co-authored-by: JulioV <juliovhz@gmail.com>
2020-03-17 17:26:30 -04:00
JulioV 3d4c26754e Rename merge metrics for models and add filter valid sensed days
Co-authored-by: Meng Li <AnnieLM1996@gmail.com>
2020-03-12 17:31:46 -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 aba9f13332 Add merge metrics module for analysis rules 2020-03-09 13:32:14 -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 c2a74b1cba Fix fitbit_readable_datetime.py to handle empty table 2020-03-05 14:39:05 -05:00
JulioV f25dd026fd Fix download_dataset.R to handle non sensor tables 2020-03-05 14:10:36 -05:00
JulioV 2548539dc4 Fix bug when application foreground list was empty 2020-03-05 13:23:21 -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 e058820309 Fix encoding issues when reading participant files 2020-03-03 11:08:57 -05:00
JulioV 619a6e6e2b Fix screen delta extraction for iOS and Android 2020-03-02 19:26:20 -05:00
Meng Li fa9029b090 Add overall compliance heatmap for last 7 days 2020-02-25 13:27:17 -05:00
JulioV f22d1834ee Add metric filter to barnett location features 2020-02-21 10:58:35 -05:00
Meng Li 579df6325f Add date filter for download_dataset 2020-02-20 15:51:22 -05:00
Meng Li 3369a97d0e Add device_id and label to heatmaps 2020-02-20 10:16:03 -05:00
Meng Li 76888b412d Add label and dates for external files 2020-02-18 16:41:10 -05:00
JulioV 6bbc916702 Add download_participants functionality 2020-02-10 16:45:34 -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
Meng Li 6c5ace5611 Fixed fitbit preprocess issue#28 and added heartrate_zone column for heartrate 2020-02-07 11:26:35 -05:00
Meng Li 2798a957be Fixed heatmap issue#25 2020-02-07 11:19:56 -05:00
Meng Li 3d13940bd3 Fixed heatmap issue#27 2020-02-07 11:14:19 -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
JulioV 4aec2c4032 Combine all fitbit sensors in one script and one rule 2020-01-16 17:20:04 -05:00
JulioV 9d00f14f7f Add category (genre) to foreground apps 2020-01-15 18:28:56 -05:00
Meng Li 34c4586e4d Add fitbit raw data and datetime 2020-01-15 17:18:10 -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 3fbc1b5b92 Add html compliance report 2019-12-18 15:23:42 -05:00
Meng Li 96394a0468 Replace ZERO with NaN for heatmap 2019-12-17 17:07:35 -05:00
JulioV 545d8a5ffe Add support for multi device participants 2019-12-17 13:41:27 -05:00
Meng Li 3aa037f031 Fixed encoding 2019-12-16 11:13:32 -05:00
JulioV e777bf171f Make extension upper case for resample fused location 2019-12-12 14:40:19 -05:00
JulioV 3947f1ec29 Refactor resample fused location to filter fused rows earlier 2019-12-09 19:15:57 -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
JulioV 0ba88203f4 Add resampling for fused location 2019-12-09 18:23:00 -05:00
JulioV 6a79fbe1e8 Fix bug in iOS battery (different status compared to Android) 2019-12-05 16:24:05 -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
Meng Li 975dc80c4b Change the input of compliance_heatmap.py 2019-12-04 15:32:20 -05:00
JulioV 4d52e2d980 Fix bugs with empty dataframes in screen and gar metrics 2019-12-04 12:04:20 -05:00
JulioV 0bd946b53c Delete row names from sensed bins and valid sensed days 2019-12-04 11:39:40 -05:00
JulioV 15a9e33728 Add phone sensed bins (sensor row count for every n min bin) 2019-12-04 11:33:25 -05:00
Meng Li dbe2e236a9 Fixed issue #16 2019-12-03 10:46:03 -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 2230421167 fix battery consumption rates bar chart 2019-11-25 15:44:10 -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 f7be15ea9e Update compliance_heatmap to handle empty dataframes from all sensors 2019-11-13 14:55:22 -05:00
JulioV d24c62392a Fix small bug on battery_consumption plot script 2019-11-13 14:54:44 -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
JulioV bea791a106 Add unify ios and android rule and script 2019-11-12 14:57:27 -05:00
JulioV 384f401062 Avoid recording row names in download dataset and readable datetime 2019-11-12 14:56:31 -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 b16702561c Rename plot title 2019-11-11 15:03:56 -05:00
Meng Li 54d8084db6 Add battery daily features and daily consumption rate plot 2019-11-08 12:18:21 -05:00
JulioV bdb473411b Merge branch 'master' of https://github.com/JulioV/moshi-aware 2019-11-08 12:05:51 -05:00
JulioV 867624657b Remove row names column in battery deltas 2019-11-08 12:05:41 -05:00
Meng Li e76051e399 Fixed the plot bugs of date and colorbar 2019-11-07 12:31:11 -05:00
JulioV 2adfe8d81a Fix timezone for US Eastern Time 2019-11-06 17:12:06 -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 58299a8869 Merge branch 'master' of https://github.com/JulioV/moshi-aware 2019-11-05 16:22:55 -05:00
JulioV d062502aa5 Make barnett_location_metrics.R load packrat env 2019-11-05 16:22:46 -05:00
Meng Li df2a73fe1b Merge branch 'master' of https://github.com/JulioV/moshi-aware 2019-11-05 16:18:43 -05:00
Meng Li 70f3c336b5 Fix empty df bug and add color code to compliance heatmap 2019-11-05 16:18:02 -05:00
JulioV 13a6537b14 Add Barnett's location features 2019-11-05 15:17:20 -05:00
JulioV cca1633728 Add valid sensed days 2019-11-05 12:34:22 -05:00
JulioV 6eb7bc9e70 Fix quoting problem with columns containing quotes 2019-11-05 11:47: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
Meng Li c177b393b9 Refactor row heatmap and add all sensors compliance 2019-11-01 14:26:51 -04:00
JulioV 2cc73985aa Refactor readable_datetime 2019-10-31 10:05:40 -04:00
JulioV e388a757b8 Fix split local time, add minute column 2019-10-30 18:12:46 -04:00
Meng Li eb1a307dc4 Merge branch 'master' of https://github.com/JulioV/moshi-aware 2019-10-25 11:15:49 -04:00
Meng Li 1952098888 Add row count heatmap 2019-10-25 11:12:55 -04: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 2fdf23e0af Add readable time script 2019-10-24 16:08:05 -04:00
JulioV 1b1799f9d8 Added dataset download rule 2019-10-24 12:11:24 -04:00
JulioV 41c233e4ed First commit 2019-10-22 13:11:01 -04:00