Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
3865859
asoiaf
smasongarrison Apr 7, 2025
5f68290
extendparser
smasongarrison Apr 7, 2025
bb9f66b
split
smasongarrison Apr 7, 2025
5000ed5
Rename readPedigree.R to readGedcom.R
smasongarrison Apr 7, 2025
ddac2df
spilting file
smasongarrison Apr 7, 2025
48db447
refactoring
smasongarrison Apr 7, 2025
119d604
docs
smasongarrison Apr 7, 2025
1d3a2dc
styling
smasongarrison Apr 7, 2025
c3c9c3b
refactor summary subfunctions
smasongarrison Apr 8, 2025
9d9ac4f
* reduced complexity of com2links and summarizePedigree with the use …
smasongarrison Apr 8, 2025
837b97b
missed documentation
smasongarrison Apr 8, 2025
26c0eb0
comment out skipped test
smasongarrison Apr 8, 2025
2e28ae1
Merge pull request #61 from R-Computing-Lab/wikitemplate_parser
smasongarrison Apr 8, 2025
f52458b
Merge branch 'main' into dev_main
smasongarrison Apr 8, 2025
5029937
add update rate
smasongarrison Apr 8, 2025
e22c933
allow verbose argument to be passed to standardizeColnames
smasongarrison Apr 8, 2025
a8c2b6c
refactor checkids
smasongarrison Apr 8, 2025
3326f75
docs
smasongarrison Apr 8, 2025
6019916
documentation
smasongarrison Apr 9, 2025
7f24910
Updatedocs
smasongarrison Apr 10, 2025
61fb620
renaming beta
smasongarrison Apr 10, 2025
2c0961c
Update .gitignore
smasongarrison Apr 10, 2025
edf2745
reorder coms
smasongarrison Apr 10, 2025
39fde6c
Delete benchmark_results.csv
smasongarrison Apr 10, 2025
015c32a
reorder coms
smasongarrison Apr 10, 2025
e2fc3cf
Merge branch 'wikitemplate_parser' of https://github.com/R-Computing-…
smasongarrison Apr 10, 2025
0850662
Update test-makeLinks.R
smasongarrison Apr 10, 2025
c5eabef
splitting links into legacy
smasongarrison Apr 10, 2025
8039f67
more tests and exploring option to write out all values
smasongarrison Apr 10, 2025
728d560
additional aliases
smasongarrison Apr 11, 2025
7d8dfe5
Merge branch 'main' into wikitemplate_parser
smasongarrison Apr 11, 2025
9641a04
Delete assignCoupleIds.Rd
smasongarrison Apr 11, 2025
9525061
allow NAs to behave
smasongarrison Apr 11, 2025
c18dbd7
allow NAs to behave
smasongarrison Apr 11, 2025
31f9a42
nicer plots
smasongarrison Apr 12, 2025
76e33bc
Merge branch 'wikitemplate_parser' of https://github.com/R-Computing-…
smasongarrison Apr 12, 2025
c7320eb
more tests
smasongarrison Apr 13, 2025
f45712f
aliases
smasongarrison Apr 13, 2025
d023b78
default now is direct method
smasongarrison Apr 14, 2025
b55ae50
Update readGedcom.R
smasongarrison Apr 14, 2025
2541415
Update readGedcom.R
smasongarrison Apr 14, 2025
65affa3
rename
smasongarrison Apr 14, 2025
1ee34ba
rename
smasongarrison Apr 14, 2025
294186b
Update readGedcomlegacy.R
smasongarrison Apr 14, 2025
8244984
updating tests
smasongarrison Apr 15, 2025
ff69473
rename
smasongarrison Apr 15, 2025
8039214
potential more direct methods
smasongarrison Apr 16, 2025
3293ebd
BENCHMARCKING
smasongarrison Apr 16, 2025
2ae4336
rolling out a direct(ish) method
smasongarrison Apr 17, 2025
76ebddc
styler
smasongarrison Apr 17, 2025
13ac783
oops
smasongarrison Apr 17, 2025
48b9328
Merge pull request #62 from R-Computing-Lab/wikitemplate_parser
smasongarrison Apr 17, 2025
5475b12
Update test-readPedigrees.R
smasongarrison Apr 17, 2025
682df51
graph tracing wip
smasongarrison Apr 18, 2025
4886b20
docs
smasongarrison Apr 19, 2025
66a68f5
smarter parsinh
smasongarrison Apr 19, 2025
ab1c7fd
rename functions
smasongarrison Apr 19, 2025
3373800
Update test-readWikiTree.R
smasongarrison Apr 19, 2025
00ac669
rename
smasongarrison Apr 21, 2025
6c3603b
rename
smasongarrison Apr 21, 2025
2038a66
split out adjacency
smasongarrison Apr 21, 2025
75b9b4e
renamed
smasongarrison Apr 21, 2025
fd71877
switch
smasongarrison Apr 21, 2025
05676d1
rename
smasongarrison Apr 21, 2025
4a1fe32
Merge pull request #64 from R-Computing-Lab/wikitemplate_parser
smasongarrison Apr 21, 2025
9311fdb
docs
smasongarrison Apr 21, 2025
703786e
renamed 1.3.6 to 1.4.0
smasongarrison Apr 22, 2025
1b65260
Merge pull request #65 from R-Computing-Lab/refactorChecks
smasongarrison Apr 22, 2025
0e597c3
varnames
smasongarrison Apr 22, 2025
7ecc24b
data fix
smasongarrison Apr 22, 2025
49dee2d
assignParentValue
smasongarrison Apr 22, 2025
305d186
Update buildComponent.R
smasongarrison Apr 22, 2025
bae130a
renaming
smasongarrison Apr 22, 2025
39451f8
loadOrComputeInverseDiagonal
smasongarrison Apr 22, 2025
078bbfd
adding config
smasongarrison Apr 28, 2025
f01482d
defined config
smasongarrison Apr 28, 2025
5fcbc81
Merge pull request #67 from R-Computing-Lab/refactorChecks
smasongarrison Apr 28, 2025
53e29c3
added hex
smasongarrison Apr 29, 2025
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
31 changes: 18 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
.Rproj.user
*.ASOIAF.ged
*.Rproj
*.knit.md
.DS_Store
data-raw/ASOIAF.ged
R/.Rhistory
.Rdata
.Rhistory
paper/paper.html
.Rproj.user
.httr-oauth
.quarto
.vscode/launch.json
/Meta/
*.knit.md
vignettes/articles/paper.html
BGmisc.code-workspace
tests/testthat/Rplots.pdf
*.ASOIAF.ged
ASOIAF.ged
*.Rproj

.vscode/launch.json
dataRelatedPairs_new2.csv
R/.Rhistory
benchmark_results.csv
data-raw/ASOIAF.ged
data-raw/ASOIAF_040725.ged
dataRelatedPairs.csv
dataRelatedPairs_new2.csv
paper/paper.html
tests/testthat/Rplots.pdf
vignettes/articles/paper.html
.vscode/settings.json
data-raw/logo_orange.png
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: BGmisc
Title: An R Package for Extended Behavior Genetics Analysis
Version: 1.3.5.1
Version: 1.4.0
Authors@R: c(
person("S. Mason", "Garrison", , "garrissm@wfu.edu", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4804-6003")),
Expand Down
19 changes: 14 additions & 5 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
# Generated by roxygen2: do not edit by hand

export(SimPed)
export(allGens)
export(assignCoupleIDs)
export(buildTreeGrid)
export(calcAllGens)
export(calcFamilySize)
export(calculateRelatedness)
export(checkIDs)
export(checkParentIDs)
export(checkPedigreeNetwork)
export(checkSex)
export(com2links)
export(comp2vech)
export(computeParentAdjacency)
export(createGenDataFrame)
export(dropLink)
export(evenInsert)
export(extractSummaryText)
export(famSizeCal)
export(fitComponentModel)
export(getWikiTreeSummary)
export(identifyComponentModel)
export(inferRelatedness)
export(insertEven)
export(makeInbreeding)
export(makeTwins)
export(parseTree)
export(ped2add)
export(ped2ce)
export(ped2cn)
Expand All @@ -30,18 +33,24 @@ export(ped2maternal)
export(ped2mit)
export(ped2paternal)
export(plotPedigree)
export(readGed)
export(readGedcom)
export(readWikifamilytree)
export(readgedcom)
export(recodeSex)
export(related_coef)
export(relatedness)
export(repairSex)
export(resample)
export(simulatePedigree)
export(summariseFamilies)
export(summariseMatrilines)
export(summarisePatrilines)
export(summarisePedigrees)
export(summarizeFamilies)
export(summarizeMatrilines)
export(summarizePatrilines)
export(summarizePedigrees)
export(traceTreePaths)
export(vech)
import(data.table)
import(kinship2)
Expand Down
9 changes: 8 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# BGmisc 1.3.6
# BGmisc 1.4.0
* revived checkParents function to check for handling phantom parents and missing parents
* added tests for checkParents function
* added GoT analysis
* reduced complexity of com2links, summarizePedigree, and checkIDs with the use of subfunctions
* allow verbose argument to be passed to standardizeColnames
* list SimPed and related_coef as aliases for functions
* harmonizing function names like calcFamilySize from famSizeCal
* implemented adjBeta function to evaluation alternative build method
* reorganize file names to be more consistent
* harmonized famID

# BGmisc 1.3.5.1
* Setting the default for the `sparse` argument in `ped2com()` to TRUE
Expand Down
Loading