Skip to content

spreadFitGoogleDriveFolder default from fireSenseUtils #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eliotmcintire merged 2 commits into from
Oct 15, 2026
Merged

spreadFitGoogleDriveFolder default from fireSenseUtils #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b69aa
spreadFitGoogleDriveFolder default from fireSenseUtils
eliotmcintire Oct 15, 2026
0d73af6
Merge development (NEWS conflict: keep both entries)
eliotmcintire Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# fireSense_dataPrepFit (development version)

- `spreadFitGoogleDriveFolder` defaults to `fireSenseUtils::spreadFitLedgerFolder()`, which follows `options(fireSenseUtils.spreadFitLedgerFolder = )`. `fireSenseUtils` floor raised to 0.2.3.9094, the first version with `spreadFitLedgerFolder()`.
- Fixed: `init` is declared in the new `.neverCache` parameter, so it is never cached, even when `.useCache` (the module's or `.globals`) lists it. It reads the spread-fit ledger on Google Drive, which is not part of the event's cache key, so a cached `init` replayed an old "fit exists" or "no fit yet" answer. Needs SpaDES.core >= 3.2.1.9037.

- Changed: the defaults are the values production already passes. `spreadIntercept` is `TRUE` (spread formula `~ 1 + ...`, free intercept with centred covariates) and `areaMultiplier` is `function(size) 10 * fireSenseUtils::multiplier(size)`, 10 times the old default, built to be `identical()` to what runs pass so their caches are unchanged. Fits that relied on the old defaults now get the intercept and the 10x buffers.
Expand Down
4 changes: 2 additions & 2 deletions fireSense_dataPrepFit.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defineModule(sim, list(
reqdPkgs = list("data.table", "fastDummies", "Require",
"PredictiveEcology/reproducible@development (>= 3.2.1.9042)", # CacheGeo re-reads a changed local file
"PredictiveEcology/climateData@development (>= 2.2.3.9006)",
"PredictiveEcology/fireSenseUtils@development (>= 0.2.3.9093)", # dataYearFor(), dataYearElement()
"PredictiveEcology/fireSenseUtils@development (>= 0.2.3.9094)", # dataYearFor(), dataYearElement()
"FOR-CAST/fireregimetools@main (>= 0.1.0.9008)",
"ggplot2", "parallel", "purrr", "raster", "sf", "sp",
"PredictiveEcology/LandR@development (>= 1.2.0.9015)",
Expand Down Expand Up @@ -115,7 +115,7 @@ defineModule(sim, list(
"Set it for every fireSense module at once with `.globals = list(heldOutFold = 1L)`;",
"`Init()` stops if `fireSense_spreadFit` has a different value. Any other value is an error.")),
defineParameter("spreadFitGoogleDriveFolder", "character",
"https://drive.google.com/drive/folders/1X9-mRjyLMNpgkP_cfqhbr_AQEPOsVCHf",
fireSenseUtils::spreadFitLedgerFolder(),
NA, NA, paste("URL of the Google Drive folder holding the ledger of previous SpreadFit results",
"(`spreadFitFilename`), read with `reproducible::CacheGeo`.")),
defineParameter("spreadFitFilename", "character", "latest",
Expand Down
Loading