From d665fd715ac798ac54975648543e804732df45c8 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 29 Jun 2018 14:37:30 +0200 Subject: More details for soil degradation --- ChangeLog | 6 ++++++ DESCRIPTION | 2 +- R/chent.R | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f427c74..96d9174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit 9cd6a79cd5c0fc69ca0b2c689d3a77f46978beba +Author: Johannes Ranke +Date: 2018-06-21 12:29:51 +0200 + + Add country field to soil degradation data + commit d1786a315fe7bc68a6543de15685d59a56eaa1b1 Author: Johannes Ranke Date: 2018-05-20 12:25:51 +0200 diff --git a/DESCRIPTION b/DESCRIPTION index a7cff9d..f93ddd9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: chents Type: Package Title: Chemical Entities as R Objects Version: 0.2-6 -Date: 2018-06-21 +Date: 2018-06-29 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de")) Description: Utilities for dealing with chemical entities and associated diff --git a/R/chent.R b/R/chent.R index 1376d46..e977544 100644 --- a/R/chent.R +++ b/R/chent.R @@ -308,8 +308,10 @@ chent <- R6Class("chent", add_soil_degradation = function(soils, DT50, type = NA, country = NA, pH_orig = NA, pH_medium = NA, pH_H2O = NA, + perc_OC = NA, temperature = NA, moisture = NA, category = "lab", formulation = NA, + model = NA, chi2 = NA, remark = "", source, page = NA) { new_soil_degradation = data.frame( soil = soils, @@ -319,10 +321,13 @@ chent <- R6Class("chent", pH_orig = pH_orig, pH_medium = pH_medium, pH_H2O = pH_H2O, + perc_OC = perc_OC, temperature = temperature, moisture = moisture, category = category, formulation = formulation, + model = model, + chi2 = chi2, remark = remark, source = source, page = page, -- cgit v1.2.1