-
Notifications
You must be signed in to change notification settings - Fork 3
Dev main #115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Dev main #115
Changes from all commits
Commits
Show all changes
82 commits
Select commit
Hold shift + click to select a range
8a1aadf
cran prep
smasongarrison 6fdd2d3
Merge branch 'main' into dev_main
smasongarrison e1b35b8
Merge branch 'main' into dev_main
smasongarrison f98188e
Create buildmxPedigrees.R
smasongarrison 0b8dc52
Update buildmxPedigrees.R
smasongarrison 2ffd87f
Add documentation and improve pedigree model functions
smasongarrison d3087c9
Improve vignette VignetteIndexEntry titles
smasongarrison bfa9223
Update vignettes: images, timestamps, Rmd tweak
smasongarrison 58dcf49
add optimized branch
smasongarrison 8546c4c
Optimize simulatePedigree parent selection with vectorized operations…
smasongarrison 2330dcf
Update test-simulatePedigree.R
smasongarrison bb0c759
Add twinID support and mz_twins option
smasongarrison 2c4b710
Change beta_match_base from TRUE to FALSE
smasongarrison bc9b50e
Add MZ twin support to adjacency matrix via twinID column (#116)
smasongarrison 78e9a06
Add mz_method option and refine MZ merging
smasongarrison 98fcc48
Update buildComponent.R
smasongarrison 55eb4e7
Update buildComponent.R
smasongarrison 53d8e5a
Add mz_method parameter to ped2add
smasongarrison 91d573f
two twin methods
smasongarrison 4d841f0
Compare MZ twin methods and add checks
smasongarrison 8c0d792
docs
smasongarrison 298095c
Update v5_ASOIAF.Rmd
smasongarrison 12e40e7
Support 'addtwins' in MZ handling and add tests
smasongarrison 71cca2d
Refactor MZ twin merging logic and tests
smasongarrison 9d4d507
Fix twin matrix size mismatch between addtwins and merging methods (#…
smasongarrison 2072a03
Restrict MZ twin restoration and add isTwin()
smasongarrison c2138ae
Update buildComponent.R
smasongarrison f33aed8
Claude/fix twin matrix sizes bn n ve (#120)
smasongarrison 59e9fa8
Update test-buildComponent.R
smasongarrison 619ae5e
Update optimizing.R
smasongarrison 565876b
Merge branch 'dev_main' into mztwins
smasongarrison 283e627
Update optimizing.R
smasongarrison 38816e9
Improve benchmarking and add parent checks in tests
smasongarrison 5ba1ad8
Improve benchmarking and add parent checks in tests
smasongarrison bc5d0f3
Improve benchmarking and add parent checks in tests
smasongarrison 16ae62c
move to help twins
smasongarrison ed7f6c0
Add test flag and improve fuseTwins logic
smasongarrison 380378c
Merge branch 'dev_main' into mztwins
smasongarrison 5d21c9a
Update buildComponent.R
smasongarrison 1ecd5c7
Update test-helpTwins.R
smasongarrison fdb44be
Improve MZ twin handling and fuseTwins
smasongarrison 80f6d26
Update optimizing.R
smasongarrison cd677af
test some optimizations
smasongarrison 9d45d96
Add beta flag & fuseTwins; optimize MZ handling
smasongarrison ff3fb1a
Reformat helpTwins, fuseTwins, buildComponent, tests
smasongarrison 2f06155
Update buildComponent.R
smasongarrison ac9314e
Update buildComponent.R
smasongarrison ba12485
benchmarking
smasongarrison 5022a69
clean up
smasongarrison 51c5f50
fix
smasongarrison c43657d
smart fuse
smasongarrison 9dccf8a
docs and concluding remarks for simualtions
smasongarrison db49f35
moving
smasongarrison 09a435b
drop0 to top
smasongarrison 10fcfc2
docs
smasongarrison da49f16
twinning
smasongarrison 3b2e9d7
optimized speed
smasongarrison fcc6d9b
Update test-buildComponent.R
smasongarrison f3d477f
Update tweakPedigree.R
smasongarrison 6ae78ef
Enable single-ID twin/mate auto-selection
smasongarrison cdf24b0
Enable single-ID twin/mate auto-selection
smasongarrison b1382ca
Merge branch 'mztwins' of https://github.com/R-Computing-Lab/BGmisc i…
smasongarrison aad8113
docs
smasongarrison f8e409c
Merge pull request #118 from R-Computing-Lab/mztwins
smasongarrison 30fb7b3
Merge branch 'main' into pedigree_helpers
smasongarrison 89bb348
Merge branch 'dev_main' into pedigree_helpers
smasongarrison a232402
Add OpenMx pedigree model builders and docs
smasongarrison 096f398
clean up pedigree functions
smasongarrison fa990b5
Merge branch 'dev_main' into pedigree_helpers
smasongarrison 988e762
Create unit tests
smasongarrison 122bf8e
Update vignettes/v6_pedigree_model_fitting.Rmd
smasongarrison b814bc7
Remove HTML vignette build artifacts from version control (#124)
Copilot 4ba25dd
Use requireNamespace for OpenMx checks
smasongarrison ec6dd3a
Add relatedness matrix parameters to fitPedigreeModel (#125)
Copilot b73c55d
fixed failing test
smasongarrison e37aaa7
Update NEWS.md
smasongarrison 2b448e7
Merge pull request #123 from R-Computing-Lab/pedigree_helpers
smasongarrison 537f60f
Merge branch 'dev_main' of https://github.com/R-Computing-Lab/BGmisc …
smasongarrison b395780
Apply suggestion from @Copilot
smasongarrison ccbd0a7
Update R/tweakPedigree.R
smasongarrison 3262b16
Update v6_pedigree_model_fitting.Rmd
smasongarrison 91eafd6
reknitting
smasongarrison File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,6 +47,7 @@ Suggests: | |
| rmarkdown, | ||
| testthat (>= 3.0.0), | ||
| tidyverse, | ||
| mvtnorm, | ||
| withr | ||
| VignetteBuilder: | ||
| knitr | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.