P281424/AMR
1
0
Fork 0
mirror of https://github.com/msberends/AMR.git synced 2026-01-11 23:54:34 +01:00
Code Releases Activity

(v3.0.1.9012) fix translations

Browse Source
This commit is contained in:
dr. M.S. (Matthijs) Berends
2026-01-07 11:00:58 +01:00
parent 9d1b4565f6
commit fa827f27f4
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DESCRIPTION
View File

@@ -1,6 +1,6 @@
Package: AMR Package: AMR
Version: 3.0.1.9008 Version: 3.0.1.9012
Date: 2026-01-06 Date: 2026-01-07
Title: Antimicrobial Resistance Data Analysis Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR) Description: Functions to simplify and standardise antimicrobial resistance (AMR)
data analysis and to work with microbial and antimicrobial properties by data analysis and to work with microbial and antimicrobial properties by

2
NEWS.md
View File

@@ -1,4 +1,4 @@
# AMR 3.0.1.9008 # AMR 3.0.1.9012
### New ### New
* Integration with the **tidymodels** framework to allow seamless use of SIR, MIC and disk data in modelling pipelines via `recipes` * Integration with the **tidymodels** framework to allow seamless use of SIR, MIC and disk data in modelling pipelines via `recipes`

2
R/ab_property.R
View File

@@ -301,7 +301,7 @@ ab_info <- function(x, language = get_AMR_locale(), ...) {
ab = as.character(x), ab = as.character(x),
cid = ab_cid(x), cid = ab_cid(x),
name = ab_name(x, language = language), name = ab_name(x, language = language),
group = ab_group(x, language = language), group = ab_group(x, language = language, all_groups = TRUE),
atc = ab_atc(x), atc = ab_atc(x),
atc_group1 = ab_atc_group1(x, language = language), atc_group1 = ab_atc_group1(x, language = language),
atc_group2 = ab_atc_group2(x, language = language), atc_group2 = ab_atc_group2(x, language = language),

30
R/translate.R
View File

@@ -279,29 +279,23 @@ translate_into_language <- function(from,
} }
) )
# non-regex part # non-regex part
translate_tokens <- function(tokens) {
patterns <- df_trans$pattern[df_trans$regular_expr == FALSE]
replacements <- df_trans[[lang]][df_trans$regular_expr == FALSE]
matches <- match(tokens, patterns)
tokens[!is.na(matches)] <- replacements[matches[!is.na(matches)]]
tokens
}
from_unique_translated <- vapply( from_unique_translated <- vapply(
FUN.VALUE = character(1), FUN.VALUE = character(1),
USE.NAMES = FALSE, USE.NAMES = FALSE,
from_unique_translated, from_unique_translated,
function(x) { function(x) {
words <- strsplit(x, " ", fixed = TRUE)[[1]] delimiters <- "[ /()]"
# print(words) split_regex <- paste0("(?<=", delimiters, ")|(?=", delimiters, ")")
for (i in seq_along(words)) { tokens <- strsplit(x, split_regex, perl = TRUE)[[1]]
word_trans <- df_trans[[lang]][df_trans$regular_expr == FALSE][match(words[i], df_trans$pattern[df_trans$regular_expr == FALSE])] tokens <- translate_tokens(tokens)
if (!is.na(word_trans)) { paste(tokens, collapse = "")
words[i] <- word_trans
}
}
words <- paste(words, collapse = " ")
words <- strsplit(x, "/", fixed = TRUE)[[1]]
# print(words)
for (i in seq_along(words)) {
word_trans <- df_trans[[lang]][df_trans$regular_expr == FALSE][match(words[i], df_trans$pattern[df_trans$regular_expr == FALSE])]
if (!is.na(word_trans)) {
words[i] <- word_trans
}
}
paste(words, collapse = " ")
} }
) )