prepare CRAN submission

HannaMeyer · Jun 10, 2024 · ed4987d · ed4987d
1 parent 133ebb2
commit ed4987d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,7 +20,7 @@ URL: https://github.com/HannaMeyer/CAST,
 Encoding: UTF-8
 LazyData: false
 Depends: R (>= 4.1.0)
-Imports: caret, stats, utils, ggplot2, graphics, FNN, plyr, zoo, methods, grDevices, data.table, sf, forcats, twosamples, terra
+Imports: caret, stats, utils, ggplot2, graphics, FNN, plyr, zoo, methods, grDevices, data.table, sf, forcats, twosamples, terra, sp
 Suggests: 
     doParallel,
     lubridate,

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,5 @@
 # `CAST` 1.0.2
 * bug fix: tests run conditionally
-* modifications: dependence on sp replaced by sf
 
 # `CAST` 1.0.1
 * bug fix: fix failed tests in global_validation

diff --git a/R/geodist.R b/R/geodist.R
@@ -640,16 +640,17 @@ sampleFromArea <- function(modeldomain, samplesize, type,variables,sampling, cat
   sf::st_as_sf(modeldomainextent) |>
     sf::st_transform(4326) -> bb
 
-  #methods::as(bb, "Spatial") |>
-  # sp::spsample(n = samplesize, type = sampling)  |>
-  # sf::st_as_sfc() |>
-  # sf::st_set_crs(4326) -> predictionloc
-  # predictionloc <- sf::st_as_sf(predictionloc)
-
-  predictionloc <- sf::st_sample(sf::st_make_valid(bb),size=samplesize,type=sampling)
-  sf::st_crs(predictionloc) <- 4326
+  methods::as(bb, "Spatial") |>
+    sp::spsample(n = samplesize, type = sampling)  |>
+    sf::st_as_sfc() |>
+    sf::st_set_crs(4326) -> predictionloc
   predictionloc <- sf::st_as_sf(predictionloc)
 
+  # sf version:
+  #  predictionloc <- sf::st_sample(sf::st_make_valid(bb),size=samplesize,type=sampling)
+  #  sf::st_crs(predictionloc) <- 4326
+  #  predictionloc <- sf::st_as_sf(predictionloc)
+
 
 
 

diff --git a/tests/testthat/test-geodist.R b/tests/testthat/test-geodist.R
@@ -17,7 +17,7 @@ test_that("geodist works with points and polygon in geographic space", {
 
   expect_equal(mean_sample2sample, 20321)
   expect_equal(mean_CV_distances, 25616)
-  expect_equal(nrow_dist, 3405) #3410
+  expect_equal(nrow_dist, 3410)
 
 
 })
@@ -247,7 +247,7 @@ test_that("geodist works with categorical variables in feature space", {
   mean_CV_distance <- round(mean(dist[dist$what=="CV-distances","dist"]), 4)
 
   expect_equal(mean_sample2sample, 0.0459)
-  expect_equal(mean_prediction2sample, 0.161) #0.1625
+  expect_equal(mean_prediction2sample, 0.1625) #0.1625
   expect_equal(mean_test2sample, 0.2358)
   expect_equal(mean_CV_distance, 0.0663)
 })