mirror of
https://github.com/msberends/AMR.git
synced 2026-11-16 04:20:53 +01:00
EUCAST import: blocking rows, note restrictions, PK-PD and parser fixes (#310)
Make the EUCAST Clinical Breakpoint Tables import (2019-2026) fail-safe: - Add blocking rows (NA breakpoints, reason in `note`) where EUCAST gives no breakpoint for an organism (IE, "-", Note, brackets, "except" clauses, table scope), so as.sir() no longer falls back to broader taxa - Apply restrictions from EUCAST notes via a curated rule table with a completeness guard (e.g. zone diameters for E. coli only) - Import PK-PD (non-species related) breakpoints 2019-2023, H. parainfluenzae MIC breakpoints, and explicit screening thresholds from notes (high-level aminoglycosides, cefoxitin MIC, unidentified CoNS) - Parser fixes: lost Staphylococcus sheets 2019/2020, note keys and bodies, struck-through cells, hidden sheets, missing disk contents, organism groups, site vocabulary, MIC dilution levels, off-scale breakpoints stored as 0.0001 - Keep EUCAST antifungal breakpoints 2019-2025 from WHONET; code WHONET streptomycin as STR1 instead of STR (streptoduocin) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
5d9974e2b9
commit
dab4c47e86
25 files changed
+83693
-58604
No files matched your search
@@ -63,10 +63,14 @@ test_that("test-data.R", {
|
||||
)
|
||||
|
||||
# check valid disks/MICs
|
||||
expect_false(anyNA(as.mic(clinical_breakpoints[which(clinical_breakpoints$method == "MIC" & clinical_breakpoints$ref_tbl != "ECOFF"), "breakpoint_S", drop = TRUE])))
|
||||
expect_true(anyNA(as.mic(clinical_breakpoints[which(clinical_breakpoints$method == "MIC" & clinical_breakpoints$ref_tbl != "ECOFF"), "breakpoint_R", drop = TRUE])))
|
||||
expect_false(anyNA(as.disk(clinical_breakpoints[which(clinical_breakpoints$method == "DISK" & clinical_breakpoints$ref_tbl != "ECOFF"), "breakpoint_S", drop = TRUE])))
|
||||
expect_true(anyNA(as.disk(clinical_breakpoints[which(clinical_breakpoints$method == "DISK" & clinical_breakpoints$ref_tbl != "ECOFF"), "breakpoint_R", drop = TRUE])))
|
||||
# rows without any breakpoint are EUCAST's blocking rows ("no breakpoint" for that organism), which must state their reason
|
||||
is_blocking <- is.na(clinical_breakpoints$breakpoint_S) & is.na(clinical_breakpoints$breakpoint_R)
|
||||
expect_true(all(grepl("^\\[No breakpoint\\] ", clinical_breakpoints$note[is_blocking])))
|
||||
expect_true(all(clinical_breakpoints$guideline[is_blocking] %like% "EUCAST"))
|
||||
expect_false(anyNA(as.mic(clinical_breakpoints[which(clinical_breakpoints$method == "MIC" & clinical_breakpoints$ref_tbl != "ECOFF" & !is_blocking), "breakpoint_S", drop = TRUE])))
|
||||
expect_true(anyNA(as.mic(clinical_breakpoints[which(clinical_breakpoints$method == "MIC" & clinical_breakpoints$ref_tbl != "ECOFF" & !is_blocking), "breakpoint_R", drop = TRUE])))
|
||||
expect_false(anyNA(as.disk(clinical_breakpoints[which(clinical_breakpoints$method == "DISK" & clinical_breakpoints$ref_tbl != "ECOFF" & !is_blocking), "breakpoint_S", drop = TRUE])))
|
||||
expect_true(anyNA(as.disk(clinical_breakpoints[which(clinical_breakpoints$method == "DISK" & clinical_breakpoints$ref_tbl != "ECOFF" & !is_blocking), "breakpoint_R", drop = TRUE])))
|
||||
|
||||
# antibiotic names must always be coercible to their original AB code
|
||||
expect_identical(as.ab(AMR::antimicrobials$name), AMR::antimicrobials$ab)
|
||||
|
||||
Reference in new issue
Block a user