[Pomp-commits] r416 - in pkg: . R inst/doc

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

Author: kingaa
Date: 2010-11-10 00:55:50 +0100 (Wed, 10 Nov 2010)
New Revision: 416

Modified:
   pkg/DESCRIPTION
   pkg/R/traj-match.R
   pkg/inst/doc/advanced_topics_in_pomp.pdf
   pkg/inst/doc/intro_to_pomp.pdf
Log:
- revert version dependence to R>=2.10.1
- fix bug in 'traj.match'


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-11-09 19:07:29 UTC (rev 415)
+++ pkg/DESCRIPTION	2010-11-09 23:55:50 UTC (rev 416)
@@ -8,7 +8,7 @@
 Maintainer: Aaron A. King <kingaa at umich.edu>
 URL: http://pomp.r-forge.r-project.org
 Description: Inference methods for partially-observed Markov processes
-Depends: R(>= 2.11.1), stats, methods, graphics
+Depends: R(>= 2.10.1), stats, methods, graphics
 Imports: mvtnorm, subplex, deSolve
 License: GPL(>= 2)
 LazyLoad: true

Modified: pkg/R/traj-match.R
===================================================================
--- pkg/R/traj-match.R	2010-11-09 19:07:29 UTC (rev 415)
+++ pkg/R/traj-match.R	2010-11-09 23:55:50 UTC (rev 416)
@@ -107,7 +107,10 @@
 
   }
 
-  obj at states <- trajectory(obj,t0=t0)[,1,]
+  ## fill 'states' slot of returned object with the trajectory
+  x <- trajectory(obj,t0=t0)
+  obj at states <- array(data=x,dim=dim(x)[c(1,3)])
+  rownames(obj at states) <- rownames(x)
   
   new(
       "traj.matched.pomp",

Modified: pkg/inst/doc/advanced_topics_in_pomp.pdf
===================================================================
(Binary files differ)

Modified: pkg/inst/doc/intro_to_pomp.pdf
===================================================================
(Binary files differ)