From 9b8db57c6518501b25e5aab9d2edfb6be0654aef Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Wed, 26 Aug 2020 15:34:12 +0200 Subject: [PATCH] (v1.3.0.9008) also tibble printing for ab --- DESCRIPTION | 2 +- NAMESPACE | 2 ++ NEWS.md | 2 +- R/aa_helper_functions.R | 4 ++-- R/ab.R | 20 ++++++++++++++++++++ R/eucast_rules.R | 15 +++++---------- R/globals.R | 6 +++++- R/zzz.R | 4 +++- data-raw/antibiotics.dta | Bin 329492 -> 329492 bytes data-raw/antibiotics.sas | Bin 1880064 -> 1880064 bytes data-raw/antibiotics.sav | Bin 1406605 -> 1406605 bytes data-raw/antibiotics.xlsx | Bin 66082 -> 66083 bytes data-raw/antivirals.dta | Bin 68841 -> 68841 bytes data-raw/antivirals.sas | Bin 81920 -> 81920 bytes data-raw/antivirals.sav | Bin 69306 -> 69306 bytes data-raw/antivirals.xlsx | Bin 13934 -> 13935 bytes data-raw/intrinsic_resistant.dta | Bin 3909333 -> 3909333 bytes data-raw/intrinsic_resistant.sas | Bin 3985408 -> 3985408 bytes data-raw/intrinsic_resistant.sav | Bin 4353410 -> 4353410 bytes data-raw/intrinsic_resistant.xlsx | Bin 524509 -> 524510 bytes data-raw/microorganisms.dta | Bin 26468289 -> 26468289 bytes data-raw/microorganisms.old.dta | Bin 1896607 -> 1896607 bytes data-raw/microorganisms.old.sas | Bin 1941504 -> 1941504 bytes data-raw/microorganisms.old.sav | Bin 2034367 -> 2034367 bytes data-raw/microorganisms.old.xlsx | Bin 453023 -> 453024 bytes data-raw/microorganisms.sas | Bin 27521024 -> 27521024 bytes data-raw/microorganisms.sav | Bin 29548953 -> 29548953 bytes data-raw/microorganisms.xlsx | Bin 6401595 -> 6401595 bytes data-raw/rsi_translation.dta | Bin 3121505 -> 3121505 bytes data-raw/rsi_translation.sas | Bin 3334144 -> 3334144 bytes data-raw/rsi_translation.sav | Bin 3582161 -> 3582161 bytes data-raw/rsi_translation.xlsx | Bin 656225 -> 656226 bytes docs/404.html | 2 +- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++++---- docs/pkgdown.yml | 2 +- docs/reference/eucast_rules.html | 18 ++++++------------ docs/reference/index.html | 2 +- docs/survey.html | 2 +- man/eucast_rules.Rd | 16 +++++----------- tests/testthat/test-mo_property.R | 2 +- 44 files changed, 63 insertions(+), 52 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 83141de83..373efc2af 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.3.0.9007 +Version: 1.3.0.9008 Date: 2020-08-26 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NAMESPACE b/NAMESPACE index d66e8ebb3..967d8a920 100755 --- a/NAMESPACE +++ b/NAMESPACE @@ -40,6 +40,7 @@ S3method(format,bug_drug_combinations) S3method(kurtosis,data.frame) S3method(kurtosis,default) S3method(kurtosis,matrix) +S3method(pillar_shaft,ab) S3method(pillar_shaft,disk) S3method(pillar_shaft,mic) S3method(pillar_shaft,mo) @@ -62,6 +63,7 @@ S3method(skewness,matrix) S3method(summary,mic) S3method(summary,mo) S3method(summary,rsi) +S3method(type_sum,ab) S3method(type_sum,disk) S3method(type_sum,mic) S3method(type_sum,mo) diff --git a/NEWS.md b/NEWS.md index 41a517919..64fb04698 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.3.0.9007 +# AMR 1.3.0.9008 ## Last updated: 26 August 2020 ### New diff --git a/R/aa_helper_functions.R b/R/aa_helper_functions.R index dbcdce77d..0ffb96c0e 100755 --- a/R/aa_helper_functions.R +++ b/R/aa_helper_functions.R @@ -575,9 +575,9 @@ isFALSE <- function(x) { deparse1 <- function(expr, collapse = " ", width.cutoff = 500L, ...) { paste(deparse(expr, width.cutoff, ...), collapse = collapse) } -file.size <- function (...) { +file.size <- function(...) { base::file.info(...)$size } -file.mtime <- function (...) { +file.mtime <- function(...) { base::file.info(...)$mtime } diff --git a/R/ab.R b/R/ab.R index 4a926ed76..52469f9ed 100755 --- a/R/ab.R +++ b/R/ab.R @@ -467,6 +467,26 @@ is.ab <- function(x) { inherits(x, "ab") } + +#' @method pillar_shaft ab +#' @export +pillar_shaft.ab <- function(x, ...) { + # import from the pillar package, without being dependent on it! + style_na <- import_fn("style_na", "pillar", error_on_fail = FALSE) + new_pillar_shaft_simple <- import_fn("new_pillar_shaft_simple", "pillar", error_on_fail = FALSE) + out <- format(x) + out[is.na(x)] <- style_na(NA) + new_pillar_shaft_simple(out, + align = "left", + min_width = 4) +} + +#' @method type_sum ab +#' @export +type_sum.ab <- function(x, ...) { + "ab" +} + #' @method print ab #' @export #' @noRd diff --git a/R/eucast_rules.R b/R/eucast_rules.R index acda0d52d..5f2668501 100755 --- a/R/eucast_rules.R +++ b/R/eucast_rules.R @@ -40,17 +40,12 @@ EUCAST_VERSION_EXPERT_RULES <- "3.1, 2016" #' **Note:** This function does not translate MIC values to RSI values. Use [as.rsi()] for that. \cr #' **Note:** When ampicillin (AMP, J01CA01) is not available but amoxicillin (AMX, J01CA04) is, the latter will be used for all rules where there is a dependency on ampicillin. These drugs are interchangeable when it comes to expression of antimicrobial resistance. #' -#' Before further processing, some non-EUCAST rules can be applied to improve the efficacy of the EUCAST rules. These non-EUCAST rules, that are then applied to all isolates, are: -#' - Inherit amoxicillin (AMX) from ampicillin (AMP), where amoxicillin (AMX) is unavailable; -#' - Inherit ampicillin (AMP) from amoxicillin (AMX), where ampicillin (AMP) is unavailable; -#' - Set amoxicillin (AMX) = R where amoxicillin/clavulanic acid (AMC) = R; -#' - Set piperacillin (PIP) = R where piperacillin/tazobactam (TZP) = R; -#' - Set trimethoprim (TMP) = R where trimethoprim/sulfamethoxazole (SXT) = R; -#' - Set amoxicillin/clavulanic acid (AMC) = S where amoxicillin (AMX) = S; -#' - Set piperacillin/tazobactam (TZP) = S where piperacillin (PIP) = S; -#' - Set trimethoprim/sulfamethoxazole (SXT) = S where trimethoprim (TMP) = S. +#' Before further processing, two non-EUCAST rules about drug combinations can be applied to improve the efficacy of the EUCAST rules. These rules are: #' -#' These rules are not applied at default, since they are not approved by EUCAST. To use these rules, please use `eucast_rules(..., rules = "all")`, or set the default behaviour of the `[eucast_rules()]` function with `options(AMR.eucast_rules = "all")` (or any other valid input value(s) to the `rules` parameter). +#' 1. A drug **with** enzyme inhibitor will be set to S if the drug **without** enzyme inhibitor is S +#' 2. A drug **without** enzyme inhibitor will be set to R if the drug **with** enzyme inhibitor is R +#' +#' These rules are not applied at default, since they are not approved by EUCAST. To use these rules, use `eucast_rules(..., rules = "all")`, or set the default behaviour of the `[eucast_rules()]` function with `options(AMR.eucast_rules = "all")` (or any other valid input value(s) to the `rules` parameter). #' #' The file containing all EUCAST rules is located here: . #' diff --git a/R/globals.R b/R/globals.R index a86baa5c6..74f68be9e 100755 --- a/R/globals.R +++ b/R/globals.R @@ -19,9 +19,11 @@ # Visit our website for more info: https://msberends.github.io/AMR. # # ==================================================================== # -globalVariables(c("ab", +globalVariables(c(".rowid", + "ab", "ab_txt", "angle", + "antibiotic", "antibiotics", "atc_group1", "atc_group2", @@ -35,9 +37,11 @@ globalVariables(c("ab", "group", "hjust", "input", + "intrinsic_resistant", "isolates", "lang", "lookup", + "microorganism", "microorganisms", "microorganisms.codes", "microorganisms.old", diff --git a/R/zzz.R b/R/zzz.R index 574f5bb44..1e0738015 100755 --- a/R/zzz.R +++ b/R/zzz.R @@ -29,6 +29,8 @@ envir = asNamespace("AMR")) # support for tibble headers (type_sum) and tibble columns content (pillar_shaft) + s3_register("pillar::pillar_shaft", "ab") + s3_register("tibble::type_sum", "ab") s3_register("pillar::pillar_shaft", "mo") s3_register("tibble::type_sum", "mo") s3_register("pillar::pillar_shaft", "rsi") @@ -87,7 +89,7 @@ create_MO.old_lookup <- function() { } # copied from vctrs::s3_register -s3_register <- function (generic, class, method = NULL) { +s3_register <- function(generic, class, method = NULL) { stopifnot(is.character(generic), length(generic) == 1) stopifnot(is.character(class), length(class) == 1) pieces <- strsplit(generic, "::")[[1]] diff --git a/data-raw/antibiotics.dta b/data-raw/antibiotics.dta index 18d7005ab4815087573f87187b382656c77bef8f..3f94d9065cc0e7e07e9fdd2da0176bc1ae5976b8 100644 GIT binary patch delta 32 ncmbQzCo-i^WI`*8sg<#DV`pn8V{0cD8v{zwNhZugn1}b6hxEnw5k>!> sVvGx1VuCANV~QKxVum>uSYm}W?r@I>JmLw@*x&`Pc*8rklU@J$0rG<`iU0rr diff --git a/data-raw/antibiotics.sav b/data-raw/antibiotics.sav index c6f4a0996a6666511dfb6b363b5583222d9eaa49..5ec52cbd0a27755cb2f2a10c01bb350f425e41d4 100644 GIT binary patch delta 88 zcmV~$IT3?U06@Wk1js=+atOcze`rX92`u0M0V!U|OuDFeC4Mk~hwLu06@WjARh%mVE{IO*cfbFf)(7r0VrNcV#gG(bRQOA2k(}BTK4JtPKL36 pjQ4)+p22Gt0}Szi5yp7L1XIi~#}l5hz!EQ5VU1V3Ve_-yK7SADBlG|O diff --git a/data-raw/antibiotics.xlsx b/data-raw/antibiotics.xlsx index d7a6a8da9324c2d338a95b1c6dc1eebaf05a24a8..298927ef65e3099d68abb1b4670fb54534a533c1 100644 GIT binary patch delta 714 zcmZ3~!m_x9g(tw9nMH(wgM))XyJjPg3L}$t&1NIUl^}ZZU8a{H>IAbv{l9~TPPZFR z&6DBq6S?nHbe(m!y-N7*y6Ve*tD9|qRTQ85d)L`-ujNa-pDglIOnEgo%~45cnR=>( zxAI>8Wm8Y4BIU|_UXzp-2eVw=HSO;CvK1i$lQ;|)D!RKI*Wi7`F{@qYl$sX%Yt!Qv zzxu57?p3mHIrCZcYC}xXlafVC^Xd;yH16m8{@z1VY{~Bre|aV}Iq^&JutlY?{{5;{ zA-hiR%&A8+smuCB9BxH%so4~4*|+xPeMgIHpBr{Z z9B^#hBfGfn>09etmHa6}%my;CZ=SnXu6+0Id-SDgl{1(Bw9*a#{irQeRD1RImrsuV zQ!06~=)yPd0B?4VXYb!O2r@D-NH8%lAP3%NaaL_`=((_Uf$0nEt6M>#S=;*x%+Ktf zzzX93p5hPY`%KdV(>2q}(m}!e<)1l-(*17_qVoRRaB9~`1%j=cy!pQwNbvQ48AhI| z9E_UsAgQ$*V>QfyE}0_8z@W~6081Jzrv@;BG)(Palwmr`KKTK=*wj6YJRp%%j50Pw zy$lQ$Ir_yVl{u-!dKI}j0p5&E;>@sQAQjj%gP%2!m4RWgGy{V$!eE9ajd9bJ7#Wpf zK-P=Qig6JET7MRZ`B4;om;yGxJijPADL+3On+@ge5g+aYHKhPUQ5i+EIAbv{g&21r`wIE z=E-n`iQIQ8y3RV=UghGt`}ek7ewEN)y~pzTzjunu@6Ee1p{DWkr59{ZB^^04@>;Ic zHplIXjaqnweHp8CPaB)>gNxhN?kxQ9q=!{p<%f#Xmi!BbEZ&CS{%~~t)H!9P#r{}? zyRgJ|TTlH4xdO)%Y}yQbXFrKKEBl~k`GKaw+}{8EcP=&l z+|bV|qtdZk^Huo0x4{%(~uJV18Er z1Xd9L&lG92T85n7^`6pbjcJ!1_pHo1X$8&F*T48q+x0&qYTp#_Q?;~#is6MW@J=~0ofxmE5=0xXwO+7=0{QVehLFa zMUH-Xeo=N(etx!IMQ%=jHzSicGb}+#1(v%|fl!SurdGzrRz}8?6$Kp{*KS?Q$jb)+hD!+9 delta 27 jcmdlrmu1&nmI-O>hE@g^R>lUC6$Kp{*KS?Q$jb)+h6f1M diff --git a/data-raw/antivirals.xlsx b/data-raw/antivirals.xlsx index 9a47392cfbd96358c95cf14378a4321c9e5bf90f..58d46c73423699c836af663f83484a4d289c6179 100644 GIT binary patch delta 656 zcmaEt^FD_sz?+#xgn@&DgF(AyBaaFrlXlH!BgT~=dh%VSmmul{vqAm8gN9DG8&A!X z;qVi=?^JZ1b+)}q`0l#u%YLhyZGTl1pZj~)*>A7qOS_*e@>5KCH8;&sNobjRs)V=l zUjAiMPo^T}%6wjvlokiGT-`P8?)kD6Ap(;)3>PZ8yBycxeZ(=VUFVdV7W-?{;}*aA ztn}_xvTr%_S@dc{Owp5)MN9MQ4^A}h=luTOLsM+Y?+<@@CNw$mOYyKprLg|}s#GDn zPVdaAM>ecmceEv*Xv_L`)P=S7uC2}4hry}K`b8XWMRBRw6l~eI_T_y?i))`7c1Ij= zY}_NexbEp&>syulDMHK!GO=%-yH~D!_wIZ2rD>Hjm;bcV4gdY9EmTx{_4b!fj{Z|B zd9vujH|_v$c8+K7-!=#`GB8LmF)$zp-ez%DZE)zhuyujy3+#scpwMI%e+A~hmzcl` z;y23qgZY=_^}sZfqKyzJm>rDGK~$x&J&4+6Y{RKtBNYg?Zt{O)GkFm2vim}jrwj}X zJAjr;0cjXm(#SJ8#6%OMvED?6(Q@(}6NrXtrK4Lu@-Z+hNMK+PfvE=4OB#<({%E3X z3pVs}rp`v7kB%`jFz}+N`60%@P?4iwTvC~nTC7)*n-k#8$Ry4TOD~fHO=TFLOwKb^ z0y|D*R*Z`X(44bC%#UJD+2r-6av;Z@2WmJz`HiU&h@)U8!}xu&t(i8Pu`x(F0IoCS A)Bpeg delta 672 zcmaE#^Dc)cz?+#xgn@&DgMmMCBaaFr6My7pBgT~=dh%VSmmul{vqAlq)T}IWzKFuGBWi z?TU?Bc!Yf!t8`Bro9}~*+t%(Z{P3iQRb1tViqn?-3x+J-hTr~hbp6yhWu?XbScJQ< z#CBUx{RX)L#}jPY96lQkeDLvpTi@lJF8B1?GmnGeOa7J|W)hG&%)nLh!Qy<;pXa;} zrtIIfL1XpjCr@8V9XFIdeN5tt1KlZfvFP&#Ui8(9#pl11jro!Cb|NM6@HU8Yt z&nlzRv0L+1_`SMCbH6*N7&7oq?*02mYyH!|&fA@H9l0h=($Y1HofjN*anhdi>iXZF zD=Le(Zo41g&CVfHwntfjk%2*iiGcw*>^4iVYJ&sMm8}a*Ut~Ar2L&dJ_$x5~gTw?@ z5Wh*zAI!fjuLq`?6>Wq-q3mdE4x*}z?LpLTV;fHXNU1=ub(2iYKw=gqGECg8lQmdn z_yW8cnZ%i4@iw`^M268~@>~-$1(2R|zi5IKUx}aEue2 m;tc1wz$L!mE56}7uJ8lbxWP{h@e8;3jXT`q0i!>UKj$0hBu-%f delta 196 zcmWN=M|MF006@`$PqYxdL`i}az1J<+l))RknN`?LfI}SN7$-Qz8P0KmOI+a^H@L+e?ynw>mw)D|PG0~3 diff --git a/data-raw/intrinsic_resistant.sas b/data-raw/intrinsic_resistant.sas index f3a19afdeb60bd360e463d2bf06dcccc2417b44e..b6dbe2ca99473d5dc6cbb86123107ac6f020807e 100644 GIT binary patch delta 205 zcmWN=OIkqz0Dw_fBsW4LN+?wFsH8k6t)MO42LH^Uv5}eaKWN?#+JIfOft>F<(dI9R z_P@5_YR&FF7W-MPKg9s!cz_8^;vuH+2-6tiF=jA}Cz!)L7Vs2{c!nh`<2hEaiWhi^ zHN3()Hn54;c!Mo$V+U{X4)3vx57@seK%_=L|m!WSIlE56|br#QnoF1}rU{Qd*5 CA6#Yt delta 205 zcmWN=OIkqz0Dw_cZmv`!Zz`$ul6O=SE3l>8;2)V-LNnukU~UICU>9wG^L;1!`;SM5 z%T*XG*v(?GO|bYCo@GTawhzl6tA}(PGmvIGGaShk8j1}C#P29q5+`%gD;vVkf0UqKJ z*07EZJjN!r@B~ls4A1cbFYyZ7*ugGd;|<>89o}OPLwvvp`}l|he8L!?F~Jv1@fC+S M!Z&=M`SJVt58_&4xBvhE diff --git a/data-raw/intrinsic_resistant.xlsx b/data-raw/intrinsic_resistant.xlsx index 88a869f599d1129b4d5ea46d6a008ccb1c8c5ad0..db36c3c221caff473b87db629734ed773652fdc2 100644 GIT binary patch delta 686 zcmccHsBo`QfhWM5nMH(wgM))XyJjPg3L}$t&1NIUl^}ZZU8a{H>IAbv{l9~TPPZFR z&6DBq6S?nHbe(m!y-N7*y6Ve*tD9|qRTQ85d)L`-ujNa-pDglIOnEgo%~45cnR=>( zxAI>8Wm8Y4BIU|_UXzp-2eVw=HSO;CvK1i$lQ;|)D!RKI*Wi7`F{@qYl$sX%Yt!Qv zzxu57?p3mHIrCZcYC}xXlafVC^Xd;yH16m8{@z1VY{~Bre|aV}Iq^&JutlY?{{5;{ zA-hiR%&A8+smuCB9BxH%so4~4*|+xPeMgIHpBr{Z z9B^#hBfGfn>09etmHa6}%my;CZ=SnXu6+0Id-SDgl{1(Bw9*a#{irQeRD1RImrsuV zQ!06~=)yPd0B?4VXYb!O2r@D-NH8%lAP3%NaaL_`=((_Uf$0nEK6gN&Dfi?Rn9ucW z0xO6==e0kW|Mra@h;EjB*Dm{x5r~<9m>Gy!fS47C*|y8RW1qkeR5N}3Uv_g4{o*gX zJ&4x)$8N)^T_Y6;cFpv>f9z)RAns-Ng(6QG7#MZ{9VZ2(VPHuk&-BCp*fl|V-~D5k zVYHmi{U54l0^gsVJa-rv)VMepL|__#^peJ-(-Z!)E8Bt%zMQGE5$Nk<%nS^?D2jxi zFfdf)=ogn%=A;(uRpjObcr!AIGsDu<^aKBa*8QJ;_dmN5(Dtc}95Rd(r^<22fjD*? gGE9%&O#b^ul@C?d)PA5cp{Z*)wAmK@We3^^0QO(}3jhEB delta 720 zcmccDsBpJYfhWM5nMH(wgM)*CKXN0F3L_JLIAbv{gT!|r`wIE z=E-n`iQIQ8x-L4~UghGt`}ek7ewEN)y~pzTzjunuZ_T?hp{DWk-ixM-Bpo?35>wXi zmfE{z_ZF8<{upmN30~7#2NvfBb3T4>Qj%Nm%Y(@r7x%dx7tlF;qgz?y-DZu~D`a|t zZH`p!ESuMd>vP1t*!08|!YZ*XEmB>2qVY^3sTj-!AiVJ8CgPm6!GZT%94D$FIUKqx2IR2YEWxS`4m?-3E--zO-RBM{Fy)`T0`s|_ zO<)D_=f3s_^WVME1JTWL@7m?wF#<6Y5HkZY3lOscG23>zckC1Rfoi62_{(k%qF?@H zw+GQ$|JZFf`6HzQ!LFH}|Bu~F0mQxRzEI>T0|UbjpyQ-~Gz=_hF@us%P?9@=lRcWCJ)j-f$z^wo;wT-YFr!)A~4NBdP(Dv>52c@m2JV6T+YN^%nS^?D2jxhFfdf)=ogn%=A;(uRpjQNS$FV1(7J!q@BL?20$V3CE5=0xXwq3A u=0`DU!c=(K+OPt*7v#q diff --git a/data-raw/microorganisms.dta b/data-raw/microorganisms.dta index 478b99179b5558b46fbea118e24a461831b020d0..1328140a6f6228a7a5ff0c96d0e1b2c945e74de7 100644 GIT binary patch delta 1375 zcmWN=1&|N~07bz$T3SH5!$71Cq)SpjMF|1v?pC^a!lT9R?(RgyZtPaAz2`gh2JP4~|HLQ*` zuqM{R+E@qcVm+*n4X`0L!p7JH55`0AP&^Eq;^Ei~kHF^G0$XA$Y>kE32HWD1*bduc z2keNQurqeSuGkH`V-GwEdtxu_jeW2$_QRvGKMufwcnltk$KfD69#6o*I0T2{Fgy{5 z;|LsyC*dd@jbm^uj>GXd0Vm=loQzX&Do(@cI0I+mES!yVa4ycn`M3ZV;vzg5Pr=2w z1efA6T#hSnC9cBNxCYnaI$Vz%5Ihw(;wBU~;}+bC+i*MXz@2y+?!wdY3_KIh!n5%l zJQvTy^YH?_5HG@u@e;fgFT>063cM1p!mIHbycVy+>+uG>5pTkq@fN%lZ^PU14!jfZ z!n^Svych4o`|$zXjSu1;d!AwH}Nfe8{ffq@jcv+@8bvfA%27(<0tqjeukgp7x*Q9gkfpOsmd$cmJ}YF! zJTNO|<*bqiW!0>f)w4#{%vxDH>tx-mm-VwjHq1uZIGg0bc}O0bhh@_|Je%ba**sfh z%WRdcvoPCa+dMMcW&7-q9kWw*&Mw(CyJh$6kw<0E?3KNvKbrr{>1ol;-B#l3R0IZqFUL QGf&H11-m`Hp#A>;0aOTKOaK4? delta 1375 zcmWN=1&|N~07bz$y1P3S6r|xOX+c1wB?M_uq?C}(2Rsl3?C$PPRP4rX#qRFbzcah{ z!F}cS=1z*W>(;h#y;y)nuqYP8;#dMpVks<*Ww0!k!}3@GD`F+Aj8(8IR>SI818ZU} ztc`WBF4n{P*Z>=1BW#RKuqigf=6C=eh%K-s9)t&DD{PI2U>j_U?XW#|z>e4nJ7X6t z#ID#4yJHXRiHBk@?2Ub}FZRR!H~)Jra4a5$ z<8VAqz=?P?PQuA}3{JtRI1Q)c44jFxa5m1tWAQkgi^tSJ z!;^41uE3SJ3RmMAT#M^)J#N5_xCz0{xCOVOxDB`C$+!bg!BcT3?!w)88lH}4;F)+9 zo{i_=xp*F)j~C#DcoANVm*Ay%8D5T8;FWk4UX9n_wRjy~k2m0rcoW`?x8SXK8{Uq0 z;GK9E-i`O*y?7tqk9+U|d=MYPz4$Obf{)^3_&7d+PvTSfG(LmR;&b>s?!y=GMSKZg z##iuFd<|d6H}Fk-3*W|f@LhZl_v8Ec0e*-d;m7z1eu|&r=lBJFiC^K@_zixG-{JT8 z1OA9V;m`OB{))fh@AwD)iGShW_z(Vz|7pPv3$jQS&0<+ROJvC`m8G*xmd$cmJ}YF! ztdy0rN>F^|qkIXREXDLFN#<@B79GjmqX&N+E(9+z|T_?(yX zb3rc5MR`J=n2U2sF3n|mQZCOGxiVMf>Rgj+b6u{_4Y@HlCAm4bNM?i2v+&By;@HS)&(+p+{%|3zt58`3;mDh)^58dmNhUc4a8%6&g tVvG}<;tc1wz$LCQ!8N9sVU8Otu*5CyaE}M9@Q5{@@QfF{;%&6K4?hW?F+BhP delta 111 zcmWN?s{w*g06s4ZhB+3v#tm+9hb30H#{(X*#s*vLu*Vag@$&I{fBgVxhA))> diff --git a/data-raw/microorganisms.old.sav b/data-raw/microorganisms.old.sav index 7569d9ca721b937d8811c8a4689ea64db5c6fe98..8aa0b28f168738e0700223e4f9d49b1a8e341301 100644 GIT binary patch delta 118 zcmV~$xe&7!wLIpaudBE|+mAzydBbrZso_uIanx{Rr+=SyrEK zowv{8B@S?iBOGIZ6P#j*GmLPK3tZv~*SNtL6HIZ78RoddJs$9gCp_Z?uRm`|^aqFV BF%$p* delta 119 zcmV~$DH4JJ06@`k!3A6Z6?eUWK^nt>>~w;L-!U+r;zu*%&3vzG>#nVvN068IqWt`- zD0@F|FR_Px9N-WG9N`!zIK>bnoZ%c7xWpI}OmT&4++c=V+~FP%c*GN)@$&VWhJU0h BF-QOa diff --git a/data-raw/microorganisms.old.xlsx b/data-raw/microorganisms.old.xlsx index 47b09d06bc7c3bcd25a6b9a1d241e60ec1f5aa29..cf0be9843fd861ef836100f9df0be49be8793d1a 100644 GIT binary patch delta 706 zcmbP#S$e@`X`TRYW)=|!4h{|m?V61|DvV6pHJgnXSAyutcbQ&-s1wWv_5ThUI^AwO zHBW}aPvpK+(RJ3@_A24K>#8sNt!}pcRZ)EI?_FoVy_PTSezM3)TNm*4n$aHfJ9Or!MOkakv%5rDjvGW#8JD_Z=;+eQwwt zalo;0kL=>Qr*ExqRr03@F&oIlzIpCmx$@n+@6ng0RnA=g(@Hn|_oKE@QSH^+Up_hd zPpRa|q6^=+1H9Qep1ptDAjrtTAi>1IfE;+6#aXq%q36QZ1)`fTu(w}eX9QxV?HAaY z4Ml)r+nHsUUx6gIzn5j6zzSkCDl_|oMJ}l@>wy^UOlr(P%mT!$+nLnZat{Cnrx!kB zGY8SDp0U}3=-1EKY&f-RqyoXtnQri$%?u=*@tjSDk!O1Ab2d#7cLRuPIsGh9Rsp1V z$&6bZABCA2>dr|ph%g|)lE$O#lOM2)O}Bi(#uEindHHgt&PJdwk1;ba@FEm4ENT29 z&CF1dqhDN7nUh+qSCN|&;LXS+&J0UKQh_})_*ny485kBzGcX9FXnit${tGrGd64-c zvtnFCfaaeCVty1wWz!$LV3Py7e%ec*Y6yDvV70k(-SeSAyutcbQ&-s1wWv^;=p4oo+Xt znkT~%CUW1Y=sN3cdzFjp?%&&T`Bg%H^&ZRT|K2Gszc=s7gqp_BmtL?vm2~9H$ZNS$ z+Z?wmHfrG!_GPTnJ#B2h4=!$7yR-1alO9%al^-fjTk5uxWGnY&h`2$NO!4mvg$@({Il_4u&uJTXL95K;|$5SIGy9^F@E2 z^FElef7b?$)t{d{eI<3=Q2O*yap9*wa{vF>)8fB$p8X`|tn7oD~>K4uY?x14Gz&pA3?;ox8Pyae^cg}U>nlwpE*DQ8kaL~m`d(Nxt ze|xT|EZ(~9etqx2IR2YEWxS`4m?-3E)d;(k-hyQJ0lP?ZNJFQ zY$yU0+s-1x{0bzw{evv?1Xd8ENtxLnEOJ?eSr5c$XI5hdViq7~-OjAWmU{pwIKAi@ zn>mPH{fx~XM8A2)X2Z!JDHRBI&UC})Y-S+g%;#(}Ox&!KHCSc%0=yZS#F=4HJAETi ziqT^FIiN}fkj5o5ZgG4RW@e~6C&3`XfB;JxkFZaE$SyYB>IEAQ$V`tHY%(_ArI{Hj za`cN!Dsxhc^(u06P)(N#?3uyO8pz7PuvnUbK^S2g!;;3w(-*v8Q<4YSDKaa@MFbdj zXMva>MN#SWhcDRVK-Mw71iJIsbh(#oMqoWlSxcPN4=^)uNXjutpy>HFJ^v+}He2#D HHlQ#7^B41! diff --git a/data-raw/microorganisms.sas b/data-raw/microorganisms.sas index ae64b298c3b6276b8f5c5911a9b6b410e02360bc..950fc459189ad5066ba86a77dada16593a314fcb 100644 GIT binary patch delta 1445 zcmWN=2eb$T0ESU7B1E!*<`f$*IwFt@4ffld;j;G zTloIkGKIPBic%}L@^`0OW*-m5=&ueJP^xZSv&~K;lWrQ zD_}*egq5)hR>f*~2v)}$SQ8J$!>|_C#yVIR562_09@fVOcqBH&qp%S+#wK_)HpOPx z99v*ZJO*1~YdjW@!!~$4o`7w!9iE6MVSDU=9kCO3#xB?uyWz>$9edy@*b{qUZ|sA8 zu^*m_r(u5_fCKS#9E5{$2oA+zI2_Nw5jYY@;boPZN?5>CdmaSEP; z=i*eHhSPBd&cs=G9?r%&I2Y&Pd^{f)U?DEV3vdxGMsNu(#bvl0SKvxqg{yH5uElkD zAzp;*aRXkA8*vkE#x1xNx8Zi&fjjXM+=aVw5AMZF@iM#|ufQwuD!dx6!E5n4ydH1B z8&SLoZ^m2jR=f>w$2;&&ybJHfdvG7#i}&IE_y9hL58=c32tJCB;p6xOK8a7^)A$TN zi_hWn_yWF&FX7Ah3ciZ3;p_MYzKL()+xQN?i|^t4_yK;1AK}ON34V&7;pg}Teu-b< z*Z2*7i{Ih*_yhikKjF{#3;v3~;qUkd{)vC#-}n#yi~lXRV6_FgUlz?`xqlYV5_v$D z%u-o856m)IHV?{jd2p7`3Ry8LW#z1rRkKJEO|w}x&lcG-kI7cqI*-lcvP~YJCuG}fmnY^)**-gD$Ly4yvrBf( zZh3Nc&mMV7_RL<{JNsnc?3btJY1uyqV2j$=#l0$P?4$m`kM2^f+IXcJW*c_K< z=21>x+>jUN#@v*fb4zZ`ZMi*nf-g{5&z4xB~ zJ?9p_zq)*3uGv$zL=k(t6f0I(qG*9wfcxOSSR6}WNi2n>u?&{Q{jeOC#|pSVR>VqJ z8LMDbtcKOG1|EPl@j$GF2Vrfjg9qawSQqPIeQbb-;$hej8{y&D7>~dsu?aTCX4o8C zU`uR;M`3GhgKe=L9*ym>19rq?@L24Gov{lZhh4E7cE=vr6MJEA?1O#rcT~}9w*>wcsibe6LAuriD%(toPuZL zRGfy>aR#1)GjSH4i?i`OJRj%a1vnSy;e0H_1-K9w;bH`r;Dxvpm*H|O!WFm@SK(@0 zgKKdeuE!0y5jWvx+=5&2BD@&4;db1Cm*Azi6L;ZmybLeLD{v29iC5v(cnw~Q*WvYe z1Kx<@O?Wfjg16#rcst&Kcj8@mH{OHy;(d5OK7bG6L-;U0f{)^3_&7d+PvTSfG(LmR z;&b>szJM>{OZYOrg0JFh_&UCUZ{l0{HtxlD@LhZl-^UN|L;MIo#!v85{0u+GFYrtJ z3ctp0@LT*2zsDc&NBjwY#$WJP{0)D{Kk!fd3;)J{@L&9InFT8?$bE9(ES@E@WR}X( zStiToepxQdXNBB9D`usvoK>=FR?F&HBM-=$d0^JcgR*wk$%FHdtef?+em2NM^RR4~ zjq>npoJZu5*(950vuvI%vSqf)qq23j$+p=pkIwelAv@+Vd2Dvd&ekpA+)5 zJU!3Ii8(3H%(HTGPRX-#YEH}PIU~=>nK>)Z&DnWgo}Y8_f}ET4a())(f?Sx3a&eMN z^1@u2%W`=Z<%(RHt8#U&$+fvI*XM@Zn45BQZpp2AQC^(ea(nK`OY+j(nY#+^b$3Dk G@BRl=^}rGU diff --git a/data-raw/microorganisms.sav b/data-raw/microorganisms.sav index 089a5a750ad5289af439117a9d82461a8aeea571..3ddd1a2bc6aa2c86b1ae46eb63da58dc6a6e303f 100644 GIT binary patch delta 1572 zcmWN=2eb$T0EW@?DzdUyNJhg938g_slOm&x%qT0Ab_w~cM;Vn>WTo&)Hf6Q<-g{5& zz5DMucj3c@r5EPxp+#D>Zr;50{AGn@>dl!@ZK7C!2jGEt5Ej9rcrX^j;#dMpVktZX zOJf-LhBSZt2RVGC@Dt?+m}0bApVcoLqBr(hdwi>G2cY>yqVBc6t*;~97+o`q*) zC+v*p;JMfZyW)A+4ZC9x?1|^&1=tIFV;}5`7h*r`j{|TZ4#L5B5e~tjcrjjr!*Do` zz>zo#FU8R~2FK!McsY*4EAUFZ3a`d%@LIeMug4p3Jl=>Ca3W5^n{YCMQ*bIy!|6B! z3vnjS!kh6HoQ-pEF3!VS@ix32=i>rgh>LJB-hp@G5?qRR;WAu~D{v*Q!n<)b-h=nz z8eEI(P+X7q;Rd`PH{vGTj9YLkZo}=k19##B_#p1W-M9z$;y!!`AI3-UQG5&^$0zVf zd=BCpJ=^6I=Mug&Z7`n(~>=Z!fb zC+4KQDJLg6C8y@JoSrkXFlXkhyg6^l**PcY=DfT$Z_C?relEy`xhNOs9eHOi$)$N$ zF3aV)B3I_BygOItJ$Y}g$+fvI&GmU-Zpiy{V{XdLxh1#ew%ndOa%Vn}59Y4ioqKX` N?km{kLk0Uk_#eW0_J9BY delta 1573 zcmWN=2eb$T0EW@?M6y@1lCn$6D4{}1R#8HOhO!z~$jB_8vO-y}%tA(=Xd^4_z4y>w z+I#okb8g|@S!D}z-oRo_TQ_Ohdc~Hi6$={9pHh9QSb#a6AHQV;!uE^{_rRz=n7v9)*qY zXl#tf;IY^Qn_@F;j>qBg*aA<$me>kgIfG^@p_%gnNui|U?I=+E#;#>GOzJu@Ld-y(nfcx-6{0KkBPw-Rx z3_r&&@Jsv(zsCLe4StK?;rI9h{)j)}&-e@eiofCS_y_)pf8pQw5B`h)&9GpO1z98y z$f8*+56t3uP?pG&St?6snJk;-vV2y^idiWS&dPa6R>`VaEvsjZJTz^$_O^(U2IWEWNwK*Xt=A@jQ zQ*vrvm)GaCB&X*Md1KDVnK>(G=bXGL=jObepEu_%xgZzjqFkIyvM_JW+j40x%jLNu zSLUj`J@3fXxhB`9=a(h0UJ9204 P%H6rAV26(s?BDl4t&H|3 diff --git a/data-raw/microorganisms.xlsx b/data-raw/microorganisms.xlsx index f6a3f80c57b9c6648a944f49f6cedf7487a438c4..52511808342ecf0280a485024ad2fe62b70e82aa 100644 GIT binary patch delta 867 zcmXZZYeOWj>gX%;54a4t>i~{ZD6jk@lONGXi z+9$jyMdEU2!pK~hRriTIRw`B}8H0c1&rHll7Zut{9i@ykU|R82R{B&{T*B*RJTCg& zH(o2h8{O`kW1G)%ZtGtYXSzJdyYum3?X9^?T<`LrecX<&gQ+RN-P-Ek%vbFstVcs_Xjv zzkHoWAbfPIM9f@dOn{7N*fj3W8xLgupJ4Ln!QqJrD+aAsiwg681q9?1uxOfM|$; zgAfZ!I0Pz)gLp`QL`Z_ekPK=#0x575j)4YJ;W(s$7IdJ8bjW}ca1t`%6r6@E$c7v^ z183nJnXRm?bY5~+>b#_Ld8tk3B{MCx_ft`Q zBpUdo7D^?tjTVX{6;$jZN!X_47ZX93B^iQY8k+r&`QgX^obzztInU{xtP}KtM~+S) z^raYvq1d9A9&#R^E$WQsJtx`nh5wzzupo-xb*JTzKw5R9Pd)edXK=@qX}qbjddc}s zQ&o) zI!J!EH*~&m>Q?)s-zjnx#kSmAUsJwtt!wRCqejx)tc-{$G3Dnu+AAL$N`H)IL`sbP zyd0gFF?ALE^5#*LKcAwurbKU!sneeh+niIHsDWgSLtO6=^MDTm5CRP%AT(=(DztFvq^h@Y`6SycTnfn< a3#TS2v;MzbX5|vd{-KpKkX*2G+5Z4T@rphG diff --git a/data-raw/rsi_translation.dta b/data-raw/rsi_translation.dta index 91b9b34f39f43ba7407dc4639bb76bf83da4680d..aafb6513bcda9cce647435bb3c3e36031854eb66 100644 GIT binary patch delta 160 zcmWN=w++Go002Q5OwKvyoC}MF?I^zZjuBXbmVzm0y$PIj@#h`H{}00JEsE}9fC)@u zh$&2C2D6yMJQlEsB`jkFt60N2Hn52;Y-0zz*uy>!aEK!u;{>NT!#OT+i7Q;=2DiAw OJs$9gCp^Ere4jtNls{hp delta 160 zcmWN=w++Go002Q5OwKvyoS{Q(NAbmXjKC7K6ih+uP2i-9KJOsAKsJJ`h@_Hlqi9N`!zIK>&xae+%*;Tku% O#U1YPfXA1o@AC(`VLx2} diff --git a/data-raw/rsi_translation.sas b/data-raw/rsi_translation.sas index c707b95a986cdbad8d2738a3e6931abfedc03f93..e760c7ae8be19bc632389aa738e495ab2cca2f06 100644 GIT binary patch delta 175 zcmWN=Id(w-06@|IO%d}DVxD475O!b%wnXtNjoJp(uh8pl!8x|VJ?HLk_i+Dyx}=V0 z9@`)Yj^~3IVg#cY!#F1J1C#iPDNJJqvzWs?7O;pVEaMkeu!`SU!#Xywi7jkn2fNtA fJ`V5)hd9D9PH>7doZ~P4;R2Vq!hc*}-Rzz(F~Ln; delta 175 zcmWN=Npb-J06@`hw0WLF%wu9mh#NS8E6L)oY}~^7FYN7IL6xiUs^0N-50CHXOEx<3 z*atxno&LoTV;IK-MwrADrZIzA%wZl2Si};Rv4T~sVI3RT#1Cv?8$YpwUF=~W2ROtL ej&XuhoZ%e5@EaGn#1*db2Y+#cTl~AaJ3L=^kW4cG diff --git a/data-raw/rsi_translation.sav b/data-raw/rsi_translation.sav index 2cea4cf83e5861bde370fe1278d916a236e7c06f..8f3af7e993bdc57681dc43378a3d99b7403fbf15 100644 GIT binary patch delta 189 zcmWN=IdVY(0D$2UVoPihV&7v463+{T%4rP=R<0< z3&UNoy#&Yd{v^im1>=~&S4?6G)0n|5zTrFOFpmW+VhKO6jGtJ+Dt=)N>)601wy=#I o>|zi5IKUx}@EgZC!70x02j{rJCH~?ct}wtghWL-0o7>U#0hEDJiU0rr delta 189 zcmWN=IZgrr06@{O$)+MZ3Ieh!>kNw_RGfxmkXZbljw{&wl7mdkY2YOjAH_mn8GJaV+OOB!#qCY3%+6j->`@!EMo<$Si?Ft@Et#}i7ouZ pHg>R!U)aMw4seJg9OF0s-~^{Q!#OT+i2;VV!ZmJid-Zqle+Q4bQG);g diff --git a/data-raw/rsi_translation.xlsx b/data-raw/rsi_translation.xlsx index 12573e17ca02853ba3bd3797bbc94e0b4749cf27..6d30b389fbddc5407c40f48d6280332fec1d6dd0 100644 GIT binary patch delta 757 zcmaFZrtzpvgD1e7nMH(wgM))Xqh=$I3L}$7&1NIUl^}ZZU8a{H>IAa^^RlBxlYcWy z)!W^hQ(XUjLU6u+mWSQJ%FL2xk7>rgwsvRX zhZjAp;wnE>oVMg&Fl6yI{Pu^V>!;2sD=qfNBHV=~w%dC4Ze=&N9;mr-oQY59$Xk)G+WGe{o~u@vB+<}z z@>pHnl*ox@F3Oj0_AC zObiUrU}6P_(`Ip2ZE!%juyujy3+y#Kpn&rec?ITMiA`Vy@y|&6gZZ+udLX*lSFYVx zjuD8NfS4JGS%8=oh}nRc9f&!$`^s@Xc?eWH)tJj1MCEYVgQ&G!Hk=wYQh{JMP5s1W z1{9pG#mFVY$TQuYkxNq^B)N8DtcE$z!BYeo7}OaMU`eCp^nOMzGX;>M4;)wb+VC(i zFh(#ih#=H3ENMK-KKTK=*!16wTp-U(=VaoNv2g|}smReUE~(5(E!L~Z%?a>kWD;kF zr5LHeo*DeCfvgM+i=`PDgi(yspPtCXr4$3QQ)E_*iwMwRXMva>MbSZ^HlX?C`9;}D z`T5z{Y$$h+_;4SnDFqk}$|#zJrr&4cG6H-3O1AsXc@H@mxY;5ZBv2GNO*dfX(q>a* I-~tK*0HZnV`Tzg` delta 734 zcmaFVrtz>%gD1e7nMH(wgM)*CD{>=`3L_I&IAa^^O9!6$-kMU z>Z|uyKL7Vlarv!zCG%?=`A^M~y4bXUr)NXZ%yn-1Z}sjk&~eFAdB3(%s#oB`wv{bk zKRj8>EHB!k`X-`gs=e^~V#eZL(*zGhsKfs%v<6pPQIsrxo1_>qx z23RPufP!hW1gkbUoLt$u!1P7-8Xi!%`HQ>)^R2}uu!8t!rTxKtIaxgr-RvjV?kC3x z#7scU48$xz%nHP8K+F!r9NYcmIG;QOs-0@WWe%cpx$HsIIxZVdu1Kjsu$!iS<}w2c zPS0C@)GB!>k3=9=H`o$%cIjO~Z6}dS9-i%D*%&?>(71%R_pEZz`fnl*U1A{Qa zaE2v~def7bxRhc*P7s+D<01ld!dW2ZM^SVDs10a-d45rLQht6mHXF*_BR<>*YDxhH sxH5`n!RZf}xQxJ_yprv{bKXNv25z=U1_=~Jj?)d9xwP3-8MuJL0MqZ{6#xJL diff --git a/docs/404.html b/docs/404.html index ad154d90f..ba608dbc6 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 37c046d98..3426713a5 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008 diff --git a/docs/articles/index.html b/docs/articles/index.html index 7879e8c50..8240a25b4 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008 diff --git a/docs/authors.html b/docs/authors.html index c05ee22ee..b30cf69a1 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008 diff --git a/docs/index.html b/docs/index.html index 05ddf3403..8c5cf54e1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008 diff --git a/docs/news/index.html b/docs/news/index.html index a8db57fed..6df18f1a3 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008 @@ -236,9 +236,9 @@ Source: NEWS.md -
-

