Skip to content

Commit 1a90db7

Browse files
committed
update NEWS; catch a few stragglers
1 parent fb8d5ec commit 1a90db7

12 files changed

+44
-27
lines changed

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: pomp
22
Type: Package
33
Title: Statistical Inference for Partially Observed Markov Processes
4-
Version: 6.0.2.0
5-
Date: 2024-12-12
4+
Version: 6.0.2.2
5+
Date: 2024-12-15
66
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")),
77
person(given=c("Edward","L."),family="Ionides",role="aut",comment=c(ORCID="0000-0002-4190-0174")) ,
88
person(given="Carles",family="Bretó",role="aut",comment=c(ORCID="0000-0003-4695-4902")),

R/objfun.R

+7-5
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ setMethod(
100100
setMethod(
101101
"simulate",
102102
signature=signature(object="objfun"),
103-
definition=function (object, seed = NULL, ...) {
103+
definition=function (object, seed = NULL,...) {
104104
simulate(as(object,"pomp"),seed=seed,...)
105105
}
106106
)
@@ -110,7 +110,7 @@ setMethod(
110110
setMethod(
111111
"probe",
112112
signature=signature(data="objfun"),
113-
definition=function (data, seed = NULL, ...) {
113+
definition=function (data, ..., seed = NULL) {
114114
probe(as(data,"pomp"),seed=seed,...)
115115
}
116116
)
@@ -130,7 +130,7 @@ setMethod(
130130
setMethod(
131131
"spect",
132132
signature=signature(data="objfun"),
133-
definition=function (data, seed = NULL, ...) {
133+
definition=function (data, ..., seed = NULL) {
134134
spect(as(data,"pomp"),seed=seed,...)
135135
}
136136
)
@@ -143,7 +143,8 @@ setMethod(
143143
definition = function (object, ...) {
144144
object@env$.gnsi <- TRUE
145145
pompLoad_internal(object@env$object,...)
146-
})
146+
}
147+
)
147148

148149
##' @rdname load
149150
##' @export
@@ -153,4 +154,5 @@ setMethod(
153154
definition = function (object, ...) {
154155
object@env$.gnsi <- TRUE
155156
pompUnload_internal(object@env$object,...)
156-
})
157+
}
158+
)

R/pfilter.R

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ setMethod(
125125
signature=signature(data="data.frame"),
126126
definition=function (
127127
data,
128-
Np,
129128
...,
129+
Np,
130130
params, rinit, rprocess, dmeasure,
131131
pred.mean = FALSE,
132132
pred.var = FALSE,
@@ -201,8 +201,9 @@ setMethod(
201201
"pfilter",
202202
signature=signature(data="pfilterd_pomp"),
203203
function (
204-
data, Np,
204+
data,
205205
...,
206+
Np,
206207
verbose = getOption("verbose", FALSE)
207208
) {
208209

@@ -214,8 +215,7 @@ setMethod(
214215
)
215216

216217
pfilter_internal <- function (
217-
object, Np,
218-
...,
218+
object, ..., Np,
219219
pred.mean = FALSE, pred.var = FALSE, filter.mean = FALSE,
220220
filter.traj = FALSE, cooling, cooling.m,
221221
save.states = c("no", "filter", "prediction",

R/pmcmc.R

+5-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,11 @@ setMethod(
222222
setMethod(
223223
"continue",
224224
signature=signature(object="pmcmcd_pomp"),
225-
function (object, Nmcmc = 1, ...) {
225+
function (
226+
object,
227+
...,
228+
Nmcmc = 1
229+
) {
226230

227231
ndone <- object@Nmcmc
228232
accepts <- object@accepts

R/wpfilter.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ setMethod(
8383
signature=signature(data="data.frame"),
8484
definition=function (
8585
data,
86-
Np,
8786
...,
87+
Np,
8888
params, rinit, rprocess, dmeasure,
8989
trigger = 1, target = 0.5,
9090
verbose = getOption("verbose", FALSE)
@@ -116,8 +116,8 @@ setMethod(
116116
signature=signature(data="pomp"),
117117
definition=function (
118118
data,
119-
Np,
120119
...,
120+
Np,
121121
trigger = 1, target = 0.5,
122122
verbose = getOption("verbose", FALSE)
123123
) {

inst/NEWS

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
_N_e_w_s _f_o_r _p_a_c_k_a_g_e '_p_o_m_p'
22

3+
_C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _6._0._2:
4+
5+
• The ‘save.states’ option to ‘pfilter’ has changed. See
6+
‘?pfilter’ and ‘?saved_states’ for details.
7+
38
_C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _6._0._1:
49

510
• In calls to ‘pomp’ elementary and inference algorithms, it is

inst/NEWS.Rd

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
\name{NEWS}
22
\title{News for package `pomp'}
3+
\section{Changes in \pkg{pomp} version 6.0.2}{
4+
\itemize{
5+
\item The \code{save.states} option to \code{pfilter} has changed.
6+
See \code{?pfilter} and \code{?saved_states} for details.
7+
}
8+
}
39
\section{Changes in \pkg{pomp} version 6.0.1}{
410
\itemize{
511
\item In calls to \pkg{pomp} elementary and inference algorithms, it is now necessary to pass all arguments by name.

man/continue.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/pfilter.Rd

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/probe.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/spect.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/wpfilter.Rd

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)