From acb07277665973b5d7fba87361669427c0439341 Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:50:38 -0500 Subject: [PATCH 01/19] reordered reset daily stats --- .../animal/data_types/herd_statistics.py | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 44475ededb..65f502b53e 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -21,6 +21,8 @@ class HerdStatistics: Count of cows for each parity class, (unitless). avg_daily_cow_milking : float Average number of milking cows per day, (unitless). + stillborn_calf_info : list[SoldAnimalTypedDict] + Details about stillborn calves including relevant attributes. sold_calves_info : list[SoldAnimalTypedDict] Details about sold calves including relevant attributes. sold_heiferIIIs_info : list[SoldAnimalTypedDict] @@ -347,16 +349,20 @@ def reset_daily_stats(self) -> None: self.milking_cow_num = 0 self.dry_cow_num = 0 + self.animals_deaths_by_stage: dict[AnimalType, int] = { + AnimalType.CALF: 0, + AnimalType.HEIFER_I: 0, + AnimalType.HEIFER_II: 0, + AnimalType.HEIFER_III: 0, + AnimalType.LAC_COW: 0, + AnimalType.DRY_COW: 0, + } + self.preg_cow_percent = 0.0 self.dry_cow_percent = 0.0 self.milking_cow_percent = 0.0 self.non_preg_cow_percent = 0.0 - self.daily_milk_production = 0.0 - self.herd_milk_fat_kg = 0.0 - self.herd_milk_fat_percent = 0.0 - self.herd_milk_protein_kg = 0.0 - self.herd_milk_protein_percent = 0.0 self.avg_days_in_milk = 0.0 self.avg_days_in_preg = 0.0 self.avg_cow_body_weight = 0.0 @@ -368,14 +374,11 @@ def reset_daily_stats(self) -> None: self.avg_cow_culling_age = 0.0 self.avg_mature_body_weight = 0.0 - self.animals_deaths_by_stage: dict[AnimalType, int] = { - AnimalType.CALF: 0, - AnimalType.HEIFER_I: 0, - AnimalType.HEIFER_II: 0, - AnimalType.HEIFER_III: 0, - AnimalType.LAC_COW: 0, - AnimalType.DRY_COW: 0, - } + self.daily_milk_production = 0.0 + self.herd_milk_fat_kg = 0.0 + self.herd_milk_fat_percent = 0.0 + self.herd_milk_protein_kg = 0.0 + self.herd_milk_protein_percent = 0.0 def reset_parity(self) -> None: """Resets parity-based attributes.""" From 958aab875c9d3334fa9e28d1cbeb61a2337d739a Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:51:58 -0500 Subject: [PATCH 02/19] added stillborn_calf_info to herdstatistics attributs --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 1 + 1 file changed, 1 insertion(+) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 65f502b53e..05bc5e571c 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -163,6 +163,7 @@ class HerdStatistics: num_cow_for_parity: dict[str, int] avg_daily_cow_milking = 0.0 + stillborn_calf_info: list[SoldAnimalTypedDict] sold_calves_info: list[SoldAnimalTypedDict] sold_heiferIIIs_info: list[SoldAnimalTypedDict] sold_heiferIIs_info: list[SoldAnimalTypedDict] From 9a6bc479e85aa57ef548b06a9ad089b2b23928fa Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:52:44 -0500 Subject: [PATCH 03/19] removed unused avg_daily_cow_milking attribute --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 05bc5e571c..4eabbd7125 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -19,8 +19,6 @@ class HerdStatistics: Count statistics of culled animals, categorized by specified culling reasons, (unitless). num_cow_for_parity : dict[str, int] Count of cows for each parity class, (unitless). - avg_daily_cow_milking : float - Average number of milking cows per day, (unitless). stillborn_calf_info : list[SoldAnimalTypedDict] Details about stillborn calves including relevant attributes. sold_calves_info : list[SoldAnimalTypedDict] @@ -161,7 +159,6 @@ class HerdStatistics: cull_reason_stats: dict[str, int] num_cow_for_parity: dict[str, int] - avg_daily_cow_milking = 0.0 stillborn_calf_info: list[SoldAnimalTypedDict] sold_calves_info: list[SoldAnimalTypedDict] From 291f974caac9248c96cf5b8c62f2a9f146d5809b Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:52:54 -0500 Subject: [PATCH 04/19] removed avg_daily_cow_milking in unit test --- .../test_animal/test_data_types/test_herd_statistics.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_biophysical/test_animal/test_data_types/test_herd_statistics.py b/tests/test_biophysical/test_animal/test_data_types/test_herd_statistics.py index eb683eeba7..b859d8aabd 100644 --- a/tests/test_biophysical/test_animal/test_data_types/test_herd_statistics.py +++ b/tests/test_biophysical/test_animal/test_data_types/test_herd_statistics.py @@ -26,7 +26,6 @@ def test_initialization(herd_statistics: HerdStatistics) -> None: assert herd_statistics.sold_cows_info == [] assert herd_statistics.herd_num == 0 assert herd_statistics.calf_num == 0 - assert herd_statistics.avg_daily_cow_milking == 0.0 def test_reset_daily_stats(herd_statistics: HerdStatistics) -> None: From c0f9dc64fb15431df93308b1d8921bc56012cb82 Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:58:45 -0500 Subject: [PATCH 05/19] HerdStatistics docstring updates --- .../animal/data_types/herd_statistics.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 4eabbd7125..8f88e90c00 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -23,14 +23,16 @@ class HerdStatistics: Details about stillborn calves including relevant attributes. sold_calves_info : list[SoldAnimalTypedDict] Details about sold calves including relevant attributes. - sold_heiferIIIs_info : list[SoldAnimalTypedDict] - Detailed information on sold animals categorized as "Heifer III". sold_heiferIIs_info : list[SoldAnimalTypedDict] Detailed information about sold animals categorized as "Heifer II". + sold_heiferIIIs_info : list[SoldAnimalTypedDict] + Detailed information on sold animals categorized as "Heifer III". sold_cows_info : list[SoldAnimalTypedDict] Comprehensive details of sold cows including relevant attributes. sold_and_died_cows_info : list[SoldAnimalTypedDict] Information concerning cows that were either sold or died. + total_enteric_methane : dict[AnimalType, dict[str, float]] + Total amount of enteric methane, grouped by animal types and methods (g/day). herd_num : int Total number of animals in the herd, (unitless). calf_num : int @@ -93,6 +95,8 @@ class HerdStatistics: Total number of semen units used for cows, (unitless). ed_period_h : int Estrus detection (ED) period for heifers, (simulation days). + ed_period : int + Estrus detection (ED) period for cows, (simulation days). open_cow_num : int Total number of open (non-pregnant) cows, (unitless). preg_cow_num : int @@ -150,8 +154,8 @@ class HerdStatistics: Percentage statistics of culled animals, categorized by culling reasons, (unitless). percent_cow_for_parity : dict[str, float] Percentage of cows available for each parity class, calculated based on total counts, (unitless). - total_enteric_methane : dict[AnimalType, dict[str, float]] - Total amount of enteric methane, grouped by animal types and methods (g/day). + animals_deaths_by_stage : dict[AnimalType, int] + Count of animal deaths categorized by their stages. """ @@ -162,8 +166,8 @@ class HerdStatistics: stillborn_calf_info: list[SoldAnimalTypedDict] sold_calves_info: list[SoldAnimalTypedDict] - sold_heiferIIIs_info: list[SoldAnimalTypedDict] sold_heiferIIs_info: list[SoldAnimalTypedDict] + sold_heiferIIIs_info: list[SoldAnimalTypedDict] sold_cows_info: list[SoldAnimalTypedDict] sold_and_died_cows_info: list[SoldAnimalTypedDict] total_enteric_methane: dict[AnimalType, dict[str, float]] From 38420e1772ffc32b1f06a371d87989f41e78b06d Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:14:46 -0500 Subject: [PATCH 06/19] reordered variable grouping in reset daily stats and attributes --- .../animal/data_types/herd_statistics.py | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 8f88e90c00..d9fcac752e 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -107,6 +107,8 @@ class HerdStatistics: Number of cows actively milking in the herd, (unitless). dry_cow_num : int Number of dry cows (non-milking) in the herd, (unitless). + animals_deaths_by_stage : dict[AnimalType, int] + Count of animal deaths categorized by their stages. dry_cow_percent : float Percentage of dry cows in the herd, (unitless). milking_cow_percent : float @@ -115,16 +117,6 @@ class HerdStatistics: Percentage of pregnant cows in the herd, (unitless). non_preg_cow_percent : float Percentage of non-pregnant cows in the herd, (unitless). - daily_milk_production : float - Average daily milk production, (kg). - herd_milk_fat_kg : float - Total quantity of milk fat in the herd's milk production, (kg). - herd_milk_fat_percent : float - Percentage of milk fat in the herd's milk production, (unitless). - herd_milk_protein_kg : float - Total quantity of milk protein in the herd's milk production, (kg). - herd_milk_protein_percent : float - Percentage of milk protein in the herd's milk production, (unitless). avg_days_in_milk : float Average number of days in milk, (simulation days). avg_days_in_preg : float @@ -154,8 +146,16 @@ class HerdStatistics: Percentage statistics of culled animals, categorized by culling reasons, (unitless). percent_cow_for_parity : dict[str, float] Percentage of cows available for each parity class, calculated based on total counts, (unitless). - animals_deaths_by_stage : dict[AnimalType, int] - Count of animal deaths categorized by their stages. + daily_milk_production : float + Average daily milk production, (kg). + herd_milk_fat_kg : float + Total quantity of milk fat in the herd's milk production, (kg). + herd_milk_fat_percent : float + Percentage of milk fat in the herd's milk production, (unitless). + herd_milk_protein_kg : float + Total quantity of milk protein in the herd's milk production, (kg). + herd_milk_protein_percent : float + Percentage of milk protein in the herd's milk production, (unitless). """ @@ -195,9 +195,9 @@ class HerdStatistics: heiferIII_percent = 0.0 cow_percent = 0.0 + CIDR_count = 0 preg_check_num_h = 0 preg_check_num = 0 - CIDR_count = 0 GnRH_injection_num_h = 0 GnRH_injection_num = 0 PGF_injection_num_h = 0 @@ -216,16 +216,13 @@ class HerdStatistics: milking_cow_num = 0 dry_cow_num = 0 + animals_deaths_by_stage: dict[AnimalType, int] + dry_cow_percent = 0.0 milking_cow_percent = 0.0 preg_cow_percent = 0.0 non_preg_cow_percent = 0.0 - daily_milk_production = 0.0 - herd_milk_fat_kg = 0.0 - herd_milk_fat_percent = 0.0 - herd_milk_protein_kg = 0.0 - herd_milk_protein_percent = 0.0 avg_days_in_milk = 0.0 avg_days_in_preg = 0.0 avg_cow_body_weight = 0.0 @@ -244,7 +241,11 @@ class HerdStatistics: cull_reason_stats_percent: dict[str, float] percent_cow_for_parity: dict[str, float] - animals_deaths_by_stage: dict[AnimalType, int] + daily_milk_production = 0.0 + herd_milk_fat_kg = 0.0 + herd_milk_fat_percent = 0.0 + herd_milk_protein_kg = 0.0 + herd_milk_protein_percent = 0.0 def __init__(self) -> None: """ @@ -338,6 +339,7 @@ def reset_daily_stats(self) -> None: self.GnRH_injection_num = 0 self.PGF_injection_num_h = 0 self.PGF_injection_num = 0 + self.ai_num_h = 0 self.ai_num = 0 self.semen_num_h = 0 From 86c47cf869a21243f8ece3eb5d6d317875f8c3ef Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:16:55 -0500 Subject: [PATCH 07/19] updated changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 1519be8e9a..0cb2a22780 100644 --- a/changelog.md +++ b/changelog.md @@ -32,6 +32,7 @@ v1.0.0 - [2690](https://github.com/RuminantFarmSystems/RuFaS/pull/2690) - [minor change] [TaskManager] [NoInputChange] [NoOutputChange] Remove hard-coded name for output folder, use user-defined name instead. - [2720](https://github.com/RuminantFarmSystems/MASM/pull/2720) - [minor change] [Emissions] [NoInputChange] [NoOutputChange] Adds FGF emissions reset when there's a harvest-kill operation and there's none of that feed left in storage. - [2791](https://github.com/RuminantFarmSystems/MASM/pull/2791) - [minor change] [Animal] [NoInputChange] [NoOutputChange] Updates ration percentage values in example feed files to sum to exactly 100. +- [2809](https://github.com/RuminantFarmSystems/MASM/pull/2809) - [minor change] [Animal] [NoInputChange] [NoOutputChange] Reorders grouping of attributes in some HerdStatistics methods, updates docstrings. ### v1.0.0 From 7737636caea2dd610959f96bf191b68977a32b2e Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:17:04 -0500 Subject: [PATCH 08/19] removed TODOs --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index d9fcac752e..f0065b4f37 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -172,7 +172,6 @@ class HerdStatistics: sold_and_died_cows_info: list[SoldAnimalTypedDict] total_enteric_methane: dict[AnimalType, dict[str, float]] - # TODO: Maybe break this list down into smaller lists GitHub Issue #1215 herd_num = 0 calf_num = 0 heiferI_num = 0 @@ -331,7 +330,6 @@ def reset_daily_stats(self) -> None: self.heiferIII_percent = 0.0 self.cow_percent = 0.0 - # TODO: Check if all the following variables need to reset daily GitHub Issue #1215 self.CIDR_count = 0 self.preg_check_num_h = 0 self.preg_check_num = 0 From 1ce605522e8f3d4231fd731a2a755ea4e6421d89 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Mar 2026 22:23:10 +0000 Subject: [PATCH 09/19] Apply Black Formatting --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index d9fcac752e..620d41892e 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -32,7 +32,7 @@ class HerdStatistics: sold_and_died_cows_info : list[SoldAnimalTypedDict] Information concerning cows that were either sold or died. total_enteric_methane : dict[AnimalType, dict[str, float]] - Total amount of enteric methane, grouped by animal types and methods (g/day). + Total amount of enteric methane, grouped by animal types and methods (g/day). herd_num : int Total number of animals in the herd, (unitless). calf_num : int From 3385859a771bf1397e0d45684965c4cb5953055e Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:23:53 -0500 Subject: [PATCH 10/19] flake8 fix --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index f0065b4f37..45f83ecc47 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -32,7 +32,7 @@ class HerdStatistics: sold_and_died_cows_info : list[SoldAnimalTypedDict] Information concerning cows that were either sold or died. total_enteric_methane : dict[AnimalType, dict[str, float]] - Total amount of enteric methane, grouped by animal types and methods (g/day). + Total amount of enteric methane, grouped by animal types and methods (g/day). herd_num : int Total number of animals in the herd, (unitless). calf_num : int From 19be0cb2ac674fe5aabdfda4a74c88347302bdb6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Mar 2026 22:26:55 +0000 Subject: [PATCH 11/19] Apply Black Formatting From 5c334f94a2b6cb8874088a3fb681b51ad047a68c Mon Sep 17 00:00:00 2001 From: JoeWaddell Date: Tue, 3 Mar 2026 22:30:26 +0000 Subject: [PATCH 12/19] Update badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a9660d1af8..8f8a508e00 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) -[![Mypy](https://img.shields.io/badge/Mypy-1684%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Mypy](https://img.shields.io/badge/Mypy-1688%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) # RuFaS: Ruminant Farm Systems From 255fe4af979dd9d24b1a4ed6eb79121997321b39 Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Wed, 4 Mar 2026 08:27:29 -0500 Subject: [PATCH 13/19] updated typing --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 45f83ecc47..7147dfff2b 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from RUFAS.biophysical.animal import animal_constants -from RUFAS.biophysical.animal.data_types.animal_typed_dicts import SoldAnimalTypedDict +from RUFAS.biophysical.animal.data_types.animal_typed_dicts import SoldAnimalTypedDict, StillbornCalfTypedDict from RUFAS.biophysical.animal.data_types.animal_types import AnimalType @@ -164,7 +164,7 @@ class HerdStatistics: num_cow_for_parity: dict[str, int] - stillborn_calf_info: list[SoldAnimalTypedDict] + stillborn_calf_info: list[StillbornCalfTypedDict] sold_calves_info: list[SoldAnimalTypedDict] sold_heiferIIs_info: list[SoldAnimalTypedDict] sold_heiferIIIs_info: list[SoldAnimalTypedDict] From a71c27831832ff1a77ad79a87ba187dffcb75f50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 4 Mar 2026 13:35:22 +0000 Subject: [PATCH 14/19] Apply Black Formatting From 23222b47412164ceb5d33ad1cbdaaecb845b28a6 Mon Sep 17 00:00:00 2001 From: JoeWaddell Date: Wed, 4 Mar 2026 13:46:13 +0000 Subject: [PATCH 15/19] Update badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f8a508e00..6115546ca3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) -[![Mypy](https://img.shields.io/badge/Mypy-1688%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Mypy](https://img.shields.io/badge/Mypy-1683%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) # RuFaS: Ruminant Farm Systems From e3e9c5a3666d7db9324c9b2d0531832b097e3b32 Mon Sep 17 00:00:00 2001 From: JoeWaddell <109082924+JoeWaddell@users.noreply.github.com> Date: Fri, 6 Mar 2026 12:10:41 -0500 Subject: [PATCH 16/19] fixed typing from review comment --- RUFAS/biophysical/animal/data_types/herd_statistics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RUFAS/biophysical/animal/data_types/herd_statistics.py b/RUFAS/biophysical/animal/data_types/herd_statistics.py index 7147dfff2b..be3d3de66f 100644 --- a/RUFAS/biophysical/animal/data_types/herd_statistics.py +++ b/RUFAS/biophysical/animal/data_types/herd_statistics.py @@ -19,7 +19,7 @@ class HerdStatistics: Count statistics of culled animals, categorized by specified culling reasons, (unitless). num_cow_for_parity : dict[str, int] Count of cows for each parity class, (unitless). - stillborn_calf_info : list[SoldAnimalTypedDict] + stillborn_calf_info : list[StillbornCalfTypedDict] Details about stillborn calves including relevant attributes. sold_calves_info : list[SoldAnimalTypedDict] Details about sold calves including relevant attributes. From e8458771d9c332c897f0f0e11ed84f6da8f512a9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Mar 2026 17:13:55 +0000 Subject: [PATCH 17/19] Apply Black Formatting From b00f480ecb422522e5098eddc82e89569818fb09 Mon Sep 17 00:00:00 2001 From: JoeWaddell Date: Fri, 6 Mar 2026 17:17:31 +0000 Subject: [PATCH 18/19] Update badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f54af128e..2fe5e5399f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) -[![Mypy](https://img.shields.io/badge/Mypy-1424%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Mypy](https://img.shields.io/badge/Mypy-1423%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) # RuFaS: Ruminant Farm Systems From 0183bbcddaee8813889a36639812270bd697f20b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Mar 2026 19:16:27 +0000 Subject: [PATCH 19/19] Apply Black Formatting