[Pomp-commits] r971 - pkg/pomp/R

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

Author: kingaa
Date: 2014-06-10 15:21:48 +0200 (Tue, 10 Jun 2014)
New Revision: 971

Modified:
   pkg/pomp/R/abc-methods.R
   pkg/pomp/R/pmcmc-methods.R
Log:
- minor tweaks to diagnostic plotting routines

Modified: pkg/pomp/R/abc-methods.R
===================================================================
--- pkg/pomp/R/abc-methods.R	2014-06-09 16:32:00 UTC (rev 970)
+++ pkg/pomp/R/abc-methods.R	2014-06-10 13:21:48 UTC (rev 971)
@@ -135,7 +135,6 @@
     oma.multi <- c(6,0,5,0)
     xx <- z[[1]]
     estnames <- pars
-    
     ## plot abc convergence diagnostics
     other.diagnostics <- c()
     plotnames <- c(other.diagnostics,estnames)
@@ -152,7 +151,7 @@
       hi <- min(low+n.per.page-1,nplots)
       for (i in seq(from=low,to=hi,by=1)) {
         n <- i-low+1
-        dat <- sapply(z,function(po,label) conv.rec(po,label),label=plotnames[i])
+        dat <- sapply(z,conv.rec,pars=plotnames[i])
         matplot(
                 y=dat, 
                 x=iteration,

Modified: pkg/pomp/R/pmcmc-methods.R
===================================================================
--- pkg/pomp/R/pmcmc-methods.R	2014-06-09 16:32:00 UTC (rev 970)
+++ pkg/pomp/R/pmcmc-methods.R	2014-06-10 13:21:48 UTC (rev 971)
@@ -135,7 +135,7 @@
     hi <- min(low+n.per.page-1,nplots)
     for (i in seq(from=low,to=hi,by=1)) {
       n <- i-low+1
-      dat <- sapply(z,function(po,label) conv.rec(po,label),label=plotnames[i])
+      dat <- sapply(z,conv.rec,pars=plotnames[i])
       matplot(
               y=dat, 
               x=iteration,