Feature/rename basis #490

Ddelval · 2022-10-30T00:43:42Z

Closes #488 by renaming the current basis to add "Basis" as a suffix.
Additionally, the current basis classes are marked as deprecated and implemented as subclasses of the renamed one.

codecov · 2022-10-30T00:43:57Z

Codecov Report

Base: 85.35% // Head: 85.40% // Increases project coverage by +0.04% 🎉

Coverage data is based on head (966b335) compared to base (7b51542).
Patch coverage: 97.97% of modified lines in pull request are covered.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop     #490      +/-   ##
===========================================
+ Coverage    85.35%   85.40%   +0.04%     
===========================================
  Files          139      139              
  Lines        11064    11100      +36     
===========================================
+ Hits          9444     9480      +36     
  Misses        1620     1620

Impacted Files	Coverage Δ
skfda/inference/hotelling/_hotelling.py	`91.66% <ø> (ø)`
skfda/misc/_math.py	`84.37% <ø> (ø)`
skfda/ml/regression/_linear_regression.py	`98.07% <ø> (ø)`
skfda/preprocessing/dim_reduction/_fpca.py	`90.98% <ø> (ø)`
.../feature_construction/_coefficients_transformer.py	`100.00% <ø> (ø)`
...ing/feature_construction/_evaluation_trasformer.py	`89.47% <ø> (ø)`
...eprocessing/registration/_landmark_registration.py	`87.09% <ø> (ø)`
...ocessing/registration/_lstsq_shift_registration.py	`97.97% <ø> (ø)`
skfda/preprocessing/smoothing/_basis.py	`100.00% <ø> (ø)`
skfda/representation/basis/_fdatabasis.py	`80.65% <ø> (ø)`
... and 30 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

github-actions · 2022-10-30T00:44:07Z

skfda/representation/basis/_monomial_basis.py

+        ordered_evaluated_points = evaluated_points[-2::-1]
+
+        # Build the matrix
+        return scipy.linalg.hankel(  # type: ignore[no-any-return]


🚫 [mypy] _{reported by reviewdog 🐶}
Unused "type: ignore" comment

skfda/representation/basis/_finite_element_basis.py

skfda/representation/basis/_bspline_basis.py

github-actions · 2022-10-30T00:44:07Z

tutorial/plot_basis_representation.py

@@ -278,7 +278,7 @@
 ##############################################################################
 # Here we show the first five elements of a Fourier basis.

-basis = skfda.representation.basis.Fourier(n_basis=5)
+basis = skfda.representation.basis.FourierBasis(n_basis=5)


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "FourierBasis", variable has type "MonomialBasis")

github-actions · 2022-10-30T00:44:08Z

tutorial/plot_basis_representation.py

@@ -314,7 +314,7 @@
 ##############################################################################
 # Here we show the first five elements of a B-spline basis.

-basis = skfda.representation.basis.BSpline(n_basis=5)
+basis = skfda.representation.basis.BSplineBasis(n_basis=5)


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "BSplineBasis", variable has type "MonomialBasis")

github-actions · 2022-10-30T00:44:08Z

tutorial/plot_basis_representation.py

@@ -365,12 +365,12 @@

 fd = skfda.FDataGrid(X)

