Comment on w_inf no longer leads to error in plyr::aaply(). Closes #269

sizespectrum · Dec 5, 2022 · 1d56040 · 1d56040
1 parent 7a684ed
commit 1d56040
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/R/MizerParams-class.R b/R/MizerParams-class.R
@@ -565,8 +565,7 @@ emptyParams <- function(species_params,
                   dimnames = list(sp = species_names, w = signif(w,3)))
     ft_pred_kernel <- array(NA, dim = c(no_sp, no_w_full),
                             dimnames = list(sp = species_names, k = 1:no_w_full))
-    ft_mask <- plyr::aaply(species_params$w_inf, 1,
-                           function(x) w_full < x, .drop = FALSE)
+    ft_mask <- t(sapply(species_params$w_inf, function(x) w_full < x))
 
     selectivity <- array(0, dim = c(length(gear_names), no_sp, no_w), 
                          dimnames = list(gear = gear_names, sp = species_names, 

diff --git a/R/summary_methods.R b/R/summary_methods.R
@@ -513,8 +513,8 @@ get_size_range_array <- function(params, min_w = min(params@w),
              value for each species.")
     }
     if (!all(min_w < max_w)) stop("min_w must be less than max_w")
-    min_n <- plyr::aaply(min_w, 1, function(x) params@w >= x, .drop = FALSE)
-    max_n <- plyr::aaply(max_w, 1, function(x) params@w <= x, .drop = FALSE)
+    min_n <- t(sapply(min_w, function(x) params@w >= x))
+    max_n <- t(sapply(max_w, function(x) params@w <= x))
     size_n <- min_n & max_n
     dimnames(size_n) <- list(sp = params@species_params$species, 
                              w = signif(params@w, 3)) 

diff --git a/data/NS_params.RData b/data/NS_params.RData
diff --git a/data/NS_params.rda b/data/NS_params.rda