Skip to content

Commit

Permalink
Merge branch 'bzhanglab:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
iblacksand authored Mar 7, 2024
2 parents 97f94e0 + 5bc8283 commit ee303da
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions R/idMappingMetabolites.R
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ add_prefix <- function(x, sourceIdType) {
uppers <- c("LIPIDMAPS", "CAS")
if (toupper(sourceIdType) %in% uppers) {
return(unlist(sapply(x, function(y) {
if (grepl(":", y, FIXED = TRUE)) {
if (grepl(":", y)) {
return(y)
}
return(paste0(toupper(sourceIdType), ":", toupper(y)))
})))
} else {
return(unlist(sapply(x, function(y) {
if (grepl(":", y, fixed = TRUE) && sourceIdType != "swisslipids") {
if (grepl(":", y) && sourceIdType != "swisslipids") {
return(y)
}
return(paste0(sourceIdType, ":", y))
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# WebGestaltR

[![R-CMD-check](https://github.com/iblacksand/WebGestaltR/actions/workflows/check-standard.yaml/badge.svg)](https://github.com/iblacksand/WebGestaltR/actions/workflows/check-standard.yaml)
[![R-CMD-check](https://github.com/bzhanglab/WebGestaltR/actions/workflows/check-standard.yaml/badge.svg)](https://github.com/bzhanglab/WebGestaltR/actions/workflows/check-standard.yaml)

> [!IMPORTANT]
> The new version of WebGestaltR requires Rust, which must be installed on your device prior to installing or updating the package from CRAN. See the installation section for more information.
Expand Down Expand Up @@ -28,14 +28,14 @@ After installing Rust, you can install WebGestaltR by running the following comm

```R
# install.packages("devtools") # run if devtools not already installed
devtools::install_github("iblacksand/WebGestaltR")
devtools::install_github("bzhanglab/WebGestaltR")
```

During installation, the Rust compiler will be called to build the computation library used by WebGestaltR. If you run into problems with installation of the new version, please [open a new issue](https://github.com/iblacksand/WebGestaltR/issues/new/choose).
During installation, the Rust compiler will be called to build the computation library used by WebGestaltR. If you run into problems with installation of the new version, please [open a new issue](https://github.com/bzhanglab/WebGestaltR/issues/new/choose).

## Changes

> [!NOTE]
> Besides the change in installation, there should be no difference in how the R package performs for existing use-cases. If you experience any difference in results that are not due to the data-update, that is considered a bug. [Please report the changes you experience in a new issue](https://github.com/iblacksand/WebGestaltR/issues/new/choose).
> Besides the change in installation, there should be no difference in how the R package performs for existing use-cases. If you experience any difference in results that are not due to the data-update, that is considered a bug. [Please report the changes you experience in a new issue](https://github.com/bzhanglab/WebGestaltR/issues/new/choose).
WebGestaltR's core was re-written in Rust, which dramatically increased performance, with up to 15x the speed of previous versions. The new version also supports metabolomics, with support for 15 different ID types.

0 comments on commit ee303da

Please sign in to comment.