Merge pull request #48 from aberHRML/devel

v2.4.2
aberHRML · Dec 1, 2020 · 71e0f9b · 71e0f9b
2 parents fb0268d + e7f6c14
commit 71e0f9b
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: binneR
 Title: Spectral Processing for High Resolution Flow Infusion Mass Spectrometry
-Version: 2.4.1
+Version: 2.4.2
 Authors@R: person("Jasen", "Finch", email = "[email protected]", role = c("aut", "cre"))
 Description: A spectral binning approach for high resolution flow infusion mass spectrometry data.
 biocViews: MassSpectrometry, Metabolomics

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# binneR v2.4.2
+
+* Bin measures are now correctly averaged across samples in [`binneR::plotCentrality()`](https://aberHRML.github.io/binneR/reference/plotCentrality.html) and [`binneR::plotPurity()`](https://aberHRML.github.io/binneR/reference/plotPurity.html).
+
 # binneR v2.4.1
 
 * Fixed errors in [`binneR::plotCentrality()`](https://aberHRML.github.io/binneR/reference/plotCentrality.html) and [`binneR::plotPurity()`](https://aberHRML.github.io/binneR/reference/plotPurity.html).

diff --git a/R/plot.R b/R/plot.R
@@ -234,8 +234,9 @@ setMethod('plotPurity',signature = 'Binalysis',function(x,histBins = 30){
 
 	pur <- x %>%
 		accurateData() %>%
-		dplyr::select(polarity,purity) %>%
-		mutate(polarity = as.character(polarity)) 
+		select(polarity,bin,purity) %>%
+		group_by(polarity,bin) %>%
+		summarise(purity = mean(purity),.groups = 'drop')
 
 	pur$polarity[pur$polarity == 'n'] <- 'Negative mode'
 	pur$polarity[pur$polarity == 'p'] <- 'Positive mode'
@@ -266,8 +267,9 @@ setMethod('plotCentrality',signature = 'Binalysis',function(x,histBins = 30){
 
 	pur <- x %>%
 		accurateData() %>%
-		dplyr::select(polarity,centrality) %>%
-		mutate(polarity = as.character(polarity)) 
+		select(polarity,bin,centrality) %>%
+		group_by(polarity,bin) %>%
+		summarise(centrality = mean(centrality),.groups = 'drop') 
 
 	pur$polarity[pur$polarity == 'n'] <- 'Negative mode'
 	pur$polarity[pur$polarity == 'p'] <- 'Positive mode'

diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/reference/index.html b/docs/reference/index.html