Skip to content

Commit

Permalink
fix window issue
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-robo committed Oct 5, 2023
1 parent 8b76ec1 commit 9c2d15a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ Meta
.gitattributes


.vscode
.vscode
small_data.rds
test.R
26 changes: 22 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,27 @@ Depends: R (>= 4.0)
VignetteBuilder: knitr
BugReports: https://github.com/ellispatrick/lisaClust/issues
URL: https://ellispatrick.github.io/lisaClust/, https://github.com/ellispatrick/lisaClust
Imports: ggplot2, class, concaveman, grid, BiocParallel, spatstat.explore,
spatstat.geom, BiocGenerics, S4Vectors, methods, spicyR,
purrr, stats, data.table, dplyr, tidyr, SingleCellExperiment, SpatialExperiment,
SummarizedExperiment, pheatmap
Imports:
ggplot2,
class,
concaveman,
grid,
BiocParallel,
spatstat.explore,
spatstat.geom,
BiocGenerics,
S4Vectors,
methods,
spicyR,
purrr,
stats,
data.table,
dplyr,
tidyr,
SingleCellExperiment,
SpatialExperiment,
SummarizedExperiment,
pheatmap,
spatstat.random
Suggests: BiocStyle, knitr, rmarkdown
RoxygenNote: 7.2.3
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ importFrom(spatstat.geom,owin)
importFrom(spatstat.geom,ppp)
importFrom(spatstat.geom,solapply)
importFrom(spatstat.geom,union.owin)
importFrom(spatstat.random,expand.owin)
importFrom(spicyR,"cellAnnotation<-")
importFrom(spicyR,SegmentedCells)
importFrom(spicyR,cellAnnotation)
Expand Down
2 changes: 2 additions & 0 deletions R/LISA.R
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ weightCounts <- function(dt, X, maxD, lam) {
#' @rdname inhomLocalK
#' @importFrom spatstat.geom ppp closepairs marks area
#' @importFrom spatstat.explore density.ppp
#' @importFrom spatstat.random expand.owin
#' @importFrom tidyr pivot_longer
#' @importFrom dplyr left_join
inhomLocalK <-
Expand All @@ -379,6 +380,7 @@ inhomLocalK <-
lisaFunc = "K") {

ow <- makeWindow(data, window, window.length)
ow <- spatstat.random::expand.owin(ow, distance = 0.01)
X <-
spatstat.geom::ppp(
x = data$x,
Expand Down

0 comments on commit 9c2d15a

Please sign in to comment.