Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
7ab45cf
Add temporal pedigree model builder functions
smasongarrison Jul 6, 2026
413ac66
Adjust AE smoke test beta and eta comment
smasongarrison Jul 6, 2026
3a23182
Generalize temporal model time basis
smasongarrison Jul 7, 2026
faca38b
Create datanotes.txt
smasongarrison Jul 7, 2026
b9e9e3e
Update buildmxPedigrees.R
smasongarrison Jul 7, 2026
564515c
Update helpGeneric.R
smasongarrison Jul 8, 2026
49fa5b3
chec
smasongarrison Jul 8, 2026
5e05487
Create famofengland.R
smasongarrison Jul 8, 2026
083f69b
draft
smasongarrison Jul 8, 2026
db6dd2d
fix docs
smasongarrison Jul 8, 2026
0305076
add unit tests
smasongarrison Jul 8, 2026
f62ffc6
fix check id error
smasongarrison Jul 9, 2026
5b989d4
Refactor temporal smoke tests and defaults
smasongarrison Jul 9, 2026
a02d722
add clean ID option
smasongarrison Jul 9, 2026
0baf676
clean names
smasongarrison Jul 9, 2026
6e12b7e
Update buildmxPedigrees.R
smasongarrison Jul 9, 2026
a2fdf10
notes
smasongarrison Jul 10, 2026
a8049eb
basic mc
smasongarrison Jul 10, 2026
76446a7
results
smasongarrison Jul 10, 2026
9560638
Fix temporal MC convergence and add Panel A
smasongarrison Jul 10, 2026
cf97e0e
styling
smasongarrison Jul 11, 2026
cb4b0ba
smaerter matrixes
smasongarrison Jul 11, 2026
b4174f9
provide staticgrouping option
smasongarrison Jul 11, 2026
1d113c7
add tests
smasongarrison Jul 11, 2026
7813284
add tests
smasongarrison Jul 11, 2026
33d6ec2
Merge branch 'temporal' of https://github.com/R-Computing-Lab/BGmisc …
smasongarrison Jul 11, 2026
103f4e2
Update helpGeneric.R
smasongarrison Jul 11, 2026
c01991c
make difference components optional
smasongarrison Jul 11, 2026
7660703
Update temporal_BGmisc_smoke_test_AE_full.R
smasongarrison Jul 12, 2026
31bb154
Update temporal_BGmisc_smoke_test_AE_full.R
smasongarrison Jul 12, 2026
10399f4
Update temporal_BGmisc_smoke_test_AE_full.R
smasongarrison Jul 12, 2026
52a8dae
Merge branch 'temporal' of https://github.com/R-Computing-Lab/BGmisc …
smasongarrison Jul 12, 2026
5950120
Update temporal_BGmisc_smoke_test_AE_full.R
smasongarrison Jul 12, 2026
1a8bcdf
fix
smasongarrison Jul 12, 2026
78b06d7
Update smoketest_helpers.R
smasongarrison Jul 12, 2026
bc3d3c3
Update DESCRIPTION
smasongarrison Jul 14, 2026
fd82668
more flexibility in generation
smasongarrison Jul 14, 2026
c162122
ready to run?
smasongarrison Jul 14, 2026
c7b7ee3
update
smasongarrison Jul 14, 2026
59b0278
add helpers
smasongarrison Jul 14, 2026
9dba6a1
fix time span
smasongarrison Jul 14, 2026
02a2a92
Update temporal_basic_mc.R
smasongarrison Jul 14, 2026
6988ed5
Update temporal_basic_mc.R
smasongarrison Jul 14, 2026
5386df9
prelim sim
smasongarrison Jul 15, 2026
6f8f71e
Create replication_results.csv
smasongarrison Jul 15, 2026
29bd203
adding proportion
smasongarrison Jul 15, 2026
1d78d24
figure and notes
smasongarrison Jul 15, 2026
39a280d
split the sim and plot of sim
smasongarrison Jul 16, 2026
4d28dc4
sim results
smasongarrison Jul 16, 2026
0271fec
panels
smasongarrison Jul 16, 2026
14a86ef
Scale up MC simulation to 500 reps/families
smasongarrison Jul 16, 2026
6b7094c
add fast version
smasongarrison Jul 18, 2026
e25001b
Update temporal_basic_mc.R
smasongarrison Jul 18, 2026
0f926c6
Update temporal_basic_mc_plots.R
smasongarrison Jul 18, 2026
e6568fa
results
smasongarrison Jul 18, 2026
753bf38
Refine temporal panels and simulation settings
smasongarrison Jul 18, 2026
9c770bb
simresults
smasongarrison Jul 18, 2026
a92bea4
push
smasongarrison Jul 18, 2026
5b3be34
figures
smasongarrison Jul 18, 2026
2558c58
merge
smasongarrison Jul 18, 2026
b37087d
Update replication_results.csv
smasongarrison Jul 19, 2026
2fe70f2
Update replication_results.csv
smasongarrison Jul 19, 2026
4dadcf4
more comments
smasongarrison Jul 19, 2026
f9603bb
more reps
smasongarrison Jul 19, 2026
6b737c8
results
smasongarrison Jul 19, 2026
5dd87e7
Merge branch 'temporal' of https://github.com/R-Computing-Lab/BGmisc …
smasongarrison Jul 19, 2026
c5d35e8
sim done
smasongarrison Jul 20, 2026
8ade32e
temporal
smasongarrison Jul 20, 2026
9140da0
update panel
smasongarrison Jul 20, 2026
29cf472
Update replication_results.csv
smasongarrison Jul 20, 2026
36f6001
Update replication_results.csv
smasongarrison Jul 20, 2026
dbe681d
smarter variable name
smasongarrison Jul 22, 2026
1346def
results
smasongarrison Jul 22, 2026
c29daa7
Merge branch 'temporal' of https://github.com/R-Computing-Lab/BGmisc …
smasongarrison Jul 22, 2026
19da483
change param
smasongarrison Jul 23, 2026
586da85
revised panel
smasongarrison Jul 23, 2026
47b68f5
Update replication_results.csv
smasongarrison Jul 23, 2026
b8db8da
flip color
smasongarrison Jul 23, 2026
fbb577b
Update replication_results.csv
smasongarrison Jul 24, 2026
2d3c6a5
plots
smasongarrison Jul 24, 2026
e527ef1
more reps
smasongarrison Jul 25, 2026
86eb8ef
panel figures
smasongarrison Jul 25, 2026
bce7b4e
Update panels.R
smasongarrison Jul 25, 2026
4102adf
Show two pedigrees in relatedness matrix figure
smasongarrison Jul 25, 2026
5b64feb
Refine temporal panel simulation and styling
smasongarrison Jul 25, 2026
68d685d
Update replication_results.csv
smasongarrison Jul 25, 2026
f666587
cleanup
smasongarrison Jul 26, 2026
e1c9cfa
push
smasongarrison Jul 26, 2026
54025c9
ci names
smasongarrison Jul 27, 2026
2f898f1
cis
smasongarrison Jul 27, 2026
dea1b73
Update replication_results.csv
smasongarrison Jul 27, 2026
523afd0
Update replication_results.csv
smasongarrison Jul 28, 2026
e045ea7
Refine panel titles and refresh simulation outputs
smasongarrison Jul 29, 2026
f2f5a1a
Update replication_results.csv
smasongarrison Jul 29, 2026
6f5027e
results
smasongarrison Jul 30, 2026
a8577b9
push
smasongarrison Aug 1, 2026
f42cff0
addped prep for moving
smasongarrison Aug 2, 2026
0b4e9e1
Merge branch 'main' into temporal
smasongarrison Aug 2, 2026
d8dd4d2
Update test-tweakPedigree.R
smasongarrison Aug 2, 2026
99ff4f3
Update test-buildComponent.R
smasongarrison Aug 2, 2026
6d5c252
finished simulation run
smasongarrison Aug 4, 2026
fd696cb
helpers
smasongarrison Aug 4, 2026
570a9e9
partial fix for adding means
smasongarrison Aug 4, 2026
057c2f3
Update test-buildComponent.R
smasongarrison Aug 4, 2026
17ea6e5
add means....
smasongarrison Aug 4, 2026
fd4cd1f
smarter poly
smasongarrison Aug 4, 2026
78901b2
Create replication_results.csv
smasongarrison Aug 5, 2026
968edf4
sims
smasongarrison Aug 5, 2026
e01abcd
end sim
smasongarrison Aug 5, 2026
10c7ad2
have fixed frozen g_mean bug
smasongarrison Aug 5, 2026
16bb21b
Update addParentalChain.R
smasongarrison Aug 5, 2026
e934337
Create replication_results.csv
smasongarrison Aug 5, 2026
350f48e
Merge branch 'main' into temporal
smasongarrison Aug 5, 2026
1cc5bfd
Update replication_results.csv
smasongarrison Aug 6, 2026
e1b5945
open variables to pass through
smasongarrison Aug 6, 2026
d13fd45
sims
smasongarrison Aug 6, 2026
0c70beb
moving to helper file
smasongarrison Aug 6, 2026
450dfc0
sims
smasongarrison Aug 9, 2026
24f4921
Update replication_results.csv
smasongarrison Aug 9, 2026
0c08f82
results
smasongarrison Aug 10, 2026
03968df
read.csv(parameter_targets_file)
smasongarrison Sep 12, 2026
bbfa9fa
Create ped2gendistancetesting.R
smasongarrison Oct 7, 2026
05ac153
Update ped2gendistancetesting.R
smasongarrison Oct 7, 2026
ae98070
clean up
smasongarrison Oct 7, 2026
9539897
Document temporal mean parameters
Copilot Oct 8, 2026
714994f
Update ped2gendistancetesting.R
smasongarrison Oct 8, 2026
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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,13 @@ vignettes/understanding_relatedness.Xmd
.positai
*.tmp.*
benchmark_rowlessParents_results.csv
dev/*
fit_ace0_100_500_.rds
fit_ace_linear_100_500_.rds
fit_ace_linear_h_100_500_.rds
fit_ae0_100_500_.rds
fit_ae_linear_100_500_.rds
fit_ae_linear_h_100_500_.rds
fit_mace0_100_500_.rds
fit_mace_linear_100_500_.rds
fit_mace_linear_h_100_500_.rds
5 changes: 2 additions & 3 deletions 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.9.0
Version: 1.9.0.9
Authors@R: c(
person("S. Mason", "Garrison", , "garrissm@wfu.edu", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4804-6003")),
Expand Down Expand Up @@ -58,5 +58,4 @@ Config/testthat/edition: 3
Encoding: UTF-8
Language: en-US
LazyData: true
Config/roxygen2/version: 8.0.0
RoxygenNote: 8.0.0
Config/roxygen2/version: 8.1.0
33 changes: 23 additions & 10 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@ export(addPaternalChain)
export(addPaternalLineFlag)
export(alignPhenToMatrix)
export(buildFamilyGroups)
export(buildFamilyGroups_list)
export(buildOneFamilyGroup)
export(buildOneTemporalFamilyGroup)
export(buildPedigreeModelCovariance)
export(buildPedigreeMx)
export(buildTemporalFamilyGroups)
export(buildTemporalFamilyGroups_list)
export(buildTemporalPedigreeModelCovariance)
export(buildTemporalPedigreeMx)
export(buildTreeGrid)
export(calcAllGens)
export(calcFamilySize)
Expand All @@ -30,6 +36,7 @@ export(dropLink)
export(findLeaves)
export(fitComponentModel)
export(fitPedigreeModel)
export(fitTemporalPedigreeModel)
export(getGenDist)
export(getWikiTreeSummary)
export(identifyComponentModel)
Expand Down Expand Up @@ -75,14 +82,20 @@ export(summarizePedigrees)
export(traceTreePaths)
export(trimPedigree)
export(vech)
importFrom(Matrix,Diagonal)
importFrom(Matrix,sparseMatrix)
importFrom(Matrix,
Diagonal,
sparseMatrix
)
importFrom(data.table,as.data.table)
importFrom(igraph,V)
importFrom(igraph,distances)
importFrom(igraph,subcomponent)
importFrom(stats,na.omit)
importFrom(stats,pnorm)
importFrom(stats,qnorm)
importFrom(stats,runif)
importFrom(stats,setNames)
importFrom(igraph,
V,
distances,
subcomponent
)
importFrom(stats,
na.omit,
pnorm,
qnorm,
runif,
setNames
)
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Development version

* Added temporal pedigree models.
* Added make clean personids for error handling and debugging.
* Added optional way to reduce file size when the pedigrees share matrices.
* Preparing for CRAN transition to tidygedcom

## BGmisc 1.9.0
* Added `addParentalChain()` and `addParentalFlag()` for tracing parental lineages. These functions support general parental-chain construction and convenient maternal and paternal lineage workflows. `addParentalFlag()` adds a binary indicator for whether each individual belongs to a specified parental chain, which can be useful for filtering, grouping, and lineage-specific summaries.
Expand Down
Loading
Loading