From c8de5ccf185fba33fbbc837f33eaade6239c8d33 Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Wed, 9 Jul 2025 13:24:26 -0600 Subject: [PATCH 1/7] Moving depend packages to imports as that is preferred behaviour. Also updated doc type for roxygen. --- DESCRIPTION | 13 +++++++------ R/cffdrs-package.R | 2 +- man/cffdrs-package.Rd | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b53ab99..8130fca 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,16 +23,17 @@ Description: This project provides a group of new functions to calculate . Some functions have two versions, table and raster based. License: GPL-2 -URL: https://github.com/cffdrs/cffdrs_r +URL: https://r-forge.r-project.org/projects/cffdrs/ BugReports: - https://github.com/cffdrs/cffdrs_r/issues/new/choose + https://r-forge.r-project.org/tracker/?func=browse&group_id=1970&atid=5372 Depends: + R (>= 3.5) + +Imports: + sf, + terra, data.table, foreach, - R (>= 3.5), - sf, - terra -Imports: doParallel, geosphere, methods, diff --git a/R/cffdrs-package.R b/R/cffdrs-package.R index cc72690..3efed80 100644 --- a/R/cffdrs-package.R +++ b/R/cffdrs-package.R @@ -58,7 +58,7 @@ #' #' @name cffdrs-package #' @aliases cffdrs-package cffdrs -#' @docType package +#' @docType _PACKAGE #' @author Xianli Wang, Alan Cantin, Marc-André Parisien, Mike Wotton, Kerry #' Anderson, Brett Moore, Tom Schiks, and Mike Flannigan #' diff --git a/man/cffdrs-package.Rd b/man/cffdrs-package.Rd index 9699863..1606ce1 100644 --- a/man/cffdrs-package.Rd +++ b/man/cffdrs-package.Rd @@ -1,6 +1,6 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/cffdrs-package.R -\docType{package} +\docType{_PACKAGE} \name{cffdrs-package} \alias{cffdrs-package} \alias{cffdrs} From 4927f1b93fe67696d4ebf492ec7a6968c8b18d7f Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Wed, 9 Jul 2025 13:25:55 -0600 Subject: [PATCH 2/7] Updated version number. --- DESCRIPTION | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8130fca..acf5e24 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: cffdrs Title: Canadian Forest Fire Danger Rating System -Version: 1.9.0 +Version: 1.9.1 Date: 2024-01-19 Authors@R: c( person("Xianli", "Wang", email = "Xianli.Wang@nrcan-rncan.gc.ca", role = "aut"), @@ -28,7 +28,6 @@ BugReports: https://r-forge.r-project.org/tracker/?func=browse&group_id=1970&atid=5372 Depends: R (>= 3.5) - Imports: sf, terra, From 51932506fc4023e6d8abbe6fcb7ceab7c6a05166 Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Wed, 9 Jul 2025 13:40:07 -0600 Subject: [PATCH 3/7] Moved to _PACKAGE doc type declaration Fixed versions, dates and maintainer information. --- DESCRIPTION | 2 +- R/cffdrs-package.R | 6 +++--- man/cffdrs-package.Rd | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index acf5e24..9e6be51 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -42,4 +42,4 @@ Suggests: Config/testthat/edition: 3 Encoding: UTF-8 LazyData: true -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.2 diff --git a/R/cffdrs-package.R b/R/cffdrs-package.R index 3efed80..6fd3a8c 100644 --- a/R/cffdrs-package.R +++ b/R/cffdrs-package.R @@ -33,7 +33,7 @@ #' major vegetation types in Canada. #' #' \tabular{ll}{ Package: \tab cffdrs\cr Type: \tab Package\cr Version: \tab -#' 1.8.16\cr Date: \tab 2020-05-26\cr License: \tab GPL-2\cr } This package +#' 1.9.1\cr Date: \tab 2025-07-09\cr License: \tab GPL-2\cr } This package #' includes eleven functions. Seven functions, \code{\link{fwi}}, #' \code{\link{fwiRaster}}, \code{\link{hffmc}}, \code{\link{hffmcRaster}}, #' \code{\link{sdmc}}, \code{\link{gfmc}}, and @@ -58,11 +58,10 @@ #' #' @name cffdrs-package #' @aliases cffdrs-package cffdrs -#' @docType _PACKAGE #' @author Xianli Wang, Alan Cantin, Marc-André Parisien, Mike Wotton, Kerry #' Anderson, Brett Moore, Tom Schiks, and Mike Flannigan #' -#' Maintainer: Alan Cantin \email{Alan.Cantin@nrcan-rncan.gc.ca} +#' Maintainer: Brett Moore \email{Brett.Moore@nrcan-rncan.gc.ca} #' @seealso \code{\link{fbp}}, \code{\link{fire_season}}, \code{\link{fwi}}, #' \code{\link{fwiRaster}}, \code{\link{gfmc}}, \code{\link{hffmc}}, #' \code{\link{hffmcRaster}}, \code{\link{lros}}, \code{\link{pros}}, @@ -198,6 +197,7 @@ #' # end date, and using overwintered DC #' fwi_withFSwDC #' +"_PACKAGE" NULL diff --git a/man/cffdrs-package.Rd b/man/cffdrs-package.Rd index 1606ce1..dba23ca 100644 --- a/man/cffdrs-package.Rd +++ b/man/cffdrs-package.Rd @@ -1,6 +1,6 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/cffdrs-package.R -\docType{_PACKAGE} +\docType{package} \name{cffdrs-package} \alias{cffdrs-package} \alias{cffdrs} @@ -40,7 +40,7 @@ outputs. Sixteen fuel types are included in the FBP System, covering mainly major vegetation types in Canada. \tabular{ll}{ Package: \tab cffdrs\cr Type: \tab Package\cr Version: \tab -1.8.16\cr Date: \tab 2020-05-26\cr License: \tab GPL-2\cr } This package +1.9.1\cr Date: \tab 2025-07-09\cr License: \tab GPL-2\cr } This package includes eleven functions. Seven functions, \code{\link{fwi}}, \code{\link{fwiRaster}}, \code{\link{hffmc}}, \code{\link{hffmcRaster}}, \code{\link{sdmc}}, \code{\link{gfmc}}, and @@ -206,6 +206,6 @@ Inf. Rep. NOR-X-417. Xianli Wang, Alan Cantin, Marc-André Parisien, Mike Wotton, Kerry Anderson, Brett Moore, Tom Schiks, and Mike Flannigan -Maintainer: Alan Cantin \email{Alan.Cantin@nrcan-rncan.gc.ca} +Maintainer: Brett Moore \email{Brett.Moore@nrcan-rncan.gc.ca} } \keyword{package} From ab33ba6e7c91470cf6f3f7e88ab76fcb7d88159e Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Wed, 9 Jul 2025 13:42:15 -0600 Subject: [PATCH 4/7] Incorrect package url and issue location. Adjusted to GitHub --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9e6be51..334dd22 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,9 +23,9 @@ Description: This project provides a group of new functions to calculate . Some functions have two versions, table and raster based. License: GPL-2 -URL: https://r-forge.r-project.org/projects/cffdrs/ +URL: https://github.com/cffdrs/cffdrs_r BugReports: - https://r-forge.r-project.org/tracker/?func=browse&group_id=1970&atid=5372 + https://github.com/cffdrs/cffdrs_r/issues/new/choose Depends: R (>= 3.5) Imports: From 3a78643dcfd2b3186fcb70ea91872eb8bbc1a147 Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Thu, 21 Aug 2025 09:55:49 -0600 Subject: [PATCH 5/7] Increment version number to 1.9.2 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 334dd22..479be17 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: cffdrs Title: Canadian Forest Fire Danger Rating System -Version: 1.9.1 +Version: 1.9.2 Date: 2024-01-19 Authors@R: c( person("Xianli", "Wang", email = "Xianli.Wang@nrcan-rncan.gc.ca", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 2349144..ad685d8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# cffdrs 1.9.2 + # version 1.9.0 --- From c47786630485e4b40d1af61f5f170a59db2682df Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Thu, 21 Aug 2025 09:56:54 -0600 Subject: [PATCH 6/7] Updating some tests and terra instantiations. --- R/fbpRaster.r | 1 + R/gfmcRaster.R | 1 + man/fbpRaster.Rd | 1 + man/gfmcRaster.Rd | 1 + tests/testthat/test_fbp.r | 12 ++++++++---- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/R/fbpRaster.r b/R/fbpRaster.r index 7fa4ab1..3c68035 100644 --- a/R/fbpRaster.r +++ b/R/fbpRaster.r @@ -270,6 +270,7 @@ #' # The dataset is the standard test data for FBP system #' # provided by Wotton et al (2009), and randomly assigned #' # to a stack of raster layers +#' require(terra) #' test_fbpRaster <- rast( #' system.file("extdata", "test_fbpRaster.tif", package = "cffdrs") #' ) diff --git a/R/gfmcRaster.R b/R/gfmcRaster.R index c520954..9c67325 100644 --- a/R/gfmcRaster.R +++ b/R/gfmcRaster.R @@ -32,6 +32,7 @@ #' @export gfmcRaster #' #' @examples +#' require(terra) #' set.seed(5123) #' test_gfmc_r <- rast( #' nrows = 25, diff --git a/man/fbpRaster.Rd b/man/fbpRaster.Rd index f3095e8..d42ec32 100644 --- a/man/fbpRaster.Rd +++ b/man/fbpRaster.Rd @@ -248,6 +248,7 @@ will still work. # The dataset is the standard test data for FBP system # provided by Wotton et al (2009), and randomly assigned # to a stack of raster layers +require(terra) test_fbpRaster <- rast( system.file("extdata", "test_fbpRaster.tif", package = "cffdrs") ) diff --git a/man/gfmcRaster.Rd b/man/gfmcRaster.Rd index 135bffd..b8da666 100644 --- a/man/gfmcRaster.Rd +++ b/man/gfmcRaster.Rd @@ -34,6 +34,7 @@ also an equivalent Grass Fuel Moisture Code. All equations come from Wotton (2009) as cited below unless otherwise specified. } \examples{ +require(terra) set.seed(5123) test_gfmc_r <- rast( nrows = 25, diff --git a/tests/testthat/test_fbp.r b/tests/testthat/test_fbp.r index 41f6f33..f87016a 100644 --- a/tests/testthat/test_fbp.r +++ b/tests/testthat/test_fbp.r @@ -40,8 +40,10 @@ test_that("fbp_10", { return(actual) }) }) +## Returns NA and warns ad nauseum test_that("fbp_11", { - fct_test_fbp("fbp_11", + expect_warning( + fct_test_fbp("fbp_11", function(test_fbp) { non_fuel <- copy(test_fbp) non_fuel$FuelType <- "NF" @@ -49,10 +51,12 @@ test_that("fbp_11", { # HACK: for now change type here actual$FD <- as.logical(actual$FD) return(actual) - }) + }),"NaNs produced") }) +## Returns NA and warns ad nauseum test_that("fbp_12", { - fct_test_fbp("fbp_12", + expect_warning( + fct_test_fbp("fbp_12", function(test_fbp) { water <- copy(test_fbp) water$FuelType <- "WA" @@ -60,5 +64,5 @@ test_that("fbp_12", { # HACK: for now change type here actual$FD <- as.logical(actual$FD) return(actual) - }) + }),"NaNs produced") }) From c6dd9c30e7c5c8764d07c9aff0cee3e3e2cdd4a0 Mon Sep 17 00:00:00 2001 From: Brett Moore Date: Thu, 21 Aug 2025 11:55:33 -0600 Subject: [PATCH 7/7] Version bump --- R/cffdrs-package.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/cffdrs-package.R b/R/cffdrs-package.R index 6fd3a8c..f71a793 100644 --- a/R/cffdrs-package.R +++ b/R/cffdrs-package.R @@ -33,7 +33,7 @@ #' major vegetation types in Canada. #' #' \tabular{ll}{ Package: \tab cffdrs\cr Type: \tab Package\cr Version: \tab -#' 1.9.1\cr Date: \tab 2025-07-09\cr License: \tab GPL-2\cr } This package +#' 1.9.2\cr Date: \tab 2025-07-09\cr License: \tab GPL-2\cr } This package #' includes eleven functions. Seven functions, \code{\link{fwi}}, #' \code{\link{fwiRaster}}, \code{\link{hffmc}}, \code{\link{hffmcRaster}}, #' \code{\link{sdmc}}, \code{\link{gfmc}}, and