Merge remote-tracking branch 'origin/devel' into devel

sneumann · Feb 23, 2024 · de0b366 · de0b366
2 parents e606322 + 4fcb331
commit de0b366
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -35,7 +35,11 @@ Authors@R: c(
 	   person(given = "Philippine", family = "Louail",
 	   email = "philippine.louail@eurac.edu",
 	   role = "aut",
-	   comment = c(ORCID = "0009-0007-5429-6846"))
+	   comment = c(ORCID = "0009-0007-5429-6846")),
+	   person(given = "Pablo", family = "Vangeenderhuysen",
+	   email = "pablo.vangeenderhuysen@ugent.be",
+	   role = "ctb",
+	   comment = c(ORCID = "0000-0002-5492-6904"))
 	   )
 Depends:
     R (>= 4.0.0),

diff --git a/R/XcmsExperiment.R b/R/XcmsExperiment.R
@@ -702,7 +702,7 @@
 NULL
 
 .empty_chrom_peaks <- function(sample = TRUE) {
-    cols <- c(.REQ_PEAKS_COLS, "maxo")
+    cols <- c(.REQ_PEAKS_COLS, "maxo","sn")
     if (!sample)
         cols <- cols[cols != "sample"]
     matrix(numeric(), ncol = length(cols), nrow = 0,

diff --git a/inst/NEWS b/inst/NEWS
@@ -1,8 +1,14 @@
-Changes in version 4.1.8
+Changes in version 4.1.9
 ----------------------
 
 - Fix bug in `filterFeatures,PercentMissingFilter`.
 
+Changes in version 4.1.8
+----------------------
+
+- Fixing issue #716: edit of `.empty_chrom_peaks` function so an `sn` column is
+  returned. Fixes extracting and plotting of peaks after using `manualChromPeaks`
+
 Changes in version 4.1.7
 ----------------------
 

diff --git a/tests/testthat/test_XcmsExperiment.R b/tests/testthat/test_XcmsExperiment.R
@@ -4,7 +4,7 @@ mse_dia <- readMsExperiment(fl)
 test_that(".empty_chrom_peaks works", {
     res <- .empty_chrom_peaks()
     expect_true(nrow(res) == 0)
-    expect_equal(colnames(res), c(.REQ_PEAKS_COLS, "maxo"))
+    expect_equal(colnames(res), c(.REQ_PEAKS_COLS, "maxo","sn"))
 
     res <- .empty_chrom_peaks(sample = FALSE)
     expect_true(nrow(res) == 0)
@@ -995,8 +995,13 @@ test_that("manualChromPeaks,XcmsExperiment works", {
     expect_equal(unname(pks[, c("mz", "into", "maxo")]),
                  unname(pks_2[, c("mz", "into", "maxo")]))
 
+    chr_pks <- chromPeaks(res)
+    expect_true("sn" %in% colnames(chr_pks))
+
     res2 <- manualChromPeaks(tmp, pks, samples = 2)
     expect_equal(unname(chromPeaks(res2)), unname(pks_2))
+
+
 })
 
 test_that("filterChromPeaks,XcmsExperiment works", {