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

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

Author: kingaa
Date: 2011-10-21 09:34:50 +0200 (Fri, 21 Oct 2011)
New Revision: 563

Modified:
   pkg/DESCRIPTION
   pkg/R/nlf-objfun.R
   pkg/R/traj-match.R
Log:
- fix infelicity in 'traj.match' and 'nlf' that arises when the 'data' slot has no rownames (thanks to K. Hader) for pointing it out


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2011-10-18 10:16:48 UTC (rev 562)
+++ pkg/DESCRIPTION	2011-10-21 07:34:50 UTC (rev 563)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Statistical inference for partially observed Markov processes
 Version: 0.39-4
-Date: 2011-10-18
+Date: 2011-10-21
 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>
 URL: http://pomp.r-forge.r-project.org

Modified: pkg/R/nlf-objfun.R
===================================================================
--- pkg/R/nlf-objfun.R	2011-10-18 10:16:48 UTC (rev 562)
+++ pkg/R/nlf-objfun.R	2011-10-21 07:34:50 UTC (rev 563)
@@ -20,7 +20,7 @@
   ## Version 0.1, 3 Dec. 2007, Bruce E. Kendall & Stephen P. Ellner
   ## Version 0.2, May 2008, Stephen P. Ellner  
 
-  data.ts <- obs(object)
+  data.ts <- object at data
   
   y <- try(
            simulate(object,times=times,t0=t0,params=params,seed=seed,obs=TRUE,states=FALSE),

Modified: pkg/R/traj-match.R
===================================================================
--- pkg/R/traj-match.R	2011-10-18 10:16:48 UTC (rev 562)
+++ pkg/R/traj-match.R	2011-10-21 07:34:50 UTC (rev 563)
@@ -53,7 +53,7 @@
     X <- trajectory(object,params=params,t0=t0)
     d <- dmeasure(
                   object,
-                  y=obs(object),
+                  y=object at data,
                   x=X,
                   times=time(object),
                   params=params,