add sumunits argument back to MA estimation functions

R/modMAarea.R

@@ -52,6 +52,8 @@
 #' only one domain, rowvar = domain variable. If more than one domain, include
 #' colvar. If no domain, rowvar = NULL.
 #' @param colvar String. Name of the column domain variable in cond or tree.
+#' @param sumunits Logical. If TRUE, estimation units are summed and returned
+#' in one table.
 #' @param bootstrap Logical. If TRUE, returns bootstrap variance estimates,
 #' otherwise uses Horvitz-Thompson estimator under simple random sampling
 #' without replacement.
@@ -250,6 +252,7 @@ modMAarea <- function(MApopdat,
                       pcfilter = NULL, 
                       rowvar = NULL, 
                       colvar = NULL, 
+                      sumunits = FALSE,
                       bootstrap = FALSE,
                       returntitle = FALSE, 
                       savedata = FALSE, 
@@ -283,7 +286,6 @@ modMAarea <- function(MApopdat,
   esttype="AREA"
   parameters <- FALSE
   returnlst <- list()
-  sumunits <- FALSE
   rawdata <- TRUE
 
   ## Set global variables

R/modMAratio.R

@@ -230,7 +230,7 @@ modMAratio <- function(MApopdat,
                        FIA = TRUE,
                        rowvar = NULL, 
                        colvar = NULL, 
-                       sumunits = TRUE, 
+                       sumunits = FALSE, 
                        returntitle = FALSE, 
                        savedata = FALSE, 
                        table_opts = NULL, 

R/modMAtree.R

@@ -67,6 +67,8 @@
 #' @param colvar String. Optional. If rowvar != NULL, name of domain variable
 #' to group estvar by for columns in table output. Colvar must be included in
 #' an input data frame (i.e., plt, cond, tree).
+#' @param sumunits Logical. If TRUE, estimation units are summed and returned
+#' in one table.
 #' @param prednames String vector. Name(s) of predictor variables to include in
 #' model.
 #' @param modelselect Logical. If TRUE, an elastic net regression model is fit 
@@ -284,6 +286,7 @@ modMAtree <- function(MApopdat,
                       pcfilter = NULL, 
                       rowvar = NULL, 
                       colvar = NULL, 
+                      sumunits = FALSE,
                       prednames = NULL, 
                       modelselect = FALSE, 
                       FIA = TRUE,
@@ -319,7 +322,6 @@ modMAtree <- function(MApopdat,
   esttype="TREE"
   parameters <- FALSE
   returnlst <- list()
-  sumunits <- FALSE
 
   ## Set global variables
   ONEUNIT=n.total=n.strata=strwt=TOTAL <- NULL