[Pomp-commits] r358 - in pkg: . R

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

Author: kingaa
Date: 2010-10-04 18:07:03 +0200 (Mon, 04 Oct 2010)
New Revision: 358

Removed:
   pkg/R/euler.R
Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
Log:

- remove the functions 'euler.simulate', 'onestep.simulate', and 'onestep.density', deprecated since version 0.29-1


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-10-04 16:01:58 UTC (rev 357)
+++ pkg/DESCRIPTION	2010-10-04 16:07:03 UTC (rev 358)
@@ -13,7 +13,7 @@
 License: GPL(>= 2)
 LazyLoad: true
 LazyData: false
-Collate: aaa.R eulermultinom.R euler.R plugins.R 
+Collate: aaa.R eulermultinom.R plugins.R 
 	 slice-design.R profile-design.R sobol.R bsplines.R 
 	 pomp-fun.R pomp.R pomp-methods.R rmeasure-pomp.R rprocess-pomp.R init-state-pomp.R 
 	 dmeasure-pomp.R dprocess-pomp.R skeleton-pomp.R simulate-pomp.R trajectory-pomp.R plot-pomp.R 

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2010-10-04 16:01:58 UTC (rev 357)
+++ pkg/NAMESPACE	2010-10-04 16:07:03 UTC (rev 358)
@@ -50,9 +50,6 @@
        as.data.frame.pomp,
        reulermultinom,
        deulermultinom,
-       euler.simulate,
-       onestep.simulate,
-       onestep.density,
        euler.sim,
        discrete.time.sim,
        onestep.sim,

Deleted: pkg/R/euler.R
===================================================================
--- pkg/R/euler.R	2010-10-04 16:01:58 UTC (rev 357)
+++ pkg/R/euler.R	2010-10-04 16:07:03 UTC (rev 358)
@@ -1,93 +0,0 @@
-onestep.simulate <- function (xstart, times, params,
-                              step.fun, ...,
-                              statenames = character(0),
-                              paramnames = character(0),
-                              covarnames = character(0),
-                              zeronames = character(0),
-                              tcovar, covar, PACKAGE)
-{
-  .Deprecated(new="onestep.sim",package="pomp")
-  efun <- pomp.fun(
-                   f=step.fun,
-                   PACKAGE=PACKAGE,
-                   proto=quote(step.fun(x,t,params,delta.t,...))
-                   )
-  .Call(
-        euler_model_simulator,
-        func=efun,
-        xstart=xstart,
-        times=times,
-        params=params,
-        dt=0,
-        method=1L,
-        statenames=statenames,
-        paramnames=paramnames,
-        covarnames=covarnames,
-        zeronames=zeronames,
-        tcovar=tcovar,
-        covar=covar,
-        args=pairlist(...)
-        )
-}
-
-euler.simulate <- function (xstart, times, params,
-                            step.fun, delta.t, ...,
-                            statenames = character(0),
-                            paramnames = character(0),
-                            covarnames = character(0),
-                            zeronames = character(0),
-                            tcovar, covar, PACKAGE)
-{
-  .Deprecated(new="euler.sim",package="pomp")
-  efun <- pomp.fun(
-                   f=step.fun,
-                   PACKAGE=PACKAGE,
-                   proto=quote(step.fun(x,t,params,delta.t,...))
-                   )
-  .Call(
-        euler_model_simulator,
-        func=efun,
-        xstart=xstart,
-        times=times,
-        params=params,
-        dt=delta.t,
-        method=0L,
-        statenames=statenames,
-        paramnames=paramnames,
-        covarnames=covarnames,
-        zeronames=zeronames,
-        tcovar=tcovar,
-        covar=covar,
-        args=pairlist(...)
-        )
-}
-
-onestep.density <- function (x, times, params,
-                             dens.fun, ...,
-                             statenames = character(0),
-                             paramnames = character(0),
-                             covarnames = character(0),
-                             tcovar, covar, log = FALSE,
-                             PACKAGE)
-{
-  .Deprecated(new="onestep.dens",package="pomp")
-  efun <- pomp.fun(
-                   f=dens.fun,
-                   PACKAGE=PACKAGE,
-                   proto=quote(dens.fun(x1,x2,t1,t2,params,...))
-                   )
-  .Call(
-        euler_model_density,
-        efun,
-        x,
-        times,
-        params,
-        statenames,
-        paramnames,
-        covarnames,
-        tcovar,
-        covar,
-        log,
-        args=pairlist(...)
-        )
-}