Skip to content

Commit

Permalink
(v2.1.1.9047) unit test and index
Browse files Browse the repository at this point in the history
  • Loading branch information
msberends committed Jun 13, 2024
1 parent cd1b37f commit 3179216
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: AMR
Version: 2.1.1.9046
Date: 2024-06-12
Version: 2.1.1.9047
Date: 2024-06-13
Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
data analysis and to work with microbial and antimicrobial properties by
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AMR 2.1.1.9046
# AMR 2.1.1.9047

*(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!)*

Expand Down
Binary file modified data-raw/microorganisms.codes.dta
Binary file not shown.
Binary file modified data-raw/microorganisms.codes.feather
Binary file not shown.
2 changes: 1 addition & 1 deletion data-raw/microorganisms.codes.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
684dc6117966c478ecc7f5c87e0964d0
0a874ae6f76e12fabd57b997cb13ebc1
Binary file modified data-raw/microorganisms.codes.parquet
Binary file not shown.
Binary file modified data-raw/microorganisms.codes.rds
Binary file not shown.
Binary file modified data-raw/microorganisms.codes.sav
Binary file not shown.
1 change: 1 addition & 0 deletions data-raw/microorganisms.codes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3200,6 +3200,7 @@
"MRPA" "B_PSDMN_AERG"
"MRSA" "B_STPHY_AURS"
"MRSE" "B_STPHY_EPDR"
"MRSP" "B_STPHY_PSDN"
"MSA" "B_MYCPLS_SLVR"
"MSB" "B_MRGNL_MRGN_SIBN"
"MSC" "B_MYCBC_SCRF"
Expand Down
Binary file modified data-raw/microorganisms.codes.xlsx
Binary file not shown.
Binary file modified data/microorganisms.codes.rda
Binary file not shown.
7 changes: 3 additions & 4 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
* Generates **antibiograms** - traditional, combined, syndromic, and even WISCA
* Provides the **full microbiological taxonomy** and extensive info on **all antimicrobial drugs**
* Applies all recent **CLSI** and **EUCAST** clinical and veterinary breakpoints for MICs and disk zones
* Corrects for duplicate isolates using 4 methods, **calculates** and **predicts** AMR per antibiotic class
* Corrects for duplicate isolates, **calculates** and **predicts** AMR per antibiotic class
* Integrates with **WHONET**, ATC, **EARS-Net**, PubChem, **LOINC**, **SNOMED CT**, and **NCBI**
* 100% free of costs and dependencies, highly suitable for places with **limited resources**
* **Easy to use** and **easy to learn**, with a **community** of contributors from around the globe

<div style="display: flex; font-size: 0.8em;">
<p style="text-align:left; width: 50%;"><small><a href="https://msberends.github.io/AMR/">https://msberends.github.io/AMR</a></small></p>
Expand Down Expand Up @@ -245,8 +244,8 @@ It will be downloaded and installed automatically. For RStudio, click on the men

#### Latest development version

[![check-recent](https://github.com/msberends/AMR/workflows/check-old/badge.svg?branch=main)](https://codecov.io/gh/msberends/AMR?branch=main)
[![check-recent](https://github.com/msberends/AMR/workflows/check-recent/badge.svg?branch=main)](https://codecov.io/gh/msberends/AMR?branch=main)
[![check-old](https://github.com/msberends/AMR/actions/workflows/check-old.yaml/badge.svg?branch=main)](https://github.com/msberends/AMR/actions/workflows/check-old.yaml?query=branch%3Amain)
[![check-recent](https://github.com/msberends/AMR/actions/workflows/check-recent.yaml/badge.svg?branch=main)](https://github.com/msberends/AMR/actions/workflows/check-recent.yaml?query=branch%3Amain)
[![CodeFactor](https://www.codefactor.io/repository/github/msberends/amr/badge)](https://www.codefactor.io/repository/github/msberends/amr)
[![Codecov](https://codecov.io/gh/msberends/AMR/branch/main/graph/badge.svg)](https://codecov.io/gh/msberends/AMR?branch=main)

Expand Down
8 changes: 4 additions & 4 deletions inst/tinytest/test-sir.R
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ expect_identical(out1, as.sir(c("S", "S", "R", "R")))
if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) {
out2 <- data.frame(mo = "Escherichia coli",
ab = "ertapenem",
some_mics = as.mic(c(0.256, 0.5, 1, 2))) |>
mutate(across(where(is.mic), function(x) as.sir(x, mo = "mo", ab = "ab", guideline = "EUCAST 2023"))) |>
some_mics = as.mic(c(0.256, 0.5, 1, 2))) %>%
mutate(across(where(is.mic), function(x) as.sir(x, mo = "mo", ab = "ab", guideline = "EUCAST 2023"))) %>%
pull(some_mics)
out3 <- data.frame(mo = "Escherichia coli",
ab = "ertapenem",
some_mics = as.mic(c(0.256, 0.5, 1, 2))) |>
mutate_if(is.mic, as.sir, mo = "mo", ab = "ab", guideline = "EUCAST 2023") |>
some_mics = as.mic(c(0.256, 0.5, 1, 2))) %>%
mutate_if(is.mic, as.sir, mo = "mo", ab = "ab", guideline = "EUCAST 2023") %>%
pull(some_mics)

expect_identical(out1, out2)
Expand Down
4 changes: 2 additions & 2 deletions man/microorganisms.codes.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3179216

Please sign in to comment.