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

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

Author: kingaa
Date: 2015-03-05 14:21:07 +0100 (Thu, 05 Mar 2015)
New Revision: 1136

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/R/builder.R
   pkg/pomp/R/pomp.R
Log:
- add secret .filedir and .filename arguments to 'pomp.internal' to allow saving of C codes in arbitrary directory

Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2015-03-04 23:04:11 UTC (rev 1135)
+++ pkg/pomp/DESCRIPTION	2015-03-05 13:21:07 UTC (rev 1136)
@@ -1,8 +1,8 @@
 Package: pomp
 Type: Package
 Title: Statistical Inference for Partially Observed Markov Processes
-Version: 0.62-5
-Date: 2015-03-02
+Version: 0.62-6
+Date: 2015-03-05
 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-03-04 23:04:11 UTC (rev 1135)
+++ pkg/pomp/R/builder.R	2015-03-05 13:21:07 UTC (rev 1136)
@@ -1,8 +1,8 @@
-pompCBuilder <- function (name = NULL,
+pompCBuilder <- function (name = NULL, dir = NULL,
                           statenames, paramnames, covarnames, obsnames,
                           rmeasure, dmeasure, step.fn, skeleton,
                           parameter.transform, parameter.inv.transform,
-                          rprior, dprior, globals, dir = NULL,
+                          rprior, dprior, globals,
                           verbose = getOption("verbose",FALSE))
 {
 

Modified: pkg/pomp/R/pomp.R
===================================================================
--- pkg/pomp/R/pomp.R	2015-03-04 23:04:11 UTC (rev 1135)
+++ pkg/pomp/R/pomp.R	2015-03-05 13:21:07 UTC (rev 1136)
@@ -9,7 +9,8 @@
                               obsnames, statenames, paramnames, covarnames,
                               zeronames, PACKAGE,
                               parameter.transform, parameter.inv.transform,
-                              globals, userdata, ..., .solibfile,
+                              globals, userdata, ...,
+                              .solibfile, .filename, .filedir,
                               verbose = getOption("verbose",FALSE)) {
 
   ## preliminary error checking
@@ -18,6 +19,8 @@
   if (missing(t0)) stop(sQuote("t0")," is a required argument")
   if (missing(params)) params <- numeric(0)
   if (missing(.solibfile)) .solibfile <- list()
+  if (missing(.filename)) .filename <- NULL
+  if (missing(.filedir)) .filedir <- NULL
   
   if (missing(userdata)) userdata <- list()
   added.userdata <- list(...)
@@ -144,6 +147,8 @@
                                   paramnames=paramnames,
                                   covarnames=covarnames,
                                   globals=globals,
+                                  name=.filename,
+                                  dir=.filedir,
                                   verbose=verbose
                                   ),
                              snips