Skip to content

Commit

Permalink
use sdsfun::inverse_distance_swm
Browse files Browse the repository at this point in the history
  • Loading branch information
SpatLyu committed Nov 15, 2024
1 parent 662464b commit abe2ee9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions R/pid_idsa.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions R/psd_pseudop.R
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions R/psd_spade.R
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-psd_spade.R
Original file line number Diff line number Diff line change
@@ -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)
})

0 comments on commit abe2ee9

Please sign in to comment.