Skip to content
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

Changes to Systematics manager to support MABE #451

Merged
merged 142 commits into from
Mar 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
7db913f
Merge branch 'master' into mabe-systematics
emilydolson Feb 28, 2023
576a7a0
Add span-lite back in (not sure how it got remove)
emilydolson Feb 28, 2023
f5210eb
remove span-lite again
emilydolson Feb 28, 2023
4636ce4
Fix tidy include
emilydolson Feb 28, 2023
14bff00
Get rid of extraneous bracket
emilydolson Feb 28, 2023
cc05c56
Fix boiler plate
emilydolson Feb 28, 2023
249cba7
Fix trailing whitespace
emilydolson Feb 28, 2023
b647081
Fix license
emilydolson Feb 28, 2023
47e6222
Make bitset_utils compile in clang
emilydolson Feb 28, 2023
96343e4
remove extra bracket
emilydolson Feb 28, 2023
24b4fda
Fix alphabetization
emilydolson Feb 28, 2023
d6ec8e9
Fix bits destructor
emilydolson Feb 28, 2023
b6ecd90
Fix newlines at end of files
emilydolson Feb 28, 2023
939a928
Fix variable name
emilydolson Feb 28, 2023
e69a188
Maybe fix span
emilydolson Feb 28, 2023
5ba7bd4
Temporary workaround because span doesn't have a constructor for emp …
emilydolson Mar 1, 2023
0d268b8
Switch SmallFifoMap to std array
emilydolson Mar 1, 2023
18e2884
Fix trailing whitespace
emilydolson Mar 1, 2023
5fcaab8
Merge branch 'MABE_devel' into mabe-systematics
emilydolson Mar 1, 2023
70ac008
Change test to reflect changes to slice
emilydolson Mar 1, 2023
c029285
Fix bug where 1s outside part of bitstring containing numberare being…
emilydolson Mar 1, 2023
6dbeb87
Temporarily swap in std::array in a couple spots
emilydolson Mar 1, 2023
8a7e5d8
view_slices no longer includes trailing EOF
emilydolson Mar 1, 2023
7b689c1
Update web test tool chain
emilydolson Mar 1, 2023
89d27f4
CountOnes was removed, so remove tests for it
emilydolson Mar 1, 2023
fed868a
Remove make command for EmphaticText because there is no EmphaticText…
emilydolson Mar 1, 2023
930f208
Behavior has changed due to new slice implementation - commented test…
emilydolson Mar 1, 2023
9c58ba2
Update slice tests to match new behavior
emilydolson Mar 1, 2023
533519a
Fix whitespace
emilydolson Mar 1, 2023
c2a6e71
Restore original behavior of slice
emilydolson Mar 1, 2023
55390fb
Fix whitespace
emilydolson Mar 1, 2023
9f0f2da
Possibly working version?
emilydolson Mar 7, 2023
0675839
Add preliminary tests + bug fixes to phylo import
emilydolson Mar 7, 2023
d3b0ec6
Fix trailing whitespace
emilydolson Mar 7, 2023
5bb3f08
Fix tidying
emilydolson Mar 7, 2023
15321f7
Fix clang compilation error
emilydolson Mar 7, 2023
5972800
Fix trailing whitespace
emilydolson Mar 7, 2023
dbf012d
Add test ensuring file save and load are identical
rodsan0 Mar 7, 2023
de128c9
Add some assets for load/save test
rodsan0 Mar 7, 2023
8502ed8
Store tracked phenotype to file
rodsan0 Mar 7, 2023
c46e604
Comment out broken tests
rodsan0 Mar 7, 2023
fda8efe
Org info is type string
rodsan0 Mar 7, 2023
9952d31
Origination and destruction time are optional
emilydolson Mar 7, 2023
f9d6b22
Fix total offspring and depth
emilydolson Mar 7, 2023
8f65891
Merge branch 'mabe-systematics' of github.com:devosoft/Empirical into…
emilydolson Mar 7, 2023
dbd17b4
Fix trailing whitespace
emilydolson Mar 7, 2023
f0f9517
Add comments
emilydolson Mar 7, 2023
5dd3e8c
Read num_orgs and tot_orgs from file, if present
rodsan0 Mar 8, 2023
f439620
Add total_offspring tests
emilydolson Mar 8, 2023
80f2e64
Origin and destruction time are doubles
emilydolson Mar 8, 2023
258767e
Merge branch 'mabe-systematics' of github.com:devosoft/Empirical into…
emilydolson Mar 8, 2023
cbc7e16
Add degree distribution + fix loading total_offspring
emilydolson Mar 8, 2023
c49c548
Add GetAverageOriginTime
emilydolson Mar 9, 2023
e46fa2b
Fix trailing whitespace
emilydolson Mar 9, 2023
d836675
Add docstrings
emilydolson Mar 9, 2023
bb90c6c
Revert range changes that clang cant handle
emilydolson Mar 9, 2023
6ba8421
fix constness
emilydolson Mar 9, 2023
e01b3ec
remove ranges include
emilydolson Mar 9, 2023
40dc072
Temporarily swap in std library log2
emilydolson Mar 9, 2023
fe6c456
Speed up loading
emilydolson Mar 9, 2023
e770848
Remove todo; keeping a set of ancestor pointers is cheap and necessar…
emilydolson Mar 9, 2023
5222ec6
Add ability to configure total offspring; assume extant orgs have pop…
emilydolson Mar 9, 2023
82f5932
Add org_count and total_depth to load
emilydolson Mar 9, 2023
a56c167
Add evolutionary distinctiveness functions
emilydolson Mar 9, 2023
9c25c55
Fix evolutionary distinctiveness functions
emilydolson Mar 9, 2023
0dcfad4
Fix trailing whitespace
emilydolson Mar 9, 2023
77f1eed
Get rid of test for large file
emilydolson Mar 9, 2023
afb7a41
Merge branch 'mabe-systematics' of github.com:devosoft/Empirical into…
emilydolson Mar 9, 2023
8658616
Fix catch version
emilydolson Mar 9, 2023
f11e64a
Fix force-cover version
emilydolson Mar 9, 2023
09466e4
On no parent id, return string that python can eval()
rodsan0 Mar 10, 2023
e9be868
Fix capitalization of NONE
rodsan0 Mar 10, 2023
5ad8697
Do not remove whitespace when parsing file
rodsan0 Mar 10, 2023
b386769
Do not call emp::from_string when ORG_INFO is str
rodsan0 Mar 10, 2023
a72c1f1
Actually run tests
rodsan0 Mar 10, 2023
96717aa
Include algorithm library
emilydolson Apr 11, 2023
9524e33
Add get NK fitness
emilydolson Jun 3, 2023
ae7a26d
Merge branch 'master' into mabe-systematics
emilydolson Jun 11, 2023
1578787
Fix tabs
emilydolson Jun 11, 2023
881fbf5
Add assert throw for use with Python
emilydolson Nov 17, 2023
f02249f
Swap systematics to optional_throw
emilydolson Nov 17, 2023
2173dc5
Change python_throw to optional_throw
emilydolson Nov 18, 2023
1604d6f
Fix redeclaration
emilydolson Nov 18, 2023
aeed4ee
Add test for optional_throw
emilydolson Nov 18, 2023
ed27152
Fix optional throw
emilydolson Nov 18, 2023
205b566
Edit error message
emilydolson Nov 26, 2023
9d8f4c4
Add windows version of optional_throw
emilydolson Nov 26, 2023
2412737
Allow just message for optional throw
emilydolson Nov 26, 2023
f0d9d42
Fix windows optional_throw
emilydolson Nov 26, 2023
2a00356
Avoid windows type confusion
emilydolson Nov 26, 2023
b4e3996
Avoid windows type confusion
emilydolson Nov 26, 2023
87cad79
Avoid windows type confusion
emilydolson Nov 26, 2023
a87e569
Fix windows optional_throw
emilydolson Nov 26, 2023
7448a41
Fix windows optional_throw
emilydolson Nov 26, 2023
5428ebb
Fix windows optional_throw
emilydolson Nov 26, 2023
6626860
Fix windows optional_throw
emilydolson Nov 26, 2023
58c6d81
Fix windows optional_throw
emilydolson Nov 26, 2023
d62b475
Add method to get pairwise distance between one pair of taxa
emilydolson Dec 2, 2023
e750878
Fix segfault in load
emilydolson Dec 5, 2023
9a853af
Implement, test GetSumDistance member for Systematics
mmore500 Feb 27, 2024
8301ddc
Merge in master
emilydolson Feb 28, 2024
8f10adf
Merge branch 'mabe-systematics' into sum-distance-sys
emilydolson Feb 28, 2024
1e542a3
Reintegrate necessary changes to world.hpp
emilydolson Feb 29, 2024
1b323cf
Merge branch 'mabe-systematics' into sum-distance-sys
emilydolson Feb 29, 2024
2d7b807
Clean up optional throw
emilydolson Feb 29, 2024
cad65b0
Fix trailing whitespace
emilydolson Feb 29, 2024
9f73a69
Fix alphabetize includes
emilydolson Feb 29, 2024
99386bd
Fix docstrings
emilydolson Feb 29, 2024
2a90a30
Fix headergaurd
emilydolson Feb 29, 2024
ab563bf
Fix license
emilydolson Feb 29, 2024
f11a154
Merge branch 'mabe-systematics' into sum-distance-sys
emilydolson Feb 29, 2024
136a7f2
Fix tabs
emilydolson Feb 29, 2024
0fc3e62
Fix opt test case
emilydolson Feb 29, 2024
c416384
Merge branch 'mabe-systematics' into sum-distance-sys
emilydolson Feb 29, 2024
dca7b0c
Pull includes out of header
emilydolson Feb 29, 2024
96dc6ed
Merge branch 'mabe-systematics' into sum-distance-sys
emilydolson Feb 29, 2024
279944f
Remove defunct tests
emilydolson Feb 29, 2024
46610db
Merge branch 'mabe-systematics' into sum-distance-sys
emilydolson Feb 29, 2024
915bc4c
Fix tests
emilydolson Feb 29, 2024
d34e95a
Add bounds checking
emilydolson Feb 29, 2024
98a114f
Discard changes to include/emp/datastructs/SmallFifoMap.hpp
emilydolson Feb 29, 2024
a3e835a
Discard changes to include/emp/hardware/AvidaGP.hpp
emilydolson Feb 29, 2024
786e74d
Discard changes to include/emp/hardware/EventDrivenGP.hpp
emilydolson Feb 29, 2024
9bbc8f8
Discard changes to include/emp/bits/Bits.hpp
emilydolson Feb 29, 2024
8e61986
Discard changes to tests/tools/string_utils.cpp
emilydolson Feb 29, 2024
e65d525
Discard changes to tests/text/Makefile
emilydolson Feb 29, 2024
5abbf48
Discard changes to tests/matching/MatchBin_logging.cpp
emilydolson Feb 29, 2024
184ae28
Merge pull request #507 from devosoft/sum-distance-sys
emilydolson Feb 29, 2024
a0b6ecc
Merge branch 'mabe-systematics' of https://github.com/devosoft/Empiri…
emilydolson Feb 29, 2024
746d050
Update include/emp/Evolve/Systematics.hpp
emilydolson Mar 1, 2024
0c79c80
Update include/emp/Evolve/Systematics.hpp
emilydolson Mar 1, 2024
bbff40c
Little cleanups
emilydolson Mar 2, 2024
97c59cf
Merge branch 'mabe-systematics' of github.com:devosoft/Empirical into…
emilydolson Mar 2, 2024
4b422e5
Strip trailing whitespace
emilydolson Mar 2, 2024
b0c9e70
Update include/emp/Evolve/Systematics.hpp
emilydolson Mar 2, 2024
dd09c54
Swap in ternary
emilydolson Mar 2, 2024
c362b78
Merge branch 'mabe-systematics' of github.com:devosoft/Empirical into…
emilydolson Mar 2, 2024
02c7992
Update include/emp/Evolve/Systematics.hpp
emilydolson Mar 2, 2024
6974ac0
Minor fixes
emilydolson Mar 2, 2024
7132965
Merge
emilydolson Mar 2, 2024
b58329a
Merge
emilydolson Mar 2, 2024
9e7165a
Change variable name to defaulted
emilydolson Mar 2, 2024
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
Prev Previous commit
Next Next commit
Fix segfault in load
emilydolson committed Dec 5, 2023
commit e7508788bc778348c14e0d27fbb9c79d04847eb0
4 changes: 3 additions & 1 deletion include/emp/Evolve/Systematics.hpp
Original file line number Diff line number Diff line change
@@ -2385,7 +2385,9 @@ namespace emp {
// Adjust total offspring
if (adjust_total_offspring) {
mmore500 marked this conversation as resolved.
Show resolved Hide resolved
for (auto tax : active_taxa) {
tax->parent->AddTotalOffspring();
if (tax->parent) {
tax->parent->AddTotalOffspring();
}
}
} else {
total_offspring_wrong = true;