[Pomp-commits] r16 - pkg/R

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

Author: kingaa
Date: 2008-07-25 12:03:26 +0200 (Fri, 25 Jul 2008)
New Revision: 16

Modified:
   pkg/R/aaa.R
Log:
remove a whole lot of stuff that somehow got in from pomp.devel

Modified: pkg/R/aaa.R
===================================================================
--- pkg/R/aaa.R	2008-07-25 10:02:49 UTC (rev 15)
+++ pkg/R/aaa.R	2008-07-25 10:03:26 UTC (rev 16)
@@ -128,70 +128,3 @@
 states <- function (object, ...)
   stop("function ",sQuote("states")," is undefined for objects of class ",sQuote(class(object)))
 setGeneric('states')
-
-bsmc <- function (object, ...)
-  stop("function ",sQuote("bsmc")," is undefined for objects of class ",sQuote(class(object)))
-setGeneric('bsmc')
-
-#lpspomp and pmpomp class
-lpspomp <- function (object, ...)
-  stop("function ",sQuote("lpspomp")," is undefined for objects of class ",sQuote(class(object)))
-setGeneric('lpspomp')
-
-pmpomp <- function (object, ...)
-  stop("function ",sQuote("pmpomp")," is undefined for objects of class ",sQuote(class(object)))
-setGeneric('pmpomp')
-
-distance.hist <- function (object, ...)
-  stop("function ",sQuote("distance.hist")," is undefined for objects of class ",sQuote(class(object)))
-setGeneric('distance.hist')
-
-r.hist <- function (object, ...)
-  stop("function ",sQuote("r.hist")," is undefined for objects of class ",sQuote(class(object)))
-setGeneric('r.hist')
-
-sensitivity.spectrum.fit <- function (object, ...)
-  stop("function ",sQuote("sensitivity.spectrum.fit")," is undefined for objects of class ",sQuote(class(object)))
-setGeneric('sensitivity.spectrum.fit')
-
-# The class "lpspomp" (log power spectrum pomp). Its parts are:
-# 1) A pomp, with filled "params" and "initializer" slots
-# 2) Log power spectra of simulated time series
-# 3) Log power spectra of data time series
-# 4) The p-value for the "spectrum distance fit test"
-# 5) The p-value for the "spectrum shape fit test"
-# 6) The kernel width used for spectrum smoothing
-# 7) Specifies the scale to which simulations and data are converted before taking power spectra
-# 8) Specifies the kind of detrending that will be done on all time series before taking spectra
-setClass("lpspomp",
-         representation("pomp",
-                        sps="array",
-                        dps="array",
-                        L2.distance.fit="numeric",
-                        r.fit="numeric",
-                        kernel.width="numeric",
-                        tsscale="character",
-                        detrend="numeric"),
-        )
-
-# The class "pmpomp." Its parts are:
-# 1) A pomp, with certain slots filled.
-# 2) A named list of probes. These should be R functions.
-# 3) A list of optional arguments to probes.
-# 4) A matrix for which each column has probe values for simualtions.
-# Columns correspond to the probes listed in 4, and rows correspond
-# to simulations.
-# 5) A vector with entries the probe values on the data.
-# 6) A vector with entries, for each probe, the fraction of simulations
-# for which the probe is less than the value of the probe on the data.
-# 7) Same but for fractions greater than.
-setClass("pmpomp",
-         representation("pomp",
-                        probes="list",
-                        probe.opt.args="list",
-                        simvals="array",
-                        datvals="numeric",
-                        fractions.less="numeric",
-                        fractions.more="numeric"),
-        )
-