From 40291d51289b7f0f43be538371edffc81008409e Mon Sep 17 00:00:00 2001 From: Darren Tsai Date: Fri, 19 Jan 2024 17:16:45 +0800 Subject: [PATCH 1/3] Fix variogramST.STIDF --- R/variogramST.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/R/variogramST.R b/R/variogramST.R index e644f60..c60a5da 100644 --- a/R/variogramST.R +++ b/R/variogramST.R @@ -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") @@ -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) From a9322021fd77a769b862e8f6a8c7408b6f0ecfb8 Mon Sep 17 00:00:00 2001 From: Darren Tsai Date: Sat, 20 Jan 2024 19:55:43 +0800 Subject: [PATCH 2/3] Add units.default --- R/zzz.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/zzz.R b/R/zzz.R index 883e725..3ef30b8 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -17,3 +17,4 @@ ## } variogram <- function(object, ...) UseMethod("variogram") +units.default <- function(x, ...) base::units.difftime(x) From 21c42ba72bc918fee758e49cb3954ee5fe2e90f4 Mon Sep 17 00:00:00 2001 From: Darren Tsai Date: Mon, 22 Jan 2024 18:33:53 +0800 Subject: [PATCH 3/3] Revert "Add units.default" This reverts commit a9322021fd77a769b862e8f6a8c7408b6f0ecfb8. --- R/zzz.R | 1 - 1 file changed, 1 deletion(-) diff --git a/R/zzz.R b/R/zzz.R index 3ef30b8..883e725 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -17,4 +17,3 @@ ## } variogram <- function(object, ...) UseMethod("variogram") -units.default <- function(x, ...) base::units.difftime(x)