(v0.7.1.9013) guess_mo_ab speed improvement

R/guess_ab_col.R

@@ -79,6 +79,13 @@ guess_ab_col <- function(x = NULL, search_string = NULL, verbose = FALSE) {
     search_string.ab <- suppressWarnings(as.ab(search_string))
     if (search_string.ab %in% colnames(x)) {
       ab_result <- colnames(x)[colnames(x) == search_string.ab][1L]
+
+    } else if (any(tolower(colnames(x)) %in% tolower(unlist(ab_property(search_string.ab, "abbreviations"))))) {
+      ab_result <- colnames(x)[tolower(colnames(x)) %in% tolower(unlist(ab_property(search_string.ab, "abbreviations")))][1L]
+
+    # } else if (any(tolower(colnames(x)) %in% tolower(ab_tradenames(search_string.ab)))) {
+    #   ab_result <- colnames(x)[tolower(colnames(x)) %in% tolower(ab_tradenames(search_string.ab))][1L]
+
     } else {
       # sort colnames on length - longest first
       cols <- colnames(x[, x %>% colnames() %>% nchar() %>% order() %>% rev()])

R/misc.R

@@ -97,8 +97,10 @@ search_type_in_df <- function(x, type) {
   if (type == "mo") {
     if ("mo" %in% lapply(x, class)) {
       found <- colnames(x)[lapply(x, class) == "mo"][1]
-    } else if (any(colnames(x) %like% "^(mo|microorganism|organism|bacteria)s?$")) {
-      found <- colnames(x)[colnames(x) %like% "^(mo|microorganism|organism|bacteria)s?$"][1]
+    } else if (any(colnames(x) %like% "^(mo|microorganism|organism|bacteria|bacterie)s?$")) {
+      found <- colnames(x)[colnames(x) %like% "^(mo|microorganism|organism|bacteria|bacterie)s?$"][1]
+    } else if (any(colnames(x) %like% "^(microorganism|organism|bacteria|bacterie)")) {
+      found <- colnames(x)[colnames(x) %like% "^(microorganism|organism|bacteria|bacterie)"][1]
     } else if (any(colnames(x) %like% "species")) {
       found <- colnames(x)[colnames(x) %like% "species"][1]
     }