add multi_est placeholder

R/hc.R

@@ -76,7 +76,8 @@ ssd_hc.fitdists <- function(
     ci = FALSE, 
     level = 0.95, 
     nboot = 1000,
-    average = TRUE, 
+    average = TRUE,
+    multi_est = TRUE,
     delta = 7, 
     min_pboot = 0.99,
     parametric = TRUE, 
@@ -101,6 +102,7 @@ ssd_hc.fitdists <- function(
     level = level,
     nboot = nboot,
     average = average,
+    multi_est = multi_est,
     delta = delta,
     min_pboot = min_pboot,
     parametric = parametric,
@@ -144,6 +146,7 @@ ssd_hc.fitburrlioz <- function(x, percent = 5, ci = FALSE, level = 0.95, nboot =
     level = level,
     nboot = nboot,
     average = FALSE,
+    multi_est = TRUE,
     delta = Inf,
     min_pboot = min_pboot,
     parametric = parametric,

R/hcp.R

@@ -216,14 +216,14 @@ hcp_weighted <- function(hcp, weight, value, method, nboot) {
   )
 }
 
-
 .ssd_hcp_fitdists <- function(
     x, 
     value, 
     ci, 
     level, 
     nboot,
     average, 
+    multi_est,
     min_pboot, 
     parametric, 
     multi, 
@@ -307,6 +307,7 @@ ssd_hcp_fitdists <- function(
     level,
     nboot,
     average,
+    multi_est,
     delta,
     min_pboot,
     parametric,
@@ -327,6 +328,7 @@ ssd_hcp_fitdists <- function(
   chk_gt(nboot)
   chk_lt(nboot, 1e+09)
   chk_flag(average)
+  chk_flag(multi_est)
   chk_number(delta)
   chk_gte(delta)
   chk_number(min_pboot)
@@ -347,6 +349,7 @@ ssd_hcp_fitdists <- function(
     level = level, 
     nboot = nboot,
     average = average, 
+    multi_est = multi_est,
     min_pboot = min_pboot,
     parametric = parametric,
     multi = multi,

R/hp.R

@@ -34,7 +34,9 @@ ssd_hp <- function(x, ...) {
 #' @export
 ssd_hp.fitdists <- function(
     x, conc = 1, ci = FALSE, level = 0.95, nboot = 1000,
-    average = TRUE,  delta = 7, min_pboot = 0.99,
+    average = TRUE, 
+    multi_est = TRUE,
+    delta = 7, min_pboot = 0.99,
     parametric = TRUE, multi = TRUE, control = NULL, 
     samples = FALSE,
     save_to = NULL, weighted = TRUE, ...
@@ -46,7 +48,7 @@ ssd_hp.fitdists <- function(
 
   hcp <- ssd_hcp_fitdists(
     x = x, value = conc, ci = ci, level = level, nboot = nboot,
-    average = average, delta = delta, min_pboot = min_pboot,
+    average = average, multi_est = multi_est, delta = delta, min_pboot = min_pboot,
     parametric = parametric, multi = multi, control = control, 
     save_to = save_to, samples = samples, hc = FALSE,  fix_weights = weighted,
   )
@@ -82,6 +84,7 @@ ssd_hp.fitburrlioz <- function(x, conc = 1, ci = FALSE, level = 0.95, nboot = 10
     level = level,
     nboot = nboot,
     average = FALSE,
+    multi_est = TRUE,
     delta = Inf,
     min_pboot = min_pboot,
     parametric = parametric,

R/params.R

@@ -56,6 +56,7 @@
 #' @param min_pboot A number of the minimum proportion of bootstrap samples that must successfully 
 #' fit in the sense of returning a likelihood.
 #' @param min_pmix A number between 0 and 0.5 specifying the minimum proportion in mixture models.
+#' @param multi_est A flag specifying whether to calculate model averaged estimates using the multi as opposed to the mean method.
 #' @param na.rm A flag specifying whether to silently remove missing values or 
 #' remove them with a warning.
 #' @param n positive number of observations.