Skip to content

Commit 76a8e5e

Browse files
smasongarrisonsmasongarrison
committed
fams
1 parent 08e4858 commit 76a8e5e

4 files changed

Lines changed: 63 additions & 43 deletions

File tree

‎data-raw/ASOIAF.csv‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
271271
270,6,264,263,Obella Sand,F,NA,NA
272272
271,6,264,263,Dorea Sand,F,NA,NA
273273
272,6,264,263,Loreza Sand,F,NA,NA
274-
273,6,NA,NA,Harmen Uller,M,NA,NA
275-
274,11,NA,NA,Uller,U,NA,NA
276-
275,12,NA,NA,Ulwyck Uller,M,NA,NA
274+
273,6,NA,274,Harmen Uller,M,NA,NA
275+
274,6,NA,NA,Lord Uller,M,NA,NA
276+
275,6,NA,274,Ulwyck Uller,M,NA,NA
277277
276,6,NA,NA,Mellario of Norvos,F,NA,NA
278278
277,6,276,260,Arianne Martell,F,NA,NA
279279
278,6,276,260,Quentyn Martell,M,NA,NA
@@ -303,7 +303,7 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
303303
302,6,502,306,Aegon Targaryen,M,NA,NA
304304
303,6,502,306,Naerys Targaryen,F,NA,NA
305305
304,6,303,302,Daenerys Targaryen,F,594,dz
306-
305,13,NA,NA,Maron Martell,M,NA,NA
306+
305,11,NA,NA,Maron Martell,M,NA,NA
307307
306,6,339,536,Viserys Targaryen,M,NA,NA
308308
307,6,502,306,Aemon 'The Dragonknight' Targaryen,M,NA,NA
309309
308,6,322,321,Daena Targaryen,F,NA,NA
@@ -334,7 +334,7 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
334334
333,6,520,522,Alyn Velaryon,M,NA,NA
335335
334,6,322,321,Daeron Targaryen,M,NA,NA
336336
335,6,322,321,Baelor Targaryen,M,NA,NA
337-
336,14,NA,NA,Companion of Alyn Velaryon,F,NA,NA
337+
336,12,NA,NA,Companion of Alyn Velaryon,F,NA,NA
338338
337,6,323,333,Jon Waters,M,NA,NA
339339
338,6,323,333,Jeyne Waters,F,NA,NA
340340
339,6,341,340,Rhaenyra Targaryen,F,NA,NA
@@ -355,7 +355,7 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
355355
354,6,359,358,Rhaenys Targaryen,F,NA,NA
356356
355,6,359,358,Visenya Targaryen,F,NA,NA
357357
356,6,355,353,Maegor Targaryen,M,NA,NA
358-
357,15,NA,NA,Jeyne Westerling,F,NA,NA
358+
357,13,NA,NA,Jeyne Westerling,F,NA,NA
359359
358,6,NA,364,Aerion (son of Daemion) Targaryen,M,NA,NA
360360
359,6,NA,NA,Velena Velaryon,F,NA,NA
361361
360,6,NA,167,Bastard of Robert Baratheon,U,NA,NA
@@ -379,14 +379,14 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
379379
378,6,376,375,Willas Tyrell,M,NA,NA
380380
379,6,376,375,Margaery Tyrell,F,NA,NA
381381
380,6,NA,393,Luthor Tyrell,M,NA,NA
382-
381,16,NA,NA,Leonette Fossoway,F,NA,NA
382+
381,14,NA,NA,Leonette Fossoway,F,NA,NA
383383
382,6,NA,439,Olenna Redwyne,F,NA,NA
384384
383,6,NA,393,Garth 'The Gross' Tyrell,M,NA,NA
385385
384,6,NA,393,Moryn Tyrell,M,NA,NA
386386
385,6,NA,393,Gormon Tyrell,M,NA,NA
387387
386,6,382,380,Janna Tyrell,F,NA,NA
388388
387,6,382,380,Mina Tyrell,F,NA,NA
389-
388,17,NA,NA,Jon Fossoway,M,NA,NA
389+
388,15,NA,NA,Jon Fossoway,M,NA,NA
390390
389,6,NA,438,Paxter Redwyne,M,NA,NA
391391
390,6,387,389,Horas 'Horror' Redwyne,M,391,unknown
392392
391,6,387,389,Hobber 'Slobber' Redwyne,M,390,unknown
@@ -403,11 +403,11 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
403403
402,6,NA,NA,Lia Serry,F,NA,NA
404404
403,6,402,399,Elinor Tyrell,F,NA,NA
405405
404,6,402,399,Luthor Tyrell,M,NA,NA
406-
405,18,NA,NA,Leo Blackbar,M,NA,NA
406+
405,16,NA,NA,Leo Blackbar,M,NA,NA
407407
406,6,NA,425,Leyton Hightower,M,NA,NA
408408
407,6,448,444,Rhea Florent,F,NA,NA
409409
408,6,407,406,Baelor Hightower,M,NA,NA
410-
409,19,NA,NA,Rhonda Rowan,F,NA,NA
410+
409,17,NA,NA,Rhonda Rowan,F,NA,NA
411411
410,6,407,406,Alysanne Hightower,F,NA,NA
412412
411,6,NA,NA,Arthur Ambrose,M,NA,NA
413413
412,6,407,406,Denyse Hightower,F,NA,NA
@@ -416,26 +416,26 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
416416
415,6,407,406,Malora Hightower,F,NA,NA
417417
416,6,407,406,Garth Hightower,M,NA,NA
418418
417,6,407,406,Gunthor Hightower,M,NA,NA
419-
418,20,NA,NA,Jeyne Fossoway,F,NA,NA
419+
418,18,NA,NA,Jeyne Fossoway,F,NA,NA
420420
419,6,407,406,Leyla Hightower,F,NA,NA
421-
420,21,NA,NA,Jon Cupps,M,NA,NA
421+
420,19,NA,NA,Jon Cupps,M,NA,NA
422422
421,6,407,406,Humfrey Hightower,M,NA,NA
423423
422,6,407,406,Lynesse Hightower,F,NA,NA
424-
423,22,NA,488,Jorah Mormont,M,NA,NA
425-
424,23,NA,NA,Tregar Ormollen,M,NA,NA
424+
423,20,NA,488,Jorah Mormont,M,NA,NA
425+
424,21,NA,NA,Tregar Ormollen,M,NA,NA
426426
425,6,NA,426,Hightower,M,NA,NA
427427
426,6,NA,NA,Hightower,M,NA,NA
428428
427,6,NA,426,Gerold 'The White Bull' Hightower,M,NA,NA
429-
428,24,NA,NA,Glover,F,NA,NA
430-
429,22,NA,NA,Mormont,M,NA,NA
431-
430,22,NA,429,Maege Mormont,F,NA,NA
432-
431,22,430,NA,Dacey Mormont,F,NA,NA
433-
432,22,430,NA,Alysane Mormont,F,NA,NA
434-
433,22,430,NA,Lyra Mormont,F,NA,NA
435-
434,22,430,NA,Jorelle Mormont,F,NA,NA
436-
435,22,430,NA,Lyanna Mormont,F,NA,NA
437-
436,22,432,NA,Snow,F,NA,NA
438-
437,22,432,NA,Snow,M,NA,NA
429+
428,22,NA,NA,Glover,F,NA,NA
430+
429,20,NA,NA,Mormont,M,NA,NA
431+
430,20,NA,429,Maege Mormont,F,NA,NA
432+
431,20,430,NA,Dacey Mormont,F,NA,NA
433+
432,20,430,NA,Alysane Mormont,F,NA,NA
434+
433,20,430,NA,Lyra Mormont,F,NA,NA
435+
434,20,430,NA,Jorelle Mormont,F,NA,NA
436+
435,20,430,NA,Lyanna Mormont,F,NA,NA
437+
436,20,432,NA,Snow,F,NA,NA
438+
437,20,432,NA,Snow,M,NA,NA
439439
438,6,NA,439,Redwyne,M,NA,NA
440440
439,6,NA,NA,Runceford Redwyne,M,NA,NA
441441
440,6,NA,443,Ryam Florent,M,NA,NA
@@ -449,7 +449,7 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
449449
448,6,NA,NA,Melara Crane,F,NA,NA
450450
449,6,448,444,Alekyne Florent,M,NA,NA
451451
450,6,448,444,Melessa Florent,F,NA,NA
452-
451,25,NA,NA,Rycherd Crane,M,NA,NA
452+
451,23,NA,NA,Rycherd Crane,M,NA,NA
453453
452,6,NA,447,Merrell Florent,M,NA,NA
454454
453,6,NA,447,Omer Florent,M,NA,NA
455455
454,6,NA,NA,Hosman Norcross,M,NA,NA
@@ -479,14 +479,14 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
479479
478,6,479,476,Lomas Estermont,M,NA,NA
480480
479,6,NA,480,Sylva 'Spotted Sylva' Santagar,F,NA,NA
481481
480,6,NA,NA,Symon Santagar,M,NA,NA
482-
481,26,NA,482,Ashara Dayne,F,NA,NA
483-
482,26,NA,NA,Lord Dayne (father of Edric),M,NA,NA
484-
483,26,NA,482,Dayne,M,NA,NA
485-
484,26,NA,482,Arthur Dayne,M,NA,NA
486-
485,26,NA,482,Allyria Dayne,F,NA,NA
487-
486,26,NA,483,Edric Dayne,M,NA,NA
488-
487,27,NA,NA,Beric Dondarrion,M,NA,NA
489-
488,22,NA,429,Jeor Mormont,M,NA,NA
482+
481,24,NA,482,Ashara Dayne,F,NA,NA
483+
482,24,NA,NA,Lord Dayne (father of Edric),M,NA,NA
484+
483,24,NA,482,Dayne,M,NA,NA
485+
484,24,NA,482,Arthur Dayne,M,NA,NA
486+
485,24,NA,482,Allyria Dayne,F,NA,NA
487+
486,24,NA,483,Edric Dayne,M,NA,NA
488+
487,25,NA,NA,Beric Dondarrion,M,NA,NA
489+
488,20,NA,429,Jeor Mormont,M,NA,NA
490490
489,6,NA,167,Bastard of Robert Baratheon,U,NA,NA
491491
490,6,NA,167,Bastard of Robert Baratheon,U,NA,NA
492492
491,6,NA,167,Bastard of Robert Baratheon,U,NA,NA
@@ -601,7 +601,7 @@ id,famID,momID,dadID,name,sex,twinID,zygosity
601601
600,6,NA,NA,Kiera of Tyrosh,F,NA,NA
602602
601,6,596,597,Aerea Targaryen,F,602,mz
603603
602,6,596,597,Rhaella Targaryen (daughter of Aegon),F,601,mz
604-
603,28,605,606,Erryk Cargyll,M,604,mz
605-
604,28,605,606,Arryk Cargyll,M,603,mz
606-
605,28,NA,NA,Mother Cargyll,F,NA,NA
607-
606,28,NA,NA,Father Cargyll,M,NA,NA
604+
603,26,605,606,Erryk Cargyll,M,604,mz
605+
604,26,605,606,Arryk Cargyll,M,603,mz
606+
605,26,NA,NA,Mother Cargyll,F,NA,NA
607+
606,26,NA,NA,Father Cargyll,M,NA,NA

‎data-raw/df_ASOIAF.R‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ df <- ped2fam(ASOIAF, personID = "personID") %>%
2828
momID = as.numeric(momID),
2929
dadID = as.numeric(dadID),
3030
name = case_when(
31+
personID == 274 ~ "Lord Uller",
3132
personID == 322 ~ "Daenaera Velaryon",
3233
name == "Naerys " ~ "Naerys Targaryen",
3334
name == "Rhaenyra " ~ "Rhaenyra Targaryen",
@@ -101,7 +102,6 @@ df <- ped2fam(ASOIAF, personID = "personID") %>%
101102
mutate(
102103
zygosity = case_when(
103104
personID %in% c(164, 165) ~ "dz", # Jaime Lannister
104-
105105
!is.na(twinID) ~ "unknown",
106106
TRUE ~ NA_character_
107107
)
@@ -441,7 +441,7 @@ df <- df %>%
441441
) %>%
442442
addPersonToPed(
443443
name = "Beron Stark", sex = "M",
444-
personID = 575, momID = NA, dadID = NA
444+
personID = 575, momID = 607, dadID = 606
445445
) %>%
446446
addPersonToPed(
447447
name = "Lorra Royce", sex = "F",
@@ -568,8 +568,27 @@ df <- df %>%
568568
) %>% addPersonToPed(
569569
name = "Mother Cargyll", sex = "F",
570570
personID = 605, momID = NA, dadID = NA
571+
) %>% addPersonToPed(
572+
name = "Brandon Stark (son of Cregan)", sex = "M",
573+
personID = 606, momID = 608, dadID = 609
574+
) %>% addPersonToPed(
575+
name = "Alys Karstark (wife of Brandon)", sex = "F",
576+
personID = 607, momID = NA, dadID = NA
577+
) %>% addPersonToPed(
578+
name = "Lynara Stark", sex = "F",
579+
personID = 608, momID = NA, dadID = NA
580+
) %>% addPersonToPed(
581+
name = "Cregan Stark", sex = "M",
582+
personID = 609, momID = 611, dadID = 610
583+
) %>% addPersonToPed(
584+
name = "Rickon Stark (son of Benjen)", sex = "M",
585+
personID = 610, momID = NA, dadID = NA
586+
) %>% addPersonToPed(
587+
name = "Gilliane Glover", sex = "F",
588+
personID = 611, momID = NA, dadID = NA
571589
)
572590

591+
573592
# modify existing people
574593
df <- df %>%
575594
mutate(
@@ -579,6 +598,7 @@ df <- df %>%
579598
personID == 328 ~ "F",
580599
personID == 329 ~ "F",
581600
personID == 330 ~ "F",
601+
personID == 274 ~ "M",
582602
TRUE ~ sex
583603
),
584604
momID = case_when(
@@ -621,17 +641,18 @@ df <- df %>%
621641
personID == 306 ~ 339, # Viserys II's mother is Rhaenyra Targaryen
622642
personID %in% c(351,350) ~ 510, # Alysanne Targaryen's mom is Alyssa Velaryon
623643
personID %in% c(
624-
283, # # Dyanna Dayne is mother of Daeron Targaryen (son of Maekar I)
644+
283, # # Daeron Targaryen (son of Maekar I)
625645
287, # Aemon Targaryen (son of Maekar I)
626646
285, # Aerion (son of Maekar) Targaryen
627-
288
628-
) ~ 516, # Rhae Targaryen
647+
288 # Rhae Targaryen
648+
) ~ 516, # Dyanna Dayne is mother of
629649
personID %in% c(226, 232, 231) ~ 538, # kids of Jasper
630650
personID == 1 ~ 566, # Walder Frey's mother
631651
personID == 284 ~ 600,
632652
TRUE ~ momID
633653
),
634654
dadID = case_when(
655+
personID %in% c(273,275) ~ 274,
635656
personID %in% c(207, 260:263) ~ 595,
636657
personID == 465 ~ 575, # Beron Stark
637658
personID == 291 ~ 568, # Myriah Martell's mother is the Father of Maron Martell

‎data/ASOIAF.rda‎

0 Bytes
Binary file not shown.

‎vignettes/v5_ASOIAF.Rmd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ As we can see, the repaired pedigree now has unique IDs for all individuals, and
201201

202202
## Visualize the Pedigree
203203

204-
### Visualize the Pedigree with `ggPedigree()`
205204

206205
We can now visualize the repaired pedigree using the `ggPedigree()` function from {ggpedigree}. This function generates a plot of the pedigree, with individuals colored based on their affected status. In this case, we highlight Jon and Daenerys as "affected" individuals. Otherwise they would be difficult to distinguish from the rest of the pedigree. To make the plot more informative, we also fill every member of the tree by how related they are to Rhaenyra Targaryen, who is the focal individual in this case.
207206

0 commit comments

Comments
 (0)