[Pomp-commits] r937 - www/vignettes

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

Author: kingaa
Date: 2014-04-24 00:24:34 +0200 (Thu, 24 Apr 2014)
New Revision: 937

Modified:
   www/vignettes/advanced_topics_in_pomp.R
   www/vignettes/advanced_topics_in_pomp.Rnw
   www/vignettes/advanced_topics_in_pomp.pdf
   www/vignettes/pomp.pdf
Log:
- small fix


Modified: www/vignettes/advanced_topics_in_pomp.R
===================================================================
--- www/vignettes/advanced_topics_in_pomp.R	2014-04-23 19:56:17 UTC (rev 936)
+++ www/vignettes/advanced_topics_in_pomp.R	2014-04-23 22:24:34 UTC (rev 937)
@@ -256,27 +256,8 @@
 }
 
 
-## ----sir-sim,eval=F------------------------------------------------------
-## 
-## coef(sir) <- c(
-##                gamma=26,mu=0.02,iota=0.01,
-##                beta1=400,beta2=480,beta3=320,
-##                beta.sd=0.001,
-##                popsize=2.1e6,
-##                rho=0.6,theta=10,
-##                S.0=26/400,I.0=0.001,R.0=1
-##                )
-## 
-## sir <- simulate(sir,seed=3493885L)
-## traj <- trajectory(sir,hmax=1/52)
-## 
+## ----sir-sim,eval=T------------------------------------------------------
 
-## ----sir-sim-eval,echo=F,eval=T------------------------------------------
-binary.file <- "sim-sim.rda"
-if (file.exists(binary.file)) {
-  load(binary.file)
-} else {
-
 coef(sir) <- c(
                gamma=26,mu=0.02,iota=0.01,
                beta1=400,beta2=480,beta3=320,
@@ -289,8 +270,6 @@
 sir <- simulate(sir,seed=3493885L)
 traj <- trajectory(sir,hmax=1/52)
 
-  save(sir,traj,file=binary.file,compress='xz')
-}
 
 
 ## ----sir-plot,fig=T,echo=F-----------------------------------------------

Modified: www/vignettes/advanced_topics_in_pomp.Rnw
===================================================================
--- www/vignettes/advanced_topics_in_pomp.Rnw	2014-04-23 19:56:17 UTC (rev 936)
+++ www/vignettes/advanced_topics_in_pomp.Rnw	2014-04-23 22:24:34 UTC (rev 937)
@@ -329,7 +329,7 @@
 @ 
 
 Let's specify some parameters, simulate, and compute a deterministic trajectory:
-<<sir-sim,eval=F>>=
+<<sir-sim,eval=T>>=
 
 coef(sir) <- c(
                gamma=26,mu=0.02,iota=0.01,
@@ -343,14 +343,6 @@
 sir <- simulate(sir,seed=3493885L)
 traj <- trajectory(sir,hmax=1/52)
 
-<<sir-sim-eval,echo=F,eval=T>>=
-binary.file <- "sim-sim.rda"
-if (file.exists(binary.file)) {
-  load(binary.file)
-} else {
-<<sir-sim>>
-  save(sir,traj,file=binary.file,compress='xz')
-}
 @ 
 
 \begin{figure}

Modified: www/vignettes/advanced_topics_in_pomp.pdf
===================================================================
(Binary files differ)

Modified: www/vignettes/pomp.pdf
===================================================================
(Binary files differ)