From e4702d321e1f79d685396c24d7897bd318186e36 Mon Sep 17 00:00:00 2001 From: Brett M Date: Thu, 19 Sep 2024 10:09:26 -0600 Subject: [PATCH] [CFFDRS R FR]: Make named lists rather than 2 calls to the same object Fixes #34 --- R/crown_base_height.r | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/R/crown_base_height.r b/R/crown_base_height.r index 9994103..608de60 100644 --- a/R/crown_base_height.r +++ b/R/crown_base_height.r @@ -1,13 +1,24 @@ crown_base_height <- function(FUELTYPE, CBH, SD, SH) { # logic originally in fbp() pulled into its own function - CBHs <- c( - 2, 3, 8, 4, 18, 7, 10, - 0, 6, 6, 6, 6, 0, 0, 0, 0, 0 - ) - names(CBHs) <- c( - "C1", "C2", "C3", "C4", "C5", "C6", "C7", - "D1", "M1", "M2", "M3", "M4", "S1", "S2", "S3", "O1A", "O1B" - ) +CBHs <-c( +"C1" = 2, +"C2" = 3, +"C3" = 8, +"C4" = 4, +"C5" = 18, +"C6" = 7, +"C7" = 10, +"D1" = 0, +"M1" = 6, +"M2" = 6, +"M3" = 6, +"M4" = 6, +"S1" = 0, +"S2" = 0, +"S3" = 0, +"O1A" = 0, +"O1B" =0) + CBH <- ifelse( CBH <= 0 | CBH > 50 | is.na(CBH), ifelse(