Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

340/cran release/update version #341

Merged
merged 10 commits into from
Jan 27, 2025
1 change: 0 additions & 1 deletion .github/workflows/check-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
any::ggbeeswarm
any::PairedData
any::metaviz
any::metaplus

- name: Render README
run: |
Expand Down
3 changes: 0 additions & 3 deletions CRAN-SUBMISSION

This file was deleted.

6 changes: 1 addition & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: serocalculator
Title: Estimating Infection Rates from Serological Data
Version: 1.2.0.9027
Version: 1.3.0.9000
Authors@R: c(
person("Peter", "Teunis", , "[email protected]", role = c("aut", "cph"),
comment = "Author of the method and original code."),
Expand Down Expand Up @@ -45,7 +45,6 @@ Imports:
stringr
Suggests:
bookdown,
devtag (>= 0.0.0.9000),
DT,
fs,
ggbeeswarm,
Expand All @@ -70,8 +69,5 @@ Encoding: UTF-8
Language: en-US
LazyData: true
NeedsCompilation: no
Remotes:
bcgov/ssdtools,
moodymudskipper/devtag
Roxygen: list(markdown = TRUE, roclets = c("collate", "rd", "namespace", "devtag::dev_roclet"))
RoxygenNote: 7.3.2
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# serocalculator (development version)

# serocalculator 1.3.0

## New features

* Removed function 'get_additional_data()' (#332)
Expand Down Expand Up @@ -75,7 +77,7 @@ copied from <https://github.com/tidyverse/ggplot2>
[GitHub actions](https://docs.github.com/en/actions),
including:
- check that `README.qmd` still compiles
(advice from [preventive-r-package-care](https://indrajeetpatil.github.io/preventive-r-package-care)) (#259)
(advice from [preventive-r-package-care](https://indrajeetpatil.github.io/preventive-r-package-care/#/preventive-care-for-r-packages)) (#259)
d-morrison marked this conversation as resolved.
Show resolved Hide resolved
- check `NEWS.md` for updated change log (#257)
- lint changed files (#256)

Expand Down
3 changes: 2 additions & 1 deletion R/graph.decay.curves.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#' * If the user directly specifies the `rows_to_graph` argument,
#' then `n_curves` has no effect.
#' @examples
#' \donttest{
#' library(dplyr) # loads the `%>%` operator and `dplyr::filter()`
#'
#' curve <-
Expand All @@ -39,7 +40,7 @@
#' serocalculator:::plot_curve_params_one_ab()
#'
#' curve
#'
#' }
plot_curve_params_one_ab <- function(
object,
verbose = FALSE,
Expand Down
1 change: 0 additions & 1 deletion R/sim.cs.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
#' Makes a cross-sectional data set (age, y(t) set)
#' and adds noise, if desired.

#' @param lambda a [numeric()] scalar indicating the incidence rate (in events per person-years)

Check warning on line 7 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=7,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 96 characters.
#' @param n.smpl number of samples to simulate
#' @param age.rng age range of sampled individuals, in years
#' @param age.fx specify the curve parameters to use by age (does nothing at present?)

Check warning on line 10 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=10,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 86 characters.
#' @param antigen_isos Character vector with one or more antibody names. Values must match `curve_params`.

Check warning on line 11 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=11,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 106 characters.
#' @param n.mc how many MCMC samples to use:
#' * when `n.mc` is in `1:4000` a fixed posterior sample is used
#' * when `n.mc` = `0`, a random sample is chosen
#' @param renew.params whether to generate a new parameter set for each infection

Check warning on line 15 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=15,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 81 characters.
#' * `renew.params = TRUE` generates a new parameter set for each infection
#' * `renew.params = FALSE` keeps the one selected at birth, but updates baseline y0

Check warning on line 17 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=17,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 84 characters.
#' @param add.noise a [logical()] indicating whether to add biological and measurement noise

Check warning on line 18 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=18,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 92 characters.
#' @inheritParams log_likelihood

#' @param noise_limits biologic noise distribution parameters
Expand All @@ -23,9 +23,8 @@
#' * `"long"` (one measurement per row) or
#' * `"wide"` (one serum sample per row)
#' @param ... additional arguments passed to `simcs.tinf()`
#' @inheritDotParams simcs.tinf
#' @inheritParams log_likelihood # verbose
#' @return a [tibble::tbl_df] containing simulated cross-sectional serosurvey data, with columns:

Check warning on line 27 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=27,col=81,[line_length_linter] Lines should not be more than 80 characters. This line is 97 characters.
#' * `age`: age (in days)
#' * one column for each element in the `antigen_iso` input argument
#' @export
Expand Down Expand Up @@ -69,10 +68,10 @@
#' format = "long"
#' )
#'
sim.cs <- function(

Check warning on line 71 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=71,col=1,[object_name_linter] Variable and function name style should match snake_case or symbols.
lambda = 0.1,
n.smpl = 100,

Check warning on line 73 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=73,col=5,[object_name_linter] Variable and function name style should match snake_case or symbols.
age.rng = c(0, 20),

Check warning on line 74 in R/sim.cs.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/sim.cs.R,line=74,col=5,[object_name_linter] Variable and function name style should match snake_case or symbols.
age.fx = NA,
antigen_isos,
n.mc = 0,
Expand Down
12 changes: 8 additions & 4 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
## Resubmission

* Reduced run time of examples
## Resubmission

* Package had been archived from CRAN on 26-11-2024 following policy violation (Internet Access)
* In response, we removed urls with unstable servers and added internal datasets for examples and testing
* Includes additional developments consistent with a minor version increase.
* Full updates are described in NEWS.md.
* There are currently no downstream dependencies for this package

## R CMD check results

0 errors | 0 warnings | 1 note

* This is a new release.
* There are some words flagged as misspellings in DESCRIPTION, however these are spelled correctly.

* Package was previously archived on CRAN
3 changes: 2 additions & 1 deletion man/plot_curve_params_one_ab.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions man/sim.cs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading