ewenharrison / finalfit

Compare eea5756 ... +0 ... 5b7bf28

Showing 3 of 7 files from the diff.

@@ -100,7 +100,7 @@
Loading
100 100
#'   summary_factorlist(dependent, explanatory)
101 101
summary_factorlist <- function(.data, 
102 102
															 dependent = NULL, explanatory, 
103 -
															 cont = "mean", cont_nonpara = NULL, cont_cut = 5, cont_range = FALSE, 
103 +
															 cont = "mean", cont_nonpara = NULL, cont_cut = 5, cont_range = TRUE, 
104 104
															 p = FALSE, p_cont_para = "aov", p_cat = "chisq",
105 105
															 column = TRUE, total_col = FALSE, orderbytotal = FALSE,
106 106
															 digits = c(1, 1, 3, 1), 

@@ -15,9 +15,10 @@
Loading
15 15
#' @param explanatory_multi Character vector of any length: quoted name(s) of a
16 16
#'   subset of explanatory variables to generate reduced multivariable model
17 17
#'   (must only contain variables contained in \code{explanatory}).
18 -
#' @param random_effect Character vector of length 1: quoted name of random
19 -
#'   effects variable. When included mixed effects model generated
20 -
#'   (\code{lme4::glmer lme4::lmer}).
18 +
#' @param random_effect Character vector of length 1, either, (1) name of random
19 +
#'   intercept variable, e.g. "var1", (automatically convered to "(1 | var1)");
20 +
#'   or, (2) the full \code{lme4} specification, e.g. "(var1 | var2)". Note
21 +
#'   parenthesis MUST be included in (2) but NOT included in (1).
21 22
#' @param column Logical: Compute margins by column rather than row.
22 23
#' @param keep_models Logical: include full multivariable model in output when
23 24
#'   working with reduced multivariable model (\code{explanatory_multi}) and/or

@@ -82,6 +82,7 @@
Loading
82 82
#' colon_s %>% str()
83 83
#'   
84 84
ff_relabel <- function(.data, .labels){
85 +
	if(any(class(.data) %in% c("tbl_df", "tbl"))) .data = data.frame(.data)
85 86
	# Keep only labels for variables in data
86 87
	.labels = .labels[names(.labels) %in% names(.data)]
87 88
	relabel_one <- function(.){
@@ -144,8 +145,8 @@
Loading
144 145
	}
145 146
	
146 147
	suppressWarnings( # All these irritiating bind_row warnings
147 -
	.data %>% 
148 -
		purrr::map_df(attr_label_null)
148 +
		.data %>% 
149 +
			purrr::map_df(attr_label_null)
149 150
	)
150 151
}
151 152

Learn more Showing 1 files with coverage changes found.

Changes in R/summaryfactorlist.R
-2
+2
Loading file...
Files Coverage
R 0.10% 82.47%
Project Totals (39 files) 82.47%
Loading