Fixed as_function bug; fixed typo

PNNL-Comp-Mass-Spec · Jan 20, 2025 · 527efa1 · 527efa1
1 parent 1b6e1fe
commit 527efa1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ Misc/
 
 **/*.html
 vignettes/*.R
+
+tests/
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -90,4 +90,4 @@ Remotes:
     github::cran/FField,
     github::PNNL-Comp-Mass-Spec/MSnID@pnnl-master
 VignetteBuilder: knitr
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
diff --git a/NAMESPACE b/NAMESPACE
@@ -249,6 +249,7 @@ importFrom(reshape2,acast)
 importFrom(reshape2,melt)
 importFrom(rlang,"!!")
 importFrom(rlang,":=")
+importFrom(rlang,as_function)
 importFrom(rlang,parse_expr)
 importFrom(rlang,sym)
 importFrom(scales,alpha)

diff --git a/R/rollup.R b/R/rollup.R
@@ -36,16 +36,16 @@ rrollup <- function(msnset, rollBy, rollFun,
     algorithm <- match.arg(algorithm)
 
     if(algorithm == "reference"){
-        summarisedFeatures <- list()
+        summarizedFeatures <- list()
         unique_rollBy <- unique(fData(msnset)[[rollBy]])
-        for (i in 1:length(unique_rollBy)) {
+        for (i in seq_along(unique_rollBy)) {
             # Subset msnset to each rollBy group
             msnset_sub <- msnset[fData(msnset)[[rollBy]] == unique_rollBy[i], ,
                                  drop = FALSE]
-            summarisedFeatures[[i]] <- rrollup_a_feature_set(msnset_sub, rollBy,
+            summarizedFeatures[[i]] <- rrollup_a_feature_set(msnset_sub, rollBy,
                                                              rollFun, verbose)
         }
-        exprs.new <- do.call(rbind, summarisedFeatures)
+        exprs.new <- do.call(rbind, summarizedFeatures)
         rownames(exprs.new) <- unique_rollBy
     } else {
         temp <- data.frame(rollBy = fData(msnset)[[rollBy]],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ Misc/

		*/.html
		vignettes/*.R

		tests/