Skip to content
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

Fixes #78 #81

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ the distance measure computation:
- `max_step`: Do not allow steps larger than this value.
- `max_length_diff`: Return infinity if difference in length of two series is larger.
- `penalty`: Penalty to add if compression or expansion is applied (on top of the distance).
- `psi`: Psi relaxation to ignore begin and/or end of sequences (for cylical sequencies) [2].
- `psi`: Psi relaxation to ignore begin and/or end of sequences (for cylical sequences) [2].


#### DTW Distance Measure all warping paths
Expand All @@ -92,7 +92,7 @@ If, next to the distance, you also want the full matrix to see all possible warp
print(distance)
print(paths)

The matrix with all warping paths can be visualised as follows:
The matrix with all warping paths can be visualized as follows:

from dtaidistance import dtw
from dtaidistance import dtw_visualisation as dtwvis
Expand Down Expand Up @@ -184,7 +184,7 @@ wrapper for the SciPy linkage method).


For models that keep track of the full clustering tree (`HierarchicalTree` or `LinkageTree`), the
tree can be visualised:
tree can be visualized:

model.plot("myplot.png")

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/dtw.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ possible warping paths:
print(distance)
print(paths)

The matrix with all warping paths can be visualised as follows:
The matrix with all warping paths can be visualized as follows:

::

Expand Down
2 changes: 1 addition & 1 deletion dtaidistance/clustering.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def fit(self, series):
"""Merge sequences.

:param series: Iterator over series.
:return: Dictionary with as keys the prototype indicices and as values all the indicides of the series in
:return: Dictionary with as keys the prototype indices and as values all the indices of the series in
that cluster.
"""
nb_series = len(series)
Expand Down
2 changes: 1 addition & 1 deletion dtaidistance/dtw.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def warping_paths(s1, s2, window=None, max_dist=None,
"""
Dynamic Time Warping.

The full matrix of all warping paths is build.
The full matrix of all warping paths is built.

:param s1: First sequence
:param s2: Second sequence
Expand Down
4 changes: 2 additions & 2 deletions dtaidistance/dtw_ndim_visualisation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
dtaidistance.dtw_visualisation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Dynamic Time Warping (DTW) visualisations.
Dynamic Time Warping (DTW) visualizations.

:author: Wannes Meert
:copyright: Copyright 2017 KU Leuven, DTAI Research Group.
Expand Down Expand Up @@ -130,4 +130,4 @@ def plot_warpingpaths(s1, s2, paths, path=None, filename=None, shownumbers=False
plt.savefig(filename)
plt.close()
fig, ax = None, None
return fig, ax
return fig, ax
2 changes: 1 addition & 1 deletion dtaidistance/dtw_visualisation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
dtaidistance.dtw_visualisation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Dynamic Time Warping (DTW) visualisations.
Dynamic Time Warping (DTW) visualizations.

:author: Wannes Meert
:copyright: Copyright 2017 KU Leuven, DTAI Research Group.
Expand Down
2 changes: 1 addition & 1 deletion tests/test_bugs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


if dtw_c is None:
print('ERROR: dtw_c is not build')
print('ERROR: dtw_c is not built')
sys.exit(1)

def test_distance1_a():
Expand Down