[Pomp-commits] r1191 - in pkg/pomp: . R

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

Author: kingaa
Date: 2015-06-06 17:32:30 +0200 (Sat, 06 Jun 2015)
New Revision: 1191

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/R/builder.R
Log:
- 'globals' can now be either a string or a Csnippet

Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2015-06-05 18:35:10 UTC (rev 1190)
+++ pkg/pomp/DESCRIPTION	2015-06-06 15:32:30 UTC (rev 1191)
@@ -1,8 +1,8 @@
 Package: pomp
 Type: Package
 Title: Statistical Inference for Partially Observed Markov Processes
-Version: 0.66-6
-Date: 2015-06-05
+Version: 0.66-7
+Date: 2015-06-06
 Authors at R: c(person(given=c("Aaron","A."),family="King",
 		role=c("aut","cre"),email="kingaa at umich.edu"),
 	  person(given=c("Edward","L."),family="Ionides",role=c("aut")),

Modified: pkg/pomp/R/builder.R
===================================================================
--- pkg/pomp/R/builder.R	2015-06-05 18:35:10 UTC (rev 1190)
+++ pkg/pomp/R/builder.R	2015-06-06 15:32:30 UTC (rev 1191)
@@ -10,6 +10,7 @@
   if (is.null(dir)) dir <- tempdir()
 
   if (missing(globals)) globals <- character(0)
+  if (is(globals,"Csnippet")) globals <- globals at text
 
   name <- cleanForC(name)
   statenames <- cleanForC(statenames)