diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2017-03-31 17:53:41 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2017-03-31 17:53:41 +0200 |
| commit | c1a1e8c95ca28904e74bbd4b4afc8fe19a925ebc (patch) | |
| tree | 225762506534fc7e88117d259344c022f6545702 | |
| parent | 0ee1a4178fb7f085e4ebd834fb7485dfc56f6bd0 (diff) | |
Make RODBC a hard dependency again, ChangeLog
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | DESCRIPTION | 3 | ||||
| -rw-r--r-- | NAMESPACE | 3 | ||||
| -rw-r--r-- | R/checkexperiment.R | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -1,12 +1,16 @@ -2017-03-30 Johannes Ranke +2017-03-31 Johannes Ranke * DESCRIPTION: New verson 0.7.1 * Change package encoding to UTF-8 * Add checkcontrols() function + * Add check of positive controls in checkexperiment() for Vibrio fischeri + data * Add static documentation using pkgdown * R/drfit.R: Suppress error messages to pass CRAN checks for examples * Update test results * Remove trailing whitespace and mixed indentation in source files + * Make RODBC a hard dependency again to avoid problems with R not finding + odbcDriverConnect 2016-09-02 Johannes Ranke diff --git a/DESCRIPTION b/DESCRIPTION index 62107c8..d9982e4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,8 +4,7 @@ Date: 2017-03-31 Title: Dose-Response Data Evaluation Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre"), email = "jranke@uni-bremen.de")) -Imports: graphics, grDevices, MASS, drc, reshape2, qcc -Suggests: RODBC +Imports: graphics, grDevices, MASS, drc, reshape2, qcc, RODBC Description: A somewhat outdated package of basic and easy-to-use functions for fitting dose-response curves to continuous dose-response data, calculating some toxicological parameters and plotting the results. Please consider using @@ -4,7 +4,8 @@ import( graphics, grDevices, stats, - MASS + MASS, + RODBC ) importFrom("drc", drm, ED, LN.2, LL.2, BC.4, W1.2) diff --git a/R/checkexperiment.R b/R/checkexperiment.R index 8c844e6..5af237c 100644 --- a/R/checkexperiment.R +++ b/R/checkexperiment.R @@ -1,4 +1,4 @@ -if(getRversion() >= '2.15.1') utils::globalVariables(c("type", "conc")) +if(getRversion() >= '2.15.1') utils::globalVariables(c("type", "conc", "substance")) checkexperiment <- function(id, db = "ecotox", endpoint = "%") { databases <- data.frame( |