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

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

Author: kingaa
Date: 2009-01-27 19:05:41 +0100 (Tue, 27 Jan 2009)
New Revision: 67

Modified:
   pkg/DESCRIPTION
   pkg/R/trajectory-pomp.R
Log:
'odesolve' has been replaced by 'deSolve'

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-01-27 14:50:10 UTC (rev 66)
+++ pkg/DESCRIPTION	2009-01-27 18:05:41 UTC (rev 67)
@@ -6,6 +6,6 @@
 Author: Aaron A. King, Edward L. Ionides, Carles Martinez Breto, Steve Ellner, Bruce Kendall
 Maintainer: Aaron A. King <kingaa at umich.edu>
 Description: Inference methods for partially-observed Markov processes
-Depends: R(>= 2.6.1), stats, methods, graphics, odesolve, subplex
+Depends: R(>= 2.6.1), stats, methods, graphics, deSolve, subplex
 License: GPL (>= 2)
 LazyLoad: true

Modified: pkg/R/trajectory-pomp.R
===================================================================
--- pkg/R/trajectory-pomp.R	2009-01-27 14:50:10 UTC (rev 66)
+++ pkg/R/trajectory-pomp.R	2009-01-27 18:05:41 UTC (rev 67)
@@ -51,7 +51,7 @@
                                 )
                        if (inherits(X,'try-error'))
                          stop("trajectory error: error in ",sQuote("lsoda"),call.=FALSE)
-                       if (attr(X,'istate')!=2)
+                       if (attr(X,'istate')[[1]]!=2)
                          warning("abnormal exit from ",sQuote("lsoda"),", istate = ",attr(X,'istate'),call.=FALSE)
                        x[,j,] <- t(X[,-1])
                      }