Skip to content

Commit 59c16b7

Browse files
committed
update for R 4.3.3
1 parent 88c5a2a commit 59c16b7

File tree

91 files changed

+212
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+212
-614
lines changed

R/objfun.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ setIs(
7373
as(from@env$object,"pomp")
7474
},
7575
replace= function (from, to, value) {
76-
pStop(who=-2L,"cannot replace the pomp object in a stateful objective function.")
76+
pStop(who=-4L,"cannot replace the pomp object in a stateful objective function.")
7777
}
7878
)
7979

inst/doc/index.html

-410
Large diffs are not rendered by default.

tests/R_v_C.Rout

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -109,16 +109,16 @@ Type 'q()' to quit R.
109109
> ## ----comparison----------------------------------------------------------
110110
> system.time(simulate(gompertz,nsim=10000,format="arrays"))
111111
user system elapsed
112-
7.361 0.042 7.403
112+
6.806 0.114 6.921
113113
> system.time(simulate(Gompertz,nsim=10000,format="arrays"))
114114
user system elapsed
115-
0.160 0.004 0.165
115+
0.161 0.001 0.162
116116
> system.time(pfilter(gompertz,Np=1000))
117117
user system elapsed
118-
0.660 0.012 0.671
118+
0.642 0.013 0.655
119119
> system.time(pfilter(Gompertz,Np=1000))
120120
user system elapsed
121-
0.029 0.000 0.029
121+
0.029 0.001 0.029
122122
>
123123
> dev.off()
124124
null device

tests/abc.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/baddm.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/bake.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/basic_probes.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/betabinom.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/blowflies.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/bsmc2.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/bsplines1.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/bsplines2.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/concat.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/covmat.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/csnippet.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/dacca.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/defunct.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/dinit.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/dp-01.png

12 Bytes

tests/dp-02.png

-202 Bytes

tests/dp-03.png

-172 Bytes

tests/dp.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/dprocess.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/ebola.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/emeasure.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/eulermultinom.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/flow.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/gillespie.R

+5-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ bind_rows(
133133
ggplot(aes(x=time,y=value,color=model))+
134134
labs(color="",y="reports",title="comparison of implementations")+
135135
geom_line()+
136-
theme_bw()+theme(legend.position=c(0.2,0.8))
136+
theme_bw()+
137+
theme(
138+
legend.position="inside",
139+
legend.position.inside=c(0.2,0.8)
140+
)
137141

138142
try(gillespie(rate.fun=rate.fun,v=as.numeric(Vmatrix)))
139143
w <- Vmatrix

tests/gillespie.Rout.save

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -153,7 +153,11 @@ NOTE: The provided object 'nbasis' is available for use by POMP basic components
153153
+ ggplot(aes(x=time,y=value,color=model))+
154154
+ labs(color="",y="reports",title="comparison of implementations")+
155155
+ geom_line()+
156-
+ theme_bw()+theme(legend.position=c(0.2,0.8))
156+
+ theme_bw()+
157+
+ theme(
158+
+ legend.position="inside",
159+
+ legend.position.inside=c(0.2,0.8)
160+
+ )
157161
>
158162
> try(gillespie(rate.fun=rate.fun,v=as.numeric(Vmatrix)))
159163
Error : in 'gillespie': 'v' must be a matrix.

tests/gompertz.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/helpers.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/hitch.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/issue109.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/issue56.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/kalman.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/kalman2.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/link.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/load.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/logmeanexp.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/lookup.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/map.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/mcap.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/measure.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

tests/mif2.Rout.save

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
R version 4.3.2 (2023-10-31) -- "Eye Holes"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
2+
R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
44
Platform: x86_64-pc-linux-gnu (64-bit)
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.

0 commit comments

Comments
 (0)