From 6b4e342b240baaf18150360986d15895fc80a937 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 15 Oct 2015 14:41:26 +0200 Subject: Add endpoint and GUS functions, roxygenize --- GNUmakefile | 4 +- README.html | 20 +++--- pkg/DESCRIPTION | 18 ++++-- pkg/NAMESPACE | 12 +++- pkg/R/GUS.R | 74 ++++++++++++++++++++++ pkg/R/endpoint.R | 102 +++++++++++++++++++++++++++++++ pkg/man/FOCUS_GW_scenarios_2012.Rd | 6 +- pkg/man/GUS.Rd | 70 +++++++++++++++++++++ pkg/man/PEC_soil.Rd | 2 +- pkg/man/PEC_soil_product.Rd | 2 +- pkg/man/PEC_sw_drainage_UK_ini.Rd | 4 +- 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 | 4 +- pkg/man/SSLRC_mobility_classification.Rd | 4 +- pkg/man/TOXSWA_cwa.Rd | 6 +- pkg/man/drift_data_JKI.Rd | 8 ++- pkg/man/endpoint.Rd | 45 ++++++++++++++ pkg/man/geomean.Rd | 2 +- pkg/man/pfm_degradation.Rd | 2 +- pkg/man/plot.TOXSWA_cwa.Rd | 4 +- pkg/man/read.TOXSWA_cwa.Rd | 4 +- pkg/man/soil_DT50.Rd | 29 +++++++++ pkg/man/soil_Kfoc.Rd | 24 ++++++++ pkg/man/soil_N.Rd | 21 +++++++ pkg/man/soil_sorption.Rd | 23 +++++++ 27 files changed, 455 insertions(+), 41 deletions(-) create mode 100644 pkg/R/GUS.R create mode 100644 pkg/R/endpoint.R create mode 100644 pkg/man/GUS.Rd create mode 100644 pkg/man/endpoint.Rd create mode 100644 pkg/man/soil_DT50.Rd create mode 100644 pkg/man/soil_Kfoc.Rd create mode 100644 pkg/man/soil_N.Rd create mode 100644 pkg/man/soil_sorption.Rd diff --git a/GNUmakefile b/GNUmakefile index b6dbe8a..50de943 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,13 +31,13 @@ clean: roxygen: @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); document("pkg")' 2>&1 | tee roxygen.log + "$(R_HOME)/bin/Rscript" -e 'library(devtools); document("pkg")' @echo "DONE." $(TGZ): $(pkgfiles) sed -i -e "s/Date:.*/Date: $(DATE)/" pkg/DESCRIPTION @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); document("pkg")' 2>&1 | tee roxygen.log + "$(R_HOME)/bin/Rscript" -e 'library(devtools); document("pkg")' @echo "Building package..." git log --no-merges -M --date=iso pkg/ > pkg/ChangeLog "$(R_HOME)/bin/R" CMD build pkg > build.log 2>&1 diff --git a/README.html b/README.html index 68ad796..f23fc0a 100644 --- a/README.html +++ b/README.html @@ -12,16 +12,22 @@ - + - - - - + + + + - - + +