Skip to content

Fix/documentation #38

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.

Sign up for GitHub

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

Merged
dcuestam merged 10 commits into from
Sep 10, 2018
Merged

Fix/documentation #38

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8294a99
Adding a new test for Array operations
Sep 6, 2018
15402c3
Merge branch 'master' into fix/ArrayOperations
avilchess Sep 7, 2018
b80243e
documentation fixed
dcuestam Sep 7, 2018
fa1c9d3
Merge branch 'fix/ArrayOperations' of https://github.com/shapelets/kh…
dcuestam Sep 7, 2018
d69fcd7
Adding a new test for Array operations
Sep 6, 2018
de74764
Deleting empty line.
Sep 7, 2018
14c1825
Fixing merge
Sep 7, 2018
b8df06b
Merge branch 'fix/ArrayOperations' of https://github.com/shapelets/kh…
dcuestam Sep 7, 2018
d68694b
empty line deleted
dcuestam Sep 7, 2018
f82ba78
Merge branch 'master' into fix/documentation
avilchess Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions khiva/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ def find_best_n_motifs(profile, index, m, n, self_join=False):
def stomp(first_time_series, second_time_series, subsequence_length):
""" Stomp algorithm to calculate the matrix profile between `ta` and `tb` using a subsequence length of `m`.
Copy link
Copy Markdown
Contributor

@avilchess avilchess Sep 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this method filter trivial matches? if so, please add, "This method filters the trivial matches.", as the one below

Copy link
Copy Markdown
Contributor Author

@dcuestam dcuestam Sep 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method doesn't filter trivial matches as it consider that both time series are different.


[1] Yan Zhu, Zachary Zimmerman, Nader Shakibay Senobari, Chin-Chia Michael Yeh, Gareth Funning, Abdullah Mueen,
Philip Brisk and Eamonn Keogh (2016). Matrix Profile II: Exploiting a Novel Algorithm and GPUs to break the one
Hundred Million Barrier for Time Series Motifs and Joins. IEEE ICDM 2016.

:param first_time_series: KHIVA array with the first time series.
:param second_time_series: KHIVA array with the second time series.
:param subsequence_length: Length of the subsequence.
Expand All @@ -99,6 +103,10 @@ def stomp_self_join(time_series, subsequence_length):
""" Stomp algorithm to calculate the matrix profile between `t` and itself using a subsequence length of `m`.
This method filters the trivial matches.

[1] Yan Zhu, Zachary Zimmerman, Nader Shakibay Senobari, Chin-Chia Michael Yeh, Gareth Funning, Abdullah Mueen,
Philip Brisk and Eamonn Keogh (2016). Matrix Profile II: Exploiting a Novel Algorithm and GPUs to break the one
Hundred Million Barrier for Time Series Motifs and Joins. IEEE ICDM 2016.

:param time_series: The query and reference time series in KHIVA array format.
:param subsequence_length: Lenght of the subsequence
:return: KHIVA arrays with the profile and index.
Expand Down