Skip to content

Commit 5bd245e

Browse files
Format the package with Air (#660)
1 parent 04323ba commit 5bd245e

138 files changed

Lines changed: 7907 additions & 2757 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.Rbuildignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ docs
5050
^.dev$
5151
^vignettes/s.
5252
^vignettes/t.
53+
^[\.]?air\.toml$
54+
^\.vscode$

R/adjust.R

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,19 @@
6464
#' abline(lm(V2 ~ V1, data = adjusted_icpt), col = "red")
6565
#'
6666
#' @export
67-
adjust <- function(data,
68-
effect = NULL,
69-
select = is.numeric,
70-
exclude = NULL,
71-
multilevel = FALSE,
72-
additive = FALSE,
73-
bayesian = FALSE,
74-
keep_intercept = FALSE,
75-
ignore_case = FALSE,
76-
regex = FALSE,
77-
verbose = FALSE) {
67+
adjust <- function(
68+
data,
69+
effect = NULL,
70+
select = is.numeric,
71+
exclude = NULL,
72+
multilevel = FALSE,
73+
additive = FALSE,
74+
bayesian = FALSE,
75+
keep_intercept = FALSE,
76+
ignore_case = FALSE,
77+
regex = FALSE,
78+
verbose = FALSE
79+
) {
7880
# make sure column names are syntactically valid
7981
.check_dataframe_names(data, action = "error")
8082

@@ -92,7 +94,8 @@ adjust <- function(data,
9294
select <- is.numeric
9395
}
9496

95-
select <- .select_nse(select,
97+
select <- .select_nse(
98+
select,
9699
data,
97100
exclude,
98101
ignore_case,
@@ -105,9 +108,15 @@ adjust <- function(data,
105108
facs <- names(data[effect][!vapply(data[effect], is.numeric, logical(1L))])
106109
if (length(facs) >= 1 && multilevel) {
107110
if (additive) {
108-
formula_random <- stats::as.formula(paste("~", paste(paste0("(1|", facs, ")"), collapse = " + ")))
111+
formula_random <- stats::as.formula(paste(
112+
"~",
113+
paste(paste0("(1|", facs, ")"), collapse = " + ")
114+
))
109115
} else {
110-
formula_random <- paste("+", paste(paste0("(1|", facs, ")"), collapse = " + "))
116+
formula_random <- paste(
117+
"+",
118+
paste(paste0("(1|", facs, ")"), collapse = " + ")
119+
)
111120
}
112121
effect <- effect[!effect %in% facs]
113122
}
@@ -117,8 +126,16 @@ adjust <- function(data,
117126
for (var in select) {
118127
predictors <- effect[effect != var]
119128
if (additive) {
120-
predictors_num <- names(data[predictors][vapply(data[predictors], is.numeric, logical(1L))])
121-
predictors[predictors == predictors_num] <- paste0("s(", predictors_num, ")")
129+
predictors_num <- names(data[predictors][vapply(
130+
data[predictors],
131+
is.numeric,
132+
logical(1L)
133+
)])
134+
predictors[predictors == predictors_num] <- paste0(
135+
"s(",
136+
predictors_num,
137+
")"
138+
)
122139
}
123140
formula_predictors <- paste(c("1", predictors), collapse = " + ")
124141
model_formula <- paste(var, "~", formula_predictors)
@@ -134,7 +151,9 @@ adjust <- function(data,
134151
)
135152
out[var] <- x
136153
}
137-
out[names(data)[!names(data) %in% names(out)]] <- data[names(data)[!names(data) %in% names(out)]]
154+
out[names(data)[!names(data) %in% names(out)]] <- data[names(data)[
155+
!names(data) %in% names(out)
156+
]]
138157
out[names(data)]
139158
}
140159

@@ -144,31 +163,46 @@ data_adjust <- adjust
144163

145164

146165
#' @keywords internal
147-
.model_adjust_for <- function(data,
148-
model_formula,
149-
multilevel = FALSE,
150-
additive = FALSE,
151-
bayesian = FALSE,
152-
formula_random = NULL,
153-
keep_intercept = FALSE) {
166+
.model_adjust_for <- function(
167+
data,
168+
model_formula,
169+
multilevel = FALSE,
170+
additive = FALSE,
171+
bayesian = FALSE,
172+
formula_random = NULL,
173+
keep_intercept = FALSE
174+
) {
154175
# Additive -----------------------
155176
if (additive) {
156177
# Bayesian
157178
if (bayesian) {
158179
insight::check_if_installed("rstanarm")
159-
model <- rstanarm::stan_gamm4(stats::as.formula(model_formula), random = formula_random, data = data, refresh = 0)
180+
model <- rstanarm::stan_gamm4(
181+
stats::as.formula(model_formula),
182+
random = formula_random,
183+
data = data,
184+
refresh = 0
185+
)
160186
# Frequentist
161187
} else {
162188
insight::check_if_installed("gamm4")
163-
model <- gamm4::gamm4(stats::as.formula(model_formula), random = formula_random, data = data)
189+
model <- gamm4::gamm4(
190+
stats::as.formula(model_formula),
191+
random = formula_random,
192+
data = data
193+
)
164194
}
165195

166196
# Linear -------------------------
167197
} else if (bayesian) {
168198
# Bayesian
169199
insight::check_if_installed("rstanarm")
170200
if (multilevel) {
171-
model <- rstanarm::stan_lmer(paste(model_formula, formula_random), data = data, refresh = 0)
201+
model <- rstanarm::stan_lmer(
202+
paste(model_formula, formula_random),
203+
data = data,
204+
refresh = 0
205+
)
172206
} else {
173207
model <- rstanarm::stan_glm(model_formula, data = data, refresh = 0)
174208
}
@@ -185,8 +219,12 @@ data_adjust <- adjust
185219
# Re-add intercept if need be
186220
if (keep_intercept) {
187221
intercept <- insight::get_intercept(model)
188-
if (length(intercept) > 1) intercept <- stats::median(intercept) # For bayesian model
189-
if (is.na(intercept)) intercept <- 0
222+
if (length(intercept) > 1) {
223+
intercept <- stats::median(intercept)
224+
} # For bayesian model
225+
if (is.na(intercept)) {
226+
intercept <- 0
227+
}
190228
adjusted <- adjusted + intercept
191229
}
192230

R/assign_labels.R

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ assign_labels <- function(x, ...) {
6464
assign_labels.default <- function(x, verbose = TRUE, ...) {
6565
if (isTRUE(verbose)) {
6666
insight::format_alert(
67-
sprintf("Adding labels currently not possible for variables of class `%s`.", class(x)[1])
67+
sprintf(
68+
"Adding labels currently not possible for variables of class `%s`.",
69+
class(x)[1]
70+
)
6871
)
6972
}
7073
x
@@ -98,7 +101,11 @@ assign_labels.numeric <- function(x, variable = NULL, values = NULL, ...) {
98101
} else {
99102
insight::format_error(
100103
"Cannot add labels. Number of unique values and number of value labels are not equal.",
101-
sprintf("There are %i unique values and %i provided labels.", length(unique_values), length(values))
104+
sprintf(
105+
"There are %i unique values and %i provided labels.",
106+
length(unique_values),
107+
length(values)
108+
)
102109
)
103110
}
104111
} else {
@@ -107,14 +114,25 @@ assign_labels.numeric <- function(x, variable = NULL, values = NULL, ...) {
107114
if (!all(matching_labels)) {
108115
insight::format_error(
109116
"Following labels were associated with values that don't exist:",
110-
text_concatenate(paste0(values[!matching_labels], " (", names(values)[!matching_labels], ")"), enclose = "`")
117+
text_concatenate(
118+
paste0(
119+
values[!matching_labels],
120+
" (",
121+
names(values)[!matching_labels],
122+
")"
123+
),
124+
enclose = "`"
125+
)
111126
)
112127
}
113128
values <- values[names(values) %in% unique_values]
114129

115130
if (length(values)) {
116131
# we need to switch names and values
117-
value_labels <- stats::setNames(coerce_to_numeric(names(values)), values)
132+
value_labels <- stats::setNames(
133+
coerce_to_numeric(names(values)),
134+
values
135+
)
118136
}
119137
}
120138

@@ -132,23 +150,32 @@ assign_labels.character <- assign_labels.numeric
132150

133151
#' @rdname assign_labels
134152
#' @export
135-
assign_labels.data.frame <- function(x,
136-
select = NULL,
137-
exclude = NULL,
138-
values = NULL,
139-
ignore_case = FALSE,
140-
regex = FALSE,
141-
verbose = TRUE,
142-
...) {
153+
assign_labels.data.frame <- function(
154+
x,
155+
select = NULL,
156+
exclude = NULL,
157+
values = NULL,
158+
ignore_case = FALSE,
159+
regex = FALSE,
160+
verbose = TRUE,
161+
...
162+
) {
143163
# evaluate arguments
144-
select <- .select_nse(select,
164+
select <- .select_nse(
165+
select,
145166
x,
146167
exclude,
147168
ignore_case,
148169
regex = regex,
149170
verbose = verbose
150171
)
151172

152-
x[select] <- lapply(x[select], assign_labels, values = values, verbose = verbose, ...)
173+
x[select] <- lapply(
174+
x[select],
175+
assign_labels,
176+
values = values,
177+
verbose = verbose,
178+
...
179+
)
153180
x
154181
}

0 commit comments

Comments
 (0)