-AMR 1.3.0.9007 Unreleased +
+

+AMR 1.3.0.9008 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 6eccbc84b..66658eda6 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,7 +2,7 @@ pandoc: 2.7.3 pkgdown: 1.5.1.9000 pkgdown_sha: eae56f08694abebf93cdfc0dd8e9ede06d8c815f articles: [] -last_built: 2020-08-26T09:09Z +last_built: 2020-08-26T13:33Z urls: reference: https://msberends.github.io/AMR/reference article: https://msberends.github.io/AMR/articles diff --git a/docs/reference/eucast_rules.html b/docs/reference/eucast_rules.html index 37cecdd0f..f43976ce0 100644 --- a/docs/reference/eucast_rules.html +++ b/docs/reference/eucast_rules.html @@ -83,7 +83,7 @@ To improve the interpretation of the antibiogram before EUCAST rules are applied AMR (for R) - 1.3.0.9007 + 1.3.0.9008

@@ -302,18 +302,12 @@ Leclercq et al. EUCAST expert rules in antimicrobial susceptibility test

Note: This function does not translate MIC values to RSI values. Use as.rsi() for that.
Note: When ampicillin (AMP, J01CA01) is not available but amoxicillin (AMX, J01CA04) is, the latter will be used for all rules where there is a dependency on ampicillin. These drugs are interchangeable when it comes to expression of antimicrobial resistance.

