From 7b944d6194e657e0f666a2e796f9fc74df97bf9a Mon Sep 17 00:00:00 2001
From: Alexandre Barachant <alexandre.barachant@gmail.com>
Date: Sat, 21 Nov 2015 13:07:40 -0500
Subject: [PATCH] Fix #16
---
.travis.yml | 2 +-
pyriemann/clustering.py | 6 ++++--
pyriemann/utils/distance.py | 7 +++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pyriemann/clustering.py b/pyriemann/clustering.py
index d4fbdd3..15e2fda 100644
--- a/pyriemann/clustering.py
+++ b/pyriemann/clustering.py
@@ -16,8 +16,10 @@ def _fit_single(X, y=None, n_clusters=2, init='random', random_state=None,
"""helper to fit a single run of centroid."""
# init random state if provided
mdm = MDM(metric=metric)
- mdm.covmeans = _init_centroids(
- X, n_clusters, init, random_state=random_state)
+ squared_nomrs = [numpy.linalg.norm(x, ord='fro')**2 for x in X]
+ mdm.covmeans = _init_centroids(X, n_clusters, init,
+ random_state=random_state,
+ x_squared_norms=squared_nomrs)
if y is not None:
mdm.classes = numpy.unique(y)
else:
diff --git a/pyriemann/utils/distance.py b/pyriemann/utils/distance.py
index 6db7d08..e4965ff 100644
--- a/pyriemann/utils/distance.py
+++ b/pyriemann/utils/distance.py
@@ -1,12 +1,11 @@
+"""Distance utils."""
import numpy
from scipy.linalg import eigvalsh
from .base import logm
-###############################################################
-# distances
-###############################################################
-def distance_kullback(A,B):
+
+def distance_kullback(A, B):
"""Return the Kullback leibler divergence between
two covariance matrices A and B :
--
2.6.3