Skip to content

Commit

Permalink
rename lookup_PSCS() to lookup_texpartsize()
Browse files Browse the repository at this point in the history
  • Loading branch information
smroecker committed Jun 11, 2024
1 parent e4dddb9 commit 7126cbf
Show file tree
Hide file tree
Showing 7 changed files with 342 additions and 16 deletions.
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export(hz_lag)
export(hz_segment)
export(hz_to_taxpartsize)
export(invertLabelColor)
export(lookup_PSCS)
export(lookup_taxpartsize)
export(lunique)
export(maxDepthOf)
export(minDepthOf)
Expand Down
2 changes: 1 addition & 1 deletion R/allocate.R
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ allocate <- function(..., to = c("FAO Salt Severity", "FAO Black Soil", "ST Diag
#'
#' @author Stephen Roecker
#'
#' @seealso [texture_to_taxpartsize()], [lookup_PSCS()]
#' @seealso [texture_to_taxpartsize()], [lookup_taxpartsize()]
#'
#' @export

Expand Down
16 changes: 8 additions & 8 deletions R/texture.R
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ texmod_to_fragvoltot <- function(texmod = NULL, lieutex = NULL) {
#'
#' @return - `texture_to_taxpartsize`: a character vector containing `"taxpartsize"` classes
#'
#' @seealso \code{\link{hz_to_taxpartsize}}
#' @seealso [hz_to_taxpartsize()], [lookup_taxpartsize()]
#'
#' @rdname texture
#'
Expand Down Expand Up @@ -1071,7 +1071,7 @@ fragvol_to_texmod <- function(
#' @examples
#'
#' # class codes
#' lu <- lookup_PSCS()
#' lu <- lookup_taxpartsize()
#'
#' idx <- lu$contrasting == FALSE
#'
Expand All @@ -1080,18 +1080,18 @@ fragvol_to_texmod <- function(
#' lu$rank[as.integer(lu$taxpartsize)[idx]]
#'

lookup_PSCS <- function() {
lookup_taxpartsize <- function() {

fe <- c("diatomaceous", "very-fine", "clayey", "fine", "hydrous", "fine-silty",
"fine-gypseous", "fine-loamy", "medial", "loamy", "coarse-loamy",
"coarse-silty", "coarse-gypseous", "ashy", "sandy", "hydrous-pumiceous",
"medial-pumiceous", "ashy-pumiceous", "pumiceous", "clayey-skeletal",
"hydrous-skeletal", "medial-skeletal", "loamy-skeletal", "gypseous-skeletal",
"ashy-skeletal", "sandy-skeletal", "cindery", "fragmental")
"medial-pumiceous", "ashy-pumiceous", "clayey-skeletal", "hydrous-skeletal",
"medial-skeletal", "loamy-skeletal", "gypseous-skeletal", "ashy-skeletal",
"sandy-skeletal", "pumiceous", "cindery", "fragmental")

rank <- c(84, 74, 60.02, 46.04, 44.04, 26, 25.8, 25.6, 24, 17.24, 8.88,
8.5, 7.5, 6.5, 4.67, -55.96, -76, -93.5, -97.33, -43.33, -55.96,
-76, -83.23, -83.35, -93.5, -95.33, -97.33, -96.94)
8.5, 7.5, 6.5, 4.67, -55.96, -76, -93.5, -43.33, -55.96, -76,
-83.23, -83.35, -93.5, -95.33, -95.83, -96.33, -98.94)
names(rank) <- fe

# cf <- c("fragmental", "sandy-skeletal", "loamy-skeletal", "clay-skeletal")
Expand Down
2 changes: 1 addition & 1 deletion man/hz_to_taxpartsize.Rd

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

8 changes: 4 additions & 4 deletions man/lookup_PSCS.Rd → man/lookup_taxpartsize.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/texture.Rd

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

Loading

0 comments on commit 7126cbf

Please sign in to comment.