New fuelCovariates option: dom/sec/other AGB + treedWetland_agb - #48
Merged
Merged
Conversation
prepare_SpreadFit() (fireSense_dataPrepFit.R ~690) built the spread covariate table with fireSenseUtils::fireSenseCovariatesCreate() but never passed rstLCC, so treedWetland never appeared, and there was no way to ask for the new dom/sec/other AGB fuel representation added in fireSenseUtils#98. New parameter fuelCovariates (default "domSecOther") passes rstLCC and picks the representation. The dominant/secondary fuel classes are chosen once per ELF, from the most recent data year, via the new fireSenseUtils::chooseDomSecFuelClasses(), and recorded in sim$fuelClassRoles so every data year's covariates use the same two classes. chooseDomSecFuelClasses() is added to the prepSpreadFitData cache key (.useCacheArgs), matching PR #47. fuelCovariates = "species" keeps the previous one-column-per-fuel-class behaviour. Version 1.2.0.9016. Floors fireSenseUtils@development (>= 0.2.3.9053). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
…ter development moved) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
…#100) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
Base automatically changed from
fix/harmonize-cache-inner-fns
to
development
September 28, 2026 19:33
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
…er-fuels # Conflicts: # fireSense_dataPrepFit.html # fireSense_dataPrepFit.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
prepare_SpreadFit() (fireSense_dataPrepFit.R ~690) called fireSenseUtils::fireSenseCovariatesCreate() without rstLCC, so the treedWetland indicator never appeared, and there was no way to use the new dom/sec/other AGB fuel representation added in PredictiveEcology/fireSenseUtils#98. A new parameter, fuelCovariates (default "domSecOther"), now passes rstLCC and builds four AGB columns per ELF (dom_agb_, sec_agb_, other_agb, treedWetland_agb) instead of one column per fuel class. The dominant/secondary classes are chosen once per ELF, from the most recent data year, by the new fireSenseUtils::chooseDomSecFuelClasses(), stored in sim$fuelClassRoles so every data year's covariates use the same two classes; that function is added to the prepSpreadFitData cache key alongside PR #47's list. fuelCovariates = "species" keeps the previous behaviour unchanged.
Verified with SpaDES.core::convertToPackage() + testthat::test_local(), against a fireSenseUtils build combining this branch's floor (0.2.3.9053) with #97's harmonizeFireDataDeps(): 169 tests pass on this PR's base (
fix/harmonize-cache-inner-fns), 181 pass on this branch, 0 failures either way; the 12 new expectations in test-domSecOtherFuels.R fail on the base (missing parameter/function) and pass here. Rmd/md/html re-rendered for the new parameter and output. Version bumped to 1.2.0.9016, floors fireSenseUtils@development (>= 0.2.3.9053).Merge order: PredictiveEcology/fireSenseUtils#98 (stacked on #93, now based on development) and #97 before this; this PR after #47.
🤖 Generated with Claude Code
https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv