Skip to content

Commit

Permalink
Merge pull request #1130 from wadpac/issue1121_1127
Browse files Browse the repository at this point in the history
Skip chapters from gh-pages when building package and minor edit to NEWS.md
  • Loading branch information
vincentvanhees authored May 24, 2024
2 parents 4e56072 + f211e58 commit 706b115
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RELEASE_CYCLE.md
^_pkgdown\.yml$
^docs$
^pkgdown$
^vignettes/chapter*.Rmd
^vignettes/chapter.*\\.Rmd$
^dev-functions$
.zenodo.json
^doc$
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion R/g.analyse.perday.R
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down

0 comments on commit 706b115

Please sign in to comment.