From 2481462820f14636ff8b203fc53148b94ab00507 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 6 Mar 2017 17:28:36 +0100 Subject: Static documentation rebuilt by pkgdown::build_site() --- .Rbuildignore | 1 + GNUmakefile | 6 ++++++ _pkgdown.yml | 9 +++++++++ docs/articles/chemCal.R | 36 ++++++++++++++++++++++++++++++++++++ docs/articles/chemCal.pdf | Bin 0 -> 165600 bytes docs/articles/index.html | 4 ++-- docs/authors.html | 4 ++-- docs/index.html | 4 ++-- docs/reference/calplot.lm.html | 4 ++-- docs/reference/chemCal-package.html | 4 ++-- docs/reference/din32645.html | 4 ++-- docs/reference/index.html | 4 ++-- docs/reference/inverse.predict.html | 4 ++-- docs/reference/lod.html | 4 ++-- docs/reference/loq.html | 4 ++-- docs/reference/massart97ex1.html | 4 ++-- docs/reference/massart97ex3.html | 4 ++-- inst/staticdocs/index.r | 18 ------------------ vignettes/chemCal.R | 36 ++++++++++++++++++++++++++++++++++++ vignettes/chemCal.pdf | Bin 0 -> 165600 bytes 20 files changed, 112 insertions(+), 42 deletions(-) create mode 100644 docs/articles/chemCal.R create mode 100644 docs/articles/chemCal.pdf delete mode 100644 inst/staticdocs/index.r create mode 100644 vignettes/chemCal.R create mode 100644 vignettes/chemCal.pdf diff --git a/.Rbuildignore b/.Rbuildignore index 536ef7d..c7ccaca 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -7,4 +7,5 @@ aux$ log$ vignettes/chemCal.tex vignettes/chemCal.pdf +vignettes/chemCal.R chemCal_.*.tar.gz diff --git a/GNUmakefile b/GNUmakefile index 7c11926..730c460 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,8 +30,14 @@ check: build check-no-vignettes: build-no-vignettes "$(RBIN)/R" CMD check --as-cran $(TGZ) +vignettes/%.pdf: vignettes/%.Rnw + "$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/$*.Rnw', dir = 'vignettes')" + +vignettes: vignettes/chemCal.pdf + pd: "$(RBIN)/Rscript" -e "pkgdown::build_site()" + cp vignettes/chemCal.pdf docs/articles git add -A git commit -m 'Static documentation rebuilt by pkgdown::build_site()' -e diff --git a/_pkgdown.yml b/_pkgdown.yml index f5eeff8..edc41e2 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -2,3 +2,12 @@ title: chemCal template: bootswatch: spacelab + +navbar: + title: ~ + type: default + left: + - text: Functions and data + href: reference/index.html + - text: Short manual (pdf) + href: articles/chemCal.pdf diff --git a/docs/articles/chemCal.R b/docs/articles/chemCal.R new file mode 100644 index 0000000..701db7b --- /dev/null +++ b/docs/articles/chemCal.R @@ -0,0 +1,36 @@ +### R code from vignette source '/home/jranke/git/chemCal/vignettes/chemCal.Rnw' + +################################################### +### code chunk number 1: chemCal.Rnw:38-42 +################################################### +library(chemCal) +data(massart97ex3) +m0 <- lm(y ~ x, data = massart97ex3) +calplot(m0) + + +################################################### +### code chunk number 2: chemCal.Rnw:49-50 +################################################### +plot(m0,which=3) + + +################################################### +### code chunk number 3: chemCal.Rnw:56-63 +################################################### +attach(massart97ex3) +yx <- split(y, x) +ybar <- sapply(yx, mean) +s <- round(sapply(yx, sd), digits = 2) +w <- round(1 / (s^2), digits = 3) +weights <- w[factor(x)] +m <- lm(y ~ x, w = weights) + + +################################################### +### code chunk number 4: chemCal.Rnw:69-71 +################################################### +inverse.predict(m, 15, ws=1.67) +inverse.predict(m, 90, ws = 0.145) + + diff --git a/docs/articles/chemCal.pdf b/docs/articles/chemCal.pdf new file mode 100644 index 0000000..cf1a413 Binary files /dev/null and b/docs/articles/chemCal.pdf differ diff --git a/docs/articles/index.html b/docs/articles/index.html index 5c6fdad..17c6857 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -49,10 +49,10 @@