Skip to content

Commit d999d18

Browse files
stylr
1 parent 7ee37c3 commit d999d18

4 files changed

Lines changed: 21 additions & 17 deletions

File tree

R/insertEven.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ insertEven <- function(m, n, verbose = FALSE) {
3131
}
3232

3333

34-
if (lm == 0L) return(unname(n))
35-
if (ln == 0L) return(unname(m))
34+
if (lm == 0L) {
35+
return(unname(n))
36+
}
37+
if (ln == 0L) {
38+
return(unname(m))
39+
}
3640

3741
pos_m <- ceiling(seq_len(lm) * ln / lm)
3842

R/simulatePedigree.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildBetweenGenerations <- function(df_Fam, Ngen, sizeGens, verbose = FALSE, mar
2929
code_male = "M", code_female = "F", beta = FALSE) {
3030
# Normalize string aliases to logical values for downstream functions
3131
use_optimized <- FALSE
32-
32+
3333
if (beta %in% c("index", "indexed")) {
3434
stop("The 'index' or 'indexed' option for parameter 'beta' is not yet implemented.")
3535
} else if (isTRUE(beta) || identical(beta, "optimized")) {
@@ -39,7 +39,7 @@ buildBetweenGenerations <- function(df_Fam, Ngen, sizeGens, verbose = FALSE, mar
3939
} else {
4040
stop("Invalid value for parameter 'beta'. Accepted values are TRUE, FALSE, 'optimized', 'base', 'original', or 'index'/'indexed'.")
4141
}
42-
42+
4343
if (use_optimized) {
4444
df_Fam <- buildBetweenGenerations_optimized(
4545
df_Fam = df_Fam,

R/simulatePedigree_within.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildWithinGenerations <- function(
1919
) {
2020
# Normalize string aliases to logical values for downstream functions
2121
use_optimized <- FALSE
22-
22+
2323
if (beta %in% c("index", "indexed")) {
2424
stop("The 'index' or 'indexed' option for parameter 'beta' is not yet implemented.")
2525
} else if (isTRUE(beta) || identical(beta, "optimized")) {
@@ -29,7 +29,7 @@ buildWithinGenerations <- function(
2929
} else {
3030
stop("Invalid value for parameter 'beta'. Accepted values are TRUE, FALSE, 'optimized', 'base', 'original', or 'index'/'indexed'.")
3131
}
32-
32+
3333
if (use_optimized) {
3434
df_Fam <- buildWithinGenerations_optimized(
3535
sizeGens = sizeGens,

tests/testthat/test-simulatePedigree.R

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -172,52 +172,52 @@ test_that("simulatePedigree accepts string aliases for beta parameter", {
172172
kpc <- 4
173173
sexR <- .50
174174
marR <- .7
175-
175+
176176
# Test that "optimized" string alias works
177177
set.seed(seed)
178178
result_true <- simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = TRUE)
179-
179+
180180
set.seed(seed)
181181
result_optimized <- simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = "optimized")
182-
182+
183183
# Results should be identical when using TRUE vs "optimized"
184184
expect_equal(nrow(result_true), nrow(result_optimized))
185185
expect_equal(ncol(result_true), ncol(result_optimized))
186186
expect_equal(result_true$ID, result_optimized$ID)
187-
187+
188188
# Test that "base" string alias works
189189
set.seed(seed)
190190
result_false <- simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = FALSE)
191-
191+
192192
set.seed(seed)
193193
result_base <- simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = "base")
194-
194+
195195
# Results should be identical when using FALSE vs "base"
196196
expect_equal(nrow(result_false), nrow(result_base))
197197
expect_equal(ncol(result_false), ncol(result_base))
198198
expect_equal(result_false$ID, result_base$ID)
199-
199+
200200
# Test that "original" string alias works
201201
set.seed(seed)
202202
result_original <- simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = "original")
203-
203+
204204
# Results should be identical when using FALSE vs "original"
205205
expect_equal(nrow(result_false), nrow(result_original))
206206
expect_equal(ncol(result_false), ncol(result_original))
207207
expect_equal(result_false$ID, result_original$ID)
208-
208+
209209
# Test that invalid beta values throw errors
210210
expect_error(
211211
simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = "invalid"),
212212
"Invalid value for parameter"
213213
)
214-
214+
215215
# Test that "index" and "indexed" both throw appropriate error
216216
expect_error(
217217
simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = "index"),
218218
"not yet implemented"
219219
)
220-
220+
221221
expect_error(
222222
simulatePedigree(kpc = kpc, Ngen = Ngen, sexR = sexR, marR = marR, beta = "indexed"),
223223
"not yet implemented"

0 commit comments

Comments
 (0)