-

Before further processing, some non-EUCAST rules can be applied to improve the efficacy of the EUCAST rules. These non-EUCAST rules, that are then applied to all isolates, are:

    -

  • Inherit amoxicillin (AMX) from ampicillin (AMP), where amoxicillin (AMX) is unavailable;

    • -

  • Inherit ampicillin (AMP) from amoxicillin (AMX), where ampicillin (AMP) is unavailable;

    • -

  • Set amoxicillin (AMX) = R where amoxicillin/clavulanic acid (AMC) = R;

    • -

  • Set piperacillin (PIP) = R where piperacillin/tazobactam (TZP) = R;

    • -

  • Set trimethoprim (TMP) = R where trimethoprim/sulfamethoxazole (SXT) = R;

    • -

  • Set amoxicillin/clavulanic acid (AMC) = S where amoxicillin (AMX) = S;

    • -

  • Set piperacillin/tazobactam (TZP) = S where piperacillin (PIP) = S;

    • -

  • Set trimethoprim/sulfamethoxazole (SXT) = S where trimethoprim (TMP) = S.

    • -
+

Before further processing, two non-EUCAST rules about drug combinations can be applied to improve the efficacy of the EUCAST rules. These rules are:

    +

  1. A drug with enzyme inhibitor will be set to S if the drug without enzyme inhibitor is S

    2. +

  2. A drug without enzyme inhibitor will be set to R if the drug with enzyme inhibitor is R

    3. +
