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

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

Author: kingaa
Date: 2014-03-17 17:10:44 +0100 (Mon, 17 Mar 2014)
New Revision: 893

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/R/plot-pomp.R
Log:
- minor tweak to the plot.pomp method


Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2014-03-16 22:13:37 UTC (rev 892)
+++ pkg/pomp/DESCRIPTION	2014-03-17 16:10:44 UTC (rev 893)
@@ -1,8 +1,8 @@
 Package: pomp
 Type: Package
 Title: Statistical inference for partially observed Markov processes
-Version: 0.48-1
-Date: 2014-03-16
+Version: 0.48-2
+Date: 2014-03-17
 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/plot-pomp.R
===================================================================
--- pkg/pomp/R/plot-pomp.R	2014-03-16 22:13:37 UTC (rev 892)
+++ pkg/pomp/R/plot-pomp.R	2014-03-17 16:10:44 UTC (rev 893)
@@ -6,6 +6,7 @@
                                mar = c(0, 5.1, 0, if (yax.flip) 5.1 else 2.1),
                                oma = c(6, 0, 5, 0),
                                axes = TRUE,
+                               xlabel,
                                ...) {
   X <- as(x,"data.frame")
   vars <- names(X)
@@ -25,6 +26,7 @@
     vars <- variables
     ylabels <- names(variables)
   }
+
   plotpomp <- function (x, time, 
                         xy.labels, xy.lines, panel = lines, nc, xlabel,
                         type = "l", xlim = NULL, ylim = NULL, xlab = "time",
@@ -97,7 +99,7 @@
              time=X[[tpos]],
              ylab=ylabels,
              xy.labels=FALSE,
-             xlabel=deparse(substitute(x,env=parent.frame(1))),
+             xlabel=xlabel,
              panel=panel,
              nc=nc,
              axes=axes,
@@ -118,8 +120,10 @@
                     oma = c(6, 0, 5, 0),
                     axes = TRUE,
                     ...) {
+            xlabel <- deparse(substitute(x,env=parent.frame()))
             plotpomp.internal(x=x,y=y,variables=variables,
                               panel=panel,nc=nc,yax.flip=yax.flip,
-                              mar=mar,oma=oma,axes=axes,...)
+                              mar=mar,oma=oma,axes=axes,
+                              xlabel=xlabel,...)
           }
           )