Browse code

Merge branch 'devel' into RELEASE_3_17

Nicholas Robertson authored on 05/10/2023 02:01:15
Showing 4 changed files

... ...
@@ -10,4 +10,6 @@ Meta
10 10
 .gitattributes
11 11
 
12 12
 
13
-.vscode
14 13
\ No newline at end of file
14
+.vscode
15
+small_data.rds
16
+test.R
... ...
@@ -1,7 +1,7 @@
1 1
 Package: lisaClust
2 2
 Type: Package
3 3
 Title: lisaClust: Clustering of Local Indicators of Spatial Association
4
-Version: 1.8.1
4
+Version: 1.8.2
5 5
 Authors@R: c(
6 6
     person("Ellis", "Patrick", email = "[email protected]",
7 7
     role = c("aut", "cre")),
... ...
@@ -20,9 +20,27 @@ Depends: R (>= 4.0)
20 20
 VignetteBuilder: knitr
21 21
 BugReports: https://github.com/ellispatrick/lisaClust/issues
22 22
 URL: https://ellispatrick.github.io/lisaClust/, https://github.com/ellispatrick/lisaClust
23
-Imports: ggplot2, class, concaveman, grid, BiocParallel, spatstat.explore,
24
-        spatstat.geom, BiocGenerics, S4Vectors, methods, spicyR,
25
-        purrr, stats, data.table, dplyr, tidyr, SingleCellExperiment, SpatialExperiment,
26
-        SummarizedExperiment, pheatmap
23
+Imports: 
24
+    ggplot2,
25
+    class,
26
+    concaveman,
27
+    grid,
28
+    BiocParallel,
29
+    spatstat.explore,
30
+    spatstat.geom,
31
+    BiocGenerics,
32
+    S4Vectors,
33
+    methods,
34
+    spicyR,
35
+    purrr,
36
+    stats,
37
+    data.table,
38
+    dplyr,
39
+    tidyr,
40
+    SingleCellExperiment,
41
+    SpatialExperiment,
42
+    SummarizedExperiment,
43
+    pheatmap,
44
+    spatstat.random
27 45
 Suggests: BiocStyle, knitr, rmarkdown
28 46
 RoxygenNote: 7.2.3
... ...
@@ -65,6 +65,7 @@ importFrom(spatstat.geom,owin)
65 65
 importFrom(spatstat.geom,ppp)
66 66
 importFrom(spatstat.geom,solapply)
67 67
 importFrom(spatstat.geom,union.owin)
68
+importFrom(spatstat.random,expand.owin)
68 69
 importFrom(spicyR,"cellAnnotation<-")
69 70
 importFrom(spicyR,SegmentedCells)
70 71
 importFrom(spicyR,cellAnnotation)
... ...
@@ -367,6 +367,7 @@ weightCounts <- function(dt, X, maxD, lam) {
367 367
 #' @rdname inhomLocalK
368 368
 #' @importFrom spatstat.geom ppp closepairs marks area
369 369
 #' @importFrom spatstat.explore density.ppp
370
+#' @importFrom spatstat.random expand.owin
370 371
 #' @importFrom tidyr pivot_longer
371 372
 #' @importFrom dplyr left_join
372 373
 inhomLocalK <-
... ...
@@ -379,6 +380,7 @@ inhomLocalK <-
379 380
            lisaFunc = "K") {
380 381
 
381 382
     ow <- makeWindow(data, window, window.length)
383
+    ow <- spatstat.random::expand.owin(ow, distance = 0.01)
382 384
     X <-
383 385
       spatstat.geom::ppp(
384 386
         x = data$x,