From 9e64d7708edf9eeb8ed8b657802b3615cd2e9569 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Sun, 20 Apr 2025 15:27:36 +0200 Subject: [PATCH] (v2.1.1.9248) unit test fix --- .github/workflows/check-current-testthat.yaml | 2 +- DESCRIPTION | 2 +- NEWS.md | 2 +- R/sir.R | 7 +------ data-raw/datasets/microorganisms.codes.dta | Bin 133473 -> 133473 bytes .../datasets/microorganisms.codes.feather | Bin 88882 -> 88882 bytes .../datasets/microorganisms.codes.parquet | Bin 60219 -> 60215 bytes data-raw/datasets/microorganisms.codes.rds | Bin 23464 -> 23464 bytes data-raw/datasets/microorganisms.codes.sav | Bin 151215 -> 151215 bytes data-raw/datasets/microorganisms.codes.txt | 2 +- data-raw/datasets/microorganisms.codes.xlsx | Bin 85664 -> 85660 bytes data-raw/microorganisms.codes.md5 | 2 +- data/microorganisms.codes.rda | Bin 23496 -> 23496 bytes man/as.sir.Rd | 9 +-------- 14 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/check-current-testthat.yaml b/.github/workflows/check-current-testthat.yaml index 961b79e9d..d59035888 100644 --- a/.github/workflows/check-current-testthat.yaml +++ b/.github/workflows/check-current-testthat.yaml @@ -53,7 +53,7 @@ jobs: matrix: config: # current development version, check all major OSes: - - {os: macOS-latest, r: 'devel', allowfail: true} + # - {os: macOS-latest, r: 'devel', allowfail: true} - {os: windows-latest, r: 'devel', allowfail: false} - {os: ubuntu-latest, r: 'devel', allowfail: false, http-user-agent: 'release'} diff --git a/DESCRIPTION b/DESCRIPTION index ff9a90a06..b7ce75421 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9247 +Version: 2.1.1.9248 Date: 2025-04-20 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index c649b1809..000032ca6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9247 +# AMR 2.1.1.9248 *(this beta version will eventually become v3.0. We're happy to reach a new major milestone soon, which will be all about the new One Health support! Install this beta using [the instructions here](https://amr-for-r.org/#get-this-package).)* diff --git a/R/sir.R b/R/sir.R index 96136cea1..ad53151c9 100755 --- a/R/sir.R +++ b/R/sir.R @@ -31,12 +31,7 @@ #' #' @description Clean up existing SIR values, or interpret minimum inhibitory concentration (MIC) values and disk diffusion diameters according to EUCAST or CLSI. [as.sir()] transforms the input to a new class [`sir`], which is an ordered [factor] containing the levels `S`, `SDD`, `I`, `R`, `NI`. #' -#' These breakpoints are currently implemented: -#' - For **clinical microbiology**: EUCAST `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST" & type == "human")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST" & type == "human")$guideline)))` and CLSI `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI" & type == "human")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI" & type == "human")$guideline)))`; -#' - For **veterinary microbiology**: EUCAST `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST" & type == "animal")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST" & type == "animal")$guideline)))` and CLSI `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI" & type == "animal")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI" & type == "animal")$guideline)))`; -#' - For **ECOFFs** (Epidemiological Cut-off Values): EUCAST `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST" & type == "ECOFF")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST" & type == "ECOFF")$guideline)))` and CLSI `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI" & type == "ECOFF")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI" & type == "ECOFF")$guideline)))`. -#' -#' All breakpoints used for interpretation are available in our [clinical_breakpoints] data set. +#' Breakpoints are currently implemented from EUCAST (`r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`) and CLSI (`r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI")$guideline)))`), see *Details*. All breakpoints used for interpretation are available in our [clinical_breakpoints] data set. #' @rdname as.sir #' @param x Vector of values (for class [`mic`]: MIC values in mg/L, for class [`disk`]: a disk diffusion radius in millimetres). #' @param mo A vector (or column name) with [character]s that can be coerced to valid microorganism codes with [as.mo()], can be left empty to determine it automatically. diff --git a/data-raw/datasets/microorganisms.codes.dta b/data-raw/datasets/microorganisms.codes.dta index c10d4be5b7e6ac92eab3e1b0b9a591d465efc33d..12838b122616f7d3425b9a66fee506d84e914229 100644 GIT binary patch delta 30 mcmaDjiR0lUjtQ+SrdCGgjh$ON8JGW=e2iUSyTe~bMIHdkmkeeA delta 37 tcmaDjiR0lUjtQ+SMpmY#jh$ON8JGXz3UhaMc8(AB@%7to^_Nkd2LK(t4gCNB diff --git a/data-raw/datasets/microorganisms.codes.feather b/data-raw/datasets/microorganisms.codes.feather index ee5dfd6ef41a356550aa00c620e763f9c6626e8e..6d0427cdafdfdad2b53d6fd6a21c791d985d85a8 100644 GIT binary patch delta 36 scmdnAjdjyD)`l&N+Ton6cNv&0I2m4XZ8r&LOk-q<5!yZ{f^ixX0N_Fk5&!@I delta 36 scmdnAjdjyD)`l&N+TomRcNrMIGcd}tZ#M~NOk-pcVBS6_f^ixX0NxJ@p8x;= diff --git a/data-raw/datasets/microorganisms.codes.parquet b/data-raw/datasets/microorganisms.codes.parquet index c082c3cfb14bc605b4d16de8ebee85f81f7fa9e3..b11391142e2ee2cfa712964b12e539b4b97cbb3a 100644 GIT binary patch delta 504 zcmVNDg6E2t`dzO&ttaPEtr3j0_M^NK{ft z4h=B{atuOWSWY6#egIhxJAn{iK}I^?jDvs( z$A|;SXmN#*2+Zh=hVYDpFbIc$1JH;Agirzx;EaZV1317C9MAzCPy!DSjRkNBI3SJF z=o!@L88SqT5Fk&=>v~0f19AW+S2V~o%1eP#2 zjfxJw&Yn4`OEij70c19l9DndquBy-zx6>ahz{Szui!HoUpa-rM(N7rk3=lzC^d(5<-LM%?SbU`qhi93hbdX2<%C{o ze*ETZWf3L^(YN;HL{0yCUpY&b=a7k3b~6)7(Bt}`bP>E^%G6oQt0=co?k;W~$^ZZW h005Eg+kF55fwuwf)Ctt(7BfCD4T}N*00001Sz5dS&{_Zh delta 439 zcmV;o0Z9I+w*jcP0gxO4YOx*WS${GR79~kxQNMQ=y5mpRH|(kul% zf$gTPtd-SO`|68tw2bjNMt{AsffP~p0vIE({isvFPl%r@AC;#OK|Q{o`}WP@{ayIo zYt;kyruc(RMhB#P2XzdGR$JTmWn%bIy+uuF=1%k%j&TsJ^pQ3#0Kz?MOaaA`<^GHQ zN#YrIO3TgU3ZgzHHM>v|)AbTBtkAB+(8S9BDK8~8t@d))KAN+miYUL-8!(#IhB%-A h007V(FAM+yg0}(g)Cqc*g0(&{4T}N*00001Sz6jV&`AIQ diff --git a/data-raw/datasets/microorganisms.codes.sav b/data-raw/datasets/microorganisms.codes.sav index 0af49e517cd90fe528673d4794074888a2c49ca0..4bbe35c79b78c73b1fcbda7405aba772a25bbab4 100644 GIT binary patch delta 42 ycmZ2KmvjAG&IxJkrdCGgR>qbS3vDJgur#i1UCX$2EmMobqbS3vDJgur#i1UCX$2EmMmFSD3rAvvYi~kFVc$Ye%LM FUI4jh5WfHb diff --git a/data-raw/datasets/microorganisms.codes.txt b/data-raw/datasets/microorganisms.codes.txt index 1bafd8a27..68cb37cab 100644 --- a/data-raw/datasets/microorganisms.codes.txt +++ b/data-raw/datasets/microorganisms.codes.txt @@ -4944,7 +4944,7 @@ "VFL" "B_VIBRI_FLVL" "VFU" "B_VIBRI_FRNS" "VGC" "B_VGCCC" -"VGS" "B_VGCCC_SLMN" +"VGS" "B_STRPT_VIRI" "VHI" "B_VIBRI_CHLR" "VHO" "B_GRMNT_HLLS" "VI-" "B_VIBRI" diff --git a/data-raw/datasets/microorganisms.codes.xlsx b/data-raw/datasets/microorganisms.codes.xlsx index 6d64da9997aa23a73a11068a9cd0d58f0f5c9aec..f9dd97e3aae0ad0a64a3169dd125c17b0d22713a 100644 GIT binary patch delta 2628 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 delta 440 zcmV;p0Z0DGw*knv0gxO4i?JOAT7SEGYtur+eMglh=i*=gBGgT)C;vMKe>bk`MN!=c35g(A#cb}|>PjvE)~-vK8VYGHFZfU}`?5EB$CaEIaD^(A z4;iZtVjz!|mXv~csO7GFxCgSjnsr%12<`Hv%xp6v+^1X;83fbm7WNfkg?}|Yy9Eo|4^jorNVa$HP1$`@(zo=2`0?#6Mt0vDv(%a z*~Qk)ABY5TBzkVkjQHw|o-oJvI>&zhY6oCpGfG5V_&$0=h|W;M_A#~;-O i0002gdGQ1Q0i(A8o7D*u+EX$