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.

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

Add DensityFiltration #473

Merged
merged 34 commits into from
Oct 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
dfdad0f
Add below option for Filter
gtauzin Mar 23, 2020
7e7e8ab
Revert "Add below option for Filter"
gtauzin Mar 23, 2020
48fe0ea
Add DensityFiltration
gtauzin Mar 23, 2020
ee46506
Add tests for DensityFiltration
gtauzin Mar 23, 2020
a3bfc72
Merge with upstream
gtauzin Aug 30, 2020
e2057cf
Add DensityFiltration to the doc
gtauzin Aug 30, 2020
0df98e5
Fix docstrings
gtauzin Sep 13, 2020
80f1ffa
Remove effective_metric_params in radial
gtauzin Sep 13, 2020
9c72649
Merge branch 'master' of github.com:giotto-ai/giotto-tda into density
gtauzin Sep 14, 2020
aa499a0
Apply @ulupo's suggestions on list ranges
gtauzin Sep 14, 2020
83210d8
Merge branch 'density' of github.com:gtauzin/giotto-tda into density
gtauzin Sep 15, 2020
9dd4fa5
Remove leftover code
gtauzin Sep 15, 2020
5c9ea23
Merge branch 'master' into density
ulupo Sep 19, 2020
d1faa01
Turn warning into ValueError
gtauzin Sep 20, 2020
5937e64
Replace warnings by ValueErrors
gtauzin Sep 20, 2020
8839b5d
Improve transformer definition
gtauzin Sep 20, 2020
8422a90
Fix tests
gtauzin Sep 20, 2020
372b5b3
Merge branch 'master' into density
ulupo Sep 22, 2020
a67c47e
Fix errors
ulupo Sep 22, 2020
58c966d
Small wording/linting changes
ulupo Sep 22, 2020
f5002b0
Fix doc and mask size
gtauzin Sep 27, 2020
6526bcf
Remove Error if dim is 1
gtauzin Sep 29, 2020
7557715
Fix linting
ulupo Sep 30, 2020
4c2ff30
Remove unnecessary _is_fitted from ImageToPointCloud
ulupo Sep 30, 2020
d94d057
Fix typo
ulupo Sep 30, 2020
87c4ef0
Improve See alsos in images/filtrations.py
ulupo Sep 30, 2020
bbf3a45
Simplify code
ulupo Sep 30, 2020
716f246
Revert "Simplify code"
ulupo Sep 30, 2020
2e72d01
Simplify code
ulupo Sep 30, 2020
359bb61
Fix typo
ulupo Sep 30, 2020
49344d0
Add tests for bad input shapes in image subpackage
ulupo Sep 30, 2020
44126c0
Add inline comments
gtauzin Oct 3, 2020
2b72331
Revert update of pybind11
gtauzin Oct 3, 2020
f5cd329
Fix typo
gtauzin Oct 3, 2020
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
1 change: 1 addition & 0 deletions doc/modules/images.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ Filtrations
images.DilationFiltration
images.ErosionFiltration
images.SignedDistanceFiltration
images.DensityFiltration
4 changes: 2 additions & 2 deletions gtda/homology/cubical.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CubicalPersistence(BaseEstimator, TransformerMixin, PlotterMixin):

periodic_dimensions : boolean ndarray of shape (n_dimensions,) or None, \
optional, default: ``None``
Periodicity of the boundaries along each of the axis, where
Periodicity of the boundaries along each of the axes, where
``n_dimensions`` is the dimension of the images of the collection. The
boolean in the `d`th position expresses whether the boundaries along
the `d`th axis are periodic. The default ``None`` is equivalent to
Expand All @@ -69,7 +69,7 @@ class CubicalPersistence(BaseEstimator, TransformerMixin, PlotterMixin):
Attributes
----------
periodic_dimensions_ : boolean ndarray of shape (n_dimensions,)
Effective periodicity of the boundaries along each of the axis. Set in
Effective periodicity of the boundaries along each of the axes. Set in
:meth:`fit`.

infinity_values_ : float
Expand Down
4 changes: 3 additions & 1 deletion gtda/images/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

from .preprocessing import Binarizer, Inverter, Padder, ImageToPointCloud
from .filtrations import HeightFiltration, RadialFiltration, \
DilationFiltration, ErosionFiltration, SignedDistanceFiltration
DilationFiltration, ErosionFiltration, SignedDistanceFiltration, \
DensityFiltration

__all__ = [
'Binarizer',
Expand All @@ -17,4 +18,5 @@
'DilationFiltration',
'ErosionFiltration',
'SignedDistanceFiltration',
'DensityFiltration'
]
Loading