[Pomp-commits] r684 - in pkg/pomp: R demo inst

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

Author: kingaa
Date: 2012-04-26 16:43:38 +0200 (Thu, 26 Apr 2012)
New Revision: 684

Modified:
   pkg/pomp/R/builder.R
   pkg/pomp/demo/gompertz.R
   pkg/pomp/inst/ChangeLog
Log:
- zeronames argument in 'pompBuilder' is optional


Modified: pkg/pomp/R/builder.R
===================================================================
--- pkg/pomp/R/builder.R	2012-04-26 14:41:38 UTC (rev 683)
+++ pkg/pomp/R/builder.R	2012-04-26 14:43:38 UTC (rev 684)
@@ -37,6 +37,7 @@
                         skeleton=skeleton
                         )
   if (link) pompLink(name)
+  if (missing(zeronames)) zeronames <- character(0)
   pomp(
        data=data,times=times,t0=t0,
        rprocess=euler.sim(

Modified: pkg/pomp/demo/gompertz.R
===================================================================
--- pkg/pomp/demo/gompertz.R	2012-04-26 14:41:38 UTC (rev 683)
+++ pkg/pomp/demo/gompertz.R	2012-04-26 14:43:38 UTC (rev 684)
@@ -80,7 +80,6 @@
             t0=0,
             paramnames=c("r","K","sigma","X.0","tau"),
             statenames=c("X"),
-            zeronames=character(0),
             dmeasure=dmeas,
             rmeasure=rmeas,
             step.fn=step.fn,

Modified: pkg/pomp/inst/ChangeLog
===================================================================
--- pkg/pomp/inst/ChangeLog	2012-04-26 14:41:38 UTC (rev 683)
+++ pkg/pomp/inst/ChangeLog	2012-04-26 14:43:38 UTC (rev 684)
@@ -1,3 +1,25 @@
+2012-04-26  kingaa
+
+	* [r683] DESCRIPTION, NAMESPACE, R/builder.R, data/bbs.rda,
+	  data/blowflies.rda, data/dacca.rda, data/euler.sir.rda,
+	  data/gillespie.sir.rda, data/gompertz.rda, data/ou2.rda,
+	  data/ricker.rda, data/rw2.rda, data/verhulst.rda,
+	  demo/gompertz.R, demo/logistic.R, inst/ChangeLog, inst/NEWS,
+	  inst/data-R/sir.R, inst/doc/advanced_topics_in_pomp.Rnw,
+	  inst/doc/advanced_topics_in_pomp.pdf, inst/doc/intro_to_pomp.Rnw,
+	  inst/doc/intro_to_pomp.pdf, inst/examples/gompertz.c,
+	  inst/include/pomp.h, man/builder.Rd, src/R_init_pomp.c,
+	  src/SSA_wrapper.c, src/dmeasure.c, src/euler.c, src/partrans.c,
+	  src/pomp.h, src/pomp_internal.h, src/rmeasure.c, src/sir.c,
+	  src/skeleton.c, src/userdata.c, tests/bbs.Rout.save,
+	  tests/pfilter.Rout.save, tests/skeleton.R,
+	  tests/skeleton.Rout.save: - add new facility for accessing
+	  'userdata' from within user-defined native routines:
+	  get_pomp_userdata{,_int,_double}
+	  - change some data()-loadable examples to make use of this
+	  - make 'pompBuilder' visible
+	  - modify 'gompertz' demo to make use of 'pompBuilder'
+
 2012-04-25  kingaa
 
 	* [r682] inst/doc/advanced_topics_in_pomp.Rnw: - minor tweak to