Skip to content

New spread-fuel representation: dom/sec/other AGB + treedWetland_agb - #98

Merged
eliotmcintire merged 3 commits into
developmentfrom
feat/domSecOther-fuels
Sep 28, 2026
Merged

eliotmcintire merged 3 commits into
developmentfrom
feat/domSecOther-fuels

Conversation

@eliotmcintire

Copy link
Copy Markdown
Contributor

fireSenseCovariatesCreate() (R/fuelClassPrep.R:620) always built one covariate column per fuel class, and the treedWetland indicator (R/fuelClassPrep.R:748) was only ever 0/1, never AGB. A new fuelCovariates = "domSecOther" option collapses the per-species columns into four AGB terms per ELF: dom_agb_<class> and sec_agb_<class> (the two classes with the most total treed AGB), other_agb (the rest, pooled), and treedWetland_agb (all tree AGB on treed-wetland pixels, taken out of the other three there). A new chooseDomSecFuelClasses() picks the dominant/secondary classes once per ELF, and fireSenseCovariatesCreate(domClass=, secClass=) lets a prediction force those same classes instead of re-deriving them from its own area. The default stays fuelCovariates = "species", so existing callers are unaffected.

Verified with devtools::load_all() + testthat::test_dir(): 808 tests pass on fix/hillSlope1-fixed-at-1 (base), 843 pass on this branch (0 failures either way); the 35 new expectations in test-domSecOtherFuels.R fail on the base with "unused arguments"/"could not find function" and pass here. R CMD check --no-tests is clean (0 errors, 0 warnings, 0 notes). Version bumped to 0.2.3.9050.

This stacks on #92 and #93 (hillSlope1), base fix/hillSlope1-fixed-at-1. fireSense_dataPrepFit/fireSense_dataPrepPredict will floor on this version.

🤖 Generated with Claude Code

https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv

fireSenseCovariatesCreate() (R/fuelClassPrep.R:620) always built one covariate
column per fuel class, and treedWetland (R/fuelClassPrep.R:748) was only ever
a 0/1 indicator, never AGB, and only appeared when a caller passed rstLCC.

fuelCovariates = "domSecOther" collapses the per-species columns to four AGB
terms: dom_agb_<class> and sec_agb_<class> (the two classes with the most
total treed AGB), other_agb (the rest, pooled), and treedWetland_agb (all
tree AGB on treed-wetland pixels, removed from the other three there). New
chooseDomSecFuelClasses() picks domClass/secClass once per ELF; a prediction
can force those same classes via fireSenseCovariatesCreate(domClass=,
secClass=) instead of re-choosing them from its own area. The default stays
fuelCovariates = "species" (unchanged behaviour).

Version 0.2.3.9050.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
Base automatically changed from fix/hillSlope1-fixed-at-1 to development September 28, 2026 18:13
@eliotmcintire eliotmcintire reopened this Sep 28, 2026
@codecov

codecov Bot commented Sep 28, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 90.62500% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 69.17%. Comparing base (8d9ba2c) to head (2f33005).
⚠️ Report is 1 commits behind head on development.

Files with missing lines Patch % Lines
R/fuelClassPrep.R 90.62% 6 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           development      #98      +/-   ##
===============================================
+ Coverage        68.84%   69.17%   +0.33%     
===============================================
  Files               40       40              
  Lines             3588     3650      +62     
===============================================
+ Hits              2470     2525      +55     
- Misses            1118     1125       +7     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

eliotmcintire and others added 2 commits September 28, 2026 11:45
Development reached 0.2.3.9052; 9053 and 9054 are claimed by open PRs #97 and #99.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
… Version 0.2.3.9057

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
@eliotmcintire
eliotmcintire changed the base branch from development to combined/fixes-and-coverage September 28, 2026 18:56
Base automatically changed from combined/fixes-and-coverage to development September 28, 2026 19:13
@eliotmcintire eliotmcintire reopened this Sep 28, 2026
@eliotmcintire
eliotmcintire merged commit 3e34798 into development Sep 28, 2026
18 of 25 checks passed
@eliotmcintire
eliotmcintire deleted the feat/domSecOther-fuels branch September 28, 2026 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant