[Pomp-commits] r65 - in pkg: . R inst inst/examples man

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

Author: kingaa
Date: 2009-01-27 15:35:56 +0100 (Tue, 27 Jan 2009)
New Revision: 65

Modified:
   pkg/DESCRIPTION
   pkg/R/plot-pomp.R
   pkg/inst/ChangeLog
   pkg/inst/examples/sir.R
   pkg/man/pomp-methods.Rd
Log:
add package 'subplex' as dependency
run examples that compile native code only if Sys.info()['sysname']=='Linux'.  This replaces the previous test that .Platform$OS.type=='unix', which resulted in errors under some versions of MacOSX.

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-01-27 14:16:10 UTC (rev 64)
+++ pkg/DESCRIPTION	2009-01-27 14:35:56 UTC (rev 65)
@@ -1,11 +1,11 @@
 Package: pomp
 Type: Package
 Title: Statistical inference for partially observed Markov processes
-Version: 0.22-2
-Date: 2009-01-25
+Version: 0.22-3
+Date: 2009-01-27
 Author: Aaron A. King, Edward L. Ionides, Carles Martinez Breto, Steve Ellner, Bruce Kendall
 Maintainer: Aaron A. King <kingaa at umich.edu>
 Description: Inference methods for partially-observed Markov processes
-Depends: R(>= 2.6.1), stats, methods, graphics, odesolve
+Depends: R(>= 2.6.1), stats, methods, graphics, odesolve, subplex
 License: GPL (>= 2)
 LazyLoad: true

Modified: pkg/R/plot-pomp.R
===================================================================
--- pkg/R/plot-pomp.R	2009-01-27 14:16:10 UTC (rev 64)
+++ pkg/R/plot-pomp.R	2009-01-27 14:35:56 UTC (rev 65)
@@ -1,5 +1,3 @@
-## plot pomp object
-
 setMethod(
           "plot",
           "pomp",
@@ -8,11 +6,11 @@
                     panel = lines,
                     nc = NULL,
                     yax.flip = FALSE,
-                    mar = c(0, 5.1, 0, if(yax.flip) 5.1 else 2.1),
+                    mar = c(0, 5.1, 0, if (yax.flip) 5.1 else 2.1),
                     oma = c(6, 0, 5, 0),
                     axes = TRUE,
                     ...) {
-            X <- as(x,'data.frame')
+            X <- as(x,"data.frame")
             vars <- names(X)
             tpos <- match("time",vars)
             if (is.na(tpos))

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2009-01-27 14:16:10 UTC (rev 64)
+++ pkg/inst/ChangeLog	2009-01-27 14:35:56 UTC (rev 65)
@@ -1,3 +1,7 @@
+2009-01-27  kingaa
+
+	* [r64] inst/ChangeLog:
+
 2009-01-26  kingaa
 
 	* [r62] inst/ChangeLog:

Modified: pkg/inst/examples/sir.R
===================================================================
--- pkg/inst/examples/sir.R	2009-01-27 14:16:10 UTC (rev 64)
+++ pkg/inst/examples/sir.R	2009-01-27 14:35:56 UTC (rev 65)
@@ -125,7 +125,7 @@
 ## alternatively, one can define the computationally intensive bits using native routines:
 ## the C codes "sir_euler_simulator" and "sir_euler_density" are included in the "examples" directory (file "sir.c")
 
-if (.Platform$OS.type=='unix') {
+if (Sys.info()['sysname']=='Linux') {
 
   modelfile <- system.file("examples/sir.c",package="pomp")
   includedir <- system.file("include",package="pomp")

Modified: pkg/man/pomp-methods.Rd
===================================================================
--- pkg/man/pomp-methods.Rd	2009-01-27 14:16:10 UTC (rev 64)
+++ pkg/man/pomp-methods.Rd	2009-01-27 14:35:56 UTC (rev 65)
@@ -37,7 +37,7 @@
 \S4method{print}{pomp}(x, \dots)
 \S4method{plot}{pomp}(x, y = NULL, variables, panel = lines,
       nc = NULL, yax.flip = FALSE,
-      mar = c(0, 5.1, 0, if(yax.flip) 5.1 else 2.1),
+      mar = c(0, 5.1, 0, if (yax.flip) 5.1 else 2.1),
       oma = c(6, 0, 5, 0), axes = TRUE, \dots)
 }
 \arguments{