aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-04-16 14:27:40 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2021-04-16 14:27:40 +0200
commit23f10d1ec147873bf9f198b47c1c9d9310b6591d (patch)
tree7c23f118832e04e328fa58354564ab39eb211437
parent40979ea0a74bbbfade1ce299415605f64215c0a4 (diff)
Prepare upload to retain presence on CRAN
As knitr does not depend on markdown any more
-rw-r--r--DESCRIPTION4
-rw-r--r--NEWS.md2
-rw-r--r--build.log2
-rw-r--r--check.log2
-rw-r--r--vignettes/chemCal.R23
5 files changed, 6 insertions, 27 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 7b542a9..85745ed 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,11 +1,11 @@
Package: chemCal
Version: 0.2.2
-Date: 2021-04-08
+Date: 2021-04-15
Title: Calibration Functions for Analytical Chemistry
Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"),
email = "jranke@uni-bremen.de",
comment = c(ORCID = "0000-0003-4371-6538")))
-Suggests: MASS, knitr, testthat, investr, covr
+Suggests: MASS, knitr, testthat, investr, covr, rmarkdown
Description: Simple functions for plotting linear
calibration functions and estimating standard errors for measurements
according to the Handbook of Chemometrics and Qualimetrics: Part A
diff --git a/NEWS.md b/NEWS.md
index 174c442..e4419b6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,8 @@
- Added the cadmium dataset from Rocke and Lorenzato (1995)
+- Suggest: rmarkdown as it is not a dependency of knitr any more, as pointed out by Kurt Hornik
+
# chemCal 0.2.1
- 'inverse.predict': Do not work on the means of the calibration standards any more, as this ignores the variability of y values about the means. Thanks to Anna Burniol Figols for pointing out this issue
diff --git a/build.log b/build.log
index 2fe8e6c..62f6318 100644
--- a/build.log
+++ b/build.log
@@ -6,5 +6,5 @@
* checking for LF line-endings in source and make files and shell scripts
* checking for empty or unneeded directories
* re-saving image files
-* building ‘chemCal_0.2.3.tar.gz’
+* building ‘chemCal_0.2.2.tar.gz’
diff --git a/check.log b/check.log
index bb10d21..75ef8dc 100644
--- a/check.log
+++ b/check.log
@@ -4,7 +4,7 @@
* using session charset: UTF-8
* using option ‘--as-cran’
* checking for file ‘chemCal/DESCRIPTION’ ... OK
-* this is package ‘chemCal’ version ‘0.2.3’
+* this is package ‘chemCal’ version ‘0.2.2’
* package encoding: UTF-8
* checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
Maintainer: ‘Johannes Ranke <jranke@uni-bremen.de>’
diff --git a/vignettes/chemCal.R b/vignettes/chemCal.R
deleted file mode 100644
index d9015e9..0000000
--- a/vignettes/chemCal.R
+++ /dev/null
@@ -1,23 +0,0 @@
-## ------------------------------------------------------------------------
-library(chemCal)
-m0 <- lm(y ~ x, data = massart97ex3)
-calplot(m0)
-
-## ------------------------------------------------------------------------
-plot(m0, which=3)
-
-## ---- message = FALSE, echo = TRUE---------------------------------------
-weights <- with(massart97ex3, {
- yx <- split(y, x)
- ybar <- sapply(yx, mean)
- s <- round(sapply(yx, sd), digits = 2)
- w <- round(1 / (s^2), digits = 3)
-})
-massart97ex3.means <- aggregate(y ~ x, massart97ex3, mean)
-
-m <- lm(y ~ x, w = weights, data = massart97ex3.means)
-
-## ------------------------------------------------------------------------
-inverse.predict(m, 15, ws=1.67)
-inverse.predict(m, 90, ws = 0.145)
-

Contact - Imprint