[Pomp-commits] r670 - in pkg/pomp: . data inst/data-R src

[noreply at r-forge.r-project.org]

Author: kingaa
Date: 2012-04-19 06:46:49 +0200 (Thu, 19 Apr 2012)
New Revision: 670

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/data/bbs.rda
   pkg/pomp/data/blowflies.rda
   pkg/pomp/data/dacca.rda
   pkg/pomp/data/euler.sir.rda
   pkg/pomp/data/gillespie.sir.rda
   pkg/pomp/data/gompertz.rda
   pkg/pomp/data/ou2.rda
   pkg/pomp/data/ricker.rda
   pkg/pomp/data/rw2.rda
   pkg/pomp/data/verhulst.rda
   pkg/pomp/inst/data-R/blowflies.R
   pkg/pomp/src/blowfly.c
Log:
- fix segfault bug in blowfly example when tau is NA (thanks to Greg Minshall for finding the bug)


Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2012-04-18 12:27:14 UTC (rev 669)
+++ pkg/pomp/DESCRIPTION	2012-04-19 04:46:49 UTC (rev 670)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Statistical inference for partially observed Markov processes
 Version: 0.41-6
-Date: 2012-04-16
+Date: 2012-04-18
 Revision: $Rev$
 Author: Aaron A. King, Edward L. Ionides, Carles Breto, Steve Ellner, Bruce Kendall, Helen Wearing, Matthew J. Ferrari, Michael Lavine, Daniel C. Reuman
 Maintainer: Aaron A. King <kingaa at umich.edu>

Modified: pkg/pomp/data/bbs.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/blowflies.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/dacca.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/euler.sir.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/gillespie.sir.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/gompertz.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/ou2.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/ricker.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/rw2.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/data/verhulst.rda
===================================================================
(Binary files differ)

Modified: pkg/pomp/inst/data-R/blowflies.R
===================================================================
--- pkg/pomp/inst/data-R/blowflies.R	2012-04-18 12:27:14 UTC (rev 669)
+++ pkg/pomp/inst/data-R/blowflies.R	2012-04-19 04:46:49 UTC (rev 670)
@@ -20,6 +20,7 @@
      rprocess=discrete.time.sim(
        step.fun="_blowfly_model_simulator",
        delta.t=1,
+       PACKAGE="pomp"
        ),
      paramnames=c("P","N0","delta","sigma.P","sigma.d","tau","sigma.y"),
      statenames=c("N1","R","S","e","eps"),
@@ -53,6 +54,7 @@
      rprocess=discrete.time.sim(
        step.fun="_blowfly_model_simulator",
        delta.t=2,
+       PACKAGE="pomp"
        ),
      y.init=with( ## initial data
        raw.data,

Modified: pkg/pomp/src/blowfly.c
===================================================================
--- pkg/pomp/src/blowfly.c	2012-04-18 12:27:14 UTC (rev 669)
+++ pkg/pomp/src/blowfly.c	2012-04-19 04:46:49 UTC (rev 670)
@@ -25,8 +25,13 @@
 {
   double e = rgammawn(SIGMAP,dt)/dt;
   double eps = rgammawn(SIGMAD,dt)/dt;
-  int tau = nearbyint(TAU);
+  int tau;
   int k;
+
+  if (!(R_FINITE(TAU)))
+    error("non-finite value of 'tau'");
+
+  tau = nearbyint(TAU);
   R = rpois(P*N[tau]*exp(-N[tau]/NZERO)*dt*e);
   S = rbinom(N[0],exp(-DELTA*dt*eps));
   E = e;