From bb202c97abc6771ccbd1bab86298abc4478e03d9 Mon Sep 17 00:00:00 2001 From: muschellij2 Date: Wed, 5 Jun 2024 22:32:00 -0400 Subject: [PATCH 1/4] Add NEWS.md --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 NEWS.md diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 0000000..92cc614 --- /dev/null +++ b/NEWS.md @@ -0,0 +1,3 @@ +# GGIRread 1.0.1 + +* Added a `NEWS.md` file to track changes to the package. From 41453e53222b6924a60e56c813bd6a7853fd0235 Mon Sep 17 00:00:00 2001 From: muschellij2 Date: Wed, 5 Jun 2024 22:35:05 -0400 Subject: [PATCH 2/4] fixing onlond --- NEWS.md | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- R/zzz.R | 15 +++++++- 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 92cc614..2e0352a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,118 @@ -# GGIRread 1.0.1 +# Changes in version 1.0.1 (release date:03-06-2024) * Added a `NEWS.md` file to track changes to the package. +- Stops interactive calling of `chooseCRANmirror` on `.onAttach` if interactive and CRAN mirror not set GGIR #1141. +- Progress bar fixed, issue #63 (credits: John Muschelli) + +# Changes in version 1.0.0 (release date:27-03-2024) + +- GENEActiv no longer prints error to console when more data is requested +than is in the file because this is not an error, issue #58 + + + +# Changes in version 0.3.3 (release date:24-01-2024) + +- When GENEActiv device battery runs low before downloading data the timestamp in the file header will default to 2010-9-16. This is now corrected by using the timestamp from the first page header instead, issue #56 + + +# Changes in version 0.3.2 (release date:05-12-2023) + +- Improved handling of failed checksum in .cwa files #53 (credits: Lena Kushleyeva) + + +# Changes in version 0.3.1 (GitHub-only-release date:11-10-2023) + +- Now iterates through cwa files using native cwa blocks instead of 300 +sample pages. +- Now properly accounts for unexpected high sampling rate for the imputation. +- Deprecated option to iterate based on timestamps. +- Deprecated readWav function, see #48 for justification. +- This release already appeared on GitHub on 30 August but is now also submitted to CRAN + + +# Changes in version 0.3.0 (release date:07-08-2023) + +- Improved imputation of faulty blocks readAxivity +- Unit test added for AX6 files +- License update to Apache 2.0. + + +# Changes in version 0.2.10 (GitHub-only-release date:03-08-2023) + +- Fixed bug in temperature extraction Axivity cwa files (credits: Lena Kushleyeva) +- readAxivity now able to recognise when AX6 has been configured without +gyroscope sensor and only provides accerometer data. Fixes #31 (credits: Lena Kushleyeva) +- readAxivity refactored and faster (credits: Lena Kushleyeva) +but also expanded with checksum check and sampling frequency check, +data blocks are imputed when checks fail and this is logged in the output. +The net speed improvement is approximately 15\%-20\%. + + +# Changes in version 0.2.9 (GitHub-only-release date:20-07-2023) + +- Replace bug fix to resample function in 0.2.8 and instead fix the +issue inside readAxivity #33 +- Improvements to syntax for readGENEActiv and readGenea following R updates + + +# Changes in version 0.2.8 (release date:26-05-2023) + +- Major bug fix introduced in 0.2.7 release affecting readAxivity #29 +- resample function now able to handle timestamps outside block as +a result of large time gaps in cwa files #32 + + +# Changes in version 0.2.7 (release date:17-05-2023) + +- Fixes bug in LUX extraction for GENEActiv .bin data (#27) +- Expanded Axivity .wav file header extraction with alternative method +for sampling rate extraction (#26) +- Speeding up readAxivity function by approximately 75 percent. + + +# Changes in version 0.2.6 (release date:05-12-2022) + +- New CRAN release, only minor improvements to syntax + + +# Changes in version 0.2.5 (GitHub-only-release date:09-11-2022) + +- readWav now correctly identifies the header and first timestamp + + +# Changes in version 0.2.4 (release date:09-10-2022) + +- Addressing POSIX errors in R-devel. +- Speeding up readAxivity function by approximately 40 percent. +- Adding readWav function for reading accelerometer data stored in +wav(Audio) format. This function was formerly known as g.wavread in the +GGIR package but has been migrated here to make the GGIR package lighter. + + +# Changes in version 0.2.3 (release date:29-09-2022) + +- Changed POSIXlt to character conversion to be compatible with R-devel +update svn revision r82904 (2022-09-24 19:32:52) +- Tidying up namespace references +- Added zzz function to auto-check onattach package version relative to CRAN + + +# Changes in version 0.2.2 (release date:31-08-2022) + +- Now also extracting GENEActiv RecordingID, Handedness, DeviceLocation and DeviceModel from header +- Removed skin_on_cran() calls in unit test +- Improved description for resample function +- Fixed errors resulting from how lux values are read (issue #12) + + +# Changes in version 0.2.1 (release date:16-08-2022) + +- Addressing request from CRAN to revise AxivityNumUnpack + + +# Changes in version 0.2.0 (release date:12-08-2022) + +- First release with functionality for reading Axivity .cwa, GENEActiv .bin, and Genea, .bin data. + + diff --git a/R/zzz.R b/R/zzz.R index f868521..2bc3de5 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -1,6 +1,17 @@ .onAttach <- function(...) { if (!interactive()) return() - pkgs <- utils::available.packages() + # stop interactive calling from `library(GGIRread)` + repos <- getOption("repos") + if ("@CRAN@" %in% repos) { + repos <- utils::getCRANmirrors() + # choose cloud/first if option triggers `contrib.url` + # to call `chooseCRANmirror` + repos <- repos$URL[1] + packageStartupMessage( + "No CRAN mirror set, so using ", repos, + " to check GGIRread package version") + } + pkgs <- available.packages(repos = repos) cran_version <- package_version(pkgs[which(pkgs[,1] == "GGIRread"),"Version"]) local_version <- utils::packageVersion("GGIRread") behind_cran <- cran_version > local_version @@ -8,6 +19,6 @@ if (behind_cran) { msg <- paste0("A newer version of GGIRread is available with bug fixes and new features. [", local_version," --> ", cran_version, "]") packageStartupMessage(msg) - } + } } } From eed0d22c56790349f2ac6e88d146a312e4a355b9 Mon Sep 17 00:00:00 2001 From: Vincent van Hees Date: Wed, 12 Jun 2024 17:43:06 +0200 Subject: [PATCH 3/4] delete NEWS.Rd now NEW.md was added in bb202c9, this to avoid having two changelogs that are not in sync --- inst/NEWS.Rd | 122 --------------------------------------------------- 1 file changed, 122 deletions(-) delete mode 100755 inst/NEWS.Rd diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd deleted file mode 100755 index bb0610d..0000000 --- a/inst/NEWS.Rd +++ /dev/null @@ -1,122 +0,0 @@ -\name{NEWS} -\title{News for Package \pkg{GGIRread}} -\newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}} - -\section{Changes in version 1.0.1 (release date:03-06-2024)}{ - \itemize{ - \item Progress bar fixed, issue #63 (credits: John Muschellij) - } -} - -\section{Changes in version 1.0.0 (release date:27-03-2024)}{ - \itemize{ - \item GENEActiv no longer prints error to console when more data is requested - than is in the file because this is not an error, issue #58 - } -} - -\section{Changes in version 0.3.3 (release date:24-01-2024)}{ - \itemize{ - \item When GENEActiv device battery runs low before downloading data the timestamp in the file header will default to 2010-9-16. This is now corrected by using the timestamp from the first page header instead, issue #56 - } -} -\section{Changes in version 0.3.2 (release date:05-12-2023)}{ - \itemize{ - \item Improved handling of failed checksum in .cwa files #53 (credits: Lena Kushleyeva) - } -} -\section{Changes in version 0.3.1 (GitHub-only-release date:11-10-2023)}{ - \itemize{ - \item Now iterates through cwa files using native cwa blocks instead of 300 - sample pages. - \item Now properly accounts for unexpected high sampling rate for the imputation. - \item Deprecated option to iterate based on timestamps. - \item Deprecated readWav function, see #48 for justification. - \item This release already appeared on GitHub on 30 August but is now also submitted to CRAN - } -} -\section{Changes in version 0.3.0 (release date:07-08-2023)}{ - \itemize{ - \item Improved imputation of faulty blocks readAxivity - \item Unit test added for AX6 files - \item License update to Apache 2.0. - } -} -\section{Changes in version 0.2.10 (GitHub-only-release date:03-08-2023)}{ - \itemize{ - \item Fixed bug in temperature extraction Axivity cwa files (credits: Lena Kushleyeva) - \item readAxivity now able to recognise when AX6 has been configured without - gyroscope sensor and only provides accerometer data. Fixes #31 (credits: Lena Kushleyeva) - \item readAxivity refactored and faster (credits: Lena Kushleyeva) - but also expanded with checksum check and sampling frequency check, - data blocks are imputed when checks fail and this is logged in the output. - The net speed improvement is approximately 15\%-20\%. - } -} -\section{Changes in version 0.2.9 (GitHub-only-release date:20-07-2023)}{ - \itemize{ - \item Replace bug fix to resample function in 0.2.8 and instead fix the - issue inside readAxivity #33 - \item Improvements to syntax for readGENEActiv and readGenea following R updates - } -} -\section{Changes in version 0.2.8 (release date:26-05-2023)}{ - \itemize{ - \item Major bug fix introduced in 0.2.7 release affecting readAxivity #29 - \item resample function now able to handle timestamps outside block as - a result of large time gaps in cwa files #32 - } -} -\section{Changes in version 0.2.7 (release date:17-05-2023)}{ - \itemize{ - \item Fixes bug in LUX extraction for GENEActiv .bin data (#27) - \item Expanded Axivity .wav file header extraction with alternative method - for sampling rate extraction (#26) - \item Speeding up readAxivity function by approximately 75 percent. - } -} -\section{Changes in version 0.2.6 (release date:05-12-2022)}{ - \itemize{ - \item New CRAN release, only minor improvements to syntax - } -} -\section{Changes in version 0.2.5 (GitHub-only-release date:09-11-2022)}{ - \itemize{ - \item readWav now correctly identifies the header and first timestamp - } -} -\section{Changes in version 0.2.4 (release date:09-10-2022)}{ - \itemize{ - \item Addressing POSIX errors in R-devel. - \item Speeding up readAxivity function by approximately 40 percent. - \item Adding readWav function for reading accelerometer data stored in - wav(Audio) format. This function was formerly known as g.wavread in the - GGIR package but has been migrated here to make the GGIR package lighter. - } -} -\section{Changes in version 0.2.3 (release date:29-09-2022)}{ - \itemize{ - \item Changed POSIXlt to character conversion to be compatible with R-devel - update svn revision r82904 (2022-09-24 19:32:52) - \item Tidying up namespace references - \item Added zzz function to auto-check onattach package version relative to CRAN - } -} -\section{Changes in version 0.2.2 (release date:31-08-2022)}{ - \itemize{ - \item Now also extracting GENEActiv RecordingID, Handedness, DeviceLocation and DeviceModel from header - \item Removed skin_on_cran() calls in unit test - \item Improved description for resample function - \item Fixed errors resulting from how lux values are read (issue #12) - } -} -\section{Changes in version 0.2.1 (release date:16-08-2022)}{ - \itemize{ - \item Addressing request from CRAN to revise AxivityNumUnpack - } -} -\section{Changes in version 0.2.0 (release date:12-08-2022)}{ - \itemize{ - \item First release with functionality for reading Axivity .cwa, GENEActiv .bin, and Genea, .bin data. - } -} From 90b7f396ba8671120f8304b64dca40e6f6441f3a Mon Sep 17 00:00:00 2001 From: Vincent van Hees Date: Wed, 12 Jun 2024 17:44:39 +0200 Subject: [PATCH 4/4] New updates are not update to release 1.0.1 which I made earlier in June --- NEWS.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 2e0352a..acb326b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,10 @@ -# Changes in version 1.0.1 (release date:03-06-2024) +# Changes in version 1.0.2 (release date:??-??-2024) -* Added a `NEWS.md` file to track changes to the package. +- Added a `NEWS.md` file to track changes to the package. - Stops interactive calling of `chooseCRANmirror` on `.onAttach` if interactive and CRAN mirror not set GGIR #1141. + +# Changes in version 1.0.1 (release date:03-06-2024) + - Progress bar fixed, issue #63 (credits: John Muschelli) # Changes in version 1.0.0 (release date:27-03-2024)