Merge pull request #8 from EricArcher/master

v 0.9.8 on CRAN

Author: smwoodman

.Rbuildignore

@@ -10,4 +10,5 @@ tar.gz$
 .DS_Store
 ^\.github$
 ^\.DS_Store$
-^appveyor\.yml$
+^appveyor\.yml$
+^CRAN-SUBMISSION$

.github/.gitignore

@@ -0,0 +1,3 @@
+Version: 0.9.8
+Date: 2025-06-11 04:11:57 UTC
+SHA: bab66da242d793907acfe612a135d37e0aded140

.github/workflows/R-CMD-check.yaml

@@ -4,13 +4,14 @@ Title: BioAcoustic eveNT classifiER
 Description: Create a hierarchical acoustic event species classifier out of  
   multiple call type detectors as described in 
   Rankin et al (2017) <doi:10.1111/mms.12381>.
-Version: 0.9.6
+Version: 0.9.8
 Authors@R: c(
-  EA = person("Eric", "Archer", email = "eric.archer@noaa.gov", role = c("aut", "cre")),
-  TS = person("Taiki", "Sakai", email = "taiki.sakai@noaa.gov", role = c("aut")))
+  EA = person("Eric", "Archer", email = "eric.ivan.archer@gmail.com", role = c("aut", "cre")),
+  SR = person("Shannon", "Rankin", email = "shannon.rankin@noaa.gov", role = c("aut")))
+URL: https://github.com/SWFSC/banter
+BugReports: https://github.com/SWFSC/banter/issues
 Depends:
-  R (>= 4.1.0),
-  magrittr
+  R (>= 4.1.0)
 Imports:
   dplyr (>= 1.0.6),
   ggplot2 (>= 3.3.3),
@@ -26,7 +27,5 @@ Imports:
   tidyr (>= 1.1.1)
 Suggests: testthat
 License: GNU General Public License
-RoxygenNote: 7.2.3
-URL: https://github.com/ericarcher/banter
-BugReports: https://github.com/ericarcher/banter/issues
+RoxygenNote: 7.3.2
 Encoding: UTF-8

.gitignore

@@ -19,6 +19,5 @@ export(runBanterModel)
 export(subsampleDetections)
 exportMethods(predict)
 exportMethods(summary)
-importFrom(magrittr,"%>%")
 importFrom(methods,new)
 importFrom(rlang,.data)

CRAN-SUBMISSION

@@ -116,11 +116,11 @@ removeBanterDetector <- function(x, name) {
   start <- Sys.time()
 
   # Combine event data with call ids in detector
-  df <- x@data %>% 
-    dplyr::select(.data$event.id, .data$species) %>% 
-    dplyr::inner_join(data, by = "event.id") %>% 
-    dplyr::mutate(species = as.character(.data$species)) %>% 
-    as.data.frame
+  df <- x@data |> 
+    dplyr::select(.data$event.id, .data$species) |> 
+    dplyr::inner_join(data, by = "event.id") |> 
+    dplyr::mutate(species = as.character(.data$species)) |> 
+    as.data.frame()
 
   # Check if any columns need to be removed because of missing data
   to.remove <- sapply(df, function(i) any(is.na(i)))
@@ -143,12 +143,12 @@ removeBanterDetector <- function(x, name) {
   if(is.null(sampsize)) return(NULL)
 
   # Remove missing species and format columns
-  df <- df %>%
-    dplyr::filter(.data$species %in% names(sampsize)) %>%
-    dplyr::mutate(species = factor(.data$species)) %>%
-    dplyr::mutate(id = paste0(.data$event.id, ".", .data$call.id)) %>%
-    tibble::column_to_rownames("id") %>%
-    as.data.frame() %>%
+  df <- df |>
+    dplyr::filter(.data$species %in% names(sampsize)) |>
+    dplyr::mutate(species = factor(.data$species)) |>
+    dplyr::mutate(id = paste0(.data$event.id, ".", .data$call.id)) |>
+    tibble::column_to_rownames("id") |>
+    as.data.frame() |>
     droplevels()
 
   # Setup number of cores
@@ -157,7 +157,7 @@ removeBanterDetector <- function(x, name) {
 
   # Create random forest parameter list
   params <- list(
-    predictors = df %>% 
+    predictors = df |> 
       dplyr::select(-.data$event.id, -.data$call.id, -.data$species),
     response = df$species,
     sampsize = sampsize,
@@ -206,4 +206,4 @@ removeBanterDetector <- function(x, name) {
     proximity = FALSE, 
     norm.votes = FALSE
   )
-}
+}

DESCRIPTION

@@ -1,6 +1,5 @@
 #' banter
 #' 
-#' @docType package
 #' @name banter-package
 #' @aliases banter
 #' @title BioAcoustic EveNT ClassifiER
@@ -9,10 +8,10 @@
 #'   of dolphins in the California Current using whistles, echolocation clicks,
 #'   and burst pulses. Marine Mammal Science 33:520-540. doi:10.1111/mms.12381
 #' @importFrom rlang .data
-#' @importFrom magrittr %>%
 #' @importFrom methods new
 #' @keywords package
 NULL
+"_PACKAGE"
 
 .onAttach <- function(libname, pkgname) {
   packageStartupMessage(
@@ -46,4 +45,4 @@ NULL
 #' @usage data(test.data)
 #' @format list
 #' @keywords datasets
-NULL
+NULL