-basis = skfda.representation.basis.Tensor([
-    skfda.representation.basis.Fourier(  # X axis
+basis = skfda.representation.basis.TensorBasis([


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "TensorBasis", variable has type "MonomialBasis")

github-actions · 2022-10-30T00:44:08Z

tutorial/plot_basis_representation.py

@@ -435,7 +435,7 @@
 ##############################################################################
 # We now represent the digits dataset in this basis.

-basis = skfda.representation.basis.FiniteElement(
+basis = skfda.representation.basis.FiniteElementBasis(


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "FiniteElementBasis", variable has type "MonomialBasis")

github-actions · 2022-10-30T00:44:08Z

tutorial/plot_basis_representation.py

@@ -475,12 +475,12 @@
 # are now expressed in a Fourier basis, while we express precipitations as
 # B-splines.

-basis = skfda.representation.basis.VectorValued([
-    skfda.representation.basis.Fourier(  # First coordinate function
+basis = skfda.representation.basis.VectorValuedBasis([


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "VectorValuedBasis", variable has type "MonomialBasis")

examples/plot_extrapolation.py

examples/plot_fpca.py

github-actions · 2022-10-30T00:45:17Z

examples/plot_oneway.py

@@ -14,7 +14,7 @@
 import skfda
 from skfda.inference.anova import oneway_anova
 from skfda.representation import FDataGrid, FDataBasis
-from skfda.representation.basis import Fourier
+from skfda.representation.basis import FourierBasis


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

skfda/tests/test_basis.py

skfda/tests/test_neighbors.py

examples/plot_extrapolation.py

vnmabus · 2022-10-31T09:02:57Z

skfda/representation/basis/_bspline.py

@@ -1,19 +1,13 @@
 from __future__ import annotations


I think that it is better that the renamed classes live in the same module as the older ones.

Yes, I tried that at first, but I had some issues with Sphinx when trying to generate the documentation. When I moved the old classes into their own files, it worked, but it seems that those issues were caused by a mistake I fixed without noticing. It does seem to generate the documentation correctly with the old classes in the same files now.

github-actions · 2022-11-14T23:04:43Z

tutorial/plot_basis_representation.py

@@ -278,7 +278,7 @@
 ##############################################################################
 # Here we show the first five elements of a Fourier basis.

-basis = skfda.representation.basis.Fourier(n_basis=5)
+basis = skfda.representation.basis.FourierBasis(n_basis=5)


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "FourierBasis", variable has type "MonomialBasis") [assignment]

github-actions · 2022-11-14T23:04:43Z

tutorial/plot_basis_representation.py

@@ -314,7 +314,7 @@
 ##############################################################################
 # Here we show the first five elements of a B-spline basis.

-basis = skfda.representation.basis.BSpline(n_basis=5)
+basis = skfda.representation.basis.BSplineBasis(n_basis=5)


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "BSplineBasis", variable has type "MonomialBasis") [assignment]

github-actions · 2022-11-14T23:04:44Z

tutorial/plot_basis_representation.py

@@ -365,12 +365,12 @@

 fd = skfda.FDataGrid(X)

-basis = skfda.representation.basis.Tensor([
-    skfda.representation.basis.Fourier(  # X axis
+basis = skfda.representation.basis.TensorBasis([


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "TensorBasis", variable has type "MonomialBasis") [assignment]

github-actions · 2022-11-14T23:04:44Z

tutorial/plot_basis_representation.py

@@ -435,7 +435,7 @@
 ##############################################################################
 # We now represent the digits dataset in this basis.

-basis = skfda.representation.basis.FiniteElement(
+basis = skfda.representation.basis.FiniteElementBasis(


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "FiniteElementBasis", variable has type "MonomialBasis") [assignment]

github-actions · 2022-11-14T23:04:44Z

tutorial/plot_basis_representation.py

@@ -475,12 +475,12 @@
 # are now expressed in a Fourier basis, while we express precipitations as
 # B-splines.

-basis = skfda.representation.basis.VectorValued([
-    skfda.representation.basis.Fourier(  # First coordinate function
+basis = skfda.representation.basis.VectorValuedBasis([


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible types in assignment (expression has type "VectorValuedBasis", variable has type "MonomialBasis") [assignment]

github-actions · 2022-11-14T23:05:29Z

examples/plot_oneway.py

 # **References:**
 #
-#  [1] Antonio Cuevas, Manuel Febrero-Bande, and Ricardo Fraiman. "An anova test
-#  for functional data". *Computational Statistics  Data Analysis*,
+#  [1] Antonio Cuevas, Manuel Febrero-Bande, and Ricardo Fraiman. "An anova 


[pep8] _{reported by reviewdog 🐶}
W291 trailing whitespace

github-actions · 2022-11-14T23:05:29Z

skfda/representation/basis/_finite_element_basis.py

+
+
+class FiniteElement(FiniteElementBasis):
+    """Finite element basis.


[pep8] _{reported by reviewdog 🐶}
D208 Docstring is over-indented

skfda/representation/basis/_bspline_basis.py

skfda/representation/basis/_tensor_basis.py

skfda/representation/basis/_vector_basis.py

skfda/representation/basis/_fdatabasis.py

Ddelval added 3 commits October 30, 2022 00:30

Batch renaming

edcf3d1

Fix some style issues

1f2d9ea

Add old deprecated classes

3712aa5

Ddelval linked an issue Oct 30, 2022 that may be closed by this pull request

Rename basis to add Basis suffix #488

Closed

github-actions bot reviewed Oct 30, 2022

View reviewed changes

Merge branch 'develop' into feature/renameBasis

de0c44a

vnmabus requested changes Nov 3, 2022

View reviewed changes

Ddelval added 3 commits November 14, 2022 23:38

Move old classes to the same files as the new ones

4908218

Merge remote-tracking branch 'origin/develop' into feature/renameBasis

c57241e

Style fixes in modified files

8d5d302

github-actions bot reviewed Nov 14, 2022

View reviewed changes

Reformat basis files consistently

77261f6

github-actions bot reviewed Nov 14, 2022

View reviewed changes

Ddelval added 2 commits November 15, 2022 00:19

Fix more syntax issues in basis

bf10101

One more line too long

7371e4e

github-actions bot reviewed Nov 14, 2022

View reviewed changes

skfda/representation/basis/_fdatabasis.py Outdated Show resolved Hide resolved

Ddelval added 3 commits November 15, 2022 00:30

Fix style in file that causes flake8 to fail

2b1af63

Remove tailing whitespace

550bcee

Fix another whitespace

6eaa6b2

vnmabus approved these changes Nov 15, 2022

View reviewed changes

Merge branch 'develop' into feature/renameBasis

966b335

vnmabus merged commit aee15f4 into develop Nov 15, 2022

vnmabus deleted the feature/renameBasis branch August 17, 2023 10:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/rename basis #490

Feature/rename basis #490

Ddelval commented Oct 30, 2022

codecov bot commented Oct 30, 2022 •

edited

Loading

github-actions bot Oct 30, 2022

github-actions bot Oct 30, 2022

github-actions bot Oct 30, 2022

github-actions bot Oct 30, 2022

github-actions bot Oct 30, 2022

github-actions bot Oct 30, 2022

github-actions bot Oct 30, 2022

vnmabus Oct 31, 2022

Ddelval Nov 14, 2022

github-actions bot Nov 14, 2022

github-actions bot Nov 14, 2022

github-actions bot Nov 14, 2022

github-actions bot Nov 14, 2022

github-actions bot Nov 14, 2022

github-actions bot Nov 14, 2022

github-actions bot Nov 14, 2022



		class FiniteElement(FiniteElementBasis):
		"""Finite element basis.

Feature/rename basis #490

Feature/rename basis #490

Conversation

Ddelval commented Oct 30, 2022

codecov bot commented Oct 30, 2022 • edited Loading

Codecov Report

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

github-actions bot Oct 30, 2022

Choose a reason for hiding this comment

vnmabus Oct 31, 2022

Choose a reason for hiding this comment

Ddelval Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

github-actions bot Nov 14, 2022

Choose a reason for hiding this comment

codecov bot commented Oct 30, 2022 •

edited

Loading