diff --git a/R/pid_idsa.R b/R/pid_idsa.R index f224a4eb..795cdc41 100644 --- a/R/pid_idsa.R +++ b/R/pid_idsa.R @@ -44,7 +44,7 @@ #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la'))) #' cpsd_disc(y ~ xa + xb + xc, #' data = sim, #' wt = wt) @@ -183,7 +183,7 @@ cpsd_disc = \(formula, data, wt, discnum = 3:8, discmethod = "quantile", strate #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la'))) #' sim1 = dplyr::mutate(sim,dplyr::across(xa:xc,\(.x) sdsfun::discretize_vector(.x,5))) #' sz = sdsfun::fuzzyoverlay(y ~ xa + xb + xc, data = sim1) #' psd_iev(dplyr::select(sim1,xa:xc),sz,wt) @@ -214,7 +214,7 @@ psd_iev = \(discdata,spzone,wt){ #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la'))) #' sim1 = dplyr::mutate(sim,dplyr::across(xa:xc,\(.x) sdsfun::discretize_vector(.x,5))) #' pid_idsa(y ~ xa + xb + xc, rawdata = sim, #' discdata = sim1, wt = wt) diff --git a/R/psd_pseudop.R b/R/psd_pseudop.R index f9283bba..9a3208b0 100644 --- a/R/psd_pseudop.R +++ b/R/psd_pseudop.R @@ -23,7 +23,8 @@ #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la,power = 2) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la')), +#' power = 2) #' psd_pseudop(sim$y,sdsfun::discretize_vector(sim$xa,5),wt) #' psd_pseudop = \(y,x,wt,cores = 1, @@ -102,7 +103,7 @@ psd_pseudop = \(y,x,wt,cores = 1, #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la'))) #' psmd_pseudop(sim$y,sim$xa,wt) #' psmd_pseudop = \(yobs, xobs, wt, discnum = 3:8, diff --git a/R/psd_spade.R b/R/psd_spade.R index 87acc562..31b46d83 100644 --- a/R/psd_spade.R +++ b/R/psd_spade.R @@ -20,7 +20,8 @@ #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la,power = 2) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la')), +#' power = 2) #' psd_spade(sim$y,sdsfun::discretize_vector(sim$xa,5),wt) #' psd_spade = \(y,x,wt){ @@ -68,7 +69,7 @@ psd_spade = \(y,x,wt){ #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la'))) #' xa = sim$xa #' xa_disc = sdsfun::discretize_vector(xa,5) #' cpsd_spade(sim$y,xa,xa_disc,wt) @@ -107,7 +108,7 @@ cpsd_spade = \(yobs,xobs,xdisc,wt){ #' #' @examples #' data('sim') -#' wt = inverse_distance_weight(sim$lo,sim$la) +#' wt = sdsfun::inverse_distance_swm(sf::st_as_sf(sim,coords = c('lo','la'))) #' psmd_spade(sim$y,sim$xa,wt) #' psmd_spade = \(yobs, xobs, wt, discnum = 3:8, diff --git a/tests/testthat/test-psd_spade.R b/tests/testthat/test-psd_spade.R index c3815972..050ed9c5 100644 --- a/tests/testthat/test-psd_spade.R +++ b/tests/testthat/test-psd_spade.R @@ -1,6 +1,6 @@ test_that("test whether psd_spade function works well", { data('NTDs') - wt = inverse_distance_weight(NTDs$X,NTDs$Y,power = 2) + wt = sdsfun::inverse_distance_swm(sf::st_as_sf(NTDs,coords = c('X','Y')),power = 2) p = round(psd_spade(NTDs$incidence,NTDs$soiltype,wt),6) expect_equal(p,0.256653) })