[Pomp-commits] r885 - pkg/pomp/tests

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

Author: kingaa
Date: 2014-02-03 23:32:56 +0100 (Mon, 03 Feb 2014)
New Revision: 885

Modified:
   pkg/pomp/tests/steps.R
   pkg/pomp/tests/steps.Rout.save
Log:
- modify this test for compatibility with R/devel


Modified: pkg/pomp/tests/steps.R
===================================================================
--- pkg/pomp/tests/steps.R	2014-02-02 17:11:31 UTC (rev 884)
+++ pkg/pomp/tests/steps.R	2014-02-03 22:32:56 UTC (rev 885)
@@ -14,4 +14,4 @@
 tm <- sort(runif(n=100,max=1))
 x <- trajectory(verhulst,times=tm)["n",,]
 y <- simulate(verhulst,times=tm,states=TRUE)["n",,]
-table(cut(x-y,breaks=10))
+table(cut(x-y,breaks=c(-Inf,seq(-0.2,0.2,by=0.01),Inf),ordered=T))

Modified: pkg/pomp/tests/steps.Rout.save
===================================================================
--- pkg/pomp/tests/steps.Rout.save	2014-02-02 17:11:31 UTC (rev 884)
+++ pkg/pomp/tests/steps.Rout.save	2014-02-03 22:32:56 UTC (rev 885)
@@ -38,15 +38,27 @@
 > tm <- sort(runif(n=100,max=1))
 > x <- trajectory(verhulst,times=tm)["n",,]
 > y <- simulate(verhulst,times=tm,states=TRUE)["n",,]
-> table(cut(x-y,breaks=10))
+> table(cut(x-y,breaks=c(-Inf,seq(-0.2,0.2,by=0.01),Inf),ordered=T))
 
-(0.000885,0.0115]   (0.0115,0.0222]   (0.0222,0.0328]   (0.0328,0.0434] 
-               13                14                16                 8 
-  (0.0434,0.0541]   (0.0541,0.0647]   (0.0647,0.0753]    (0.0753,0.086] 
-                9                11                 7                 4 
-   (0.086,0.0966]    (0.0966,0.107] 
-               10                 8 
+  (-Inf,-0.2]  (-0.2,-0.19] (-0.19,-0.18] (-0.18,-0.17] (-0.17,-0.16] 
+            0             0             0             0             0 
+(-0.16,-0.15] (-0.15,-0.14] (-0.14,-0.13] (-0.13,-0.12] (-0.12,-0.11] 
+            0             0             0             0             0 
+ (-0.11,-0.1]  (-0.1,-0.09] (-0.09,-0.08] (-0.08,-0.07] (-0.07,-0.06] 
+            0             0             0             0             0 
+(-0.06,-0.05] (-0.05,-0.04] (-0.04,-0.03] (-0.03,-0.02] (-0.02,-0.01] 
+            0             0             0             0             0 
+    (-0.01,0]      (0,0.01]   (0.01,0.02]   (0.02,0.03]   (0.03,0.04] 
+            0            13            11            11             8 
+  (0.04,0.05]   (0.05,0.06]   (0.06,0.07]   (0.07,0.08]   (0.08,0.09] 
+           13            13             8             3             3 
+   (0.09,0.1]    (0.1,0.11]   (0.11,0.12]   (0.12,0.13]   (0.13,0.14] 
+           11             6             0             0             0 
+  (0.14,0.15]   (0.15,0.16]   (0.16,0.17]   (0.17,0.18]   (0.18,0.19] 
+            0             0             0             0             0 
+   (0.19,0.2]    (0.2, Inf] 
+            0             0 
 > 
 > proc.time()
    user  system elapsed 
-  0.516   0.056   0.583 
+  0.516   0.052   0.581