Skip to content

Fix aggregate_per_date() combining results using last file's columns … #75

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

Open
fredho-42 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix aggregate_per_date() combining results using last file's columns … #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ LazyData: true
Suggests:
testthat (>= 3.0.0), randomForest, gsignal, rattle
Config/testthat/edition: 3
RoxygenNote: 7.3.2
RoxygenNote: 7.3.3
Depends:
R (>= 2.10)
Imports:
caret, data.table, e1071, GGIR, HMM, signal, GGIRread, actilifecounts, actimetricModels
caret, data.table, e1071, GGIR, HMM, signal, GGIRread, actilifecounts, actimetricModels, purrr
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ importFrom(e1071,kurtosis)
importFrom(e1071,skewness)
importFrom(grDevices,dev.off)
importFrom(grDevices,pdf)
importFrom(purrr,list_rbind)
importFrom(signal,specgram)
importFrom(stats,predict)
importFrom(utils,data)
Expand Down
20 changes: 17 additions & 3 deletions R/aggregate_per_date.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#' @return Data frame with aggregates of time spent in classes per calendar date.
#'
#' @importFrom grDevices pdf dev.off
#' @importFrom purrr list_rbind
#'
#' @author Jairo H. Migueles <jairo@jhmigueles.com>
#' @export
Expand All @@ -36,6 +37,9 @@ aggregate_per_date = function(tsDir, epoch, classifier, classes,
classes = gsub("sleep", "nighttime.sleep", classes)
}
files = dir(tsDir, full.names = TRUE)
# per-file results, combined into a single table after the loop
ds_list = vector("list", length(files))
dsnames_list = vector("list", length(files))
for (fi in 1:length(files)) {
ts = NULL
load(files[fi])
Expand Down Expand Up @@ -206,12 +210,22 @@ aggregate_per_date = function(tsDir, epoch, classifier, classes,
classes = classes, epoch = epoch)
grDevices::dev.off()
}
# store information in daysummary and next file
if (fi == 1) daysummary = ds else daysummary = rbind(daysummary, ds)
# store information for this file; combined into daysummary after the loop
ds_list[[fi]] = ds
dsnames_list[[fi]] = dsnames
}

# Combine results across files. Column structure (dsnames/ci) is determined
# by the run's parameters (classifier, classes, boutdur), so it is expected
# to be identical for every file; we use the *first* file's dsnames as the
# canonical column names/count rather than whichever file happened to be
# processed *last*, so the combined table does not silently depend on which
# file is last in `files`.
daysummary = list_rbind(ds_list)
dsnames = dsnames_list[[1]]

# keep only calculated columns and insert colnames
daysummary = daysummary[, 1:(ci - 1)]
daysummary = daysummary[, 1:length(dsnames)]
colnames(daysummary) = dsnames
# return
return(daysummary)
Expand Down