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

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

Author: kingaa
Date: 2015-02-22 23:49:30 +0100 (Sun, 22 Feb 2015)
New Revision: 1090

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/NAMESPACE
   pkg/pomp/R/mif-methods.R
   pkg/pomp/R/pmcmc-methods.R
Log:
- remove deprecated 'compare.mif' and 'compare.pmcmc' methods
- make package Description conform to standard.
- register S3 method 'as.data.frame' for 'pomp' and 'pfilterd.pomp' objects

Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2015-02-22 19:43:39 UTC (rev 1089)
+++ pkg/pomp/DESCRIPTION	2015-02-22 22:49:30 UTC (rev 1090)
@@ -17,7 +17,7 @@
 	  person(given=c("Simon","N."),family="Wood",role=c("ctb"))
 	  )
 URL: http://pomp.r-forge.r-project.org
-Description: Inference methods for partially observed Markov processes (AKA stochastic dynamical systems, state-space models)
+Description: Inference methods for partially observed Markov processes (AKA stochastic dynamical systems, state-space models).
 Depends: R(>= 3.0.0), methods, subplex, nloptr
 Imports: stats, graphics, mvtnorm, deSolve, coda
 License: GPL(>= 2)

Modified: pkg/pomp/NAMESPACE
===================================================================
--- pkg/pomp/NAMESPACE	2015-02-22 19:43:39 UTC (rev 1089)
+++ pkg/pomp/NAMESPACE	2015-02-22 22:49:30 UTC (rev 1090)
@@ -73,9 +73,10 @@
               traj.match
               )
 
+S3method(as.data.frame,pomp)
+S3method(as.data.frame,pfilterd.pomp)
+
 export(
-       as.data.frame.pomp,
-       as.data.frame.pfilterd.pomp,
        Csnippet,
        reulermultinom,
        deulermultinom,
@@ -92,7 +93,6 @@
        profileDesign,
        bspline.basis,
        periodic.bspline.basis,
-       compare.mif,
        parmat,
        logmeanexp,
        probe.mean,

Modified: pkg/pomp/R/mif-methods.R
===================================================================
--- pkg/pomp/R/mif-methods.R	2015-02-22 19:43:39 UTC (rev 1089)
+++ pkg/pomp/R/mif-methods.R	2015-02-22 22:49:30 UTC (rev 1090)
@@ -208,11 +208,6 @@
   }
 }
 
-compare.mif <- function (z) {
-  stop(sQuote("compare.mif")," has been deprecated in favor of ",
-       sQuote("plot"))
-}
-
 mif.diagnostics <- function (z) {
   ## assumes that z is a list of mifs with identical structure
   mar.multi <- c(0,5.1,0,2.1)

Modified: pkg/pomp/R/pmcmc-methods.R
===================================================================
--- pkg/pomp/R/pmcmc-methods.R	2015-02-22 19:43:39 UTC (rev 1089)
+++ pkg/pomp/R/pmcmc-methods.R	2015-02-22 22:49:30 UTC (rev 1090)
@@ -167,13 +167,3 @@
   }
   invisible(NULL)
 }
-
-compare.pmcmc <- function (z) {
-  if (!is.list(z)) z <- list(z)
-  if (!all(sapply(z,function(x)is(x,'pmcmc'))))
-    stop("compare.pmcmc error: ",sQuote("z"),
-         " must be a pmcmc object or a list of pmcmc objects",call.=FALSE)
-  warning(sQuote("compare.pmcmc")," is deprecated.\n",
-          "Use ",sQuote("diagnostics")," instead.",call.=FALSE)
-  pmcmc.diagnostics(z)
-}