diff --git a/NEWS.md b/NEWS.md index 3d13b5f..91374cd 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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. diff --git a/fireSense_dataPrepFit.R b/fireSense_dataPrepFit.R index 114bddf..2072f00 100644 --- a/fireSense_dataPrepFit.R +++ b/fireSense_dataPrepFit.R @@ -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)", @@ -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",