From ad4cd5d9a1f8c3976d08048a441129b1fb49a62b Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 2 Jul 2015 16:05:59 +0200 Subject: Changes to pass R CMD check --as-cran, roxygen run --- GNUmakefile | 11 +++++++++-- pkg/DESCRIPTION | 6 +++--- pkg/NAMESPACE | 3 ++- pkg/R/drift_data_JKI.R | 8 ++++---- pkg/data/drift_data_JKI.RData | Bin 972 -> 966 bytes pkg/man/PEC_soil.Rd | 2 +- pkg/man/PEC_sw_drainage_UK_ini.Rd | 2 +- pkg/man/PEC_sw_drift.Rd | 2 +- pkg/man/PEC_sw_drift_ini.Rd | 2 +- pkg/man/PEC_sw_sed.Rd | 2 +- pkg/man/SFO_actual_twa.Rd | 2 +- pkg/man/SSLRC_mobility_classification.Rd | 2 +- pkg/man/TOXSWA_cwa.Rd | 2 +- pkg/man/drift_data_JKI.Rd | 10 +++++----- pkg/man/geomean.Rd | 2 +- pkg/man/pfm_degradation.Rd | 2 +- pkg/man/plot.TOXSWA_cwa.Rd | 2 +- pkg/man/read.TOXSWA_cwa.Rd | 2 +- 18 files changed, 35 insertions(+), 27 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 493299f..9a41b50 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -48,12 +48,12 @@ test: build "$(R_HOME)/bin/Rscript" -e 'library(devtools); devtools::test("pkg")' 2>&1 | tee test.log @echo "DONE." -check: build +quickcheck: build @echo "Running check..." "$(R_HOME)/bin/R" CMD check $(TGZ) @echo "DONE." -crancheck: build +check: build @echo "Running CRAN check..." "$(R_HOME)/bin/R" CMD check --as-cran $(TGZ) @echo "DONE." @@ -62,3 +62,10 @@ install: build @echo "Installing package..." "$(R_HOME)/bin/R" CMD INSTALL --no-multiarch $(TGZ) @echo "DONE." + +winbuilder: build + date + @echo "Uploading to R-release on win-builder" + curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-release/ + @echo "Uploading to R-devel on win-builder" + curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/ diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION index 39b8c20..5c3050c 100644 --- a/pkg/DESCRIPTION +++ b/pkg/DESCRIPTION @@ -1,8 +1,8 @@ Package: pfm Type: Package -Title: Utilities for pesticide fate modelling -Version: 0.2-1 -Date: 2015-06-12 +Title: Utilities for Pesticide Fate Modelling +Version: 0.2-3 +Date: 2015-07-02 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre", "cph")) Description: Utilities for simple PEC calculations and for dealing with data diff --git a/pkg/NAMESPACE b/pkg/NAMESPACE index a1796f5..0613a5c 100644 --- a/pkg/NAMESPACE +++ b/pkg/NAMESPACE @@ -1,6 +1,7 @@ -# Generated by roxygen2 (4.1.0.9001): do not edit by hand +# Generated by roxygen2 (4.1.1): do not edit by hand S3method(plot,TOXSWA_cwa) +export(PEC_pw) export(PEC_soil) export(PEC_sw_drainage_UK_ini) export(PEC_sw_drift) 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 diff --git a/pkg/data/drift_data_JKI.RData b/pkg/data/drift_data_JKI.RData index 061ca27..0a2f05e 100644 Binary files a/pkg/data/drift_data_JKI.RData and b/pkg/data/drift_data_JKI.RData differ diff --git a/pkg/man/PEC_soil.Rd b/pkg/man/PEC_soil.Rd index 76ffd4b..1ced69a 100644 --- a/pkg/man/PEC_soil.Rd +++ b/pkg/man/PEC_soil.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/PEC_soil.R \name{PEC_soil} \alias{PEC_soil} diff --git a/pkg/man/PEC_sw_drainage_UK_ini.Rd b/pkg/man/PEC_sw_drainage_UK_ini.Rd index 1b2009d..1715b39 100644 --- a/pkg/man/PEC_sw_drainage_UK_ini.Rd +++ b/pkg/man/PEC_sw_drainage_UK_ini.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/PEC_sw_drainage_UK.R \name{PEC_sw_drainage_UK_ini} \alias{PEC_sw_drainage_UK_ini} diff --git a/pkg/man/PEC_sw_drift.Rd b/pkg/man/PEC_sw_drift.Rd index 20299a5..99d3d65 100644 --- a/pkg/man/PEC_sw_drift.Rd +++ b/pkg/man/PEC_sw_drift.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/PEC_sw_drift.R \name{PEC_sw_drift} \alias{PEC_sw_drift} diff --git a/pkg/man/PEC_sw_drift_ini.Rd b/pkg/man/PEC_sw_drift_ini.Rd index 0bcbf97..994a07e 100644 --- a/pkg/man/PEC_sw_drift_ini.Rd +++ b/pkg/man/PEC_sw_drift_ini.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/PEC_sw_drift_ini.R \name{PEC_sw_drift_ini} \alias{PEC_sw_drift_ini} diff --git a/pkg/man/PEC_sw_sed.Rd b/pkg/man/PEC_sw_sed.Rd index ee496d1..515562c 100644 --- a/pkg/man/PEC_sw_sed.Rd +++ b/pkg/man/PEC_sw_sed.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/PEC_sw_sed.R \name{PEC_sw_sed} \alias{PEC_sw_sed} diff --git a/pkg/man/SFO_actual_twa.Rd b/pkg/man/SFO_actual_twa.Rd index 967b60f..7a9c2f1 100644 --- a/pkg/man/SFO_actual_twa.Rd +++ b/pkg/man/SFO_actual_twa.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/SFO_actual_twa.R \name{SFO_actual_twa} \alias{SFO_actual_twa} diff --git a/pkg/man/SSLRC_mobility_classification.Rd b/pkg/man/SSLRC_mobility_classification.Rd index 62a345b..0b441ae 100644 --- a/pkg/man/SSLRC_mobility_classification.Rd +++ b/pkg/man/SSLRC_mobility_classification.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/SSLRC_mobility_classification.R \name{SSLRC_mobility_classification} \alias{SSLRC_mobility_classification} diff --git a/pkg/man/TOXSWA_cwa.Rd b/pkg/man/TOXSWA_cwa.Rd index 5aa8bfc..b14f654 100644 --- a/pkg/man/TOXSWA_cwa.Rd +++ b/pkg/man/TOXSWA_cwa.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/TOXSWA_cwa.R \docType{class} \name{TOXSWA_cwa} diff --git a/pkg/man/drift_data_JKI.Rd b/pkg/man/drift_data_JKI.Rd index a2bbb77..d7e6d3b 100644 --- a/pkg/man/drift_data_JKI.Rd +++ b/pkg/man/drift_data_JKI.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/drift_data_JKI.R \docType{data} \name{drift_data_JKI} @@ -7,7 +7,7 @@ published by the JKI} \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 @@ -27,8 +27,8 @@ as its licence is not clear. \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() @@ -39,7 +39,7 @@ as its licence is not clear. 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") } } \keyword{datasets} diff --git a/pkg/man/geomean.Rd b/pkg/man/geomean.Rd index 42a30c4..be9f26a 100644 --- a/pkg/man/geomean.Rd +++ b/pkg/man/geomean.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/geomean.R \name{geomean} \alias{geomean} diff --git a/pkg/man/pfm_degradation.Rd b/pkg/man/pfm_degradation.Rd index b875434..04a692f 100644 --- a/pkg/man/pfm_degradation.Rd +++ b/pkg/man/pfm_degradation.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/pfm_degradation.R \name{pfm_degradation} \alias{pfm_degradation} diff --git a/pkg/man/plot.TOXSWA_cwa.Rd b/pkg/man/plot.TOXSWA_cwa.Rd index 1dddb78..8a5ada4 100644 --- a/pkg/man/plot.TOXSWA_cwa.Rd +++ b/pkg/man/plot.TOXSWA_cwa.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/TOXSWA_cwa.R \name{plot.TOXSWA_cwa} \alias{plot.TOXSWA_cwa} diff --git a/pkg/man/read.TOXSWA_cwa.Rd b/pkg/man/read.TOXSWA_cwa.Rd index f67455f..684e107 100644 --- a/pkg/man/read.TOXSWA_cwa.Rd +++ b/pkg/man/read.TOXSWA_cwa.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.0.9001): do not edit by hand +% Generated by roxygen2 (4.1.1): do not edit by hand % Please edit documentation in R/TOXSWA_cwa.R \name{read.TOXSWA_cwa} \alias{read.TOXSWA_cwa} -- cgit v1.2.1