From 65f3114bf879b5fa7c33ec2794da75e01abada3d Mon Sep 17 00:00:00 2001 From: SpatLyu Date: Mon, 6 Jul 2026 00:00:01 +0800 Subject: [PATCH 1/3] fix bug of `ssh_marginalcontri` when `overlay` is assigned to `intersection` --- R/ssh_marginalcontri.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/ssh_marginalcontri.R b/R/ssh_marginalcontri.R index f7247e7..0137725 100644 --- a/R/ssh_marginalcontri.R +++ b/R/ssh_marginalcontri.R @@ -41,10 +41,10 @@ ssh_marginalcontri = \(formula, data, overlay = 'and', cores = 1){ pd_mc = \(formula, discdata, overlaymethod = 'and'){ formula = stats::as.formula(formula) formulavars = all.vars(formula) - if (formula.vars[2] != "."){ + if (formulavars[2] != "."){ discdata = dplyr::select(discdata,dplyr::all_of(formulavars)) } - yname = formula.vars[1] + yname = formulavars[1] if (overlaymethod == 'intersection'){ fuzzyzone = discdata |> dplyr::select(-dplyr::any_of(yname)) |> From 35b983cbbe47d080f8762a4c87ae76fe904bd3cd Mon Sep 17 00:00:00 2001 From: SpatLyu Date: Mon, 6 Jul 2026 00:00:01 +0800 Subject: [PATCH 2/3] fix bug of `ssh_marginalcontri` when `overlay` is assigned to `intersection` --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 77ddac9..44503f2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # cisp 0.3.0 +* Fix bug of `ssh_marginalcontri` when `overlay` is assigned to `intersection` （#27） + # cisp 0.2.0 * Optimize `spc` with OPGD for efficiency and rename the results table (#13). From 51ea5e963a915dabce750e902d60478baaa6b7af Mon Sep 17 00:00:00 2001 From: SpatLyu Date: Mon, 6 Jul 2026 00:00:01 +0800 Subject: [PATCH 3/3] upgrade dependencies version --- DESCRIPTION | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8821fad..244c135 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,7 +35,7 @@ Depends: Imports: dplyr, forcats, - gdverse (>= 1.5), + gdverse (>= 1.6), ggplot2, ggraph, igraph, @@ -49,5 +49,7 @@ Imports: Suggests: knitr, rmarkdown, - spEDM + spEDM, + infoxtr, + pc VignetteBuilder: knitr