Skip to content

Commit

Permalink
Merge branch 'release/v0.7.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dmphillippo committed May 7, 2024
2 parents 7415cdf + 1e5d045 commit f104add
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 74 deletions.
107 changes: 70 additions & 37 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# -----------------------------------------------------------
# CITATION file created with {cffr} R package, v0.5.0
# --------------------------------------------
# CITATION file created with {cffr} R package
# See also: https://docs.ropensci.org/cffr/
# -----------------------------------------------------------
# --------------------------------------------

cff-version: 1.2.0
message: 'To cite package "multinma" in publications use:'
type: software
license: GPL-3.0-only
title: 'multinma: Bayesian Network Meta-Analysis of Individual and Aggregate Data'
version: 0.6.1.9000
version: 0.7.0
doi: 10.5281/zenodo.3904454
abstract: Network meta-analysis and network meta-regression models for aggregate data,
individual patient data, and mixtures of both individual and aggregate data using
multilevel network meta-regression as described by Phillippo et al. (2020) <doi:10.1111/rssa.12579>.
multilevel network meta-regression as described by Phillippo et al. (2020) <https://doi.org/10.1111/rssa.12579>.
Models are estimated in a Bayesian framework using 'Stan'.
authors:
- family-names: Phillippo
Expand All @@ -28,7 +28,7 @@ preferred-citation:
email: [email protected]
orcid: https://orcid.org/0000-0003-2672-7841
year: '2023'
notes: R package version 0.6.1.9000
notes: R package version 0.7.0
url: https://dmphillippo.github.io/multinma/
doi: 10.5281/zenodo.3904454
repository: https://CRAN.R-project.org/package=multinma
Expand Down Expand Up @@ -78,45 +78,41 @@ references:
url: https://www.R-project.org/
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2024'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
version: '>= 3.4.0'
- type: software
title: methods
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2024'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
- type: software
title: stats
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2024'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
- type: software
title: graphics
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2024'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
- type: software
title: survival
abstract: 'survival: Survival Analysis'
Expand Down Expand Up @@ -174,7 +170,9 @@ references:
given-names: Gregory
- family-names: Geelnard
given-names: Marcus
website: https://tinythreadpp.bitsnbites.eu/
- name: Intel
website: https://www.threadingbuildingblocks.org/
year: '2024'
version: '>= 5.0.1'
- type: software
Expand Down Expand Up @@ -330,29 +328,30 @@ references:
orcid: https://orcid.org/0000-0002-2739-7082
- family-names: Bryan
given-names: Jennifer
email: jenny@rstudio.com
email: jenny@posit.co
orcid: https://orcid.org/0000-0002-6983-2759
year: '2024'
- type: software
title: randtoolbox
abstract: 'randtoolbox: Toolbox for Pseudo and Quasi Random Number Generation and
Random Generator Tests'
notes: Imports
url: https://r-forge.r-project.org/projects/rmetrics/
repository: https://CRAN.R-project.org/package=randtoolbox
authors:
- family-names: Chalabi
given-names: R port by Yohan
given-names: R code by Yohan
- family-names: Dutang
given-names: Christophe
- family-names: Savicky
given-names: Petr
- family-names: Matsumoto
given-names: Diethelm Wuertz with some underlying C codes of the SFMT algorithm
from M.
- family-names: Saito
given-names: M.
- family-names: Knuth.
given-names: the Knuth-TAOCP RNG from D.
- family-names: Torus
given-names: Diethelm Wuertz; C code of
- name: Halton
- family-names: Dutang
given-names: Sobol sequences by Christophe
- family-names: Saito.
given-names: Mutsuo
year: '2024'
- type: software
title: copula
Expand Down Expand Up @@ -404,7 +403,7 @@ references:
authors:
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
year: '2024'
- type: software
title: Matrix
Expand Down Expand Up @@ -434,22 +433,28 @@ references:
- family-names: Csárdi
given-names: Gábor
email: [email protected]
orcid: https://orcid.org/0000-0001-7098-9676
- family-names: Nepusz
given-names: Tamás
email: [email protected]
orcid: https://orcid.org/0000-0002-1451-338X
- family-names: Traag
given-names: Vincent
orcid: https://orcid.org/0000-0003-3170-3879
- family-names: Horvát
given-names: Szabolcs
email: [email protected]
orcid: https://orcid.org/0000-0002-3100-523X
- family-names: Zanini
given-names: Fabio
email: [email protected]
orcid: https://orcid.org/0000-0001-7097-8539
- family-names: Noom
given-names: Daniel
- family-names: Müller
given-names: Kirill
email: [email protected]
orcid: https://orcid.org/0000-0002-1416-3412
year: '2024'
- type: software
title: ggraph
Expand Down Expand Up @@ -497,6 +502,10 @@ references:
- family-names: Dunnington
given-names: Dewey
orcid: https://orcid.org/0000-0002-9415-4582
- family-names: Brand
given-names: Teun
name-particle: van den
orcid: https://orcid.org/0000-0002-9335-7468
year: '2024'
version: '>= 3.3.0'
- type: software
Expand Down Expand Up @@ -640,6 +649,30 @@ references:
email: [email protected]
year: '2024'
version: '>= 2.1.0'
- type: software
title: vdiffr
abstract: 'vdiffr: Visual Regression Testing and Graphical Diffing'
notes: Suggests
url: https://vdiffr.r-lib.org/
repository: https://CRAN.R-project.org/package=vdiffr
authors:
- family-names: Henry
given-names: Lionel
email: [email protected]
- family-names: Pedersen
given-names: Thomas Lin
email: [email protected]
orcid: https://orcid.org/0000-0002-5147-4711
- family-names: Luciani
given-names: T Jake
email: [email protected]
- family-names: Decorde
given-names: Matthieu
email: [email protected]
- family-names: Lise
given-names: Vaudor
email: [email protected]
year: '2024'
- type: software
title: withr
abstract: 'withr: Run Code ''With'' Temporarily Modified Global State'
Expand All @@ -651,7 +684,7 @@ references:
given-names: Jim
- family-names: Henry
given-names: Lionel
email: lionel@rstudio.com
email: lionel@posit.co
- family-names: Müller
given-names: Kirill
email: [email protected]
Expand All @@ -660,7 +693,7 @@ references:
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
- family-names: Chang
given-names: Winston
year: '2024'
Expand Down Expand Up @@ -725,16 +758,15 @@ references:
notes: Suggests
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2024'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
- type: software
title: R.rsp
abstract: 'R.rsp: Dynamic Generation of Scientific Reports'
notes: Suggests
url: https://github.com/HenrikBengtsson/R.rsp
url: https://henrikbengtsson.github.io/R.rsp/
repository: https://CRAN.R-project.org/package=R.rsp
authors:
- family-names: Bengtsson
Expand All @@ -750,7 +782,7 @@ references:
authors:
- family-names: Müller
given-names: Kirill
email: [email protected]
email: [email protected]
orcid: https://orcid.org/0000-0002-1416-3412
year: '2024'
- type: software
Expand Down Expand Up @@ -819,7 +851,7 @@ references:
authors:
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
orcid: https://orcid.org/0000-0003-4757-117X
- family-names: Hesselberth
given-names: Jay
Expand Down Expand Up @@ -848,7 +880,7 @@ references:
title: flexsurv
abstract: 'flexsurv: Flexible Parametric Survival and Multi-State Models'
notes: Suggests
url: https://github.com/chjackson/flexsurv-dev
url: http://chjackson.github.io/flexsurv/
repository: https://CRAN.R-project.org/package=flexsurv
authors:
- family-names: Jackson
Expand All @@ -872,3 +904,4 @@ references:
given-names: Benjamin
email: [email protected]
year: '2024'

