[Pomp-commits] r1158 - in pkg/pompExamples: . inst/examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun May 24 19:24:31 CEST 2015
Author: kingaa
Date: 2015-05-24 19:24:31 +0200 (Sun, 24 May 2015)
New Revision: 1158
Modified:
pkg/pompExamples/DESCRIPTION
pkg/pompExamples/inst/examples/ebola.R
Log:
- add R-Forge to 'Additional_repositories' field.
- fix const declarations in Ebola example that give warnings
Modified: pkg/pompExamples/DESCRIPTION
===================================================================
--- pkg/pompExamples/DESCRIPTION 2015-05-22 17:40:16 UTC (rev 1157)
+++ pkg/pompExamples/DESCRIPTION 2015-05-24 17:24:31 UTC (rev 1158)
@@ -2,7 +2,7 @@
Type: Package
Title: Additional pomp examples
Version: 0.27-2
-Date: 2015-05-22
+Date: 2015-05-24
Maintainer: Aaron A. King <kingaa at umich.edu>
Authors at R: c(person(given=c("Aaron","A."),family="King",role=c("aut","cre"),
email="kingaa at umich.edu"),
@@ -19,6 +19,7 @@
Depends: R(>= 3.0.0), stats, graphics, pomp(>= 0.58-6)
Suggests: plyr, reshape2, ggplot2, knitr, markdown
LinkingTo: pomp
+Additional_repositories: http://r-forge.r-rproject.org
License: GPL (>= 2)
LazyData: false
BuildVignettes: true
Modified: pkg/pompExamples/inst/examples/ebola.R
===================================================================
--- pkg/pompExamples/inst/examples/ebola.R 2015-05-22 17:40:16 UTC (rev 1157)
+++ pkg/pompExamples/inst/examples/ebola.R 2015-05-24 17:24:31 UTC (rev 1158)
@@ -55,7 +55,7 @@
paruntrans <- Csnippet('
- double *IC = &S_0;
+ const double *IC = &S_0;
double *TIC = &TS_0;
TN = log(N);
TR0 = log(R0);
@@ -68,7 +68,7 @@
')
partrans <- Csnippet('
- double *IC = &S_0;
+ const double *IC = &S_0;
double *TIC = &TS_0;
TN = exp(N);
TR0 = exp(R0);
@@ -146,7 +146,7 @@
skel <- Csnippet('
double lambda, beta;
- double *E = &E1;
+ const double *E = &E1;
double *DE = &DE1;
beta = R0 * gamma; // Transmission rate
lambda = beta * I / N; // Force of infection
More information about the pomp-commits
mailing list