Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions R/func_discord_regression.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ discord_regression <- function(data,
data_processed = FALSE,
coding_method = "none",
fast = TRUE) {
if (data_processed == TRUE & !is.data.frame(data)) {
if (data_processed == TRUE && !is.data.frame(data)) {
stop("data must be a data frame if data_processed is TRUE")
}
if (data_processed == FALSE) {
check_discord_errors(data = data, id = id, sex = sex, race = race, pair_identifiers = pair_identifiers)
}
# if no demographics provided
if (is.null(demographics)) {
if (is.null(sex) & is.null(race)) {
if (is.null(sex) && is.null(race)) {
demographics <- "none"
} else if (is.null(sex) & !is.null(race)) {
} else if (is.null(sex) && !is.null(race)) {
demographics <- "race"
} else if (!is.null(sex) & is.null(race)) {
} else if (!is.null(sex) && is.null(race)) {
demographics <- "sex"
} else if (!is.null(sex) & !is.null(race)) {
} else if (!is.null(sex) && !is.null(race)) {
demographics <- "both"
}
}
Expand Down Expand Up @@ -116,7 +116,7 @@ discord_regression <- function(data,
list(formula_obj = formula_)
))

return(model)
model
}

# alias
Expand Down Expand Up @@ -164,13 +164,13 @@ discord_between_model <- function(data,

# if no demographics provided
if (is.null(demographics)) {
if (is.null(sex) & is.null(race)) {
if (is.null(sex) && is.null(race)) {
demographics <- "none"
} else if (is.null(sex) & !is.null(race)) {
} else if (is.null(sex) && !is.null(race)) {
demographics <- "race"
} else if (!is.null(sex) & is.null(race)) {
} else if (!is.null(sex) && is.null(race)) {
demographics <- "sex"
} else if (!is.null(sex) & !is.null(race)) {
} else if (!is.null(sex) && !is.null(race)) {
demographics <- "both"
}
}
Expand Down Expand Up @@ -243,5 +243,5 @@ discord_between_model <- function(data,
list(formula_obj = formula_)
))

return(model)
model
}