Commit cfcca3d4 authored by Anthony Larcher's avatar Anthony Larcher
Browse files

bug fix in scoring due to sklearn deprecated function

parent 8d0be90b
...@@ -57,4 +57,4 @@ __maintainer__ = "Sylvain Meignier" ...@@ -57,4 +57,4 @@ __maintainer__ = "Sylvain Meignier"
__email__ = "sylvain.meignierr@univ-lemans.fr" __email__ = "sylvain.meignierr@univ-lemans.fr"
__status__ = "Production" __status__ = "Production"
__docformat__ = 'reStructuredText' __docformat__ = 'reStructuredText'
__version__ = "0.1.4.1" __version__ = "0.1.4.3"
...@@ -5,7 +5,7 @@ scipy>=0.19.0 ...@@ -5,7 +5,7 @@ scipy>=0.19.0
matplotlib>=2.0.2 matplotlib>=2.0.2
bottleneck>=1.3.1 bottleneck>=1.3.1
setuptools>=38.5.2 setuptools>=38.5.2
sidekit>=1.3.>6.4 sidekit>=1.3.6.5
six>=1.11.0 six>=1.11.0
scikit_learn>=0.19.1 scikit_learn>=0.19.1
sortedcontainers>=1.5.9 sortedcontainers>=1.5.9
......
...@@ -26,7 +26,6 @@ Copyright 2014-2020 Sylvain Meignier ...@@ -26,7 +26,6 @@ Copyright 2014-2020 Sylvain Meignier
import copy import copy
import numpy as np import numpy as np
# from sklearn.utils.linear_assignment_ import linear_assignment deprecated
from scipy.optimize import linear_sum_assignment from scipy.optimize import linear_sum_assignment
...@@ -187,7 +186,7 @@ class DER: ...@@ -187,7 +186,7 @@ class DER:
and value equal to the confusion score and value equal to the confusion score
:return: a list object containing the hypothesis cluster_list that are not assigned :return: a list object containing the hypothesis cluster_list that are not assigned
""" """
self.assigned = linear_sum_assignment(-1.0*self.conf) self.assigned = np.stack(linear_sum_assignment(-1.0 * self.conf), 1)
name_assigned = dict() name_assigned = dict()
self.match = 0; self.match = 0;
self.not_assigned = copy.deepcopy(self.hyp_cluster_list) self.not_assigned = copy.deepcopy(self.hyp_cluster_list)
......
...@@ -51,7 +51,7 @@ setup( ...@@ -51,7 +51,7 @@ setup(
"PyAudio>=0.2.11", "PyAudio>=0.2.11",
"bottleneck>=1.3.1", "bottleneck>=1.3.1",
"setuptools>=38.5.2", "setuptools>=38.5.2",
"sidekit>=1.3.6.4", "sidekit>=1.3.6.5",
"scikit_learn>=0.22", "scikit_learn>=0.22",
"sortedcontainers>=1.5.9" "sortedcontainers>=1.5.9"
], ],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment