Skip to content

Commit 0588499

Browse files
addped prep for moving
1 parent 54bf5ac commit 0588499

4 files changed

Lines changed: 14 additions & 16 deletions

File tree

‎NAMESPACE‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export(addParentalChain)
77
export(addParentalLineFlag)
88
export(addPaternalChain)
99
export(addPaternalLineFlag)
10-
export(addPersonToPed)
1110
export(alignPhenToMatrix)
1211
export(buildFamilyGroups)
1312
export(buildOneFamilyGroup)

‎R/tweakPedigree.R‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,8 @@ dropLink <- function(ped,
507507
#'
508508
#' @return A \code{data.frame} with the new person added to the existing pedigree.
509509
#'
510-
#' @export
511510
#'
512-
addPersonToPed <- function(ped, name = NULL,
511+
.addPersonToPed <- function(ped, name = NULL,
513512
sex = NULL, momID = NA,
514513
dadID = NA, twinID = NULL,
515514
personID = NULL, zygosity = NULL,
Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/testthat/test-tweakPedigree.R‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ test_that("addPersonToPed works as expected", {
303303
)
304304

305305
# Add person with all fields specified
306-
updated <- addPersonToPed(
306+
updated <- BGmisc:::.addPersonToPed(
307307
ped,
308308
name = "Charlie",
309309
sex = "M",
@@ -323,14 +323,14 @@ test_that("addPersonToPed works as expected", {
323323
expect_true(is.na(updated$twinID[3]))
324324

325325
# Add person with generated ID
326-
updated2 <- addPersonToPed(ped, name = "Dana", sex = "F")
326+
updated2 <- BGmisc:::.addPersonToPed(ped, name = "Dana", sex = "F")
327327
expect_equal(nrow(updated2), 3)
328328
expect_equal(updated2$name[3], "Dana")
329329
expect_equal(updated2$sex[3], "F")
330330
expect_equal(updated2$personID[3], max(ped$personID, na.rm = TRUE) + 1)
331331

332332
# Add person with missing optional fields
333-
updated3 <- addPersonToPed(ped)
333+
updated3 <- BGmisc:::.addPersonToPed(ped)
334334
expect_equal(nrow(updated3), 3)
335335
expect_true(is.na(updated3$name[3]))
336336
expect_true(is.na(updated3$sex[3]))
@@ -341,7 +341,7 @@ test_that("addPersonToPed works as expected", {
341341
expect_equal(updated3$personID[3], max(ped$personID, na.rm = TRUE) + 1)
342342

343343
# Add person with overwrite = TRUE
344-
updated4 <- addPersonToPed(ped, name = "New", sex = "F", personID = 1, overwrite = TRUE)
344+
updated4 <- BGmisc:::.addPersonToPed(ped, name = "New", sex = "F", personID = 1, overwrite = TRUE)
345345
expect_equal(nrow(updated4), 2)
346346
expect_equal(updated4$name[1], "New")
347347
expect_equal(updated4$sex[1], "F")
@@ -373,7 +373,7 @@ test_that("addPersonToPed works as expected with zygosity", {
373373
)
374374

375375
# Add person with all fields specified
376-
updated <- addPersonToPed(
376+
updated <- BGmisc:::.addPersonToPed(
377377
ped,
378378
name = "Charlie",
379379
sex = "M",
@@ -396,7 +396,7 @@ test_that("addPersonToPed works as expected with zygosity", {
396396
expect_true(is.na(updated$url[3]))
397397

398398
# Add person with generated ID
399-
updated2 <- addPersonToPed(ped, name = "Dana", sex = "F", url = "http://example.com")
399+
updated2 <- BGmisc:::.addPersonToPed(ped, name = "Dana", sex = "F", url = "http://example.com")
400400
expect_equal(nrow(updated2), 3)
401401
expect_equal(updated2$name[3], "Dana")
402402
expect_equal(updated2$sex[3], "F")
@@ -405,7 +405,7 @@ test_that("addPersonToPed works as expected with zygosity", {
405405
expect_true(!is.na(updated2$url[3]))
406406

407407
# Add person with missing optional fields
408-
updated3 <- addPersonToPed(updated2)
408+
updated3 <- BGmisc:::.addPersonToPed(updated2)
409409
expect_equal(nrow(updated3), 4)
410410
expect_true(is.na(updated3$name[4]))
411411
expect_true(is.na(updated3$sex[4]))
@@ -635,7 +635,7 @@ test_that("addPersonToPed - error when overwrite=TRUE and personID does not exis
635635
stringsAsFactors = FALSE
636636
)
637637
expect_error(
638-
addPersonToPed(ped, personID = 99, overwrite = TRUE),
638+
BGmisc:::.addPersonToPed(ped, personID = 99, overwrite = TRUE),
639639
regexp = "does not exist in the pedigree"
640640
)
641641
})
@@ -651,7 +651,7 @@ test_that("addPersonToPed - notes column is handled when present in ped", {
651651
notes = c(NA_character_, NA_character_),
652652
stringsAsFactors = FALSE
653653
)
654-
updated <- addPersonToPed(ped,
654+
updated <- BGmisc:::.addPersonToPed(ped,
655655
name = "Charlie", sex = "M",
656656
momID = 1, dadID = 2,
657657
notes = "test note", personID = 10
@@ -660,7 +660,7 @@ test_that("addPersonToPed - notes column is handled when present in ped", {
660660
expect_equal(updated$notes[3], "test note")
661661

662662
# When notes not supplied it should be NA
663-
updated2 <- addPersonToPed(ped, name = "Dana", sex = "F")
663+
updated2 <- BGmisc:::.addPersonToPed(ped, name = "Dana", sex = "F")
664664
expect_true(is.na(updated2$notes[3]))
665665
})
666666

0 commit comments

Comments
 (0)