From a553da8971dff49c07427f7b51718c555123500b Mon Sep 17 00:00:00 2001 From: andrewzm Date: Wed, 18 Oct 2023 13:14:14 +1100 Subject: [PATCH] Removing dependency on rgdal --- .Rbuildignore | 2 ++ DESCRIPTION | 5 ++--- R/SREvalidation.R | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 07c4204..228f5d3 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -34,3 +34,5 @@ rhipe_fns.R$ ^docs$ ^pkgdown$ ^\.github$ +^FRKv2_6page.pdf$ +^examples$ \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index 1615e14..e6919e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: FRK Type: Package Title: Fixed Rank Kriging -Version: 2.1.5 -Date: 2023-01-30 +Version: 2.2.0 +Date: 2023-10-18 Authors@R: c( person("Andrew", "Zammit-Mangion", , "andrewzm@gmail.com", c("aut", "cre")), person("Matthew", "Sainsbury-Dale", , "msdale@uow.edu.au", c("aut"))) @@ -21,7 +21,6 @@ Suggests: knitr, mapproj, parallel, - rgdal, sf, spdep, splancs, diff --git a/R/SREvalidation.R b/R/SREvalidation.R index 6576ea2..e43b729 100644 --- a/R/SREvalidation.R +++ b/R/SREvalidation.R @@ -18,7 +18,7 @@ simulate <- function(object, newdata = NULL, nsim = 400, conditional_fs = FALSE, # Fix the size parameter over the BAUs to 1 (we will use k_Z) k <- 1 - k <- rep(k, length(M@BAUs)) # repeat k to prevent message from predict() + k <- rep(k, length(object@BAUs)) # repeat k to prevent message from predict() if (!is.null(list(...)$k)) stop("k should not be provided when calling simulate") }