Smoothing in several dimensions #436

ElenaPetrunina · 2022-03-28T15:25:31Z

Close #132

github-actions · 2022-03-28T15:28:57Z

skfda/misc/hat_matrix.py

            inner_product_matrix = X_train.basis.inner_product_matrix()

            # Calculate new coefficients taking into account cross-products
            # if the basis is orthonormal, C would not change
            C = C @ inner_product_matrix  # noqa: WPS350
+


[pep8] _{reported by reviewdog 🐶}
W293 blank line contains whitespace

github-actions · 2022-03-28T15:28:57Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

@@ -9,9 +9,10 @@

 import numpy as np

-from ..._utils._utils import _to_grid_points
+from ..._utils._utils import _to_grid_points, _cartesian_product


[pep8] _{reported by reviewdog 🐶}
I001 isort found an import in the wrong position

github-actions · 2022-03-28T15:28:57Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

 from ...misc.hat_matrix import HatMatrix, NadarayaWatsonHatMatrix
-from ...representation._typing import GridPointsLike, NDArrayFloat
+from ...misc.metrics import PairwiseMetric, l2_distance, Metric


[pep8] _{reported by reviewdog 🐶}
I001 isort found an import in the wrong position

github-actions · 2022-03-28T15:28:57Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

 from ...misc.hat_matrix import HatMatrix, NadarayaWatsonHatMatrix
-from ...representation._typing import GridPointsLike, NDArrayFloat
+from ...misc.metrics import PairwiseMetric, l2_distance, Metric
+from ...representation._typing import GridPointsLike, NDArrayFloat, Vector


[pep8] _{reported by reviewdog 🐶}
I005 isort found an unexpected missing import

github-actions · 2022-03-28T15:28:58Z

skfda/preprocessing/smoothing/_linear.py

