WIP code for vectorizing FBP

R/fbp.r

@@ -294,6 +294,7 @@ fbp <- function(
   if (!is.na(charmatch("input", search()))) {
     detach(input)
   }
+  names(input) <- toupper(names(input))
   # If input is not provided, then calculate FBP with default values
   if (is.null(input)) {
     fullList <- fire_behaviour_prediction(input)
@@ -307,6 +308,7 @@ fbp <- function(
     n <- ifelse(m * n0 >= nrow(input), n0, n0 + 1)
     # Set up parallel processing, if # of cores is entered
     if (cores > 1) {
+      # print(input)
       # create and register a set of parallel R instances for foreach
       cl <- parallel::makeCluster(cores)
       doParallel::registerDoParallel(cl)

R/fire_behaviour_prediction.r

@@ -27,6 +27,8 @@ fire_behaviour_prediction <- function(
     warning("Attached dataset 'input' is being detached to use fbp() function.")
     detach(input)
   }
+  # print(input)
+  # print(input$ID)
   output <- toupper(output)
   # if input does not exist, then set defaults
   if (is.null(input)) {
@@ -454,7 +456,9 @@ fire_behaviour_prediction <- function(
     DF <- ifelse(ACCEL == 1, (DH + DB) / (LBt * 2), (DH + DB) / (LB * 2))
   }
   # Create an id field if it does not exist
-  ID <- ifelse(exists("ID") && !is.null(ID), ID, row.names(input))
+  if (!exists("ID") || is.null(ID)) {
+    ID <- row.names(input)
+  }
   # if Primary is selected, wrap the primary outputs into a data frame and
   #  return them
   if (output %in% c("PRIMARY", "P")) {