[Pomp-commits] r1195 - in pkg/pomp: . tests

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

Author: kingaa
Date: 2015-06-08 01:51:14 +0200 (Mon, 08 Jun 2015)
New Revision: 1195

Modified:
   pkg/pomp/DESCRIPTION
   pkg/pomp/tests/ou2-mif2.R
   pkg/pomp/tests/ou2-mif2.Rout.save
   pkg/pomp/tests/ou2-pmcmc.R
   pkg/pomp/tests/ou2-pmcmc.Rout.save
Log:
- update tests

Modified: pkg/pomp/DESCRIPTION
===================================================================
--- pkg/pomp/DESCRIPTION	2015-06-07 23:51:07 UTC (rev 1194)
+++ pkg/pomp/DESCRIPTION	2015-06-07 23:51:14 UTC (rev 1195)
@@ -1,7 +1,7 @@
 Package: pomp
 Type: Package
 Title: Statistical Inference for Partially Observed Markov Processes
-Version: 0.66-8
+Version: 0.66-9
 Date: 2015-06-07
 Authors at R: c(person(given=c("Aaron","A."),family="King",
 		role=c("aut","cre"),email="kingaa at umich.edu"),

Modified: pkg/pomp/tests/ou2-mif2.R
===================================================================
--- pkg/pomp/tests/ou2-mif2.R	2015-06-07 23:51:07 UTC (rev 1194)
+++ pkg/pomp/tests/ou2-mif2.R	2015-06-07 23:51:14 UTC (rev 1195)
@@ -131,7 +131,7 @@
            rw.sd=rw.sd(
              x1.0=c(0.5,rep(0.2,99)),
              x2.0=ivp(0.5),
-             alpha.2=if (time==1) 0.2 else 0.1,
+             alpha.2=ifelse(time==1,0.2,0.1),
              alpha.3=0.2*(time<10)))
 
 dev.off()

Modified: pkg/pomp/tests/ou2-mif2.Rout.save
===================================================================
--- pkg/pomp/tests/ou2-mif2.Rout.save	2015-06-07 23:51:07 UTC (rev 1194)
+++ pkg/pomp/tests/ou2-mif2.Rout.save	2015-06-07 23:51:14 UTC (rev 1195)
@@ -170,11 +170,8 @@
 +            rw.sd=rw.sd(
 +              x1.0=c(0.5,rep(0.2,99)),
 +              x2.0=ivp(0.5),
-+              alpha.2=if (time==1) 0.2 else 0.1,
++              alpha.2=ifelse(time==1,0.2,0.1),
 +              alpha.3=0.2*(time<10)))
-Warning message:
-In if (time == 1) 0.2 else 0.1 :
-  the condition has length > 1 and only the first element will be used
 > 
 > dev.off()
 null device 
@@ -182,4 +179,4 @@
 > 
 > proc.time()
    user  system elapsed 
- 65.808   0.092  66.257 
+ 65.656   0.092  66.121 

Modified: pkg/pomp/tests/ou2-pmcmc.R
===================================================================
--- pkg/pomp/tests/ou2-pmcmc.R	2015-06-07 23:51:07 UTC (rev 1194)
+++ pkg/pomp/tests/ou2-pmcmc.R	2015-06-07 23:51:14 UTC (rev 1195)
@@ -1,5 +1,7 @@
 library(pomp)
 
+set.seed(1178744046L)
+
 pompExample(ou2)
 
 dprior.ou2 <- function (params, log, ...) {

Modified: pkg/pomp/tests/ou2-pmcmc.Rout.save
===================================================================
--- pkg/pomp/tests/ou2-pmcmc.Rout.save	2015-06-07 23:51:07 UTC (rev 1194)
+++ pkg/pomp/tests/ou2-pmcmc.Rout.save	2015-06-07 23:51:14 UTC (rev 1195)
@@ -17,6 +17,8 @@
 
 > library(pomp)
 > 
+> set.seed(1178744046L)
+> 
 > pompExample(ou2)
 newly created object(s):
  ou2 
@@ -136,4 +138,4 @@
 > 
 > proc.time()
    user  system elapsed 
- 23.849   0.080  24.151 
+ 23.761   0.072  24.043