From e5a5927690208356e4e97f2e3ed03853fa866bfe Mon Sep 17 00:00:00 2001 From: Andrey Akinshin Date: Mon, 1 Apr 2024 14:30:42 +0200 Subject: [PATCH] add proper reference to 'Weighted quantile estimators' --- DESCRIPTION | 4 ++-- R/wquant.R | 4 +++- TODO.md | 1 + inst/NEWS | 7 +++++++ inst/NEWS.Rd | 6 ++++++ man/macros/citations.Rd | 2 ++ man/wquant.Rd | 4 +++- 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 01b9607d5..aef42998c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: pomp Type: Package Title: Statistical Inference for Partially Observed Markov Processes -Version: 5.7.0.2 -Date: 2024-03-31 +Version: 5.7.0.3 +Date: 2024-04-01 Authors@R: c(person(given=c("Aaron","A."),family="King",role=c("aut","cre"),email="kingaa@umich.edu",comment=c(ORCID="0000-0001-6159-3207")), person(given=c("Edward","L."),family="Ionides",role="aut",comment=c(ORCID="0000-0002-4190-0174")) , person(given="Carles",family="Bretó",role="aut",comment=c(ORCID="0000-0003-4695-4902")), diff --git a/R/wquant.R b/R/wquant.R index e3cf9086c..e9806d755 100644 --- a/R/wquant.R +++ b/R/wquant.R @@ -2,7 +2,7 @@ ##' ##' Estimate weighted quantiles. ##' -##' \code{wquant} estimates quantiles of weighted data using the estimator of Harrell & Davis (1982), with improvements recommended by Andrey Akinshin. +##' \code{wquant} estimates quantiles of weighted data using the estimator of Harrell & Davis (1982), with improvements recommended by Andrey Akinshin (2023). ##' ##' @param x numeric; a vector of data. ##' @param weights numeric; vector of weights. @@ -23,6 +23,8 @@ ##' @references ##' \Harrell1982 ##' +##' \Akinshin2023 +##' ## The discussion in Andrey Akinshin's blog post ## https://aakinshin.net/posts/weighted-quantiles/ ## was instrumental in developing these codes. diff --git a/TODO.md b/TODO.md index 48b82ff00..dfd15935d 100644 --- a/TODO.md +++ b/TODO.md @@ -4,6 +4,7 @@ ## For pomp: +- YAML interface - "Getting Started" vignette: - ~~finish discussion of smoothing and hindcasting~~ - include discussion of forecasting diff --git a/inst/NEWS b/inst/NEWS index f775afeb0..afff65835 100644 --- a/inst/NEWS +++ b/inst/NEWS @@ -1,5 +1,12 @@ _N_e_w_s _f_o_r _p_a_c_k_a_g_e '_p_o_m_p' +_C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _5._7._0: + + • More changes in C codes to forestall issues detected by + ‘rchk’. + + • Minor corrections to documentation. + _C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _5._6._1: • Minor corrections to documentation. diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index b1df8a7aa..fb52e289f 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -1,5 +1,11 @@ \name{NEWS} \title{News for package `pomp'} +\section{Changes in \pkg{pomp} version 5.7.0}{ + \itemize{ + \item More changes in C codes to forestall issues detected by \pkg{rchk}. + \item Minor corrections to documentation. + } +} \section{Changes in \pkg{pomp} version 5.6.1}{ \itemize{ \item Minor corrections to documentation. diff --git a/man/macros/citations.Rd b/man/macros/citations.Rd index 2ddab91f3..d436e3f75 100644 --- a/man/macros/citations.Rd +++ b/man/macros/citations.Rd @@ -1,5 +1,7 @@ % unlike in latex, new lines within \newcommand end the command (even using %) +\newcommand{\Akinshin2023}{A. Akinshin. Weighted quantile estimators. arXiv:2304.07265, 2023. \doi{10.48550/arxiv.2304.07265}.} + \newcommand{\Anderson2001}{J.L. Anderson. An ensemble adjustment Kalman filter for data assimilation. \emph{Monthly Weather Review} \bold{129}, 2884--2903, 2001.} \newcommand{\Andrieu2009}{C. Andrieu and G.O. Roberts. The pseudo-marginal approach for computation. \emph{Annals of Statistics} \bold{37}, 697--725, 2009.} diff --git a/man/wquant.Rd b/man/wquant.Rd index 6adf819bc..705b16a6c 100644 --- a/man/wquant.Rd +++ b/man/wquant.Rd @@ -25,7 +25,7 @@ If \code{probs} has names, these are inherited. Estimate weighted quantiles. } \details{ -\code{wquant} estimates quantiles of weighted data using the estimator of Harrell & Davis (1982), with improvements recommended by Andrey Akinshin. +\code{wquant} estimates quantiles of weighted data using the estimator of Harrell & Davis (1982), with improvements recommended by Andrey Akinshin (2023). } \examples{ x <- c(1,1,1,2,2,3,3,3,3,4,5,5,6,6,6) @@ -36,6 +36,8 @@ wquant(c(1,2,3,4,5),c(1,0,0,1,1)) } \references{ \Harrell1982 + +\Akinshin2023 } \author{ Aaron A. King