Skip to content

Fix variogramST.STIDF #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix variogramST.STIDF #135

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40291d5
Fix variogramST.STIDF
darentsai Jan 19, 2024
a932202
Add units.default
darentsai Jan 20, 2024
21c42ba
Revert "Add units.default"
darentsai Jan 22, 2024
55685d4
Merge branch 'r-spatial:main' into main
darentsai Jan 22, 2024
37e01c2
Merge branch 'r-spatial:main' into main
darentsai May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions R/variogramST.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ variogramST.STIDF <- function (formula, data, tlags, cutoff,
tmpInd[,1] <- ind %% nData # row number
tmpInd[,2] <- (ind %/% nData)+1 # col number
if (cores == 1){
tmpInd[,3] <- apply(tmpInd[,1:2,drop=FALSE], 1, function(x) spDists(data@sp[x[1]], data@sp[x[2]+x[1],]))
# tmpInd[,3] <- apply(tmpInd[,1:2,drop=FALSE], 1, function(x) spDists(data@sp[x[1]], data@sp[x[2]+x[1],]))
tmpInd[,3] <- spDists(data@sp[tmpInd[,1]], data@sp[tmpInd[,2]+tmpInd[,1], ], diagonal = TRUE)
} else {
if(!requireNamespace("future", quietly = TRUE) || !requireNamespace("future.apply", quietly = TRUE))
stop("For parallelization, future and future.apply packages are required")
Expand All @@ -252,7 +253,7 @@ variogramST.STIDF <- function (formula, data, tlags, cutoff,

indSp <- cbind(ind[indSp] %% nData, (ind[indSp] %/% nData)+1)
np[j,i] <- nrow(indSp) # Issue #7, Thanks to Roelof.
gamma[j,i] <- 0.5*mean((data[,,colnames(m)[1]]@data[indSp[,1],1] - data[,,colnames(m)[1]]@data[indSp[,1]+indSp[,2],1])^2,
gamma[j,i] <- 0.5*mean((data[,,colnames(m)[1]]@data[indSp[,1],1,drop=TRUE] - data[,,colnames(m)[1]]@data[indSp[,1]+indSp[,2],1,drop=TRUE])^2,
na.rm=TRUE)
}
if(progress)
Expand Down
1 change: 1 addition & 0 deletions R/zzz.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
## }

variogram <- function(object, ...) UseMethod("variogram")
units.default <- function(x, ...) base::units.difftime(x)