multitrait changes - #531

Open

bhaller wants to merge 408 commits into

This pull request is big! We're only showing the most recent 250 commits

Commits on Feb 14, 2026

ensure that all mutations needed are in the metadata table
bhaller
committed
00f55f8
fix CI build error
bhaller
committed
d82e647

Commits on Feb 15, 2026

try again with CI build error
bhaller
committed
3d60aba
multitrait edits for implementation.md
bhaller
committed
88ea343
fix treeSeqMetadata() to use `json+struct"
bhaller
committed
4306882
Merge pull request #614 from MesserLab/multitrait-metadata
bhaller
authored
53a1ee6
add implementation.md text about metadata in SLiM 4.3
bhaller
committed
8d622e1
make a couple of self-tests less likely to fail
bhaller
committed
bd91eee

Commits on Feb 24, 2026

add haploid trait calculation regimes and haploid caches
bhaller
committed
bdc542d
fix a few CI issues
bhaller
committed
ed32398

Commits on Feb 25, 2026

Commits on Feb 26, 2026

fix a multitrait bug involving trait invalidation with migration
bhaller
committed
e70a2f6
comment tweaks
bhaller
committed
84992a0
add comment on path not taken
bhaller
committed
3a70160
don't allow trait names beginning with an underscore
bhaller
committed
9c62949
hide deprecated APIs in auto-completion
bhaller
committed
03f0be8
clean up nonneutral cache invalidation
bhaller
committed
58f353a
add a small optimization for trait calculation in WF models
bhaller
committed
9d51625

Commits on Feb 28, 2026

Commits on Mar 3, 2026

first pass at SLiMgui multitrait support
bhaller
committed
d86672b

Commits on Mar 5, 2026

fix some warnings
bhaller
committed
10059fe
fixes for the SLiMgui trait bar in multispecies models
bhaller
committed
48bd826
fix a mutrun experiment timing bug causing logging
bhaller
committed
af785ef

Commits on Mar 8, 2026

multi-trait changes for chromosome and haplotype displays
bhaller
committed
303f297
show gray for individuals with a NAN trait value
bhaller
committed
93a1fa2
remember display trait choice across recycles
bhaller
committed
dcbd85a

Commits on Mar 10, 2026

Commits on Mar 12, 2026

Commits on Mar 14, 2026

switch to Palette for coloring individuals/mutations
bhaller
committed
60f7d53

Commits on Mar 16, 2026

Commits on Mar 17, 2026

extend call signatures with "ellipsis variants" for overloading
bhaller
committed
bfe4678

Commits on Mar 19, 2026

switch SpatialMap over to using Palette for its colors
bhaller
committed
637fd1e

Commits on Mar 21, 2026

Commits on Mar 22, 2026

Commits on Mar 23, 2026

add Palette() variants, refine ellipsis variant treatment
bhaller
committed
c0f0fbb

Commits on Mar 25, 2026

improve SLiMgui code completion
bhaller
committed
221c93c
fix a few CI build issues
bhaller
committed
684b56c
more CI build errors
bhaller
committed
f6cedb8

Commits on Mar 29, 2026

add a line in the color scales panel about gray for NAN
bhaller
committed
78b1208
add code completion support for ellipsis variant arguments
bhaller
committed
0387b0f

Commits on Mar 30, 2026

fix an independent-dominance caching bug
bhaller
committed
1f82264
fix an excessively broad warning
bhaller
committed
7a6db60

Commits on Mar 31, 2026

fix Plot's "no data" message in an erroneous case
bhaller
committed
fb66111
improve autofixes for some multitrait API changes
bhaller
committed
0eb999b

Commits on Apr 1, 2026

Commits on Apr 2, 2026

Commits on Apr 3, 2026

fix an optimization flag bug with addNewDrawnMutation()
bhaller
committed
e59ffc3
fix an optimization flag bug with autogenerated mutations
bhaller
committed
aedebd7
fix a timing check regression in removeSubpopulation()
bhaller
committed
9b6e51f

Commits on Apr 4, 2026

Commits on Apr 6, 2026

cleanup of ellipsis variant handling
bhaller
committed
88e21d0
Merge branch 'master' into multitrait
bhaller
committed
901784a
finish the previous merge
bhaller
committed
c1d9787

Commits on Apr 7, 2026

doc typo fix
bhaller
committed
2c8e0a0
bringing changes back to the master branch
bhaller
committed
c5499e7

Commits on Apr 8, 2026

Merge branch 'master' into multitrait
bhaller
committed
431c19e
fix some annoying build warnings
bhaller
committed
cd4d80a
Merge branch 'master' into multitrait
bhaller
committed
e020be6
clean up the doc after merge
bhaller
committed
b1a636f
Merge branch 'master' into multitrait
bhaller
committed
1140695
doc cleanup after merge
bhaller
committed
4005b16
Merge branch 'master' into multitrait
bhaller
committed
b8230b1

Commits on Apr 9, 2026

Merge branch 'master' into multitrait
bhaller
committed
7ab317d
enable SIMD/SLEEF in Xcode
bhaller
committed
dfb878d
Merge branch 'master' into multitrait
bhaller
committed
aeaf063
clean up project file after merge
bhaller
committed
2a5af83
another try with the project file
bhaller
committed
53edcd7

Commits on Apr 10, 2026

Merge branch 'master' into multitrait
bhaller
committed
e13904c

Commits on Apr 13, 2026

Merge branch 'master' into multitrait
bhaller
committed
e3fbaf2
remove SIMD warning suppression that doesn't work anyway
bhaller
committed
8f8a022

Commits on Apr 14, 2026

update recipes for multitrait
bhaller
committed
3e6bf13
fix recipes that re-seed the RNG to use rdunif64()
bhaller
committed
47253ad

Commits on Apr 24, 2026

comment fixes for QtSLiM autofixing
bhaller
committed
56be5e3

Commits on May 30, 2026

Merge branch 'master' into multitrait
bhaller
committed
6d6d06d
fix doc merge
bhaller
committed
b6440db
improve error messages for top-level SLiM script syntax errors
bhaller
committed
2e4d664
bump tskit/msprime requirements up to current to get json+binary codec
bhaller
committed
b18cadf
Merge branch 'master' into multitrait
bhaller
committed
cd8d650
remove obsolete custom changes to tskit
bhaller
committed
21edb35
Merge branch 'master' into multitrait
bhaller
committed
b4e960e

Commits on May 31, 2026

fixes to sync SLiM with the final `json+struct` design
bhaller
committed
ee148f7
fix header path issue in CI
bhaller
committed
d715aab

Commits on Jun 2, 2026

schema improvements
bhaller
committed
13ef056
fix occasional memory bug in previous commit
bhaller
committed
cdd13c5

Commits on Jun 13, 2026

fix an error position involving variants
bhaller
committed
81f6a83

Commits on Jun 16, 2026

add unit tests for Palette, fix various issues
bhaller
committed
bdd9e19

Commits on Jul 5, 2026

fix #638, setMutationType() can produce inconsistencies
bhaller
committed
3cd5670
fix CI build issue
bhaller
committed
0451eef
fix #633: persist the various tag properties of individual in .trees
bhaller
committed
b5a7b2c

Commits on Jul 8, 2026

Commits on Jul 9, 2026

update remaining QTL-based recipes for multitrait
bhaller
committed
d55f25d
deprecate sumOfMutationsOfType()
bhaller
committed
37ca94b
fix overbars in the object tables window
bhaller
committed
307b734

Commits on Jul 11, 2026

Commits on Jul 16, 2026

fix #641, crash after expanding mutation block buffers
bhaller
committed
d727954
disable old calcVA() self-tests that no longer work
bhaller
committed
3b66ac3
fix #642, unreferenced mutation from multiple reload
bhaller
committed
051b47d
add info about the mutation table to implementation.md
bhaller
committed
cfcecf5
fix #643, phenotypes not initialized from TreeSeq file
bhaller
committed
cd8816f
fix #644, remapping subpops causes a raise
bhaller
committed
0e2f682

Commits on Jul 17, 2026

Commits on Jul 19, 2026

fix #648: rearchitect the "retained by the tree sequence" design
bhaller
committed
cc2e6f4
Merge branch 'multitrait' of https://github.com/MesserLab/SLiM into multitrait
bhaller
committed
09ad501
update implementation.md
bhaller
committed
9425692
add some mutation retain debugging code
bhaller
committed
537f340
fix a whoopsie
bhaller
committed
e5f7364
fix another wee typo
bhaller
committed
572ff36
fix #646, #648: rearchitecture needed (see previous commits)
bhaller
committed
47325fd
fix build error in CI
bhaller
committed
ec0a6b4

Commits on Jul 20, 2026

copyright tweaks and such
bhaller
committed
8acab57
update seed for recipe 14.16
bhaller
committed
c2e474f

Commits on Jul 21, 2026

fix out-of-date recipe numbers
bhaller
committed
d667f94
a little endline cleanup in debug output
bhaller
committed
ea5067c
tweak method timing restrictions
bhaller
committed
a73466b

Commits on Jul 23, 2026

fix multitrait_REVERT_TO_NEUTRAL test
bhaller
committed
7491b91
for #649: move substitution info to Chromosome
bhaller
committed
930b9db
for #649: move muts_tracked_by_treeseq_ to Chromosome
bhaller
committed
2fc5600

Commits on Jul 24, 2026

Commits on Jul 25, 2026

doc update for mutationEffect() callbacks for multitrait
bhaller
committed
1baf68a
doc cleanup for mutationEffect() and fitnessEffect() callbacks
bhaller
committed
8fe4e47
fix incorrectly curled quote
bhaller
committed
a3410f1
increase the default size of the Eidos console and Help windows
bhaller
committed
fcb1b51
fix #651, font size in Help window doesn't scale with user pref
bhaller
committed
952b0f6
fix #653, spurious error in zygosityOfMutations()
bhaller
committed
1e54a08

Commits on Jul 29, 2026

fix estimated last tick at simulation end
bhaller
committed
21f48d0
add "Multispecies Multitrait Phenotype ~ Time" plot
bhaller
committed
98a4422
somehow excluded from the previous commit
bhaller
committed
00025a3

Commits on Jul 30, 2026

add phenotype ~ time plot, tweak other plots
bhaller
committed
263f38a
some auto and const usage cleanup
bhaller
committed
6218ee3
more auto and const usage cleanup
bhaller
committed
c4c1d0c

Commits on Aug 11, 2026

some pedigree ID design cleanup
bhaller
committed
45edaf7
little comment tweaks and such
bhaller
committed
0657f03

Commits on Aug 14, 2026

draft fix for metadata inefficiency
bhaller
committed
36d89fe
fixup of python recipe
petrelharp
committed
1a1214a

Commits on Aug 15, 2026

bug fixup
petrelharp
committed
d6def05
Merge pull request #659 from petrelharp/efficient_metadata
bhaller
authored
1321d0d
final (?) revisions
bhaller
committed
316e7a0
add newlines since they fit
bhaller
committed
37054fe
remove semicolons, sigh
bhaller
committed
0b1dd8b
Merge pull request #658 from MesserLab/efficient_metadata
bhaller
authored
d9aa4a6

Commits on Aug 19, 2026

fix #661, baseline offset needs to be split into subcomponents
bhaller
committed
3d2c471

Commits on Aug 22, 2026

put binary derived state info in the mutation table metadata
bhaller
committed
f31ec10

Commits on Aug 23, 2026

fix #663, revert filtering of unused mutation types
bhaller
committed
8faf2b8

Commits on Aug 25, 2026

Commits on Aug 26, 2026

shift the migrant flag from metadata to the flags column
bhaller
committed
fb295de
error in schema and test machinery
petrelharp
committed
3d45be3
Merge pull request #669 from petrelharp/fix_666
bhaller
authored
9a65a4d
a little cleanup of SLIM_TSK_INDIVIDUAL_MIGRATED handling
bhaller
committed
04f4051
Merge pull request #668 from MesserLab/fix_666
bhaller
authored
1d8386c
add mutrun count hint to top-level metadata, for use later
bhaller
committed
a2849c3

Commits on Aug 27, 2026

improve error handlign when reading .trees files
bhaller
committed
b6f698d
polish up another error message
bhaller
committed
e9e1a24
more error message polish
bhaller
committed
30e0056

Commits on Aug 28, 2026

add a VERSIONS note about SLiMv6MutationModel
bhaller
committed
1899c60
fix #637, fix #650: VCF I/O ##contig and #CHROM should use name
bhaller
committed
72bbc55

Commits on Aug 29, 2026

removing mutrun count hint from top-level metadata
bhaller
committed
53984b4

Commits on Sep 2, 2026

fix #536: add stacking policy "a" and recipe 13.15
bhaller
committed
488fa85
fix #670, sort derived states by mutation ID
bhaller
committed
0a0d915

Commits on Sep 4, 2026

fix { 1.0; } typos in doc
bhaller
committed
e3b88b9

Commits on Sep 5, 2026

a little cleanup of typedef struct usage
bhaller
committed
1b36c96

Commits on Sep 6, 2026

back out a few typedef struct usage changes
bhaller
committed
9370cd6
tweak __AccumulateStackedEffects() a bit
bhaller
committed
d749377
back out another typedef struct change
bhaller
committed
c57c1eb

Commits on Sep 7, 2026

fix #671, separate trait offsets by sex and by baseline vs. substitution
bhaller
committed
bb87daf

Commits on Sep 10, 2026

fix remaining references to baselineOffset etc.
bhaller
committed
4aaa803

Commits on Sep 11, 2026

insert new recipe 13.15, sexual dimorphism and differential selection
bhaller
committed
6a4ff29

Commits on Sep 12, 2026

fix #673, segfault when reloading a model that had been executed
bhaller
committed
beef64a
fix #662, add `skip` parameter to readCSV() and others
bhaller
committed
cb81790
fix #634: add [f$ failureScaling] to drawByStrength()
bhaller
committed
7b36094
fix #631: support pedigree IDs as individual IDs in VCF output
bhaller
committed
a99cbc1
tweaks to the fix for #673, segfault when reloading
bhaller
committed
92935c7
fix #609, rare error about parents with coalescence checking on
bhaller
committed
b249c8b

Commits on Sep 13, 2026

add recipe 16.12 (monozygotic twins)
bhaller
committed
9f2ff42

Commits on Sep 14, 2026

add impplementation.md info on derived state metadata
bhaller
committed
84cf290
use the new smaller minimum size only for custom plots
bhaller
committed
21c13cf
fix build errors using DEBUG_TRAIT_DEMAND
bhaller
committed
8a0f8d5
added clarifications about derived state info
bhaller
committed
0057bcf
trait tests in python
petrelharp
committed
8774a7a
relax the requirement of `ticks all` in multispecies models
bhaller
committed
4004364
remove obsolete units tests about `ticks all`
bhaller
committed
129802b
clamp effects
petrelharp
committed
63bf2fa

Commits on Sep 15, 2026

zero out ancestral state on reading in
petrelharp
committed
1231df3

Commits on Sep 16, 2026

Merge pull request #672 from petrelharp/pytests
bhaller
authored
53d6bc2
first pass on #387, needs polish and unit tests
bhaller
committed
1ba42f3
Merge branch 'multitrait' of https://github.com/MesserLab/SLiM into multitrait
bhaller
committed
ef871d3
Merge pull request #680 from petrelharp/zero_ancestral_state
bhaller
authored
097d0d9
Merge branch 'multitrait' of https://github.com/MesserLab/SLiM into multitrait
bhaller
committed
42c1225
minor note in implementation
petrelharp
committed
f72a318
Merge pull request #681 from petrelharp/implnote
bhaller
authored
f6c64f9

Commits on Sep 17, 2026

Commits on Sep 18, 2026

try a fix for the new SelfConsistencyCheck() raises
bhaller
committed
2a8c761
remove MINGW64 from CI for the CLI and GUI builds
bhaller
committed
11a8ef6
restore code that was Not The Problem
bhaller
committed
2b6208e
add a bit more diagnostic output
bhaller
committed
5b75851
change self consistency check to use an error tolerance
bhaller
committed
67d9de9
raise reporting threshold
bhaller
committed
ca68936
raise threshold again
bhaller
committed
25f040d
final tweaks to the self-consistency problem workaround
bhaller
committed
6772106
new calcVA/VD/VG/VP() functions for multitrait from Vitor Sudbrack!
bhaller
committed
0de018d
tweaks to my calcVADGP() commit to fix things I messed up, whoops
bhaller
committed
70dc4a2

Commits on Sep 19, 2026