Skip to content

Commit 83ea1f2

Browse files
committed
fix updatd sysdata.rda
1 parent 92cbf24 commit 83ea1f2

File tree

6 files changed

+29
-17
lines changed

6 files changed

+29
-17
lines changed

.bumpversion.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "2.2.1"
2+
current_version = "2.2.0"
33
search = "{current_version}"
44
replace = "{new_version}"
55
message = "Bump version: {current_version} → {new_version}"

.github/workflows/pkgdown.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
name: pkgdown
1111

1212
env:
13-
VERSION: '2.2.1'
13+
VERSION: '2.2.0'
1414
jobs:
1515
pkgdown:
1616
if: "startsWith(github.event.head_commit.message, 'Bump version:')"

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: pharmOncoX
22
Type: Package
33
Title: Molecularly targeted cancer drugs and biomarkers
4-
Version: 2.2.1
4+
Version: 2.2.0
55
URL: https://sigven.github.io/pharmOncoX
66
Authors@R:
77
c(person(given = "Sigve",

R/sysdata.rda

-5 Bytes
Binary file not shown.

data-raw/biomarker_utilities.R

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,7 +2309,15 @@ map_biomarker_phenotypes <- function(biomarkers_clinical = NULL,
23092309
dplyr::select(
23102310
cui, do_id, do_name
23112311
) |>
2312-
dplyr::distinct()
2312+
dplyr::distinct() |>
2313+
dplyr::mutate(
2314+
cui = dplyr::case_when(
2315+
.data$cui == "C0023473" ~ "C0279543",
2316+
.data$cui == "C0677886" ~ "C0346161",
2317+
.data$cui == "C5680320" ~ "C2698315",
2318+
TRUE ~ as.character(cui)
2319+
)
2320+
)
23132321

23142322
efo_terms_all <-
23152323
cancer_aux_pheno_maps$records$efo$efo2xref |>
@@ -2334,24 +2342,28 @@ map_biomarker_phenotypes <- function(biomarkers_clinical = NULL,
23342342
multiple = "all", relationship = "many-to-many") |>
23352343
dplyr::left_join(
23362344
umls_terms_all, by = "cui",
2337-
multiple = "all", relationship = "many-to-many") |>
2345+
multiple = "all",
2346+
relationship = "many-to-many") |>
23382347
dplyr::left_join(
23392348
efo_terms_all,
23402349
by = "cui", multiple = "all",
23412350
relationship = "many-to-many") |>
23422351
dplyr::distinct() |>
23432352
dplyr::mutate(primary_site = dplyr::case_when(
23442353
do_name == "cancer" ~ as.character(NA),
2345-
is.na(primary_site) & stringr::str_detect(do_name,"brain") ~ "CNS/Brain",
2346-
is.na(primary_site) & stringr::str_detect(do_name,"breast") ~ "Breast",
2347-
is.na(primary_site) & stringr::str_detect(do_name,"colon|rectum") ~ "Colon/Rectum",
2348-
is.na(primary_site) & stringr::str_detect(do_name,"gastric|stomach|esophag") ~ "Esophagus/Stomach",
2349-
is.na(primary_site) & stringr::str_detect(do_name,"prostate") ~ "Prostate",
2350-
is.na(primary_site) & stringr::str_detect(do_name,"pancrea") ~ "Pancreas",
2351-
is.na(primary_site) & stringr::str_detect(do_name,"lung") ~ "Lung",
2352-
is.na(primary_site) & stringr::str_detect(do_name,"myeloid") ~ "Myeloid",
2353-
is.na(primary_site) & stringr::str_detect(do_name,"lymphoma") ~ "Lymphoid",
2354-
is.na(primary_site) & stringr::str_detect(do_name,"ovary|ovarian") ~ "Ovary",
2354+
is.na(primary_site) &
2355+
stringr::str_detect(
2356+
tolower(do_name),
2357+
"brain|astrocytom|astroblastom|neuroblastom|nervous system") ~ "CNS/Brain",
2358+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"breast") ~ "Breast",
2359+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"colon|rectum") ~ "Colon/Rectum",
2360+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"gastric|stomach|esophag") ~ "Esophagus/Stomach",
2361+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"prostate") ~ "Prostate",
2362+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"pancrea") ~ "Pancreas",
2363+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"lung") ~ "Lung",
2364+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"myeloid|leukemi") ~ "Myeloid",
2365+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"lymphoma") ~ "Lymphoid",
2366+
is.na(primary_site) & stringr::str_detect(tolower(do_name),"ovary|ovarian") ~ "Ovary/Falopian Tube",
23552367
TRUE ~ as.character(primary_site)
23562368
))
23572369

inst/CITATION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ citEntry(
55
title = "pharmOncoX: Targeted and non-targeted anti-cancer drugs and drug regimens",
66
author = "Sigve Nakken",
77
year = "2026",
8-
note = "R package version 2.2.1",
8+
note = "R package version 2.2.0",
99
url = "https://github.com/sigven/pharmOncoX",
1010
textVersion = paste("Nakken S. ","(2026)",
1111
" pharmOncoX: Targeted and non-targeted anti-cancer drugs and drug regimens.",
12-
" R package version 2.2.1.",
12+
" R package version 2.2.0.",
1313
" (https://github.com/sigven/pharmOncoX)")
1414
)

0 commit comments

Comments
 (0)