Skip to content

Commit

Permalink
Merge pull request #186 from Artur-man/main
Browse files Browse the repository at this point in the history
update niche clustering tutorial and fix a bug in hot spot analysis
  • Loading branch information
Artur-man authored Jan 2, 2025
2 parents 2964682 + 40f2332 commit 5cd62f3
Show file tree
Hide file tree
Showing 19 changed files with 204 additions and 114 deletions.
1 change: 1 addition & 0 deletions R/spatial.R
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ getHotSpotAnalysis <- function(object, assay = NULL, method = "Getis-Ord", featu

# calculate getis ord
n <- length(statistic)
statistic <- statistic - (min(statistic)) ### correct for negative scores, correct for this later
getisord_stat <- adj_matrix %*% statistic
getisord_stat <- getisord_stat/(sum(statistic) - statistic)
getisord[[1]] <- getisord_stat[,1]
Expand Down
2 changes: 1 addition & 1 deletion docs/_site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ navbar:
- text: "Multi-omic Integration"
href: multiomic.html
- text: "Niche Clustering"
href: deconvolution.html
href: nicheclustering.html
- text: "Downstream Analysis"
menu:
- text: "ROI Analysis"
Expand Down
2 changes: 1 addition & 1 deletion docs/conversion.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/importingdata.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/interactive.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ knitr::opts_chunk$set(highlight = TRUE, echo = TRUE)

# Interactive Annotation

**VoltRon** includes interactive applications to select and manually label spatial points by drawing polygons and circles. As an example, we will use a Spot-based spatial transcriptomic assay, specifically the **Mouse Brain Serial Section 1/2** datasets, analyzed in the [Niche Clustering](deconvolution.html) tutorial. You can find the already analyzed data stored as a VoltRon object [here](https://bimsbstatic.mdc-berlin.de/landthaler/VoltRon/NicheClustering/Visium&Visium_data_decon_analyzed.rds)
**VoltRon** includes interactive applications to select and manually label spatial points by drawing polygons and circles. As an example, we will use a Spot-based spatial transcriptomic assay, specifically the **Mouse Brain Serial Section 1/2** datasets, analyzed in the [Niche Clustering](nicheclustering.html) tutorial. You can find the already analyzed data stored as a VoltRon object [here](https://bimsbstatic.mdc-berlin.de/landthaler/VoltRon/NicheClustering/Visium&Visium_data_decon_analyzed.rds)

```{r class.source="watch-out", eval = FALSE}
MBrain_Sec <- readRDS("Visium&Visium_data_decon_analyzed.rds")
Expand Down
4 changes: 2 additions & 2 deletions docs/interactive.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down Expand Up @@ -464,7 +464,7 @@ <h1>Interactive Annotation</h1>
and manually label spatial points by drawing polygons and circles. As an
example, we will use a Spot-based spatial transcriptomic assay,
specifically the <strong>Mouse Brain Serial Section 1/2</strong>
datasets, analyzed in the <a href="deconvolution.html">Niche
datasets, analyzed in the <a href="nicheclustering.html">Niche
Clustering</a> tutorial. You can find the already analyzed data stored
as a VoltRon object <a
href="https://bimsbstatic.mdc-berlin.de/landthaler/VoltRon/NicheClustering/Visium&amp;Visium_data_decon_analyzed.rds">here</a></p>
Expand Down
2 changes: 1 addition & 1 deletion docs/moleculeanalysis.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/multiomic.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
81 changes: 59 additions & 22 deletions docs/deconvolution.Rmd → docs/nicheclustering.Rmd

Large diffs are not rendered by default.

200 changes: 126 additions & 74 deletions docs/deconvolution.html → docs/nicheclustering.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/ondisk.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/pixelanalysis.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/registration.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/roianalysis.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/spotanalysis.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ In addition, VoltRon provides a number of spatially aware data analysis methods
<img width="80%" height="80%" src="https://bimsbstatic.mdc-berlin.de/landthaler/VoltRon/Package/images/multiomic.png" class="center">
<p style = "margin: 3%"> Integrating data modalities within or across tissue sections </p>
</td>
<td onclick="location.href='deconvolution.html';">
<td onclick="location.href='nicheclustering.html';">
<p class ="tutorial"> Niche Clustering </p>
<img width="80%" height="80%" src="https://bimsbstatic.mdc-berlin.de/landthaler/VoltRon/Package/images/deconvolution.png" class="center">
<p style = "margin: 5%"> Clustering based on ROI/spot deconvolution and Spatial Neighborhood </p>
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down Expand Up @@ -444,7 +444,7 @@ <h2>Spatially Aware Data Integration and Analysis</h2>
Integrating data modalities within or across tissue sections
</p>
</td>
<td onclick="location.href=&#39;deconvolution.html&#39;;">
<td onclick="location.href=&#39;nicheclustering.html&#39;;">
<p class="tutorial">
Niche Clustering
</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/voltronobjects.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<a href="multiomic.html">Multi-omic Integration</a>
</li>
<li>
<a href="deconvolution.html">Niche Clustering</a>
<a href="nicheclustering.html">Niche Clustering</a>
</li>
</ul>
</li>
Expand Down

0 comments on commit 5cd62f3

Please sign in to comment.