Skip to content

Two locus general matrix#16

Closed
lkirk wants to merge 92 commits intoupstream-mainfrom
two-locus-general-matrix
Closed

Two locus general matrix#16
lkirk wants to merge 92 commits intoupstream-mainfrom
two-locus-general-matrix

Conversation

@lkirk
Copy link
Owner

@lkirk lkirk commented Dec 4, 2025

Allows users to specify arbitrary two-locus stat summary functions

petrelharp and others added 30 commits December 3, 2025 09:29
Co-authored-by: Peter Ralph <petrel.harp@gmail.com>
* Update glossary.md

Reference ARGs in the glossary

* Tidy and add more to the glossary

* Update docs/glossary.md

Co-authored-by: Gregor Gorjanc <gregor.gorjanc@gmail.com>

* Update docs/glossary.md

Co-authored-by: Jerome Kelleher <jk@well.ox.ac.uk>

* Remove reference to node heights

---------

Co-authored-by: Gregor Gorjanc <gregor.gorjanc@gmail.com>
Co-authored-by: Jerome Kelleher <jk@well.ox.ac.uk>
Spotted when reading docs
* Improve IBD documentation and IdentitySegments docs

* edits

---------

Co-authored-by: peter <petrel.harp@gmail.com>
Co-authored-by: Yan Wong <yan.wong@bdi.ox.ac.uk>
Also add some notes on macros that were redefined as part of an
experimental downstream build as an Rcpp package. These notes
are intended to prevent accidental change and the macros may
get promoted to being formally documented if this approach works
and the R package is published.
I think it is correct that the order is by individual_id, if not specified, right @benjeffery ?
Also remove package tests from circlCI
Conflicts between Python versions
jeromekelleher and others added 28 commits March 5, 2026 12:51
Defer documentation to general admin
…'t have to add a dimension at the end for scalar operations
@lkirk lkirk force-pushed the two-locus-general-matrix branch from be14dd0 to 528a16c Compare March 6, 2026 21:16
@lkirk lkirk closed this Mar 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants