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

fix(commongrid): fix bugs and improve compute_NASC using flox #1167

Merged
merged 78 commits into from
Nov 4, 2023
Merged

fix(commongrid): fix bugs and improve compute_NASC using flox #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
149d7da
chore(deps): add flox dependency >=0.7.2
lsetiawan Aug 15, 2023
d911c45
fix(commongrid): fixes 'compute_MVBS' so it can work better and scale
lsetiawan Aug 15, 2023
a052854
docs: add small code comment
lsetiawan Aug 15, 2023
364ebce
refactor: change how ping_time index is retrieved
lsetiawan Aug 15, 2023
a0fb46a
refactor: remove for loop for channel
lsetiawan Aug 15, 2023
d5558e8
test(mvbs): add mock Sv datasets and tests for dims (#2)
leewujung Aug 24, 2023
a1e5ec1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 24, 2023
f30df73
fix: change dask to numpy
lsetiawan Aug 24, 2023
c75d9a2
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Aug 25, 2023
99f2b65
feat: Add method argument
lsetiawan Aug 25, 2023
a536d22
fix(commongrid): Fixed to include lat lon
lsetiawan Aug 29, 2023
3cdfebf
refactor: Set defaults to recommended
lsetiawan Aug 29, 2023
afa418d
feat(commongrid): Add 'range_var' argument to 'compute_MVBS'
lsetiawan Aug 29, 2023
7a861b4
fix: Add missing attributes for lat lon
lsetiawan Aug 29, 2023
41ad126
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Aug 29, 2023
53cebd4
test: Update test to use random generator
lsetiawan Aug 29, 2023
22f03d2
fix: Add case for no 'water_level'
lsetiawan Aug 29, 2023
9e2a0aa
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Aug 30, 2023
0a4dbf3
test(nasc): Remove 'compute_NASC' import to avoid failure
lsetiawan Aug 30, 2023
7c52b28
fix: Removed assumption on echo range max
lsetiawan Aug 31, 2023
828ab6d
test: Extract api test and add markings
lsetiawan Aug 31, 2023
60b025c
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Aug 31, 2023
db53a72
test: Add latlon test for 'compute_MVBS'
lsetiawan Aug 31, 2023
3f24590
test: Add small get_MVBS_along_channels test
lsetiawan Aug 31, 2023
5a963bd
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Aug 31, 2023
f3c3503
refactor: Integrate suggested changes
lsetiawan Sep 1, 2023
7d457d5
test: Added check for position values
lsetiawan Sep 1, 2023
6a33efa
test: Update range_meter_bin to strings
lsetiawan Sep 1, 2023
b64eca3
test: Added 'compute_MVBS' values test
lsetiawan Sep 2, 2023
f00c291
Update echopype/tests/utils/test_processinglevels_integration.py
emiliom Sep 2, 2023
456fb50
test: Add 'nan' sprinkles
lsetiawan Sep 8, 2023
8578432
revert: Revert the use of 'pint'
lsetiawan Sep 8, 2023
31032af
feat: Allow 'range_bin' to have space
lsetiawan Sep 8, 2023
d8dd4f8
fix: Apply suggestions from code review
lsetiawan Sep 8, 2023
5e5e19e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 8, 2023
343b31b
test: Fix test text for wrong unit
lsetiawan Sep 8, 2023
ab89fba
test: Remove the 'e.g.' part on pytest
lsetiawan Sep 8, 2023
09eb7b7
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Sep 9, 2023
527c076
revive the function to make changes easier to see
leewujung Sep 17, 2023
b6ffa59
add TODOs
leewujung Sep 17, 2023
7626357
add computation steps
leewujung Sep 17, 2023
344e997
Merge branch 'fix_mvbs' into fix-nasc
leewujung Sep 17, 2023
adafff5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 17, 2023
fe9028e
remove unused _lin2log
leewujung Sep 17, 2023
d510d25
test: Remove remnant for test_ek.py
lsetiawan Sep 20, 2023
8aa9201
refactor: Extract range_bin parsing and add close arg
lsetiawan Sep 20, 2023
73fb446
refactor: Update arg types to include interval index
lsetiawan Sep 20, 2023
744228d
test: Update tests to have brute force creation
lsetiawan Sep 20, 2023
48573fe
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 20, 2023
f1df1d6
test: Fix brute force mvbs gen
lsetiawan Sep 20, 2023
93b17b6
chore: Clean up old code for doing compute MVBS
lsetiawan Sep 20, 2023
9443c2a
chore(pytest): Added custom markers 'unit' and 'integration'
lsetiawan Sep 20, 2023
6eec56b
docs: Update docstring for `compute_MVBS`
lsetiawan Sep 20, 2023
3492b36
refactor: Merge branch 'dev' into fix_mvbs
lsetiawan Sep 20, 2023
330811a
refactor: Merge branch 'fix_mvbs' into fix_nasc
lsetiawan Sep 20, 2023
56795a5
refactor: Change 'parse_range_bin' to 'parse_x_bin'
lsetiawan Sep 21, 2023
1ca632a
refactor: Merge branch 'fix_mvbs' into fix_nasc
lsetiawan Sep 21, 2023
ca25b9b
refactor: Merge branch 'dev' into fix_nasc
lsetiawan Sep 21, 2023
935e74b
refactor: Initial unification of MVBS and NASC
lsetiawan Sep 22, 2023
49d335f
refactor: Merge branch 'dev' of https://github.com/OSOceanAcoustics/e…
lsetiawan Sep 22, 2023
2647916
fix typo when porting from notebook
leewujung Sep 24, 2023
578dccd
correct attribute units from m to nmi
leewujung Sep 24, 2023
6647a31
refactor: Add typehints and use method
lsetiawan Sep 25, 2023
e0a9b1b
feat: Add get_x_along_channels
lsetiawan Sep 25, 2023
a28be13
feat: Implement new 'compute_NASC'
lsetiawan Sep 25, 2023
4c95251
test: Renamed and moved get_x_along_channels test
lsetiawan Sep 25, 2023
7661fee
fix: Use 'ffill' and 'bfill'
lsetiawan Sep 25, 2023
8e18072
feat: Allow import 'compute_NASC' from 'commongrid' module
lsetiawan Sep 25, 2023
b50b0ca
fix: Fix bug on setup and validate and test
lsetiawan Sep 25, 2023
5b6e38c
test: Update simple NASC integration test
lsetiawan Sep 26, 2023
78b5971
test: Add brute force values test for NASC
lsetiawan Sep 26, 2023
21ed1cf
chore: Apply suggestions from code review
lsetiawan Oct 10, 2023
631c64d
refactor: Extract position reduction
lsetiawan Oct 13, 2023
7ee877b
refactor: Separate sv mean and raw computations
lsetiawan Oct 13, 2023
5063fbc
test: Remove empty test_nasc.py
lsetiawan Oct 13, 2023
501df87
docs: Update docs for functions
lsetiawan Oct 13, 2023
f7677af
refactor: Move helper funcs to utils.py
lsetiawan Oct 13, 2023
a5e9265
add L4 processing level to compute_NASC
leewujung Nov 4, 2023
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
3 changes: 2 additions & 1 deletion echopype/commongrid/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from .api import compute_MVBS, compute_MVBS_index_binning
from .api import compute_MVBS, compute_MVBS_index_binning, compute_NASC

__all__ = [
"compute_MVBS",
"compute_NASC",
"compute_MVBS_index_binning",
]
Loading