Skip to content

Commit

Permalink
Update Notebooks (#184)
Browse files Browse the repository at this point in the history
* add transect.zip

* add line notebook progress

* add saving to csv and reading from csv into lines functionality notebook

* modify doc _toc.yaml for existing and to be placed jb notebooks

* add further description

* Merge Main to Feature (#188)

* docs: README and docs/index revision (#185)

* separate out the goal and specific current dev for Echoview

* small wording changes

* Import Transect Checking from Hake-Labels (#162)

* import transect checking from hake-labels, reduce strictness

* add small bbox distance threshold test

* simplify logic and fix bt et test

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add wu jung's review suggestions

* incorporate suggestion 5 second part

* add wujungs suggestions

* Merge main to feature branch (#168)

* [pre-commit.ci] pre-commit autoupdate (#161)

updates:
- [github.com/PyCQA/isort: 5.12.0 → 5.13.1](PyCQA/isort@5.12.0...5.13.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#165)

updates:
- [github.com/psf/black: 23.11.0 → 23.12.0](psf/black@23.11.0...23.12.0)
- [github.com/PyCQA/isort: 5.13.1 → 5.13.2](PyCQA/isort@5.13.1...5.13.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Bump actions/download-artifact from 3 to 4 (#164)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/upload-artifact from 3 to 4 (#163)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#167)

updates:
- [github.com/psf/black: 23.12.0 → 23.12.1](psf/black@23.12.0...23.12.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Disentangle Nested If Else in Select Region and Add Region Class Selections (#160)

* Disentangle nested if-else under Regions2D.select_region

* update regions2d functions for region_id docstring and typehints

* add region class

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* add wu jung's suggestions

* add test for both non NaN region id and region class

* small tweak of select_region docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>

* fix idx min idx man logic

* fix comment

* Update .pre-commit-config.yaml

* attempt to resolve conflict

* test small whitespace change

* revert change

* add period

* remove period

* add space

* revert change

* move _check_transect_sequences outside

* incorporate wu jungs bbox distance threshold comment

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* set inequality in Lines.mask (#187)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* revise trawl for transect evr

* use mask label region ids to separate the region ids passed in to the mask labels used in masking

* add notebook update docs so far

* add line for testing close regions

* allow kwaargs in to_csv

* add notebooks

* fix _toc yaml

* Merge Main to Feature (#189)

* docs: README and docs/index revision (#185)

* separate out the goal and specific current dev for Echoview

* small wording changes

* Import Transect Checking from Hake-Labels (#162)

* import transect checking from hake-labels, reduce strictness

* add small bbox distance threshold test

* simplify logic and fix bt et test

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add wu jung's review suggestions

* incorporate suggestion 5 second part

* add wujungs suggestions

* Merge main to feature branch (#168)

* [pre-commit.ci] pre-commit autoupdate (#161)

updates:
- [github.com/PyCQA/isort: 5.12.0 → 5.13.1](PyCQA/isort@5.12.0...5.13.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#165)

updates:
- [github.com/psf/black: 23.11.0 → 23.12.0](psf/black@23.11.0...23.12.0)
- [github.com/PyCQA/isort: 5.13.1 → 5.13.2](PyCQA/isort@5.13.1...5.13.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Bump actions/download-artifact from 3 to 4 (#164)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/upload-artifact from 3 to 4 (#163)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#167)

updates:
- [github.com/psf/black: 23.12.0 → 23.12.1](psf/black@23.12.0...23.12.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Disentangle Nested If Else in Select Region and Add Region Class Selections (#160)

* Disentangle nested if-else under Regions2D.select_region

* update regions2d functions for region_id docstring and typehints

* add region class

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* add wu jung's suggestions

* add test for both non NaN region id and region class

* small tweak of select_region docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>

* fix idx min idx man logic

* fix comment

* Update .pre-commit-config.yaml

* attempt to resolve conflict

* test small whitespace change

* revert change

* add period

* remove period

* add space

* revert change

* move _check_transect_sequences outside

* incorporate wu jungs bbox distance threshold comment

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* set inequality in Lines.mask (#187)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Merge Main to Feature retry 1 (#190)

* docs: README and docs/index revision (#185)

* separate out the goal and specific current dev for Echoview

* small wording changes

* Import Transect Checking from Hake-Labels (#162)

* import transect checking from hake-labels, reduce strictness

* add small bbox distance threshold test

* simplify logic and fix bt et test

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add wu jung's review suggestions

* incorporate suggestion 5 second part

* add wujungs suggestions

* Merge main to feature branch (#168)

* [pre-commit.ci] pre-commit autoupdate (#161)

updates:
- [github.com/PyCQA/isort: 5.12.0 → 5.13.1](PyCQA/isort@5.12.0...5.13.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#165)

updates:
- [github.com/psf/black: 23.11.0 → 23.12.0](psf/black@23.11.0...23.12.0)
- [github.com/PyCQA/isort: 5.13.1 → 5.13.2](PyCQA/isort@5.13.1...5.13.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Bump actions/download-artifact from 3 to 4 (#164)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/upload-artifact from 3 to 4 (#163)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#167)

updates:
- [github.com/psf/black: 23.12.0 → 23.12.1](psf/black@23.12.0...23.12.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Disentangle Nested If Else in Select Region and Add Region Class Selections (#160)

* Disentangle nested if-else under Regions2D.select_region

* update regions2d functions for region_id docstring and typehints

* add region class

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* Update echoregions/regions2d/regions2d.py

Co-authored-by: Wu-Jung Lee <[email protected]>

* add wu jung's suggestions

* add test for both non NaN region id and region class

* small tweak of select_region docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>

* fix idx min idx man logic

* fix comment

* Update .pre-commit-config.yaml

* attempt to resolve conflict

* test small whitespace change

* revert change

* add period

* remove period

* add space

* revert change

* move _check_transect_sequences outside

* incorporate wu jungs bbox distance threshold comment

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* set inequality in Lines.mask (#187)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor region id selection and mask label construction in r2d.mask

* add test for checking when mask labels keys and region ids are not matching

* incorporate valentinas suggestions

* revise 3d and 2d wording

* incorporate valentinas 2nd round review comments

* revise echogram data reading and plotting

* Echoregion's to Echoregions'

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Wu-Jung Lee <[email protected]>
Co-authored-by: ctuguinay <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
5 people authored Apr 9, 2024
1 parent d8df516 commit fd83787
Show file tree
Hide file tree
Showing 18 changed files with 4,324 additions and 7,007 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

![example workflow](https://github.com/OSOceanAcoustics/echoregions/actions/workflows/pytest.yml/badge.svg)

Echoregions is a tool that interfaces annotations of water column sonar data with Machine Learning (ML) models.
Echoregions is a Python Package that interfaces with annotations of water column sonar data for training machine learning models or doing other downstream processing such as biomass estimation.

The annotations are typically regions indicating the presence of specific animal species or lines delineating ocean boundaries, such as the seafloor or sea surface, in the "echogram" (sonar images formed by echo returns). The interfacing functionalities operate in two directions:
- Annotation to ML: Parsing and organizing manual annotations for preparing training and test datasets for ML developments
- Annotation to ML: Parsing and organizing annotations for preparing training and test datasets for ML developments
- ML to annotation: Generating annotations from ML predictions that can be used for further downstream processing

At present, functionalities in the Annotation to ML direction have been built for interfacing the Echoview software that is widely used in the fisheries acoustics community. We plan to add functionalities in the ML to Annotation direction in the near future.
At present, functionalities in the Annotation to ML direction have been built for interfacing the [Echoview](https://echoview.com/products-and-services/echoview/) software that is widely used in the fisheries acoustics community. We plan to add functionalities in the ML to Annotation direction in the near future.

## Functionalities

Expand Down
2 changes: 2 additions & 0 deletions docs/source/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
transect.*
.*csv
1,858 changes: 1,858 additions & 0 deletions docs/source/Lines_functionality.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit fd83787

Please sign in to comment.