From 2c60398ebe81c496ee86542bee26ccc3cb3cc038 Mon Sep 17 00:00:00 2001 From: Eliot McIntire Date: Thu, 12 Nov 2026 16:33:30 -0700 Subject: [PATCH] docs: studyAreaLarge is now studyArea_fireSense (fireSense_ELFs) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Lx3DXgg187sAPQZwQT3Mf4 --- fireSense_dataPrepPredict.R | 4 ++-- tests/testthat/test-ownELFRows.R | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fireSense_dataPrepPredict.R b/fireSense_dataPrepPredict.R index 492b5a3..d672ac1 100644 --- a/fireSense_dataPrepPredict.R +++ b/fireSense_dataPrepPredict.R @@ -875,7 +875,7 @@ spreadParamsRowUnusable <- function(row, fuelClassCol) { #' The ledger rows to predict with: the simulated ELF's, then the neighbours that can be blended #' #' @param sa `sim$studyAreaWithSpreadParams`. -#' @param ownELF character; the simulated ELF (`sim$.ELFind`), or ELFs: over a `studyAreaLarge`, +#' @param ownELF character; the simulated ELF (`sim$.ELFind`), or ELFs: over a `studyArea_fireSense`, #' `fireSense_ELFs` makes `.ELFind` all the ELFs it covers, and each keeps its row. #' @param blend logical; the `blendNeighbourELFs` parameter. #' @param placeableELFs character; the ELFs `sim$rasterToMatchLargeELF` labels (see [ELFlabels()]). @@ -894,7 +894,7 @@ selectSpreadParamRows <- function(sa, ownELF, blend, placeableELFs, fuelInputELF stop("fireSense_dataPrepPredict: sim$studyAreaWithSpreadParams has no row for the simulated ELF ", ownELF, " (sim$.ELFind); it has ", paste(ids, collapse = ", "), ". Fit ELF ", ownELF, " first.", call. = FALSE) } - ## one row per simulated ELF; was `own[1]`, which kept only the first of several (a studyAreaLarge) + ## one row per simulated ELF; was `own[1]`, which kept only the first of several (a studyArea_fireSense) own <- own[!duplicated(ids[own])] keep <- integer(0) if (isTRUE(blend)) { diff --git a/tests/testthat/test-ownELFRows.R b/tests/testthat/test-ownELFRows.R index 178bd16..02b1da7 100644 --- a/tests/testthat/test-ownELFRows.R +++ b/tests/testthat/test-ownELFRows.R @@ -79,9 +79,9 @@ test_that("a missing own row stops with a message naming the ELF", { "13\\.1") }) -## Over a studyAreaLarge, fireSense_ELFs makes `.ELFind` every ELF it covers; `which(ids == ownELF)` then +## Over a studyArea_fireSense, fireSense_ELFs makes `.ELFind` every ELF it covers; `which(ids == ownELF)` then ## recycled the vector and kept the first ELF only (2026-11-02). -test_that("several simulated ELFs (.ELFind of a studyAreaLarge) each keep their row, neighbours as before", { +test_that("several simulated ELFs (.ELFind of a studyArea_fireSense) each keep their row, neighbours as before", { sel <- function(own, blend) selectSpreadParamRows(threeRows(), ownELF = own, blend = blend, placeableELFs = c("4.2.2", "13.1", "14.3"), fuelInputELFs = c("4.2.2", "13.1", "14.3"),