-

These rules are not applied at default, since they are not approved by EUCAST. To use these rules, please use eucast_rules(..., rules = "all"), or set the default behaviour of the [eucast_rules()] function with options(AMR.eucast_rules = "all") (or any other valid input value(s) to the rules parameter).

+

These rules are not applied at default, since they are not approved by EUCAST. To use these rules, use eucast_rules(..., rules = "all"), or set the default behaviour of the [eucast_rules()] function with options(AMR.eucast_rules = "all") (or any other valid input value(s) to the rules parameter).

The file containing all EUCAST rules is located here: https://github.com/msberends/AMR/blob/master/data-raw/eucast_rules.tsv.

Antibiotics

diff --git a/docs/reference/index.html b/docs/reference/index.html index 24667a88d..be755b359 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008
diff --git a/docs/survey.html b/docs/survey.html index b04f90ffe..4d912bd7b 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9007 + 1.3.0.9008

diff --git a/man/eucast_rules.Rd b/man/eucast_rules.Rd index c418ed3c9..a75178bc8 100644 --- a/man/eucast_rules.Rd +++ b/man/eucast_rules.Rd @@ -50,19 +50,13 @@ To improve the interpretation of the antibiogram before EUCAST rules are applied \strong{Note:} This function does not translate MIC values to RSI values. Use \code{\link[=as.rsi]{as.rsi()}} for that. \cr \strong{Note:} When ampicillin (AMP, J01CA01) is not available but amoxicillin (AMX, J01CA04) is, the latter will be used for all rules where there is a dependency on ampicillin. These drugs are interchangeable when it comes to expression of antimicrobial resistance. -Before further processing, some non-EUCAST rules can be applied to improve the efficacy of the EUCAST rules. These non-EUCAST rules, that are then applied to all isolates, are: -\itemize{ -\item Inherit amoxicillin (AMX) from ampicillin (AMP), where amoxicillin (AMX) is unavailable; -\item Inherit ampicillin (AMP) from amoxicillin (AMX), where ampicillin (AMP) is unavailable; -\item Set amoxicillin (AMX) = R where amoxicillin/clavulanic acid (AMC) = R; -\item Set piperacillin (PIP) = R where piperacillin/tazobactam (TZP) = R; -\item Set trimethoprim (TMP) = R where trimethoprim/sulfamethoxazole (SXT) = R; -\item Set amoxicillin/clavulanic acid (AMC) = S where amoxicillin (AMX) = S; -\item Set piperacillin/tazobactam (TZP) = S where piperacillin (PIP) = S; -\item Set trimethoprim/sulfamethoxazole (SXT) = S where trimethoprim (TMP) = S. +Before further processing, two non-EUCAST rules about drug combinations can be applied to improve the efficacy of the EUCAST rules. These rules are: +\enumerate{ +\item A drug \strong{with} enzyme inhibitor will be set to S if the drug \strong{without} enzyme inhibitor is S +\item A drug \strong{without} enzyme inhibitor will be set to R if the drug \strong{with} enzyme inhibitor is R } -These rules are not applied at default, since they are not approved by EUCAST. To use these rules, please use \code{eucast_rules(..., rules = "all")}, or set the default behaviour of the \verb{[eucast_rules()]} function with \code{options(AMR.eucast_rules = "all")} (or any other valid input value(s) to the \code{rules} parameter). +These rules are not applied at default, since they are not approved by EUCAST. To use these rules, use \code{eucast_rules(..., rules = "all")}, or set the default behaviour of the \verb{[eucast_rules()]} function with \code{options(AMR.eucast_rules = "all")} (or any other valid input value(s) to the \code{rules} parameter). The file containing all EUCAST rules is located here: \url{https://github.com/msberends/AMR/blob/master/data-raw/eucast_rules.tsv}. } diff --git a/tests/testthat/test-mo_property.R b/tests/testthat/test-mo_property.R index 81e81d854..0f7a60a88 100644 --- a/tests/testthat/test-mo_property.R +++ b/tests/testthat/test-mo_property.R @@ -54,7 +54,7 @@ test_that("mo_property works", { expect_equal(mo_year("Escherichia coli"), 1919) expect_equal(mo_shortname("Escherichia coli"), "E. coli") - expect_equal(mo_shortname("Escherichia"), "E. spp.") + expect_equal(mo_shortname("Escherichia"), "Escherichia") expect_equal(mo_shortname("Staphylococcus aureus"), "S. aureus") expect_equal(mo_shortname("Staphylococcus aureus", Becker = TRUE), "S. aureus") expect_equal(mo_shortname("Staphylococcus aureus", Becker = "all", language = "en"), "CoPS")