@@ -353,13 +351,6 @@
Group 2 consists of all microorganisms where the taxonomic phylum is Proteobacteria, Firmicutes, Actinobacteria or Sarcomastigophora, or where the taxonomic genus is Aspergillus, Bacteroides, Candida, Capnocytophaga, Chryseobacterium, Cryptococcus, Elisabethkingia, Flavobacterium, Fusobacterium, Giardia, Leptotrichia, Mycoplasma, Prevotella, Rhodotorula, Treponema, Trichophyton or Ureaplasma.
Group 3 (least prevalent microorganisms) consists of all other microorganisms.
-Self-learning algorithm
-
-
-The as.mo() function gains experience from previously determined microorganism IDs and learns from it. This drastically improves both speed and reliability. Use clear_mo_history() to reset the algorithms. Only experience from your current AMR package version is used. This is done because in the future the taxonomic tree (which is included in this package) may change for any organism and it consequently has to rebuild its knowledge.
-Usually, any guess after the first try runs 80-95% faster than the first try.
-This resets with every update of this AMR package since results are saved to your local package library folder.
-
Source
diff --git a/docs/reference/example_isolates.html b/docs/reference/example_isolates.html
index 353404a4..81b0b485 100644
--- a/docs/reference/example_isolates.html
+++ b/docs/reference/example_isolates.html
@@ -85,7 +85,7 @@
AMR (for R)
- 0.9.0.9016
+ 0.9.0.9018
diff --git a/docs/reference/index.html b/docs/reference/index.html
index fd7eeaff..a6baeb3a 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -84,7 +84,7 @@
AMR (for R)
- 0.9.0.9017
+ 0.9.0.9018
@@ -266,7 +266,7 @@
|
- as.mo() is.mo() mo_failures() mo_uncertainties() mo_renamed() clear_mo_history()
+ as.mo() is.mo() mo_failures() mo_uncertainties() mo_renamed()
|
Transform to microorganism ID |
diff --git a/docs/reference/microorganisms.html b/docs/reference/microorganisms.html
index a9676a3a..e75e4645 100644
--- a/docs/reference/microorganisms.html
+++ b/docs/reference/microorganisms.html
@@ -85,7 +85,7 @@
AMR (for R)
- 0.9.0.9016
+ 0.9.0.9018
diff --git a/docs/reference/mo_property.html b/docs/reference/mo_property.html
index 60caf1e1..2207c592 100644
--- a/docs/reference/mo_property.html
+++ b/docs/reference/mo_property.html
@@ -85,7 +85,7 @@
AMR (for R)
- 0.9.0.9016
+ 0.9.0.9018
diff --git a/docs/reference/rsi_translation.html b/docs/reference/rsi_translation.html
index 2ab917b0..7c150553 100644
--- a/docs/reference/rsi_translation.html
+++ b/docs/reference/rsi_translation.html
@@ -85,7 +85,7 @@
AMR (for R)
- 0.9.0.9017
+ 0.9.0.9018
diff --git a/inst/mo_history/mo_history.csv b/inst/mo_history/mo_history.csv
deleted file mode 100644
index a4d9a82e..00000000
--- a/inst/mo_history/mo_history.csv
+++ /dev/null
@@ -1 +0,0 @@
-"x","mo","uncertainty_level","package_version"
diff --git a/man/as.mo.Rd b/man/as.mo.Rd
index 76892729..e108a125 100644
--- a/man/as.mo.Rd
+++ b/man/as.mo.Rd
@@ -1,5 +1,5 @@
% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/mo.R, R/mo_history.R
+% Please edit documentation in R/mo.R
\name{as.mo}
\alias{as.mo}
\alias{mo}
@@ -7,7 +7,6 @@
\alias{mo_failures}
\alias{mo_uncertainties}
\alias{mo_renamed}
-\alias{clear_mo_history}
\title{Transform to microorganism ID}
\usage{
as.mo(
@@ -26,8 +25,6 @@ mo_failures()
mo_uncertainties()
mo_renamed()
-
-clear_mo_history(...)
}
\arguments{
\item{x}{a character vector or a \code{\link{data.frame}} with one or two columns}
@@ -122,15 +119,6 @@ Group 2 consists of all microorganisms where the taxonomic phylum is Proteobacte
Group 3 (least prevalent microorganisms) consists of all other microorganisms.
}
-
-\subsection{Self-learning algorithm}{
-
-The \code{\link[=as.mo]{as.mo()}} function gains experience from previously determined microorganism IDs and learns from it. This drastically improves both speed and reliability. Use \code{\link[=clear_mo_history]{clear_mo_history()}} to reset the algorithms. Only experience from your current \code{AMR} package version is used. This is done because in the future the taxonomic tree (which is included in this package) may change for any organism and it consequently has to rebuild its knowledge.
-
-Usually, any guess after the first try runs 80-95\% faster than the first try.
-
-This resets with every update of this \code{AMR} package since results are saved to your local package library folder.
-}
}
\section{Source}{
diff --git a/tests/testthat/test-mo.R b/tests/testthat/test-mo.R
index 778577e0..6bb75363 100644
--- a/tests/testthat/test-mo.R
+++ b/tests/testthat/test-mo.R
@@ -24,9 +24,7 @@ context("mo.R")
test_that("as.mo works", {
skip_on_cran()
-
- clear_mo_history(force = TRUE)
-
+
library(dplyr)
MOs <- AMR::microorganisms %>% filter(!is.na(mo), nchar(mo) > 3)
expect_identical(as.character(MOs$mo), as.character(as.mo(MOs$mo)))
diff --git a/vignettes/benchmarks.Rmd b/vignettes/benchmarks.Rmd
index e67cd5bd..aeea8d79 100755
--- a/vignettes/benchmarks.Rmd
+++ b/vignettes/benchmarks.Rmd
@@ -22,7 +22,6 @@ knitr::opts_chunk$set(
fig.height = 4.5,
dpi = 75
)
-options(AMR_disable_mo_history = FALSE)
```
One of the most important features of this package is the complete microbial taxonomic database, supplied by the [Catalogue of Life](http://catalogueoflife.org). We created a function `as.mo()` that transforms any user input value to a valid microbial ID by using intelligent rules combined with the taxonomic tree of Catalogue of Life.
@@ -69,9 +68,6 @@ The actual result is the same every time: it returns its microorganism code ``r
But the calculation time differs a lot:
-```{r, echo = FALSE}
-clear_mo_history()
-```
```{r, warning=FALSE}
S.aureus <- microbenchmark(
as.mo("sau"), # WHONET code
@@ -95,13 +91,10 @@ print(S.aureus, unit = "ms", signif = 2)
ggplot.bm(S.aureus)
```
-In the table above, all measurements are shown in milliseconds (thousands of seconds). A value of 5 milliseconds means it can determine 200 input values per second. It case of 100 milliseconds, this is only 10 input values per second. The second input is the only one that has to be looked up thoroughly. All the others are known codes (the first one is a WHONET code) or common laboratory codes, or common full organism names like the last one. Full organism names are always preferred.
+In the table above, all measurements are shown in milliseconds (thousands of seconds). A value of 5 milliseconds means it can determine 200 input values per second. It case of 100 milliseconds, this is only 10 input values per second.
-To achieve this speed, the `as.mo` function also takes into account the prevalence of human pathogenic microorganisms. The downside is of course that less prevalent microorganisms will be determined less fast. See this example for the ID of *Methanosarcina semesiae* (`B_MTHNSR_SEMS`), a bug probably never found before in humans:
+To achieve this speed, the `as.mo` function also takes into account the prevalence of human pathogenic microorganisms. The downside of this is of course that less prevalent microorganisms will be determined less fast. See this example for the ID of *Methanosarcina semesiae* (`B_MTHNSR_SEMS`), a bug probably never found before in humans:
-```{r, echo = FALSE}
-clear_mo_history()
-```
```{r, warning=FALSE}
M.semesiae <- microbenchmark(as.mo("metsem"),
as.mo("METSEM"),
@@ -112,33 +105,11 @@ M.semesiae <- microbenchmark(as.mo("metsem"),
print(M.semesiae, unit = "ms", signif = 4)
```
-That takes `r round(mean(M.semesiae$time, na.rm = TRUE) / mean(S.aureus$time, na.rm = TRUE), 1)` times as much time on average. A value of 100 milliseconds means it can only determine ~10 different input values per second. We can conclude that looking up arbitrary codes of less prevalent microorganisms is the worst way to go, in terms of calculation performance. Full names (like *Methanosarcina semesiae*) are always very fast and only take some thousands of seconds to coerce - they are the most probable input from most data sets.
+That takes `r round(mean(M.semesiae$time, na.rm = TRUE) / mean(S.aureus$time, na.rm = TRUE), 1)` times as much time on average. We can conclude that looking up arbitrary codes of less prevalent microorganisms is the worst way to go, in terms of calculation performance. Full names (like *Methanosarcina semesiae*) are always very fast and only take some thousands of seconds to coerce - they are the most probable input from most data sets.
In the figure below, we compare *Escherichia coli* (which is very common) with *Prevotella brevis* (which is moderately common) and with *Methanosarcina semesiae* (which is uncommon):
```{r, echo = FALSE, fig.width=12}
-clear_mo_history()
-par(mar = c(5, 16, 4, 2))
-boxplot(microbenchmark(
- 'as.mo("Methanosarcina semesiae")' = as.mo("Methanosarcina semesiae", force_mo_history = TRUE),
- 'as.mo("Prevotella brevis")' = as.mo("Prevotella brevis", force_mo_history = TRUE),
- 'as.mo("Escherichia coli")' = as.mo("Escherichia coli", force_mo_history = TRUE),
- 'as.mo("M. semesiae")' = as.mo("M. semesiae", force_mo_history = TRUE),
- 'as.mo("P. brevis")' = as.mo("P. brevis", force_mo_history = TRUE),
- 'as.mo("E. coli")' = as.mo("E. coli", force_mo_history = TRUE),
- times = 10),
- horizontal = TRUE, las = 1, unit = "s", log = TRUE,
- xlab = "", ylab = "Time in seconds (log)",
- main = "Benchmarks per prevalence")
-```
-
-The highest outliers are the first times. All next determinations were done in only thousands of seconds, because the `as.mo()` function **learns from its own output to speed up determinations for next times**.
-
-In below figure, this effect was disabled to show the difference with the boxplot above:
-
-```{r, echo = FALSE, fig.width=12}
-clear_mo_history()
-options(AMR_disable_mo_history = TRUE)
par(mar = c(5, 16, 4, 2))
boxplot(microbenchmark(
'as.mo("Methanosarcina semesiae")' = as.mo("Methanosarcina semesiae"),
@@ -151,7 +122,6 @@ boxplot(microbenchmark(
horizontal = TRUE, las = 1, unit = "s", log = TRUE,
xlab = "", ylab = "Time in seconds (log)",
main = "Benchmarks per prevalence")
-options(AMR_disable_mo_history = FALSE)
```
Uncommon microorganisms take a lot more time than common microorganisms. To relieve this pitfall and further improve performance, two important calculations take almost no time at all: **repetitive results** and **already precalculated results**.
@@ -220,7 +190,7 @@ run_it <- microbenchmark(A = mo_species("aureus"),
print(run_it, unit = "ms", signif = 3)
```
-Of course, when running `mo_phylum("Firmicutes")` the function has zero knowledge about the actual microorganism, namely *S. aureus*. But since the result would be `"Firmicutes"` too, there is no point in calculating the result. And because this package 'knows' all phyla of all known bacteria (according to the Catalogue of Life), it can just return the initial value immediately.
+Of course, when running `mo_phylum("Firmicutes")` the function has zero knowledge about the actual microorganism, namely *S. aureus*. But since the result would be `"Firmicutes"` anyway, there is no point in calculating the result. And because this package 'knows' all phyla of all known bacteria (according to the Catalogue of Life), it can just return the initial value immediately.
### Results in other languages