-
Notifications
You must be signed in to change notification settings - Fork 25
Genetics Implementation #2734
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
Genetics Implementation #2734
Changes from all commits
Commits
Show all changes
96 commits
Select commit
Hold shift + click to select a range
e88fb45
Update changelog.md
allisterakun 66ac5b1
Update changelog.md
allisterakun 2ab48cd
Merge branch 'dev' into genetics_implementation
allisterakun b8536f4
Revert "Merge branch 'dev' into genetics_implementation"
allisterakun 1f723ab
2721
allisterakun afd4baf
manure sync with dev
allisterakun f6b50a2
Merge branch 'dev' into genetics_implementation
allisterakun ef499f2
Merge f6b50a2751afe8b71e77c0b9ce6160bb6a96524c into 2f73b6a8e7abf5588…
allisterakun 3e1c3e0
Apply Black Formatting
github-actions[bot] 36e8c62
Update badges on README
allisterakun 16486e5
Merge branch 'dev' into genetics_implementation
allisterakun fe775e1
Merge 16486e56232cf155ca13de7d596d44c91b35df7e into 6e54aeb1e8d42e1b9…
allisterakun 9e20d2a
Apply Black Formatting
github-actions[bot] 86fb626
Update badges on README
allisterakun e72c006
Update input_manager.py
allisterakun 879fda1
Merge branch 'dev' into genetics_implementation
allisterakun 7be9224
Merge 879fda17c62e388b2beed75b916961b3d2f6d4ba into 19a697be425755d8b…
allisterakun e67e054
Apply Black Formatting
github-actions[bot] 64c0432
Update badges on README
allisterakun df3d25c
update all file paths to `TopListingSemen_HO.csv`
allisterakun a77ad58
Merge branch 'dev' into genetics_implementation
allisterakun 2ae07a5
Merge a77ad5882b07b1854d3e6c5e93a7dbae5315a972 into 6b1bf25ddea38a70d…
allisterakun be8aa0d
Apply Black Formatting
github-actions[bot] 957d1cd
fix broken unit tests
allisterakun 8111ec8
Merge 957d1cdace856c0ac8895937ddf6c142bfdcde7c into 6b1bf25ddea38a70d…
allisterakun f0a104d
Apply Black Formatting
github-actions[bot] 97cabc1
Update badges on README
allisterakun 723fff6
mypy error fix part 1
allisterakun 7e31b68
Merge 723fff696880856ffb51a03bef86686fd888cd6a into 6b1bf25ddea38a70d…
allisterakun 9f7f834
Apply Black Formatting
github-actions[bot] 0ff5420
Update badges on README
allisterakun c1f2b25
flake8
allisterakun f7e4df9
Merge c1f2b25fcb4037d438f528107b5bf66532090186 into 6b1bf25ddea38a70d…
allisterakun a1ec6da
Apply Black Formatting
github-actions[bot] c19bc07
Update badges on README
allisterakun 4ef57b3
compress genetic history and reduce runtime
allisterakun 65ac834
merge conflicts
allisterakun 6ef30a2
Merge 65ac83421883f0bd0e0472160f6912ed994f4243 into 7b090b9c17b481f1c…
allisterakun 33b41d8
Apply Black Formatting
github-actions[bot] f24a75b
Update badges on README
allisterakun d113542
Merge branch 'dev' into genetics_implementation
allisterakun e30178a
Merge d113542366f7db4dd02b8cbd094bea3a0e9b5dc3 into f794363cc15eba689…
allisterakun de2e829
Apply Black Formatting
github-actions[bot] 7455957
Update badges on README
allisterakun 9c56868
clamp birthdates and raise only one warning
allisterakun 4dedce8
Merge 9c56868e35a4dd4f8bd92eee604769e74bfa4af0 into f794363cc15eba689…
allisterakun a0a7ffc
Apply Black Formatting
github-actions[bot] 0adf58c
Introduce on-off switch for Genetics submodule
allisterakun 03fe344
Merge branch 'dev' into genetics_implementation
allisterakun 6cc82dd
Merge 03fe3446924a6ac849be897f56a371f5cbc42ba4 into 1320c3c98b8f80e55…
allisterakun b0dcf74
Apply Black Formatting
github-actions[bot] f4a3a2e
Update badges on README
allisterakun 6e0b6dd
Update example_freestall_animal.json
allisterakun 1ccad33
Merge branch 'genetics_implementation' of https://github.com/Ruminant…
allisterakun 1ef922d
Skip genetic history reporting when genetics is turned off
allisterakun 1cfc3ae
update `simulate_genetics` location and set default to false
allisterakun d26efad
unit tests
allisterakun 7759165
Merge branch 'dev' into genetics_implementation
allisterakun 87d2273
Merge 7759165f442d920a40ebeff8f734a7308ae135e4 into e5083e9ade04c972d…
allisterakun d0cea73
Apply Black Formatting
github-actions[bot] 49bd80d
Update badges on README
allisterakun 0e039ce
flake8
allisterakun ba952d7
Merge branch 'dev' into genetics_implementation
allisterakun e6ad90f
Merge ba952d778ed02c2ec73391d1724545508ad99131 into 5fa2e6f84c970ce31…
allisterakun c2f0a8a
Apply Black Formatting
github-actions[bot] 8ee6d7e
Update badges on README
allisterakun 60ca0cc
mypy
allisterakun dd63ce7
Merge 60ca0cc273c1a64acdcb75b2fb11fe57cdb6c80f into 5fa2e6f84c970ce31…
allisterakun b77241b
Apply Black Formatting
github-actions[bot] 65d4d46
Update badges on README
allisterakun 7858c10
update E_temporary std and correlation values
allisterakun 00b3f7f
Merge branch 'genetics_implementation' of https://github.com/Ruminant…
allisterakun 0605612
Merge 00b3f7fc716d2677a391f4171bbc70330eaaa4d0 into 5fa2e6f84c970ce31…
allisterakun 52f7221
Apply Black Formatting
github-actions[bot] e65794f
remove comments
allisterakun b1ea4a0
Merge branch 'genetics_implementation' of https://github.com/Ruminant…
allisterakun c971be8
Merge b1ea4a0bb923b5851a9015fa09c715593a937e47 into 5fa2e6f84c970ce31…
allisterakun 19f5452
Apply Black Formatting
github-actions[bot] 0fb2f7a
Merge branch 'dev' into genetics_implementation
allisterakun 952d574
Merge 0fb2f7a7fa9ba58ad5b0086605f872354598451a into 609e7b5cdc3fa9aed…
allisterakun ff27c44
Apply Black Formatting
github-actions[bot] e780baa
Update test_animal.py
allisterakun ddef102
Merge branch 'genetics_implementation' of https://github.com/Ruminant…
allisterakun f4e2915
Merge ddef102db7b1180db1ddaa16c31b0cb2bea32e11 into 609e7b5cdc3fa9aed…
allisterakun 795691d
Apply Black Formatting
github-actions[bot] 32550c0
Update badges on README
allisterakun 53447fd
Merge branch 'dev' into genetics_implementation
matthew7838 8c65c32
Merge 53447fdfde8ea61b006255d1c0dc86b4690303f2 into 194023d0779c866e0…
allisterakun b992d40
Apply Black Formatting
github-actions[bot] 222eec1
implement Matthew's comment
allisterakun 39194f1
Merge 222eec1ca15fe6bd983e9d7ec17fbfd17cbdd485 into 194023d0779c866e0…
allisterakun c1ddec4
Apply Black Formatting
github-actions[bot] e636f11
update e2e
allisterakun d921073
Merge e636f11d88229c071f108a5c1ba196c27346e70b into 194023d0779c866e0…
allisterakun 52a8769
Apply Black Formatting
github-actions[bot] 6899e48
Update badges on README
allisterakun 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
Large diffs are not rendered by default.
Oops, something went wrong.
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
650 changes: 387 additions & 263 deletions
650
RUFAS/biophysical/animal/animal_genetics/animal_genetics.py
Large diffs are not rendered by default.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| from typing import TypedDict | ||
|
|
||
| from RUFAS.biophysical.animal.data_types.animal_types import AnimalType | ||
|
|
||
|
|
||
| class GeneticHistory(TypedDict): | ||
| """ | ||
| A class to represent the genetic history of an individual animal on a farm. | ||
|
|
||
| This class is used to track the genetic attributes of an animal over the course of a simulation. | ||
| It contains information about the simulation day, the age of the animal in days, and its genetic attributes. | ||
|
|
||
| Attributes | ||
| ---------- | ||
| start_day : int | ||
| The simulation day corresponding to the start of the genetic record of the animal. | ||
| end_day : int | ||
| The simulation day corresponding to the end of the genetic record of the animal. | ||
| id : int | ||
| The unique identifier of the animal. | ||
| animal_type : AnimalType | ||
| The type of animal. | ||
| genetics: dict[str, float] | ||
| Dictionary containing the genetic attributes of the animal. | ||
| """ | ||
|
|
||
| start_day: int | ||
| end_day: int | ||
|
|
||
| id: int | ||
| animal_type: AnimalType | ||
|
|
||
| genetics: dict[str, float] |
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.
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.