-
Notifications
You must be signed in to change notification settings - Fork 208
[ENH] add a difference transformer to series transformations #2729
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.
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
Open
TinaJin0228
wants to merge
6
commits into
aeon-toolkit:main
Choose a base branch
from
TinaJin0228:feat/diff-transformer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8c07ea3
add difference transformer to series transformations
TinaJin0228 321fdc2
add myself to .all-contributorsrc
TinaJin0228 8f78ec9
small modification
TinaJin0228 8b79897
Merge branch 'main' into feat/diff-transformer
TinaJin0228 606110c
modify according to reviews
TinaJin0228 c097579
Merge branch 'main' into feat/diff-transformer
TinaJin0228 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
import numpy as np | ||
|
||
from aeon.transformations.series.base import BaseSeriesTransformer | ||
|
||
__maintainer__ = ["Tina Jin"] | ||
__all__ = ["DifferenceTransformer"] | ||
|
||
|
||
class DifferenceTransformer(BaseSeriesTransformer): | ||
""" | ||
Calculates the n-th order difference of a time series. | ||
|
||
Transforms a time series X into a series Y representing the difference | ||
calculated `order` times. | ||
|
||
The time series are supposed to be all in rows, | ||
with shape (n_channels, n_timepoints) | ||
|
||
- Order 1: Y[t] = X[t] - X[t-1] | ||
- Order 2: Y[t] = (X[t] - X[t-1]) - (X[t-1] - X[t-2]) = X[t] - 2*X[t-1] + X[t-2] | ||
- ... and so on. | ||
|
||
The transformed series will be shorter than the input series by `order` | ||
elements along the time axis. | ||
|
||
Parameters | ||
---------- | ||
order : int, default=1 | ||
The order of differencing. Must be a positive integer. | ||
|
||
Notes | ||
----- | ||
This transformer assumes the input series does not contain NaN values where | ||
the difference needs to be computed. | ||
|
||
Examples | ||
-------- | ||
>>> import numpy as np | ||
>>> from aeon.transformations.series._diff import DifferenceTransformer | ||
>>> X1 = np.array([[1, 3, 2, 5, 4, 7, 6, 9, 8, 10]]) # Shape (1, 10) | ||
>>> dt = DifferenceTransformer() | ||
>>> Xt1 = dt.fit_transform(X1) | ||
>>> print(Xt1) # Shape (1, 9) | ||
[[ 2 -1 3 -1 3 -1 3 -1 2]] | ||
|
||
>>> X2 = np.array([[1, 3, 2, 5, 4, 7, 6, 9, 8, 10]]) # Shape (1, 10) | ||
>>> dt2 = DifferenceTransformer(order=2) | ||
>>> Xt2 = dt2.fit_transform(X2) | ||
>>> print(Xt2) # Shape (1, 8) | ||
[[-3 4 -4 4 -4 4 -4 3]] | ||
|
||
>>> X3 = np.array([[1, 2, 3, 4, 5], [5, 4, 3, 2, 1]]) # Shape (2, 5) | ||
>>> dt = DifferenceTransformer() | ||
>>> Xt3 = dt.fit_transform(X3) | ||
>>> print(Xt3) # Shape (2, 4) | ||
[[ 1 1 1 1] | ||
[-1 -1 -1 -1]] | ||
""" | ||
|
||
_tags = { | ||
"capability:multivariate": True, | ||
"X_inner_type": "np.ndarray", | ||
"fit_is_empty": True, | ||
} | ||
|
||
def __init__(self, order=1): | ||
self.order = order | ||
super().__init__(axis=1) | ||
|
||
def _transform(self, X, y=None): | ||
""" | ||
Perform the n-th order differencing transformation. | ||
|
||
Parameters | ||
---------- | ||
X : Time series to transform. With shape (n_channels, n_timepoints). | ||
y : ignored argument for interface compatibility | ||
|
||
Returns | ||
------- | ||
Xt : np.ndarray | ||
Transformed version of X, containing the n-th order difference. | ||
Shape will be (n_channels, n_timepoints - order). | ||
""" | ||
if not isinstance(self.order, int) or self.order < 1: | ||
raise ValueError( | ||
f"`order` must be a positive integer, but got {self.order}" | ||
) | ||
|
||
diff_X = np.diff(X, n=self.order, axis=1) | ||
|
||
Xt = diff_X | ||
|
||
return Xt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
"""Tests for Difference transformation.""" | ||
|
||
import numpy as np | ||
|
||
from aeon.transformations.series._diff import DifferenceTransformer | ||
|
||
|
||
def test_diff(): | ||
"""Tests basic first and second order differencing.""" | ||
X = np.array([[1.0, 4.0, 9.0, 16.0, 25.0, 36.0]]) | ||
|
||
dt1 = DifferenceTransformer(order=1) | ||
Xt1 = dt1.fit_transform(X) | ||
expected1 = np.array([[3.0, 5.0, 7.0, 9.0, 11.0]]) | ||
|
||
np.testing.assert_allclose( | ||
Xt1, expected1, equal_nan=True, err_msg="Value mismatch for order 1" | ||
) | ||
|
||
dt2 = DifferenceTransformer(order=2) | ||
Xt2 = dt2.fit_transform(X) | ||
expected2 = np.array([[2.0, 2.0, 2.0, 2.0]]) | ||
|
||
np.testing.assert_allclose( | ||
Xt2, expected2, equal_nan=True, err_msg="Value mismatch for order 2" | ||
) | ||
|
||
Y = np.array([[1, 2, 3, 4], [5, 3, 1, 8]]) | ||
|
||
Yt1 = dt1.fit_transform(Y) | ||
expected3 = np.array([[1, 1, 1], [-2, -2, 7]]) | ||
np.testing.assert_allclose( | ||
Yt1, | ||
expected3, | ||
equal_nan=True, | ||
err_msg="Value mismatch for order 1,multivariate", | ||
) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you also test multivariate series in another test perhaps