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

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

Author: kingaa
Date: 2011-05-09 19:34:56 +0200 (Mon, 09 May 2011)
New Revision: 459

Modified:
   pkg/DESCRIPTION
   pkg/R/simulate-pomp.R
   pkg/R/trajectory-pomp.R
Log:
- remove the warnings that were added in 0.34-1 regarding changed default behavior of 'simulate' and 'trajectory'


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2011-05-05 16:57:49 UTC (rev 458)
+++ pkg/DESCRIPTION	2011-05-09 17:34:56 UTC (rev 459)
@@ -1,8 +1,8 @@
 Package: pomp
 Type: Package
 Title: Statistical inference for partially observed Markov processes
-Version: 0.36-7
-Date: 2011-05-05
+Version: 0.37-1
+Date: 2011-05-09
 Author: Aaron A. King, Edward L. Ionides, Carles Breto, Steve Ellner, Bruce Kendall, Helen Wearing, 
 	Matthew J. Ferrari, Michael Lavine, Daniel C. Reuman
 Maintainer: Aaron A. King <kingaa at umich.edu>

Modified: pkg/R/simulate-pomp.R
===================================================================
--- pkg/R/simulate-pomp.R	2011-05-05 16:57:49 UTC (rev 458)
+++ pkg/R/simulate-pomp.R	2011-05-09 17:34:56 UTC (rev 459)
@@ -3,15 +3,6 @@
 simulate.internal <- function (object, nsim = 1, seed = NULL, params,
                                states = FALSE, obs = FALSE,
                                times, t0, ...) {
-  warn.condition <- (missing(t0) && ((obs || states) || (!missing(times))))
-  if (warn.condition) 
-    warning(
-            "The default behavior of ",sQuote("simulate")," has changed.\n",
-            "See the documentation (",dQuote("pomp?simulate"),") for details\n",
-            "and set the ",sQuote("times")," and ",sQuote("t0"),
-            " arguments appropriately to compensate.\n",
-            call.=FALSE
-            )
 
   if (missing(times))
     times <- time(object,t0=FALSE)

Modified: pkg/R/trajectory-pomp.R
===================================================================
--- pkg/R/trajectory-pomp.R	2011-05-05 16:57:49 UTC (rev 458)
+++ pkg/R/trajectory-pomp.R	2011-05-09 17:34:56 UTC (rev 459)
@@ -5,16 +5,6 @@
 
 trajectory.internal <- function (object, params, times, t0, ...) {
 
-  warn.condition <- missing(t0)
-  if (warn.condition) 
-    warning(
-            "The default behavior of ",sQuote("trajectory")," has changed.\n",
-            "See the documentation (",dQuote("pomp?trajectory"),") for details\n",
-            "and set the ",sQuote("times")," and ",sQuote("t0"),
-            " arguments appropriately to compensate.\n",
-            call.=FALSE
-            )
-
   if (missing(times))
     times <- time(object,t0=FALSE)
   else