Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge JdP and WHR development into main #33

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ Type: Package
Title: Estimate soil properties via pedotransferfunctions
Version: 0.5.0.9000
Authors@R: c(person(given = "Gerard", family = "Ros", email = "[email protected]", role = c("aut","cre")),
person(given = "Kees", family = "van den Dool", email = "[email protected]", role = c("aut")),
person(given = "Sven", family = "Verweij", email = "[email protected]", role = c("aut")),
person(given = "Yuki", family = "Fujita", email = "[email protected]", role = c("aut")),
person(given = "Tessa", family = "van der Voort", email = "[email protected]", role = c("aut")),
person(given = "Job", family = "de Pater", email = "[email protected]", role = c("aut")),
person(given = "Brent", family = "Riechelman", email = "[email protected]", role = c("aut")),
person("Nutriënten Management Instituut", email = "[email protected]", role = "cph"))
Expand All @@ -24,6 +21,9 @@ Suggests:
rmarkdown,
knitr,
ggplot2,
roxygen2,
devtools,
testthat (>= 3.0.0)
VignetteBuilder: knitr
Config/testthat/edition: 3

4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,16 @@
* functions to facilitate checkmates with `sptf_parameters` (`check_enum()`,
`check_numeric`, `get_minval()`, `get_maxval()`, `enum_opts()`)
* manuals for whc and pmn functions
* add unit tests for all separate functions


## Changed
* checkmates to use `sptf_parameters` instead of hardcoding min and maxvalues in
each function
* export whc and pmn ptf's in NAMESPACE
* `sptf_whc4` and `sptf_whc7` now takes A_DEPTH in m instead of cm
* removed the `euptf` dependency
* removed the wilting point as function input parameter


## Version 0.1.0 2022-08-15
Expand Down
173 changes: 99 additions & 74 deletions R/whc.R

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion man/sptf_whc3.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/sptf_whc4.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions renv/.gitignore

This file was deleted.

Loading