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.

Sign up for GitHub

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

Jump to bottom

Update kriging apportionment method and functions #215

Merged
merged 56 commits into from
Apr 12, 2024
Merged

Update kriging apportionment method and functions #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
04dbc49
Edit to `setup.cfg` maintainer name
Mar 6, 2024
d93334f
Merge branch 'test-branch' of https://github.com/brandynlucca/EchoPro…
Mar 6, 2024
d74dee8
Merge branch 'main' of https://github.com/uw-echospace/EchoPro into t…
Mar 6, 2024
ba657c2
Change `setup.cfg` software name
Mar 6, 2024
0646652
Additional kriging and unit test function updates
Mar 7, 2024
2701083
Updates to kriging methods and sex-age apportionin
brandynlucca Mar 7, 2024
44e9149
Add documentation for newer functions
brandynlucca Mar 7, 2024
8fa107c
Kriging methods documentation
brandynlucca Mar 7, 2024
5b9fdc2
Merge branch 'main' into test-branch
brandynlucca Mar 7, 2024
95cc04f
Add equations to acoustics/semivariogram RTD
brandynlucca Mar 7, 2024
5c36ebe
Merge branch 'test-branch' of https://github.com/brandynlucca/EchoPro…
brandynlucca Mar 7, 2024
3d2a34e
Apply suggestions from code review
leewujung Mar 9, 2024
c123836
remove .vscode/settings.json
leewujung Mar 9, 2024
c398f47
update .gitignore
leewujung Mar 9, 2024
73663a5
Pulled documentation changes from `upstream/main`
Mar 26, 2024
1726916
Remove erroneous file additions to `upstream/main`
Mar 26, 2024
daeb4d0
Merge branch 'main' of https://github.com/uw-echospace/EchoPro into t…
Mar 26, 2024
3724e25
Rename `test_strata_mean_sigma_bs` test
Mar 26, 2024
1c12fed
Small changes to `krige` method (bugs)
Mar 26, 2024
6daa8a8
Add `filter_species` function for biodata
Mar 26, 2024
d82014e
General changes removing lambda functions
Mar 26, 2024
fd738a1
Refactor stratum weights and age-len proportions
Mar 26, 2024
8f8e91d
Refactor `distribute_aged_weight_proportions` func
Mar 26, 2024
00e0e51
Further updates to `distribute_aged_weight_prop.`
Mar 26, 2024
3363525
Update how proportion calculates handle `NaN`
Mar 26, 2024
2172325
Draft Matlab translation `thru unaged2age_mat`
Mar 26, 2024
b834712
Amendment to unaged proportion drafted code
Mar 26, 2024
cf78a55
Add test for `test_sum_strata_weight`
Mar 27, 2024
f052a21
Add test for `compute_summed_aged_proportions`
Mar 27, 2024
05dc77d
Changes to `compute_index_aged_weight_proportions`
brandynlucca Mar 28, 2024
8f59601
Vectorize apportionment of `aged_sexed_biomass`
brandynlucca Mar 28, 2024
2ea574e
`test_compute_index_aged_weight_proportions` edits
brandynlucca Mar 28, 2024
d9998ba
`compute_summed_aged_proportions` edits
Mar 29, 2024
adaac91
Added test for `compute_summed_aged_proportions`
Mar 29, 2024
0ed7c53
Edit to `test_compute_summed_aged_proportions`
Mar 29, 2024
d7768c5
Edits/test: `distribute_aged_weight_proportions`
Mar 29, 2024
8a81f25
Update to column names
Mar 29, 2024
0982370
Added `compute_index_unaged_number_proportions`
Mar 29, 2024
f5520b6
`test_compute_index_aged_weight_proportions` fixes
Mar 29, 2024
f1b0f20
Revert `bin_variable` vectorization
Mar 29, 2024
f98fbb2
`test_compute_index_unaged_number_proportions` fix
Mar 29, 2024
ba85f16
`compute_index_unaged_number_proportions` fixes
Mar 29, 2024
97fd66a
Renamed vars w/in `compute_index_unaged_number...`
Mar 29, 2024
b180df6
Add `compute_summed_unaged_proportions`
Mar 29, 2024
15eb89d
Unaged sexed proportions and biomass calculation
Mar 30, 2024
1efca37
`test_compute_unaged_sex_proportion` test
Mar 30, 2024
2f25f08
Reorganization of the `unaged2agedmat` calculation
brandynlucca Mar 30, 2024
8b0c3f7
New function: `apply_age_bins`
brandynlucca Apr 1, 2024
de32d74
Overall apportioned biomass calculation
brandynlucca Apr 1, 2024
10f3d65
Fixes to `test_kriging_biomass_apportionment`
brandynlucca Apr 1, 2024
75b85de
Edits to `test_compute_summed_aged_proportions`
brandynlucca Apr 1, 2024
aa10adf
Overhaul to `kriging_apportionment`
brandynlucca Apr 3, 2024
0b811cb
Amendments to aged-unaged biomass combination
brandynlucca Apr 3, 2024
40b3553
Edits to `biology` apportionment functions
brandynlucca Apr 3, 2024
275b146
Changes and fixes to all apportionment tests
brandynlucca Apr 3, 2024
c87c3d1
Updated kriging apportionment funcs and tests
brandynlucca Apr 12, 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
Loading