Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read aggregated Embrace Plus and Nowatch data #20

Merged
merged 19 commits into from
Apr 25, 2024
Merged

Read aggregated Embrace Plus and Nowatch data #20

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
022f1d0
refactor: separate raw and aggregated processing
hypebright Mar 28, 2024
23e02da
add `read_aggregated_embrace_plus`
hypebright Mar 28, 2024
cfd4f65
make `unzip_files` a utils function
hypebright Mar 28, 2024
743a04d
add unzip utils function
hypebright Mar 28, 2024
fe37368
add `read_nowatch` function
hypebright Mar 28, 2024
d2fe257
bump version number
hypebright Mar 28, 2024
e16479f
refactor: generalize `aggregate_data()` function for multiple devices
hypebright Mar 28, 2024
f7e1c08
add classes
hypebright Mar 28, 2024
2b87241
remove comment
hypebright Mar 28, 2024
63d7c27
remove `type` for nowatch
hypebright Mar 28, 2024
25827ea
allow folder input in `read_embrace_plus`
hypebright Apr 18, 2024
c367d0a
check activity data in Nowatch object
hypebright Apr 18, 2024
d4c9ecd
docs: bump version
hypebright Apr 18, 2024
5f53901
docs: change description
hypebright Apr 18, 2024
bcceb75
allow folder as input
hypebright Apr 18, 2024
02a9779
rename more cols
hypebright Apr 18, 2024
5b7e63b
TBD: remove NAs
hypebright Apr 18, 2024
5d6af8a
update `read_and_process_embrace_plus`
hypebright Apr 24, 2024
24ea35d
use MOVE column for ACC
hypebright Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion R/read_and_process_embrace_plus.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ read_and_process_embrace_plus <- function(zipfile, tz = Sys.timezone()) {
#' @param data object from read_e4 function
process_embrace_plus <- function(data) {

eda_filt <- process_eda(data$EDA)
# omitting NAs: TBD
# the Embrace Plus aggregated files have a lot of NAs,
# for example when the device wasn't able to record anything
# we need to decide how to handle these NAs
eda_filt <- process_eda(na.omit(data$EDA))
Comment on lines +44 to +48
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you know I'm no expert when it comes to analysing this data, but thebutter_lowpass_filter doesn't work the same as it does with other devices when there are a lot of NAs. The aggregated Embrace Plus data also has "data" present when the device wasn't worn. When I removed the NAs the flow seemed to work fine again, but would be good to double check what the implications are

flog.info("EDA data filtered.")

eda_peaks <- find_peaks(eda_filt)
Expand Down
Loading