Occupation measure construction #396

alvaro-castillo · 2021-11-23T17:43:50Z

Closes #371

codecov · 2021-11-23T17:48:46Z

Codecov Report

Merging #396 (c8cb523) into develop (89c3cd9) will increase coverage by 0.00%.
The diff coverage is 83.33%.

@@           Coverage Diff            @@
##           develop     #396   +/-   ##
========================================
  Coverage    80.19%   80.20%           
========================================
  Files           93       93           
  Lines         7266     7289   +23     
========================================
+ Hits          5827     5846   +19     
- Misses        1439     1443    +4

Impacted Files	Coverage Δ
...kfda/exploratory/stats/_functional_transformers.py	`87.50% <83.33%> (-12.50%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89c3cd9...c8cb523. Read the comment docs.

skfda/misc/feature_construction/__init__.py

skfda/misc/feature_construction/_evaluation_trasformer.py

skfda/representation/basis/_fdatabasis.py

skfda/misc/feature_construction/_functional_transformers.py

github-actions · 2022-01-14T19:26:10Z

skfda/exploratory/stats/_functional_transformers.py

+
+    left, right = domain_range[0]
+    interval_size = (right - left) / n_intervals
+    integrated_data = []


🚫 [mypy] _{reported by reviewdog 🐶}
Need type annotation for 'integrated_data' (hint: "integrated_data: List[] = ...")

github-actions · 2022-01-14T19:26:10Z

skfda/exploratory/stats/_functional_transformers.py

+def _calculate_curves_occupation_(
+    curve_y_coordinates: np.ndarray,
+    curve_x_coordinates: np.ndarray,
+    interval: Tuple,


🚫 [mypy] _{reported by reviewdog 🐶}
Missing type parameters for generic type "Tuple"

This should be Tuple[float, float].

github-actions · 2022-01-14T19:26:10Z

skfda/misc/feature_construction/_evaluation_trasformer.py

@@ -124,12 +130,11 @@ def __init__(
        self.extrapolation = extrapolation
        self.grid = grid

-    def fit(  # noqa: D102
+    def fit(


🚫 [mypy] _{reported by reviewdog 🐶}
Argument 1 of "fit" is incompatible with supertype "TransformerMixin"; supertype defines the argument type as "Input"

github-actions · 2022-01-14T19:26:11Z

skfda/misc/feature_construction/_evaluation_trasformer.py

@@ -124,12 +130,11 @@ def __init__(
        self.extrapolation = extrapolation
        self.grid = grid

-    def fit(  # noqa: D102
+    def fit(


📝 [mypy] _{reported by reviewdog 🐶}
This violates the Liskov substitution principle

github-actions · 2022-01-14T19:26:11Z

skfda/misc/feature_construction/_evaluation_trasformer.py

@@ -124,12 +130,11 @@ def __init__(
        self.extrapolation = extrapolation
        self.grid = grid

-    def fit(  # noqa: D102
+    def fit(


📝 [mypy] _{reported by reviewdog 🐶}
See https://mypy.readthedocs.io/en/stable/common_issues.html#incompatible-overrides

github-actions · 2022-01-14T19:26:32Z

skfda/misc/_math.py

-    integrand = d1 * d2
+    integrand = arg1 * arg2
+    return integrand.integrate()
+


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

github-actions · 2022-01-14T19:26:32Z

skfda/misc/feature_construction/_evaluation_trasformer.py

@@ -124,12 +130,11 @@ def __init__(
        self.extrapolation = extrapolation
        self.grid = grid

-    def fit(  # noqa: D102
+    def fit(


[pep8] _{reported by reviewdog 🐶}
D102 Missing docstring in public method

github-actions · 2022-01-14T19:26:32Z

skfda/misc/feature_construction/_evaluation_trasformer.py

@@ -140,12 +145,11 @@ def fit(  # noqa: D102

        return self

-    def transform(  # noqa: D102
+    def transform(


[pep8] _{reported by reviewdog 🐶}
D102 Missing docstring in public method

github-actions · 2022-01-14T19:26:32Z

skfda/representation/_functional_data.py

+        interval: Optional[DomainRange] = None,
+    ) -> NDArrayFloat:
+        """
+        Integration of the FData object.


[pep8] _{reported by reviewdog 🐶}
DAR003 Incorrect indentation: ~<

github-actions · 2022-01-14T19:26:33Z

skfda/representation/basis/_fdatabasis.py

+        *,
+        interval: Optional[DomainRange] = None,
+    ) -> NDArrayFloat:
+        """Examples.


[pep8] _{reported by reviewdog 🐶}
D205 1 blank line required between summary line and description

github-actions · 2022-01-14T19:51:50Z

skfda/representation/_functional_data.py

+        interval: Optional[DomainRange] = None,
+    ) -> NDArrayFloat:
+        """Integration of the FData object.
+


[pep8] _{reported by reviewdog 🐶}
DAR003 Incorrect indentation: ~<

github-actions · 2022-02-16T22:21:08Z

skfda/exploratory/stats/__init__.py

@@ -1,5 +1,9 @@
 from ._fisher_rao import _fisher_rao_warping_mean, fisher_rao_karcher_mean
-from ._functional_transformers import local_averages
+from ._functional_transformers import (


🚫 [mypy] _{reported by reviewdog 🐶}
Module 'skfda.exploratory.stats._functional_transformers' has no attribute 'number_up_crossings'

vnmabus · 2022-02-17T12:45:35Z

skfda/exploratory/stats/_functional_transformers.py

+
+def occupation_measure(
+    data: Union[FDataGrid, FDataBasis],
+    intervals: np.ndarray,


Why not a Sequence of Tuple[float, float]?

vnmabus · 2022-02-17T15:29:41Z

skfda/exploratory/stats/_functional_transformers.py

+    data: Union[FDataGrid, FDataBasis],
+    intervals: np.ndarray,
+    *,
+    n_points: Union[int, None] = None,


Use Optional[int] instead of Union[int, None].

vnmabus · 2022-02-17T15:31:52Z

skfda/exploratory/stats/_functional_transformers.py

+    intervals: np.ndarray,
+    *,
+    n_points: Union[int, None] = None,
+) -> np.ndarray:


Use a more specific type if possible, such as NDArrayFloat.

vnmabus · 2022-02-17T15:34:29Z

skfda/exploratory/stats/_functional_transformers.py

+            + " as an argument for a FDataBasis. Instead None was passed.",
+        )
+
+    for interval_check in intervals:


This can be checked in _calculate_curves_occupation_ without the need of an additional loop.

vnmabus · 2022-02-17T20:18:22Z

skfda/exploratory/stats/_functional_transformers.py

+def _calculate_curves_occupation_(
+    curve_y_coordinates: np.ndarray,
+    curve_x_coordinates: np.ndarray,
+    interval: Tuple,


This should be Tuple[float, float].

skfda/exploratory/stats/_functional_transformers.py

vnmabus · 2022-02-17T20:20:21Z

skfda/exploratory/stats/_functional_transformers.py

+    less_than_y2 = curve_y_coordinates <= y2
+    inside_interval_bools = greater_than_y1 & less_than_y2
+
+    # Correct booleans so they are not repeated


Care to explain more?

skfda/exploratory/stats/_functional_transformers.py

vnmabus

Please don't mark conversations as solved unless the underlying issue is addressed.

skfda/exploratory/stats/_functional_transformers.py

vnmabus · 2022-03-11T12:03:03Z

skfda/exploratory/stats/_functional_transformers.py

+
+        Args:
+            data: FDataGrid or FDataBasis where we want to calculate
+            the occupation measure.


Indent multiline descriptions properly.

skfda/exploratory/stats/_functional_transformers.py

vnmabus

LGTM

alvaro-castillo self-assigned this Nov 23, 2021

alvaro-castillo requested a review from vnmabus November 23, 2021 17:43

alvaro-castillo changed the title ~~Issue 371~~ Feature Construction Dec 2, 2021

vnmabus requested changes Dec 21, 2021

View reviewed changes

github-actions bot reviewed Jan 14, 2022

View reviewed changes

Alvaro added 2 commits February 3, 2022 22:59

Merge branch 'develop' into feature/featureConstruction

abb5553

Occupation measure construction

9f1f583

alvaro-castillo changed the title ~~Feature Construction~~ Occupation measure constructor Feb 3, 2022

alvaro-castillo changed the title ~~Occupation measure constructor~~ Occupation measure construction Feb 3, 2022

Merge branch 'develop' into feature/occupationMeasure

91aac2c

github-actions bot reviewed Feb 16, 2022

View reviewed changes

Style erros fixed

10c2da2

vnmabus requested changes Feb 17, 2022

View reviewed changes

vnmabus requested changes Feb 18, 2022

View reviewed changes

skfda/exploratory/stats/_functional_transformers.py Outdated Show resolved Hide resolved

skfda/exploratory/stats/_functional_transformers.py Show resolved Hide resolved

Alvaro added 2 commits February 22, 2022 12:13

Corrections

578167d

Added comment about n_points

a3d6700

vnmabus requested changes Mar 11, 2022

View reviewed changes

Coding fixes and vectorization

3cb923a

vnmabus approved these changes Mar 15, 2022

View reviewed changes

Merge branch 'develop' into feature/featureConstruction

c8cb523

vnmabus merged commit bd29e69 into develop Mar 15, 2022

alvaro-castillo deleted the feature/featureConstruction branch March 28, 2022 20:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Occupation measure construction #396

Occupation measure construction #396

alvaro-castillo commented Nov 23, 2021 •

edited

Loading

codecov bot commented Nov 23, 2021 •

edited

Loading

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

vnmabus Feb 17, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Jan 14, 2022

github-actions bot Feb 16, 2022

vnmabus Feb 17, 2022

vnmabus Feb 17, 2022

vnmabus Feb 17, 2022

vnmabus Feb 17, 2022

vnmabus Feb 17, 2022

vnmabus Feb 17, 2022

vnmabus left a comment

vnmabus Mar 11, 2022

vnmabus left a comment

Occupation measure construction #396

Occupation measure construction #396

Conversation

alvaro-castillo commented Nov 23, 2021 • edited Loading

codecov bot commented Nov 23, 2021 • edited Loading

Codecov Report

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Jan 14, 2022

Choose a reason for hiding this comment

github-actions bot Feb 16, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vnmabus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vnmabus left a comment

Choose a reason for hiding this comment

alvaro-castillo commented Nov 23, 2021 •

edited

Loading

codecov bot commented Nov 23, 2021 •

edited

Loading