Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
python-uga
training-hpc
Commits
2dae6bca
Commit
2dae6bca
authored
Jun 17, 2019
by
Franck Thollard
Browse files
fixing pb with import... still freezing
parent
097262e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
pyfiles/dtw_cort_dist/V92_dask/dtw_cort_dist_mat.py
View file @
2dae6bca
...
...
@@ -7,8 +7,7 @@ import dask
from
dask
import
delayed
from
dask.distributed
import
Client
import
numpy
as
np
from
dtw_cort
import
cort
,
DTWDistance
from
dtw_cort
import
cort
,
dtw_distance
util
=
run_path
(
Path
(
__file__
).
absolute
().
parent
.
parent
/
"util.py"
)
...
...
@@ -35,7 +34,7 @@ def distances(series, idx_s1, idx_s2, res_dtw, res_cort):
:idx_s2: index of second serie in series
:res_sult: (tuple) idx_s1, idx_s2, dtw and cort between series[s1] and series[s2]
"""
dist_dtw
=
DTWD
istance
(
series
[
idx_s1
],
series
[
idx_s2
])
dist_dtw
=
dtw_d
istance
(
series
[
idx_s1
],
series
[
idx_s2
])
dist_cort
=
0.5
*
(
1
-
cort
(
series
[
idx_s1
],
series
[
idx_s2
]))
res_dtw
[
idx_s1
,
idx_s2
]
=
dist_dtw
res_dtw
[
idx_s2
,
idx_s1
]
=
dist_dtw
...
...
@@ -52,7 +51,7 @@ def compute(series, nb_series):
inputs
=
((
series
,
t1
,
t2
)
for
t1
,
t2
in
gen
)
res
=
[
delayed
(
distances
)(
s
,
t1
,
t2
,
_dist_mat_dtw
,
_dist_mat_cort
)
for
s
,
t1
,
t2
in
inputs
]
dask
.
compute
(
res
)
client
.
compute
(
res
)
return
_dist_mat_dtw
,
_dist_mat_cort
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment