Feature/concurrent regression #531

rafa9811 · 2023-03-31T14:48:27Z

Functional response with multivariate and concurrent covariates. Some fixes in linear regression with scalar response. Tests and examples.

…ray coefficient modified. Intercept concatenated in argcheck. Q dim check.

github-actions · 2023-03-31T14:48:55Z

skfda/ml/regression/_linear_regression.py

-            penalty_matrix=penalty_matrix,
-        )
+            inner_products_list = [
+                c.regression_matrix(x, y)  # type: ignore[arg-type]


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

github-actions · 2023-03-31T14:48:55Z

skfda/ml/regression/_linear_regression.py

+        return nquad_vec(
+            integrand,
+            domain_range,
+        )  # type: ignore[no-any-return]


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

github-actions · 2023-03-31T14:49:18Z

skfda/ml/regression/_linear_regression.py

@@ -56,13 +57,17 @@ class LinearRegression(
        NDArrayFloat,
    ],
 ):
-    r"""Linear regression with multivariate response.
+    r"""Linear regression with multivariate and functional response.


[pep8] _{reported by reviewdog 🐶}
D204 1 blank line required after class docstring

skfda/ml/regression/_linear_regression.py

codecov · 2023-03-31T14:57:38Z

Codecov Report

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

Comparison is base (fe6a369) 86.17% compared to head (a020784) 86.27%.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop     #531      +/-   ##
===========================================
+ Coverage    86.17%   86.27%   +0.09%     
===========================================
  Files          149      149              
  Lines        11764    11912     +148     
===========================================
+ Hits         10138    10277     +139     
- Misses        1626     1635       +9

Files	Coverage Δ
skfda/ml/regression/_coefficients.py	`90.38% <100.00%> (-1.62%)`	⬇️
skfda/tests/test_regression.py	`99.67% <100.00%> (+0.07%)`	⬆️
skfda/ml/regression/_linear_regression.py	`96.70% <95.41%> (-1.38%)`	⬇️
skfda/misc/_math.py	`81.29% <53.84%> (-3.21%)`	⬇️

... and 2 files with indirect coverage changes

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

skfda/ml/regression/_linear_regression.py

github-actions · 2023-06-13T00:49:52Z

skfda/tests/test_regression.py

-        """Test that the number of response samples and explanatory samples
-        are not different """
+    def test_error_y_X_samples_different(self) -> None:  # noqa: N802
+        """Number of response samples and explanatory samples are not different.


[pep8] _{reported by reviewdog 🐶}
E501 line too long (80 > 79 characters)

github-actions · 2023-06-13T00:49:52Z

skfda/tests/test_regression.py

+        np.testing.assert_equal(y_basis, pred[1].basis)
+
+    def test_error_y_X_samples_different(self) -> None:  # noqa: N802
+        """Number of response samples and explanatory samples are not different.


[pep8] _{reported by reviewdog 🐶}
E501 line too long (80 > 79 characters)

…-UAM/scikit-fda into feature/concurrentRegression

github-actions · 2023-06-21T16:47:02Z

skfda/ml/regression/_coefficients.py

@@ -157,8 +157,12 @@ def coefficient_info_from_covariate(
 def _coefficient_info_from_covariate_ndarray(  # type: ignore[misc]
    X: NDArrayFloat,
    y: NDArrayFloat,
+    basis: Basis = None,


🚫 [mypy] _{reported by reviewdog 🐶}
Incompatible default for argument "basis" (default has type "None", argument has type "Basis") [assignment]

github-actions · 2023-06-21T16:47:03Z

skfda/ml/regression/_coefficients.py

@@ -157,8 +157,12 @@ def coefficient_info_from_covariate(
 def _coefficient_info_from_covariate_ndarray(  # type: ignore[misc]
    X: NDArrayFloat,
    y: NDArrayFloat,
+    basis: Basis = None,


📝 [mypy] _{reported by reviewdog 🐶}
PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True

github-actions · 2023-06-21T16:47:03Z

skfda/ml/regression/_coefficients.py

@@ -157,8 +157,12 @@ def coefficient_info_from_covariate(
 def _coefficient_info_from_covariate_ndarray(  # type: ignore[misc]
    X: NDArrayFloat,
    y: NDArrayFloat,
+    basis: Basis = None,


📝 [mypy] _{reported by reviewdog 🐶}
Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase

github-actions · 2023-06-21T16:47:03Z

skfda/ml/regression/_linear_regression.py

+
+            Xt = self._make_transpose(X_new)
+
+            for i, basis_i in enumerate(self.coef_basis):


🚫 [mypy] _{reported by reviewdog 🐶}
Argument 1 to "enumerate" has incompatible type "Sequence[Basis | None] | None"; expected "Iterable[Basis | None]" [arg-type]

github-actions · 2023-06-21T16:47:03Z

skfda/ml/regression/_linear_regression.py

+            Xt = self._make_transpose(X_new)
+
+            for i, basis_i in enumerate(self.coef_basis):
+                coef_lengths.append(basis_i.n_basis)


🚫 [mypy] _{reported by reviewdog 🐶}
Item "None" of "Basis | None" has no attribute "n_basis" [union-attr]

github-actions · 2023-06-21T16:47:07Z

skfda/tests/test_regression.py

+            beta_coef_compare,
+            atol=0.01,
+        )
+        np.testing.assert_equal(funct_reg.coef_basis[0], y_basis)


🚫 [mypy] _{reported by reviewdog 🐶}
Value of type "Sequence[Basis | None] | None" is not indexable [index]

github-actions · 2023-06-21T16:47:07Z

skfda/tests/test_regression.py

+            beta_coef_compare,
+            atol=0.01,
+        )
+        np.testing.assert_equal(funct_reg.coef_basis[0], y_basis)


🚫 [mypy] _{reported by reviewdog 🐶}
Value of type "Sequence[Basis | None] | None" is not indexable [index]

github-actions · 2023-06-21T16:47:08Z

skfda/tests/test_regression.py

+        np.testing.assert_allclose(
+            funct_reg.basis_coefs[3].ravel(), beta_pacific_R, atol=0.001,
+        )
+        np.testing.assert_equal(funct_reg.coef_basis[0], y_fd.basis)


🚫 [mypy] _{reported by reviewdog 🐶}
Value of type "Sequence[Basis | None] | None" is not indexable [index]

github-actions · 2023-06-21T16:47:08Z

skfda/tests/test_regression.py

+        df = pd.DataFrame(cov_dict)
+
+        beta_coef_compare = [
+            [[-0.463, 3.250]],


🚫 [mypy] _{reported by reviewdog 🐶}
List item 0 has incompatible type "list[float]"; expected "float" [list-item]

github-actions · 2023-06-21T16:47:08Z

skfda/tests/test_regression.py

+
+        beta_coef_compare = [
+            [[-0.463, 3.250]],
+            [[12.509, -6.275]],


🚫 [mypy] _{reported by reviewdog 🐶}
List item 0 has incompatible type "list[float]"; expected "float" [list-item]

github-actions · 2023-06-21T16:47:25Z

skfda/ml/regression/_linear_regression.py

-            ],
-            axis=0,
-        )
+        """ if self.functional_response:


[pep8] _{reported by reviewdog 🐶}
WPS428 Found statement that has no effect

github-actions · 2023-06-21T16:47:25Z

skfda/ml/regression/_linear_regression.py


-        result += self.intercept_
+                    #TODO: MIRAR ESTO BIEN  


[pep8] _{reported by reviewdog 🐶}
E265 block comment should start with '# '

github-actions · 2023-06-21T16:47:25Z

skfda/ml/regression/_linear_regression.py


-        result += self.intercept_
+                    #TODO: MIRAR ESTO BIEN  


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

vnmabus

I think the better approach with this PR is to merge it, as the functionality works, and then have a look to the code myself, in order to have a global vision and simplify things.

examples/plot_functional_regression.py

vnmabus · 2023-04-12T14:36:48Z

skfda/tests/test_math.py

@@ -9,6 +9,7 @@
 from skfda.datasets import make_gaussian_process
 from skfda.misc.covariances import Gaussian
 from skfda.representation.basis import (
+    FDataBasis,


What is this for?

vnmabus · 2023-04-12T14:37:58Z

skfda/tests/test_regression.py

+class TestFunctionalLinearRegression(unittest.TestCase):
+    """Tests for linear regression with functional response."""
+
+    def test_multivariate_covariates_1(self) -> None:


Aren't there better names?

vnmabus · 2023-04-12T14:50:14Z

skfda/ml/regression/_linear_regression.py

@@ -229,6 +304,7 @@ def __init__(
        self.coef_basis = coef_basis
        self.fit_intercept = fit_intercept
        self.regularization = regularization
+        self.y_basis = None


Why do you add this here?

vnmabus · 2023-04-18T17:16:43Z

skfda/misc/_math.py

-        f1 = arg1(f_args)[:, 0, :]
-        f2 = arg2(f_args)[:, 0, :]
+        try:
+            f1 = arg1(f_args)[:, 0, :]


What are you attempting here?

github-actions · 2023-10-20T15:53:51Z

skfda/tests/test_regression.py

+    """Tests for linear regression with functional response."""
+
+    def test_multivariate_covariates_constant_basic(self) -> None:
+        """


[pep8] _{reported by reviewdog 🐶}
D200 One-line docstring should fit on one line with quotes

github-actions · 2023-10-20T15:53:51Z

skfda/tests/test_regression.py

+            FDataBasis(
+                basis=y_basis,
+                coefficients=[[1]],
+            )


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

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+        )
+
+    def test_multivariate_covariates_monomial_basic(self) -> None:
+        """


[pep8] _{reported by reviewdog 🐶}
D200 One-line docstring should fit on one line with quotes

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+        # Currently broken.
+
+        # _test_linear_regression_common(
+        #     X_train=X_train.to_numpy(),


[pep8] _{reported by reviewdog 🐶}
E800 Found commented out code

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+
+        # _test_linear_regression_common(
+        #     X_train=X_train.to_numpy(),
+        #     y_train=y_train,


[pep8] _{reported by reviewdog 🐶}
E800 Found commented out code

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+        # _test_linear_regression_common(
+        #     X_train=X_train.to_numpy(),
+        #     y_train=y_train,
+        #     expected_coefs=expected_coefs,


[pep8] _{reported by reviewdog 🐶}
E800 Found commented out code

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+        #     X_train=X_train.to_numpy(),
+        #     y_train=y_train,
+        #     expected_coefs=expected_coefs,
+        #     X_test=X_test.to_numpy(),


[pep8] _{reported by reviewdog 🐶}
E800 Found commented out code

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+        #     y_train=y_train,
+        #     expected_coefs=expected_coefs,
+        #     X_test=X_test.to_numpy(),
+        #     y_test=y_test,


[pep8] _{reported by reviewdog 🐶}
E800 Found commented out code

github-actions · 2023-10-20T15:53:52Z

skfda/tests/test_regression.py

+        #     expected_coefs=expected_coefs,
+        #     X_test=X_test.to_numpy(),
+        #     y_test=y_test,
+        # )


[pep8] _{reported by reviewdog 🐶}
E800 Found commented out code

github-actions · 2023-10-20T17:19:53Z

skfda/ml/regression/_linear_regression.py

@@ -56,13 +67,17 @@ class LinearRegression(
        NDArrayFloat,
    ],
 ):
-    r"""Linear regression with multivariate response.
+    r"""Linear regression with multivariate and functional response.


[pep8] _{reported by reviewdog 🐶}
D412 No blank lines allowed between a section header and its content

github-actions · 2023-10-23T09:45:33Z

skfda/ml/regression/_linear_regression.py

+        elif y_basis is None:
+            return x_basis
+        else:
+            return y_basis


[pep8] _{reported by reviewdog 🐶}
WPS503 Found useless returning else statement

github-actions · 2023-10-23T09:45:34Z

skfda/tests/test_regression.py

+            linear_regression.basis_coefs[0].ravel(), beta_const_R, atol=0.001,
+        )
+        np.testing.assert_allclose(
+            linear_regression.basis_coefs[1].ravel(), beta_atlantic_R, atol=0.001,


[pep8] _{reported by reviewdog 🐶}
E501 line too long (82 > 79 characters)

github-actions · 2023-10-23T09:45:34Z

skfda/tests/test_regression.py

+            linear_regression.basis_coefs[1].ravel(), beta_atlantic_R, atol=0.001,
+        )
+        np.testing.assert_allclose(
+            linear_regression.basis_coefs[2].ravel(), beta_continental_R, atol=0.001,


[pep8] _{reported by reviewdog 🐶}
E501 line too long (85 > 79 characters)

github-actions · 2023-10-23T09:45:34Z

skfda/tests/test_regression.py

+            linear_regression.basis_coefs[2].ravel(), beta_continental_R, atol=0.001,
+        )
+        np.testing.assert_allclose(
+            linear_regression.basis_coefs[3].ravel(), beta_pacific_R, atol=0.001,


[pep8] _{reported by reviewdog 🐶}
E501 line too long (81 > 79 characters)

rafa9811 added 23 commits December 27, 2022 19:55

weighted inner product integrate

d2d2837

weighted_inner_product_integrate test

69277ef

some checks in math.py

b1dc2dd

Merge branch 'develop' into feature/concurrentRegression

f102163

Merge branch 'develop' into feature/concurrentRegression

94c334b

first approach to concurrent regression

cfc3b09

weighted_inner_product_integrate with scalar weights

b27f107

transpose of multivariate covariates

26691b3

Merge branch 'develop' into feature/concurrentRegression

522d659

moved weighted inner product to regression file. Refactoring.

9409830

convert from constant coefs

0ed8c80

deleted false check

4d46345

Merge branch 'develop' into feature/concurrentRegression

9cfd103

Merge branch 'develop' into feature/concurrentRegression

c9ff81a

deleted test: weighted inner product is now in lregression file. NDar…

ada5e40

…ray coefficient modified. Intercept concatenated in argcheck. Q dim check.

Merge branch 'develop' into feature/concurrentRegression

32db8bd

updated tests

371f056

Merge branch 'develop' into feature/concurrentRegression

14be648

fix tests and small refactoring

0ea1664

Merge branch 'develop' into feature/concurrentRegression

a20ec8f

test: multivariate and concurrent

15ea681

updated doc

aa630d5

weather example. Small fix in doc.

7d03538

rafa9811 requested a review from vnmabus March 31, 2023 14:48

github-actions bot reviewed Mar 31, 2023

View reviewed changes

Predict implementation with basis change. Updated tests.

bdc69cb

github-actions bot reviewed Apr 15, 2023

View reviewed changes

Merge branch 'develop' into feature/concurrentRegression

100b7f4

rafa9811 added 3 commits April 15, 2023 21:32

small fix in prediction function

c6bdf28

style fixes

4e6bed9

no change of basis if it's the same. Fix intercept and example.

925b602

rafa9811 marked this pull request as ready for review April 15, 2023 20:32

rafa9811 and others added 2 commits May 2, 2023 22:27

Merge branch 'develop' into feature/concurrentRegression

d418787

Merge branch 'develop' into feature/concurrentRegression

0d0fc19

github-actions bot reviewed Jun 13, 2023

View reviewed changes

rafa9811 added 3 commits June 14, 2023 10:29

small fixes: example, types

69aed6a

Merge branch 'feature/concurrentRegression' of https://github.com/GAA…

679875d

…-UAM/scikit-fda into feature/concurrentRegression

fix predict

ed03263

github-actions bot reviewed Jun 21, 2023

View reviewed changes

vnmabus mentioned this pull request Oct 20, 2023

Feature/irregular data structure #509

Closed

vnmabus previously approved these changes Oct 20, 2023

View reviewed changes

vnmabus added 2 commits October 20, 2023 12:31

Merge branch 'develop' into feature/concurrentRegression

09db85e

Fix standalone tests.

f897a2b

vnmabus dismissed their stale review via f897a2b October 20, 2023 15:53

github-actions bot reviewed Oct 20, 2023

View reviewed changes

Fix doctest.

dc51e44

github-actions bot reviewed Oct 20, 2023

View reviewed changes

vnmabus added 4 commits October 20, 2023 20:51

Modify example.

596a5fc

Fix comment in example.

b9fd149

Use function_to_fdatabasis from utils.

a946d95

Some fixes.

a020784

github-actions bot reviewed Oct 23, 2023

View reviewed changes

vnmabus merged commit 9ff930d into develop Oct 23, 2023
16 of 17 checks passed


		Xt = self._make_transpose(X_new)

		for i, basis_i in enumerate(self.coef_basis):

Feature/concurrent regression #531

Feature/concurrent regression #531

Conversation

rafa9811 commented Mar 31, 2023 • edited Loading

github-actions bot Mar 31, 2023

Choose a reason for hiding this comment

github-actions bot Mar 31, 2023

Choose a reason for hiding this comment

github-actions bot Mar 31, 2023

Choose a reason for hiding this comment

codecov bot commented Mar 31, 2023 • edited Loading

Codecov Report

github-actions bot Jun 13, 2023

Choose a reason for hiding this comment

github-actions bot Jun 13, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

github-actions bot Jun 21, 2023

Choose a reason for hiding this comment

vnmabus left a comment

Choose a reason for hiding this comment

vnmabus Apr 12, 2023

Choose a reason for hiding this comment

vnmabus Apr 12, 2023

Choose a reason for hiding this comment

vnmabus Apr 12, 2023

Choose a reason for hiding this comment

vnmabus Apr 18, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 20, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

rafa9811 commented Mar 31, 2023 •

edited

Loading

codecov bot commented Mar 31, 2023 •

edited

Loading