Commit Graph
94 Commits
Author SHA1 Message Date
dr. M.S. (Matthijs) Berends e7077081b9 Set the order of sites in as.sir(), and add the veterinary sites
Sites now go from systemic, IV, meningitis, endocarditis, pneumonia and mastitis to UTI, topical and screen. A breakpoint without a site takes the position of "other", as both mean any site that is not listed next to it. A second site breaks a tie on the first one.

The veterinary sites are now fixed codes as well: mastitis (includes Mammary gland), respiratory, metritis, genital, soft tissue and wounds (includes Abscesses). Sites that are part of each other do not contradict.

site = "other" now leaves out every breakpoint limited to an indication, and prefers a breakpoint without a site.

A rebuild of clinical_breakpoints with this order gives the same data, so the same blocking rows stay.
2026-11-02 20:20:05 +01:00
dr. M.S. (Matthijs) Berends 2c98dac7ae Store all screening breakpoints under screening agents, and add these agents to antimicrobials (#328)
Implements the decisions ticked in #328, and the behaviour specified in https://github.com/msberends/AMR/pull/339#issuecomment-6577438074: `include_screening` now defaults to NULL, using screening breakpoints for screening agents only. With TRUE, a regular agent also takes these breakpoints, and with FALSE a screening agent gives NA with a note.

- antimicrobials gains 13 screening agents, e.g. GEN-S, ERY-S and STR1-S
- GEH and STH rows move to GEN-S and STR1-S, and as.sir() keeps accepting both codes
- Topical cut-off values move to -S agents with site "Topical"
- WHONET-based rows move as ticked, including CLSI cefoxitin for staphylococci and pefloxacin for Salmonella, and EUCAST 2012-2018 cefoxitin MIC
- Clinical breakpoints that EUCAST also allows as a screening test get a copy under the -S agent
2026-11-02 17:31:46 +01:00
dr. M.S. (Matthijs) Berends 4c4a7d4392 Add site to as.sir(), and use UTI breakpoints for unknown uti if no other breakpoint exists
`site` takes fixed codes, e.g. "meningitis" or "iv", and can be a column. With `site = NA`, any fitting breakpoint can apply, from most to least systemic. With a site set, breakpoints for contradicting sites are left out, while a breakpoint without a site still applies, and the result is NA if only contradicting sites exist, without falling back to PK/PD. `uti = TRUE` stays available and equals `site = "uti"`. Every choice is noted in sir_interpretation_history(), including the site that was used.

For unknown `uti`, a blocking row without a UTI status no longer overrides a UTI breakpoint at the same taxonomic level. A `uti` vector mixing NA with TRUE or FALSE no longer gives an error.

Veterinary sites are not part of the fixed codes yet, and are treated as breakpoints without a site.
2026-11-02 16:59:07 +01:00
dr. M.S. (Matthijs) Berends fcfaa87f5d (v3.0.1.9147) Keep EUCAST blocking rows for infections other than UTI where EUCAST only gives a UTI breakpoint, e.g. breakpoints in brackets for aminoglycosides in Acinetobacter, and let as.sir() with unknown uti consistently prefer non-UTI breakpoints, use UTI breakpoints only if no others exist and note this in sir_interpretation_history() every time
The pruning of blocking rows in the EUCAST reproduction script now compares UTI status too, and the script is fixed for the renamed column of the as.ab() coercion cache. In clinical_breakpoints, only the blocking rows were replaced (356 organism/agent/method combinations newly blocked, none unblocked); other changes of a full rebuild, caused by taxonomy updates in the WHONET-based rows, are not included.
2026-10-15 14:55:57 +02:00
dr. M.S. (Matthijs) Berends 0efc8826c8 Let aggregated analyses follow the guideline for the 'I' category in count_df(), proportion_df(), sir_df(), the plotting functions, antibiogram(), wisca(), and bug_drug_combinations(), deprecate combine_SI in favour of guideline, fix format() on bug_drug_combinations() counting I as resistant, and add a shared section 'Interpretation of SIR' 2026-10-15 09:58:21 +02:00
dr. M.S. (Matthijs) Berends 80afedeb8c (v3.0.1.9115) Fix interpretation of capped MICs without an S category (off-scale S breakpoint) or without breakpoints in as.sir(), and correct the documented default of capped_mic_handling (#295) 2026-10-11 15:40:09 +02:00
dr. M.S. (Matthijs) BerendsandClaude Opus 5.5 e42237ff0d (v3.0.1.9102) Replace dead EC Union Register and CLSI M100 URLs in documentation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-04 19:50:21 +02:00
dr. M.S. (Matthijs) Berends bbdd3a92e2 (v3.0.1.9088) add version number to intrinsic_resistant 2026-09-03 12:14:25 +02:00
dr. M.S. (Matthijs) Berends 637ada920b (v3.0.1.9070) Fix #293, update EUCAST rules for PEF 2026-06-26 08:56:59 +02:00
dr. M.S. (Matthijs) Berends 9898b5df4b (v3.0.1.9059) Fix WISCA in vignette 2026-06-23 14:38:59 +02:00
Matthijs Berends 3f9f931777 (v3.0.1.9059) Update taxonomy of microorganisms 2026-06-23 01:38:13 +02:00
dr. M.S. (Matthijs) Berends 0af3f84655 (v3.0.1.9057) website fix 2026-05-02 14:56:26 +02:00
Matthijs BerendsandClaude 23beebc6c3 Migrate parallel computing in as.sir() from parallel:: to future/future.apply (#280)
* Migrate parallel computing in as.sir() from parallel:: to future/future.apply

Replace parallel::mclapply() and parallel::parLapply() with
future.apply::future_lapply(), enabling transparent support for any
future backend (multisession, multicore, mirai_multisession, cluster)
on all platforms including Windows.

When parallel = TRUE the function now: (1) respects an active
future::plan() set by the user without overriding it on exit, or
(2) sets a temporary multisession plan with parallelly::availableCores()
and tears it down on exit. The max_cores argument controls worker count
only when no user plan is active.

future and future.apply are added to Suggests in DESCRIPTION.

https://claude.ai/code/session_01M1Jvf2Miu6JL4TQrEh1wS8

* Require user plan() for parallel=TRUE; fix as_wt_nwt false-positive warnings

- parallel = TRUE now errors with a cli-styled message if no non-sequential
  future::plan() is active; users must call e.g. future::plan(future::multisession)
  before using parallel = TRUE (breaking change)
- Removed auto-setup/teardown of multisession plan inside as.sir(), which was
  slow and caused version-mismatch issues with load_all() workflows
- Added as_wt_nwt to the exclusion list in as_sir_method() to suppress
  false-positive "no longer used" warnings during parallel runs
- Fixed pieces_per_col row-batch calculation to use n_workers (total available
  workers from the active plan) instead of n_cores (workers clipped to n_cols),
  so row-batch mode activates correctly when n_cols < n_workers
- Updated @param parallel and @param max_cores roxygen docs; regenerated man/as.sir.Rd
- Updated sequential-mode hint to instruct users to set plan() first

https://claude.ai/code/session_01M1Jvf2Miu6JL4TQrEh1wS8

* fix parallel

* fix parallel

* unit tests

* unit tedts

---------

Co-authored-by: Claude <noreply@anthropic.com>
2026-04-30 08:57:19 +01:00
dr. M.S. (Matthijs) Berends 3f1b20c304 (v3.0.1.9052) fix NEWS 2026-04-25 16:21:31 +02:00
Matthijs Berends 8ff5d4472a Add add_if_missing parameter to control NA handling in interpretive rules (#264) 2026-04-21 21:53:43 +02:00
dr. M.S. (Matthijs) Berends 26613d774b (v3.0.1.9042) add EUCAST breakpoint table v16 to interpretive_rules() 2026-04-02 11:42:19 +02:00
dr. M.S. (Matthijs) Berends 3a736bc484 (v3.0.1.9041) add breakpoints 2026 2026-03-30 10:01:49 +02:00
dr. M.S. (Matthijs) Berends 12cf144b19 (v3.0.1.9021) add guideline to resistance() and susceptibility() 2026-02-12 20:34:06 +01:00
dr. M.S. (Matthijs) Berends ba4c159154 (v3.0.1.9019) Wildtype/Non-wildtype support, and start with interpretive_rules()
Fixes #246
Fixes #254
Fixes #255
Fixes #256
2026-02-08 23:15:40 +01:00
dr. M.S. (Matthijs) Berends 2df2911cf4 (v3.0.1.9018) fixes #249
updates AB groups
2026-01-16 10:57:03 +01:00
dr. M.S. (Matthijs) Berends 225c73f7e7 (v3.0.1.9004) Revamp as.sir() interpretation for capped MICs
Fixes #243
Fixes #244
2025-12-15 13:18:13 +01:00
dr. M.S. (Matthijs) Berends 8dab0a3730 (v3.0.0.9007) allow any tidyselect language in as.sir() 2025-07-17 14:29:35 +02:00
dr. M.S. (Matthijs) Berends 72db2b2562 (v3.0.0.9003) eucast_rules fix, new tidymodels integration 2025-06-13 14:03:21 +02:00
dr. M.S. (Matthijs) Berends 7d45ca9fbf (v2.1.1.9274) Improve is_sir_eligible, rename verbose MDRO output 2025-05-12 12:35:11 +02:00
dr. M.S. (Matthijs) Berends a778eb9bcf (v2.1.1.9272) (v2.1.1.9271) add sensititre AB and animal codes 2025-05-04 16:40:08 +02:00
dr. M.S. (Matthijs) Berends dc5559a2c4 (v2.1.1.9270) Add support for Korean, fix ATCs 2025-05-04 14:24:43 +02:00
dr. M.S. (Matthijs) Berends b8f0f64287 (v2.1.1.9269) Support 7 new languages 2025-05-02 19:25:19 +02:00
dr. M.S. (Matthijs) Berends 5e6bbdf3d1 (v2.1.1.9267) update ATCs 2025-05-01 11:48:49 +02:00
dr. M.S. (Matthijs) Berends faa9ae0d85 (v2.1.1.9260) fix antibiogram 2025-04-29 16:15:18 +02:00
dr. M.S. (Matthijs) Berends 6819473457 (v2.1.1.9259) Parallel computing for R < 4 2025-04-27 20:25:39 +02:00
dr. M.S. (Matthijs) Berends 52cd3e88cd (v2.1.1.9258) fix for R <= 3.6 2025-04-27 17:53:13 +02:00
dr. M.S. (Matthijs) Berends f340e257fa (v2.1.1.9256) unit tests 2025-04-26 21:29:50 +02:00
dr. M.S. (Matthijs) Berends d166aa2c1d (v2.1.1.9255) fix examples 2025-04-26 16:35:14 +02:00
dr. M.S. (Matthijs) Berends 92316d5ddc (v2.1.1.9254) fix antimicrobial synonyms 2025-04-26 16:23:14 +02:00
dr. M.S. (Matthijs) Berends 4e7fca3b38 (v2.1.1.9253) parallel computing 2025-04-26 15:47:00 +02:00
dr. M.S. (Matthijs) Berends abee2a954e (v2.1.1.9252) fix MIC for >= and <= 2025-04-25 10:19:40 +02:00
dr. M.S. (Matthijs) Berends be13934fe7 (v2.1.1.9249) unit test 2025-04-20 17:49:47 +02:00
dr. M.S. (Matthijs) Berends 9e64d7708e (v2.1.1.9248) unit test fix 2025-04-20 15:27:36 +02:00
dr. M.S. (Matthijs) Berends ea443f7483 (v2.1.1.9247) CLSI/EUCAST 2025! 2025-04-20 12:55:31 +02:00
dr. M.S. (Matthijs) Berends ca00ed468e (v2.1.1.9243) fix sir documentation 2025-04-18 16:32:45 +02:00
dr. M.S. (Matthijs) Berends 29b0ef1089 (v2.1.1.9242) sir log 2025-04-18 16:03:50 +02:00
dr. M.S. (Matthijs) Berends 579025f678 (v2.1.1.9241) fix sir 2025-04-18 13:25:59 +02:00
dr. M.S. (Matthijs) Berends cf91e677c6 (v2.1.1.9240) fix sir interpretation 2025-04-16 15:22:12 +02:00
dr. M.S. (Matthijs) Berends 36fd99e1f4 (v2.1.1.9235) New website! 2025-04-08 15:54:30 +01:00
dr. M.S. (Matthijs) Berends a905303296 (v2.1.1.9234) fix CLSI 2025-04-07 17:36:01 +01:00
dr. M.S. (Matthijs) Berends 1fdab84103 (v2.1.1.9233) chore: make all argument texts full sentences 2025-03-31 14:53:24 +02:00
dr. M.S. (Matthijs) Berends 63099cd81e (v2.1.1.9232) is.mic() iteration, documentation cleanup 2025-03-31 10:51:31 +02:00
dr. M.S. (Matthijs) Berends 49da312506 (v2.1.1.9228) repo cleaning 2025-03-28 11:17:49 +01:00
dr. M.S. (Matthijs) Berends e6f88241b2 (v2.1.1.9225) fix geom_hline()/_vline() in MIC plotting, add EUCAT 1.2 in full, add London contribs, fix mo codes, add Kleb pneu complex 2025-03-26 17:19:17 +01:00
dr. M.S. (Matthijs) Berends 7f1ae1f474 (v2.1.1.9203) unit tests 2025-03-15 13:25:23 +01:00