Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@
"affiliation": "Inserm",
"orcid": "0000-0003-3109-9720",
"type": "Researcher"
},
{
"name": "Afolabi, Samuel Timileyin",
"affiliation": "University of Lagos",
"orcid": "0009-0002-7325-6405",
"type": "Researcher"
}
]
}
5 changes: 4 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Authors@R: c(person("Vincent T","van Hees",role=c("aut","cre"),
person("Jairo H","Migueles",role="aut",
email="jairo@jhmigueles.com",
comment = c(ORCID = "0000-0003-0366-6935")),
person("Samuel T","Afolabi",role="ctb",
email="samuelafolabimails@gmail.com",
comment = c(ORCID = "0009-0002-7325-6405")),
person("Severine","Sabia",role="ctb"),
person("Matthew R","Patterson",role="ctb"),
person("Zhou","Fang",role="ctb"),
Expand Down Expand Up @@ -38,6 +41,6 @@ URL: https://github.com/wadpac/GGIR/, https://wadpac.github.io/GGIR/
BugReports: https://github.com/wadpac/GGIR/issues
License: Apache License (== 2.0) | file LICENSE
Suggests: testthat, covr, knitr, rmarkdown, actilifecounts, readxl
Imports: data.table, foreach, doParallel, signal, zoo, unisensR, ineq, methods, psych, irr, lubridate, GGIRread, ActCR, read.gt3x
Imports: data.table, foreach, doParallel, signal, zoo, unisensR, ineq, methods, psych, irr, lubridate, GGIRread, ActCR, read.gt3x, arrow
Depends: stats, utils, R (>= 3.5)
VignetteBuilder: knitr
3 changes: 2 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ export(g.analyse, g.calibrate,
check_log, g.report.part5_dictionary, DFA, ABI, SSP, visualReport,
splitRecords, getSplitNames, addSplitNames, getPart1BasicInfo,
markerButtonForRest, aggregateEvent, inspect_binFile_brand,
g.part3_correct_guider, g.part3_alignIndexVectors, filterNonwearNight)
g.part3_correct_guider, g.part3_alignIndexVectors, filterNonwearNight,
write_dashboard_parquet, write_epoch_parquet, build_epoch_table)

importFrom("grDevices", "colors", "dev.off", "pdf",
"rgb", "rainbow", "palette", "adjustcolor", "gray.colors", "dev.list", "png")
Expand Down
8 changes: 8 additions & 0 deletions R/GGIR.R
Original file line number Diff line number Diff line change
Expand Up @@ -503,4 +503,12 @@ GGIR = function(mode = 1:5, datadir = c(), outputdir = c(),
}
}
}
if (isTRUE(params_output[["save_dashboard_parquet"]])) {
if (verbose == TRUE) print_console_header("Dashboard Parquet export")
write_dashboard_parquet(metadatadir = metadatadir,
params_output = params_output,
params_general = params_general,
params_phyact = params_phyact,
verbose = verbose)
}
}
3 changes: 2 additions & 1 deletion R/check_params.R
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ check_params = function(params_sleep = c(), params_metrics = c(),
boolean_params = c("epochvalues2csv", "save_ms5rawlevels", "save_ms5raw_without_invalid",
"storefolderstructure", "dofirstpage", "visualreport", "week_weekend_aggregate.part5",
"do.part3.pdf", "outliers.only", "do.visual", "do.sibreport", "visualreport_without_invalid",
"do.part2.pdf", "do.part2.png", "old_visualreport", "require_complete_lastnight_part5")
"do.part2.pdf", "do.part2.png", "old_visualreport", "require_complete_lastnight_part5",
"save_dashboard_parquet")

character_params = c("save_ms5raw_format", "timewindow", "sep_reports", "sep_config",
"dec_reports", "dec_config", "visualreport_focus", "method_research_vars")
Expand Down
3 changes: 2 additions & 1 deletion R/load_params.R
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ load_params = function(topic = c("sleep", "metrics", "rawdata",
old_visualreport = FALSE, visualreport_hrsPerRow = 36,
visualreport_focus = "day",
visualreport_validcrit = 0, require_complete_lastnight_part5 = FALSE,
method_research_vars = NULL)
method_research_vars = NULL,
save_dashboard_parquet = FALSE)

}
if ("general" %in% topic) {
Expand Down
Loading
Loading