Skip to content

Feature/relationship matrix#95

Merged
wvjgsuhp merged 8 commits into
mainfrom
feature/relationship-matrix
May 27, 2026
Merged

Feature/relationship matrix#95
wvjgsuhp merged 8 commits into
mainfrom
feature/relationship-matrix

Conversation

@wvjgsuhp
Copy link
Copy Markdown
Contributor

@wvjgsuhp wvjgsuhp commented May 7, 2026

The rendered vignette: genetic_relationship.html

wvjgsuhp and others added 3 commits May 8, 2026 00:17
Introduces an optional `relationship` argument to `calculate_adjacency_score()`
and `speed()`, letting neighbour pairs contribute a graded similarity from a
user-supplied matrix instead of a strict identity match. `speed()` validates
and pre-flattens the matrix once before the SA loop via the new exported
`prep_relationship()` helper.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Walks through a 16-treatment, 4-group blocked design and contrasts the
default identity-only optimisation against `speed()` driven by a
relationship matrix.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
.Rbuildignore: exclude .claude/ and Rplots.pdf from package builds.
.gitignore: exclude *.local.json.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@wvjgsuhp wvjgsuhp requested a review from rogerssam May 7, 2026 14:50
wvjgsuhp and others added 2 commits May 9, 2026 20:15
speed() forwards these explicitly from optim_params() while also
splatting `...` to the objective function, so a direct
`speed(..., bal_weight = 2)` triggered "matched by multiple actual
arguments". `speed()` now stops with a message pointing the caller at
`optimise_params = optim_params(...)`.

Factor the dots guard and the pre-loop relationship prep into
`.reject_optim_params_in_dots()` and `.prep_dots()` helpers.

Vignette `genetic_relationship.qmd` gains a "Per-Pair Similarities"
example with closely-related-pair highlighting.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@wvjgsuhp wvjgsuhp marked this pull request as draft May 21, 2026 05:16
@wvjgsuhp wvjgsuhp marked this pull request as ready for review May 21, 2026 13:00
Base automatically changed from feature/adjacency-metric to main May 25, 2026 05:51
Copy link
Copy Markdown
Contributor

@rogerssam rogerssam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Not sure if it needs a rebase after the recent merge?

@wvjgsuhp wvjgsuhp merged commit c0fa5f0 into main May 27, 2026
9 checks passed
@wvjgsuhp wvjgsuhp deleted the feature/relationship-matrix branch May 27, 2026 06:24
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.

Allow input of genetic relationship matrix for designs to optimise relationship adjacency

2 participants