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

Add check_collection to gtda/utils/__init__.py #491

Merged
merged 2 commits into from
Sep 14, 2020
Merged

Add check_collection to gtda/utils/__init__.py #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33d45a5
Add check_collection to gtda/utils/__init__.py
ulupo Sep 14, 2020
768dfa1
Improve paths in some tests
ulupo Sep 14, 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
4 changes: 2 additions & 2 deletions doc/modules/validation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
:toctree: generated/utils
:template: function.rst

utils.check_diagrams
utils.check_point_clouds
utils.check_collection
utils.check_point_clouds
utils.check_diagrams
utils.validate_params
2 changes: 1 addition & 1 deletion gtda/time_series/tests/test_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import numpy as np
from numpy.testing import assert_almost_equal
from gtda.time_series.features import PermutationEntropy
from gtda.time_series import PermutationEntropy
from itertools import product

X = np.ones((10, 200, 3)) # 10 samples, of 200 points embedded in a 3d space
Expand Down
2 changes: 1 addition & 1 deletion gtda/time_series/tests/test_target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from numpy.testing import assert_almost_equal
import pytest

from gtda.time_series.target import Labeller
from gtda.time_series import Labeller

signal = np.asarray([np.sin(x / 2) + 2 for x in range(0, 20)])
X = np.tile(np.arange(10), reps=2)
Expand Down
16 changes: 9 additions & 7 deletions gtda/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
"""The module :mod:`gtda.utils` implements hyperparameter and input
validation functions."""
"""The module :mod:`gtda.utils` implements hyperparameter and input validation
functions."""

from .validation import check_diagrams, check_point_clouds, validate_params
from .validation import check_collection, check_point_clouds, check_diagrams, \
validate_params


__all__ = [
'check_diagrams',
'check_point_clouds',
'validate_params'
]
"check_collection",
"check_point_clouds",
"check_diagrams",
"validate_params"
]
4 changes: 2 additions & 2 deletions gtda/utils/tests/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import pytest
from sklearn.exceptions import DataDimensionalityWarning

from gtda.utils.validation import check_diagrams, validate_params, \
check_point_clouds, check_collection
from gtda.utils import check_collection, check_point_clouds, check_diagrams, \
validate_params


# Testing for validate_params
Expand Down