Skip to content

scikit.learn has been renamed to sklearn #2

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

Open
werthiness wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scikit.learn has been renamed to sklearn #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions pywaveclus/cluster/skl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@


import numpy as np
import scikits.learn.cluster
import scikits.learn.mixture
import sklearn.cluster
import sklearn.mixture

from .. import dsp

Expand Down Expand Up @@ -82,7 +82,7 @@ def cluster(waveforms, nfeatures, featuretype, nclusters, \
else:
raise ValueError("Unknown feature type[%s]" % featuretype)

kmeans = scikits.learn.cluster.KMeans(k=nclusters)
kmeans = sklearn.cluster.KMeans(k=nclusters)
np.save('waves_%i' % features.shape[0], waveforms)
np.save('features_%i' % features.shape[0], features)
kmeans.fit(features)
Expand All @@ -99,7 +99,7 @@ def gmm(waveforms, nfeatures, ftype, nclusters, separate, pre, minspikes, \
raise NotImplementedError("Not yet implemented")
if len(waveforms) < minspikes:
return np.zeros(len(waveforms)), {}
g = scikits.learn.mixture.GMM(nclusters, cvtype)
g = sklearn.mixture.GMM(nclusters, cvtype)
if featuretype == 'pca':
features, pca_info = dsp.pca.features(waveforms, nfeatures)
pass
4 changes: 2 additions & 2 deletions pywaveclus/dsp/ica.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import numpy as np

import scikits.learn.decomposition
import sklearn.decomposition


def features(waveforms, nfeatures=6):
Expand All @@ -15,6 +15,6 @@ def features(waveforms, nfeatures=6):
wf = np.hstack((wf, ch))
waves.append(wf)
waves = np.array(waves)
ica = scikits.learn.decomposition.FastICA(nfeatures)
ica = sklearn.decomposition.FastICA(nfeatures)
ica.fit(waves.T)
return ica.transform(waves.T).T
2 changes: 1 addition & 1 deletion pywaveclus/dsp/pca.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np

# from matplotlib.mlab import PCA
from scikits.learn.decomposition.pca import PCA
from sklearn.decomposition.pca import PCA

global FEATURES
FEATURES = None
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ nose>=0.11
numpy>=1.5.1
scipy>=0.8.0
scikits.audiolab>=0.11.0
scikits.learn>=0.8.1
scikit_learn>=0.8.1
tables>=2.1.2
pywavelets>=0.2.0