2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: multinma
Title: Bayesian Network Meta-Analysis of Individual and Aggregate Data
Version: 0.6.1.9004
Version: 0.7.0
Authors@R:
person(given = c("David", "M."),
family = "Phillippo",
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# multinma 0.6.1.9000
# multinma 0.7.0

* Feature: The new `marginal_effects()` function produces marginal treatment
effects, as a wrapper around absolute predictions from `predict()`. For example,
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ papers:
The `multinma` package can be cited as follows:

> Phillippo, D. M. (2024). *multinma: Bayesian Network Meta-Analysis of
> Individual and Aggregate Data*. R package version 0.6.1.9000, doi:
> Individual and Aggregate Data*. R package version 0.7.0, doi:
> [10.5281/zenodo.3904454](https://doi.org/10.5281/zenodo.3904454).
When fitting ML-NMR models, please cite the methods paper:
Expand All @@ -98,7 +98,8 @@ For ML-NMR models with time-to-event outcomes, please cite:
## References

<div id="refs" class="references csl-bib-body hanging-indent">
<div id="refs" class="references csl-bib-body hanging-indent"
entry-spacing="0">

<div id="ref-Carpenter2017" class="csl-entry">

Expand Down
41 changes: 8 additions & 33 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,10 @@
This release addresses an "additional checks" UBSAN failure, caused by a memory
allocation bug in Stan (https://github.com/stan-dev/rstan/issues/1111).
StanHeaders has now been patched which resolves the issue; no changes are
necessary in multinma. Verified passing UBSAN checks with rocker/r-devel-san.

In response to CRAN request, I have also:

* Added the few missing \value tags to documentation

Regarding the other issues raised:

* \dontrun{} is used in man/pairs.stan_nma.Rd, as the example is designed to
raise warning messages. These are divergent transitions in Stan, which we then
demonstrate for the user how to examine using the pairs() plot.

* The global environment is never modified. rm(list = ls()) in some large test
files is never run on CRAN or by the user, these lines only run when testing
on GitHub Actions to avoid running out of memory. These tests are skipped on
CRAN to keep check time manageable.

* Similarly, .GlobalEnv is never modified. In the .Rd-files starting with
aa_example_, the assign() to .GlobalEnv only runs and is only needed when
building the package website using pkgdown, i.e. when pkgdown::in_pkgdown() is
TRUE. This code is never run otherwise.

This release adds new features and fixes a few bugs.

## Test environments
* local rocker/r-devel-san image with sanitizers
* local R installation (Windows 10), R 4.3.3
* local R installation (Windows 10), R 4.4.0
* win-builder (release, devel)
* Ubuntu 22.04.4 on GitHub Actions (release, devel, oldrel)
* Mac OS 12.7.3 on GitHub Actions (release)
* Mac OS 14.4.1 on GitHub Actions (release)
* Windows Server 2022 10.0.20348 on GitHub Actions (release)

## R CMD check results
Expand All @@ -40,12 +15,12 @@ Regarding the other issues raised:
Imports includes 23 non-default packages.

* checking installed package size ... NOTE
installed size is 18.2Mb
installed size is 18.0Mb
sub-directories of 1Mb or more:
R 1.6Mb
doc 4.3Mb
libs 11.6Mb

R 1.7Mb
doc 4.2Mb
libs 11.5Mb
The docs directory contains 13 html vignettes demonstrating full analyses using
the package.

Expand Down

0 comments on commit f104add

Please sign in to comment.