[Pomp-commits] r18 - in pkg: inst/doc tests

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

Author: kingaa
Date: 2008-07-25 12:43:02 +0200 (Fri, 25 Jul 2008)
New Revision: 18

Modified:
   pkg/inst/doc/intro_to_pomp.Rnw
   pkg/tests/ou2-mif.R
Log:
no need to include zeros in 'rw.sd'

Modified: pkg/inst/doc/intro_to_pomp.Rnw
===================================================================
--- pkg/inst/doc/intro_to_pomp.Rnw	2008-07-25 10:30:56 UTC (rev 17)
+++ pkg/inst/doc/intro_to_pomp.Rnw	2008-07-25 10:43:02 UTC (rev 18)
@@ -367,9 +367,7 @@
            pars=c('alpha.1','alpha.4'),ivps=c('x1.0','x2.0'),
            rw.sd=c(
              x1.0=5,x2.0=5,
-             alpha.1=0.1,alpha.2=0,alpha.3=0,alpha.4=0.1,
-             sigma.1=0,sigma.2=0,sigma.3=0,
-             tau=0
+             alpha.1=0.1,alpha.4=0.1
              ),
            alg.pars=alg.pars,
            max.fail=100

Modified: pkg/tests/ou2-mif.R
===================================================================
--- pkg/tests/ou2-mif.R	2008-07-25 10:30:56 UTC (rev 17)
+++ pkg/tests/ou2-mif.R	2008-07-25 10:43:02 UTC (rev 18)
@@ -26,11 +26,14 @@
                pars=c('alpha.1','alpha.4'),ivps=c('x1.0','x2.0'),
                rw.sd=c(
                  x1.0=5,x2.0=5,
-                 alpha.1=0.1,alpha.2=0,alpha.3=0,alpha.4=0.1,
-                 sigma.1=0,sigma.2=0,sigma.3=0,
-                 tau=0
+                 alpha.1=0.1,alpha.4=0.1
                  ),
-               alg.pars=list(Np=1000,var.factor=1,ic.lag=10,cooling.factor=0.95),
+               alg.pars=list(
+                 Np=1000,
+                 var.factor=1,
+                 ic.lag=10,
+                 cooling.factor=0.95
+                 ),
                max.fail=100
                )
 mif.fit <- continue(mif.fit,Nmif=70,max.fail=100)