Skip to content

Commit

Permalink
filterOutIN: fix regex
Browse files Browse the repository at this point in the history
  • Loading branch information
Carol-seven committed Mar 4, 2024
1 parent ecd9b50 commit 5b4d221
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 19 deletions.
4 changes: 4 additions & 0 deletions R/filterings.R
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,15 @@ filterOutIn <- function(dataSet,
## only list filter if listName is present
if (length(listName) != 0) {
listIndex <- which(colnames(filteredData) %in% listName)
} else {
listIndex <- NULL
}

## only regex filter if regexName is present
if (length(regexName) != 0) {
regexIndex <- grep(paste(regexName, collapse = "|"), colnames(filteredData))
} else {
regexIndex <- NULL
}

## combine protein names from list and regex filters
Expand Down
18 changes: 0 additions & 18 deletions R/globals.R
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
##
## msDiaLogue: Analysis + Visuals for Data Indep. Aquisition Mass Spectrometry Data
## Copyright (C) 2024 Shiying Xiao, Timothy Moore and Charles Watt
## Shiying Xiao <shiying.xiao@uconn.edu>
##
## This file is part of the R package msDiaLogue.
##
## The R package msDiaLogue is free software: You can redistribute it and/or
## modify it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or any later
## version (at your option). See the GNU General Public License at
## <https://www.gnu.org/licenses/> for details.
##
## The R package wdnet is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
##

# Generated by roxyglobals: do not edit by hand

utils::globalVariables(c(
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgdown: 2.0.7
pkgdown_sha: ~
articles:
usage_template: usage_template.html
last_built: 2024-03-04T20:10Z
last_built: 2024-03-04T21:28Z
urls:
reference: https://uconn-scs.github.io/msDiaLogue/reference
article: https://uconn-scs.github.io/msDiaLogue/articles
Expand Down

0 comments on commit 5b4d221

Please sign in to comment.