diff --git a/.Rbuildignore b/.Rbuildignore index fe2d6d021..1004b4bbc 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -10,7 +10,7 @@ RELEASE_CYCLE.md ^_pkgdown\.yml$ ^docs$ ^pkgdown$ -^vignettes/chapter*.Rmd +^vignettes/chapter.*\\.Rmd$ ^dev-functions$ .zenodo.json ^doc$ diff --git a/NEWS.md b/NEWS.md index fde81d0c7..cadf84272 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# CHANGES IN GGIR VERSION 3.1-1 + +- Part 2: Corrected calculation of LXhr and MXhr which had one hour offset when timing was after midnight, #1117 + # CHANGES IN GGIR VERSION 3.1-0 - Minor issue fixes introduced in 3.0-10 related to handling nights without sustained inactivity bouts, handling recordings without midnight and storage of GGIR version in the part 4 output when there are no valid nights. @@ -151,7 +155,7 @@ If you prefer to keep old functionality then divide your old value by 24 #1050. # CHANGES IN GGIR VERSION 3.0-1 -- Part 2: Added option to provide a csv file with start and end dates when accelerometer is expected to be worn #943 +- Part 2: Added parameters study_dates_file and study_dateformat to specify csv file with start and end date when accelerometer is expected to be worn #943 - Part 5: Now stores dictionary for variable names in part 5 reports #938 diff --git a/R/g.analyse.perday.R b/R/g.analyse.perday.R index 27dd882a5..195cc4d92 100644 --- a/R/g.analyse.perday.R +++ b/R/g.analyse.perday.R @@ -422,7 +422,7 @@ g.analyse.perday = function(ndays, firstmidnighti, time, nfeatures, exfi = collectfi[which(params_247[["winhr"]] == winhr_value)] if (length(varnum) > (60 / ws3) * 60 * winhr_value * 1.2) { # Calculate values # Time window for L5 & M5 analysis - t0_LFMF = 1 #start + t0_LFMF = 0 #start # L5M5window[2] #end in 24 hour clock hours (if a value higher than 24 is chosen, it will take early hours of previous day to complete the 5 hour window t1_LFMF = length(varnum) / (60 * (60 / ws3)) + (winhr_value - (params_247[["M5L5res"]] / 60))