diff --git a/NEWS.md b/NEWS.md index 9b2f04717..f26c91b47 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,13 +1,15 @@ +# CHANGES IN GGIR VERSION 2.10-5 + +- Part 2: Move cosinor analysis code to its own function in order to ease re-using it in both part 2 and part 6. + +- Part2: Expand cosinor analysis with R2 + # CHANGES IN GGIR VERSION 2.10-4 - Part 4: Now better able to handle nights without sustained inactivity bouts (rest) #911 - Part 5: Function g.fragmentation code cleaned up, TP formulas revised following feedback Ian Danilevicz, and code now also produces sleep fragmentation #817 -- Part 2: Move cosinor analysis code to its own function in order to ease re-using it in both part 2 and part 6. - -- Part2: Expand cosinor analysis with R2 - - Part 1: Fixed issue #914 relating to specifying timezone for processing ad-hoc csv format raw data. - Part 1: Improved recognition of ActiGraph csv that occassionally confused for Axivity csv #918 diff --git a/man/GGIR.Rd b/man/GGIR.Rd index 670d23aa1..d3278919a 100755 --- a/man/GGIR.Rd +++ b/man/GGIR.Rd @@ -1249,7 +1249,6 @@ GGIR(mode = 1:5, over which L5M5 needs to be calculated. Now this is done with argument qwindow.} \item{cosinor}{ - Argument depricated after version 1.5-24. Boolean (default = FALSE). Whether to apply the cosinor analysis from the ActCR package.} } diff --git a/tests/testthat/test_cosinor.R b/tests/testthat/test_cosinor.R index a4fce97d0..11537498d 100644 --- a/tests/testthat/test_cosinor.R +++ b/tests/testthat/test_cosinor.R @@ -48,6 +48,7 @@ test_that("cosinorAnalyses provides expected output", { expect_equal(coef60$coefext$params$UpMesor, 19.52358, tolerance = 0.01) expect_equal(coef60$coefext$params$DownMesor, 16.47642, tolerance = 0.01) expect_equal(coef60$coefext$params$MESOR, 3.622534, tolerance = 0.01) + expect_equal(coef60$coefext$params$R2, 0.8976208, tolerance = 0.01) # IV IS expect_equal(coef60$IVIS$InterdailyStability, 0.9945789, tolerance = 0.01)