diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-08-21 15:12:12 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-08-21 15:12:12 +0200 |
| commit | 405c10b443aacfe9aab15f4ab2797e92def9f246 (patch) | |
| tree | 93ef1669e31d403aa6334249d87a5f6f925313de /pkg/R | |
| parent | 7faffad1907995f1b623ede8fc2e386693428e22 (diff) | |
| parent | 5038ba57fef6cc386566ec30f3d5dd67e62decff (diff) | |
Merge branch 'master' into pfm_chent
Diffstat (limited to 'pkg/R')
| -rw-r--r-- | pkg/R/TOXSWA_cwa.R | 2 | ||||
| -rw-r--r-- | pkg/R/drift_data_JKI.R | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkg/R/TOXSWA_cwa.R b/pkg/R/TOXSWA_cwa.R index 55481b4..9e23284 100644 --- a/pkg/R/TOXSWA_cwa.R +++ b/pkg/R/TOXSWA_cwa.R @@ -58,6 +58,7 @@ read.TOXSWA_cwa <- function(filename, basedir = ".", zipfile = NULL, #' Plot TOXSWA hourly concentrations of a chemical substance in a specific #' segment of a segment of a TOXSWA surface water body. #' +#' @import graphics #' @param x The TOXSWA_cwa object to be plotted. #' @param xlab,ylab Labels for x and y axis. #' @param time_column What should be used for the time axis. If "t_firstjan" is chosen, @@ -171,6 +172,7 @@ TOXSWA_cwa <- R6Class("TOXSWA_cwa", } cwa_all_segments <- try(read.table(file_connection, sep = "", skip = 40, + encoding = "UTF-8", colClasses = c("character", "numeric", "integer", rep("numeric", 5)), col.names = c("datetime", "t", "segment", diff --git a/pkg/R/drift_data_JKI.R b/pkg/R/drift_data_JKI.R index 44a959b..549798c 100644 --- a/pkg/R/drift_data_JKI.R +++ b/pkg/R/drift_data_JKI.R @@ -13,7 +13,7 @@ #' @docType data #' @format A list currently containing matrices with spray drift percentage #' data for field crops (Ackerbau), and Pome/stone fruit, early and late -#' (Obstbau früh, spät). +#' (Obstbau frueh, spaet). #' @source JKI (2010) Spreadsheet 'Tabelle der Abdrifteckwerte.xls', retrieved #' from #' http://www.jki.bund.de/no_cache/de/startseite/institute/anwendungstechnik/abdrift-eckwerte.html @@ -24,8 +24,8 @@ #' \dontrun{ #' # This is the code that was used to extract the data #' library(readxl) -#' abdrift_path <- "../inst/extdata/Tabelle der Abdrifteckwerte.xls" -#' JKI_crops <- c("Ackerbau", "Obstbau früh", "Obstbau spät") +#' abdrift_path <- "inst/extdata/Tabelle der Abdrifteckwerte.xls" +#' JKI_crops <- c("Ackerbau", "Obstbau frueh", "Obstbau spaet") #' names(JKI_crops) <- c("Field crops", "Pome/stone fruit, early", "Pome/stone fruit, late") #' drift_data_JKI <- list() #' @@ -36,7 +36,7 @@ #' crop = JKI_crops) #' drift_data_JKI[[n]] <- drift_data #' } -#' save(drift_data_JKI, file = "../data/drift_data_JKI.RData") +#' save(drift_data_JKI, file = "data/drift_data_JKI.RData") #' } #' NULL |