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

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

Author: kingaa
Date: 2015-01-22 17:10:38 +0100 (Thu, 22 Jan 2015)
New Revision: 1052

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/R/example.R
Log:
- restore compatibility with R>=3.0.0

Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2015-01-22 16:10:34 UTC (rev 1051)
+++ pkg/pomp/DESCRIPTION	2015-01-22 16:10:38 UTC (rev 1052)
@@ -1,8 +1,8 @@
 Package: pomp
 Type: Package
 Title: Statistical Inference for Partially Observed Markov Processes
-Version: 0.58-5
-Date: 2015-01-16
+Version: 0.58-6
+Date: 2015-01-22
 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")),
@@ -18,7 +18,7 @@
 	  )
 URL: http://pomp.r-forge.r-project.org
 Description: Inference methods for partially observed Markov processes (AKA stochastic dynamical systems, state-space models)
-Depends: R(>= 3.1.2), methods, subplex, nloptr
+Depends: R(>= 3.0.0), methods, subplex, nloptr
 Imports: stats, graphics, mvtnorm, deSolve, coda
 License: GPL(>= 2)
 LazyData: true

Modified: pkg/pomp/R/example.R
===================================================================
--- pkg/pomp/R/example.R	2015-01-22 16:10:34 UTC (rev 1051)
+++ pkg/pomp/R/example.R	2015-01-22 16:10:38 UTC (rev 1052)
@@ -11,7 +11,11 @@
       print(avlbl[[dir]])
     }
   } else {
-    evalEnv <- list2env(list(...))
+## the following needed from R/3.0.0 to R/3.1.1:
+    dots <- list(...)
+    evalEnv <- if (length(dots)>0) list2env(list(...)) else new.env()
+## the following will work from R/3.1.2
+##  evalEnv <- list2env(list(...))
     file <- c(lapply(exampleDirs,list.files,
                      pattern=paste0(example,".R"),
                      full.names=TRUE),