Merge pull request #64 from rformassspectrometry/andrea

matchMz, CompareMassParam
rformassspectrometry · Mar 23, 2022 · 193c065 · 193c065
2 parents 51b92af + 1b4e836
commit 193c065
Show file tree

Hide file tree

Showing 7 changed files with 1,396 additions and 787 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: MetaboAnnotation
 Title: Utilities for Annotation of Metabolomics Data
-Version: 0.99.7
+Version: 0.99.8
 Description:
     High level functions to assist in annotation of (metabolomics) data sets.
     These include functions to perform simple tentative annotations based on

diff --git a/NAMESPACE b/NAMESPACE
@@ -7,8 +7,11 @@ export(MatchForwardReverseParam)
 export(Matched)
 export(MatchedSpectra)
 export(MatchedSummarizedExperiment)
+export(Mz2MassParam)
+export(Mz2MassRtParam)
 export(MzParam)
 export(MzRtParam)
+export(ValueParam)
 export(matchFormula)
 export(matchMz)
 export(matchSpectra)
@@ -44,6 +47,7 @@ importFrom(BiocParallel,bplapply)
 importFrom(BiocParallel,bpmapply)
 importFrom(MetaboCoreUtils,adductNames)
 importFrom(MetaboCoreUtils,mass2mz)
+importFrom(MetaboCoreUtils,mz2mass)
 importFrom(MetaboCoreUtils,standardizeFormula)
 importFrom(MsCoreUtils,ndotproduct)
 importFrom(MsCoreUtils,ppm)

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,10 @@
 # MetaboAnnotation 0.99
 
+## Changes in 0.99.8
+
+- Add `matchMz, Mz2MassParam` and `matchMz, Mz2MassRtParam`. (issue
+  [#56](https://github.com/rformassspectrometry/MetaboAnnotation/issues/56)).
+
 ## Changes in 0.99.7
 
 - Add formula matching functions.

diff --git a/R/matchFormula.R b/R/matchFormula.R
@@ -71,6 +71,8 @@ setGeneric("matchFormula", function(query, target, ...)
 #' @rdname matchFormula
 #'
 #' @importFrom MetaboCoreUtils standardizeFormula
+#' 
+#' @importFrom BiocParallel bpmapply SerialParam
 setMethod(
     "matchFormula",
     signature = c(query = "character",

diff --git a/R/matchMz.R b/R/matchMz.R
diff --git a/man/matchMz.Rd b/man/matchMz.Rd