+
+        hat_matrix = np.reshape(
+            self.hat_matrix_,
+            (*dims,)


[pep8] _{reported by reviewdog 🐶}
WPS356 Found an unnecessary iterable unpacking

github-actions · 2022-03-28T15:28:58Z

skfda/preprocessing/smoothing/_linear.py

+
+        hat_matrix = np.reshape(
+            self.hat_matrix_,
+            (*dims,)


[pep8] _{reported by reviewdog 🐶}
C812 missing trailing comma

skfda/misc/hat_matrix.py

….com/GAA-UAM/scikit-fda into feature/several_dim_kernel_smoothing

codecov · 2022-03-30T11:12:48Z

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (cc486a3) 86.08% compared to head (e6ce505) 86.03%.
Report is 1 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop     #436      +/-   ##
===========================================
- Coverage    86.08%   86.03%   -0.05%     
===========================================
  Files          148      148              
  Lines        11694    11719      +25     
===========================================
+ Hits         10067    10083      +16     
- Misses        1627     1636       +9

Files	Coverage Δ
skfda/exploratory/stats/_stats.py	`85.00% <100.00%> (-1.37%)`	⬇️
skfda/preprocessing/smoothing/_kernel_smoothers.py	`95.83% <100.00%> (+0.59%)`	⬆️
skfda/preprocessing/smoothing/_linear.py	`95.12% <100.00%> (+0.52%)`	⬆️
skfda/tests/test_metrics.py	`97.87% <100.00%> (ø)`
skfda/tests/test_smoothing.py	`100.00% <100.00%> (ø)`
skfda/misc/hat_matrix.py	`86.36% <77.77%> (-2.86%)`	⬇️
skfda/misc/metrics/_lp_norms.py	`77.35% <54.54%> (-8.65%)`	⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2023-08-17T10:01:38Z

skfda/misc/hat_matrix.py

@@ -186,7 +186,7 @@ def _hat_matrix_function_not_normalized(
    ) -> NDArrayFloat:

        bandwidth = (
-            np.percentile(np.abs(delta_x), 15)
+            np.percentile(delta_x, 15)


[pep8] _{reported by reviewdog 🐶}
WPS432 Found magic number: 15

github-actions · 2023-08-17T10:01:39Z

skfda/misc/hat_matrix.py

@@ -311,10 +311,26 @@ def __call__(  # noqa: D102
    ) -> NDArrayFloat | FData:

        bandwidth = (
-            np.percentile(np.abs(delta_x), 15)
+            np.percentile(delta_x, 15)


[pep8] _{reported by reviewdog 🐶}
WPS432 Found magic number: 15

github-actions · 2023-08-17T10:01:39Z

skfda/misc/hat_matrix.py

            if self.bandwidth is None
            else self.bandwidth
        )
+


[pep8] _{reported by reviewdog 🐶}
W293 blank line contains whitespace

github-actions · 2023-08-17T10:01:39Z

skfda/misc/hat_matrix.py

@@ -325,45 +341,42 @@ def __call__(  # noqa: D102
                and isinstance(X, FDataBasis)
            ):
                raise ValueError("Only FDataBasis is supported for now.")
+


[pep8] _{reported by reviewdog 🐶}
W293 blank line contains whitespace

github-actions

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

mypy

github-actions · 2023-08-17T10:01:56Z

skfda/preprocessing/smoothing/_linear.py

+        )
+
+        data_matrix = np.einsum(
+            hat_matrix,


🚫 [mypy] _{reported by reviewdog 🐶}
Argument 1 to "einsum" has incompatible type "ndarray[Any, dtype[floating[Any]]]"; expected "str | SupportsArray[dtype[bool | integer[Any]]] | _NestedSequence[SupportsArray[dtype[bool | integer[Any]]]] | bool | int | _NestedSequence[bool | int]" [arg-type]

github-actions · 2023-08-17T10:01:56Z

skfda/preprocessing/smoothing/_linear.py

+        data_matrix = np.einsum(
+            hat_matrix,
+            [Ellipsis, *range(1, len(self.output_points_) + 1)],
+            X.data_matrix,


🚫 [mypy] _{reported by reviewdog 🐶}
Argument 3 to "einsum" has incompatible type "ndarray[Any, dtype[floating[Any]]]"; expected "SupportsArray[dtype[bool]] | _NestedSequence[SupportsArray[dtype[bool]]] | bool | _NestedSequence[bool]" [arg-type]

github-actions · 2023-08-17T10:01:56Z

skfda/preprocessing/smoothing/_linear.py

+            [Ellipsis, *range(1, len(self.output_points_) + 1)],
+            X.data_matrix,
+            [0, *range(1, len(self.output_points_) + 2)],
+            [0, Ellipsis, len(self.output_points_) + 1],


🚫 [mypy] _{reported by reviewdog 🐶}
Argument 5 to "einsum" has incompatible type "list[object]"; expected "SupportsArray[dtype[bool]] | _NestedSequence[SupportsArray[dtype[bool]]] | bool | _NestedSequence[bool]" [arg-type]

skfda/misc/hat_matrix.py

github-actions · 2023-08-17T11:17:07Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

@@ -114,10 +116,12 @@
        *,
        weights: Optional[NDArrayFloat] = None,
        output_points: Optional[GridPointsLike] = None,
+        metric: Metric[Vector] = l2_distance,


📝 [mypy] _{reported by reviewdog 🐶}
Expected:

github-actions · 2023-08-17T11:17:07Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

@@ -114,10 +116,12 @@
        *,
        weights: Optional[NDArrayFloat] = None,
        output_points: Optional[GridPointsLike] = None,
+        metric: Metric[Vector] = l2_distance,


📝 [mypy] _{reported by reviewdog 🐶}
def call(self, Vector, Vector, /) -> ndarray[Any, dtype[floating[Any]]]

github-actions · 2023-08-17T11:17:07Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

@@ -114,10 +116,12 @@
        *,
        weights: Optional[NDArrayFloat] = None,
        output_points: Optional[GridPointsLike] = None,
+        metric: Metric[Vector] = l2_distance,


📝 [mypy] _{reported by reviewdog 🐶}
Got:

github-actions · 2023-08-17T11:17:07Z

skfda/preprocessing/smoothing/_kernel_smoothers.py

@@ -114,10 +116,12 @@
        *,
        weights: Optional[NDArrayFloat] = None,
        output_points: Optional[GridPointsLike] = None,
+        metric: Metric[Vector] = l2_distance,


📝 [mypy] _{reported by reviewdog 🐶}
def [T in (ndarray[Any, dtype[floating[Any]]], FData)] call(self, elem1: T, elem2: T) -> ndarray[Any, dtype[floating[Any]]]

skfda/preprocessing/smoothing/_kernel_smoothers.py

github-actions · 2023-10-10T10:47:27Z

skfda/tests/test_smoothing.py

+        fd = skfda.FDataGrid(X)
+
+        ks = KernelSmoother(
+            kernel_estimator=KNeighborsHatMatrix(n_neighbors=1))


[pep8] _{reported by reviewdog 🐶}
WPS319 Found bracket in wrong position

github-actions · 2023-10-10T10:47:27Z

skfda/tests/test_smoothing.py

+        np.testing.assert_allclose(fd_trans.data_matrix, fd.data_matrix)
+
+        ks = KernelSmoother(
+            kernel_estimator=KNeighborsHatMatrix(n_neighbors=3))


[pep8] _{reported by reviewdog 🐶}
WPS319 Found bracket in wrong position

ElenaPetrunina and others added 2 commits March 28, 2022 17:24

Smoothing in several dimensions

4f4f332

Close #132

Merge branch 'develop' into feature/several_dim_kernel_smoothing

4fa88d5

github-actions bot reviewed Mar 28, 2022

View reviewed changes

skfda/misc/hat_matrix.py Show resolved Hide resolved

skfda/misc/hat_matrix.py Show resolved Hide resolved

skfda/misc/hat_matrix.py Show resolved Hide resolved

skfda/misc/hat_matrix.py Show resolved Hide resolved

skfda/misc/hat_matrix.py Show resolved Hide resolved

ElenaPetrunina and others added 5 commits March 28, 2022 17:40

Fix code style

a80f779

Merge branch 'feature/several_dim_kernel_smoothing' of https://github…

bd515b0

….com/GAA-UAM/scikit-fda into feature/several_dim_kernel_smoothing

Merge branch 'develop' into feature/several_dim_kernel_smoothing

f7e509b

Update hat_matrix.py

1a58019

Merge branch 'feature/several_dim_kernel_smoothing' of https://github…

8ee380f

….com/GAA-UAM/scikit-fda into feature/several_dim_kernel_smoothing

ElenaPetrunina marked this pull request as draft March 30, 2022 14:22

Merge branch 'develop' into feature/several_dim_kernel_smoothing

cfd35a8

github-actions bot reviewed Aug 17, 2023

View reviewed changes

Fix tests.

ab396f6

github-actions bot reviewed Aug 17, 2023

View reviewed changes

vnmabus added 4 commits August 17, 2023 16:37

Fix Mypy errors.

ae810e8

Merge branch 'develop' into feature/several_dim_kernel_smoothing

f279fea

Fix Mypy errors in hat matrix.

2f43c91

Add test.

e6ce505

github-actions bot reviewed Oct 10, 2023

View reviewed changes

vnmabus marked this pull request as ready for review October 10, 2023 11:00

vnmabus merged commit fac57c8 into develop Oct 10, 2023
14 of 17 checks passed

vnmabus deleted the feature/several_dim_kernel_smoothing branch October 10, 2023 11:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Smoothing in several dimensions #436

Smoothing in several dimensions #436

ElenaPetrunina commented Mar 28, 2022

github-actions bot Mar 28, 2022

github-actions bot Mar 28, 2022

github-actions bot Mar 28, 2022

github-actions bot Mar 28, 2022

github-actions bot Mar 28, 2022

github-actions bot Mar 28, 2022

codecov bot commented Mar 30, 2022 •

edited

Loading

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot left a comment

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Aug 17, 2023

github-actions bot Oct 10, 2023

github-actions bot Oct 10, 2023

Smoothing in several dimensions #436

Smoothing in several dimensions #436

Conversation

ElenaPetrunina commented Mar 28, 2022

github-actions bot Mar 28, 2022

Choose a reason for hiding this comment

github-actions bot Mar 28, 2022

Choose a reason for hiding this comment

github-actions bot Mar 28, 2022

Choose a reason for hiding this comment

github-actions bot Mar 28, 2022

Choose a reason for hiding this comment

github-actions bot Mar 28, 2022

Choose a reason for hiding this comment

github-actions bot Mar 28, 2022

Choose a reason for hiding this comment

codecov bot commented Mar 30, 2022 • edited Loading

Codecov Report

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Aug 17, 2023

Choose a reason for hiding this comment

github-actions bot Oct 10, 2023

Choose a reason for hiding this comment

github-actions bot Oct 10, 2023

Choose a reason for hiding this comment

codecov bot commented Mar 30, 2022 •

edited

Loading