diff --git a/.gitignore b/.gitignore index d0cb56a..92b603f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ docs/*.html /docs docs/reference/ar_compare.html *.html +/docs/articles +/docs diff --git a/R/scaling.R b/R/scaling.R index c79bb60..43c501d 100644 --- a/R/scaling.R +++ b/R/scaling.R @@ -17,11 +17,10 @@ xde_scaling_eir = function(model, N=25){ for(i in 1:N){ model$EIRpar$eir <- aEIR[i]/365 model <- ramp.xds::xds_solve_cohort(model, A=10, da=1) - XH <- model$outputs$orbits$XH[[1]] - terms <- model$outputs$orbits$terms[[1]] + XH <- get_XH(model, 1) pr_t = tail(XH$true_pr, 365); pr[i] = mean(pr_t) ni_t = tail(XH$ni, 365); ni[i]= mean(ni_t) - eir_t = tail(terms$EIR, 365); eir[i] = mean(eir_t) + eir_t = tail(XH$eir, 365); eir[i] = mean(eir_t) scaling[[i]] = list(aeir = eir_t*365, eir = eir_t, pr = pr_t, ni = ni_t) } diff --git a/_pkgdown.yml b/_pkgdown.yml index 85ce111..0cee6fa 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -62,3 +62,8 @@ reference: - xde_scaling_Z - xde_scaling_eir - xde_scaling_lambda +- title: Demography + desc: | + No methods to set subclass + contents: + - UnevenAgingMatrix diff --git a/docs/articles/Analysis.html b/docs/articles/Analysis.html index 83848d2..d9d270a 100644 --- a/docs/articles/Analysis.html +++ b/docs/articles/Analysis.html @@ -4,72 +4,84 @@ - - +