diff --git a/elm.py b/elm.py index 6b27947..28adec7 100644 --- a/elm.py +++ b/elm.py @@ -50,7 +50,8 @@ class BaseELM(BaseEstimator): """ __metaclass__ = ABCMeta - def __init__(self, hidden_layer, regressor): + def __init__(self, hidden_layer, regressor, **kwargs): + super(BaseELM, self).__init__(**kwargs) self.regressor = regressor self.hidden_layer = hidden_layer @@ -262,9 +263,9 @@ class GenELMClassifier(BaseELM, ClassifierMixin): def __init__(self, hidden_layer=MLPRandomLayer(random_state=0), binarizer=LabelBinarizer(-1, 1), - regressor=None): + regressor=None, **kwargs): - super(GenELMClassifier, self).__init__(hidden_layer, regressor) + super(GenELMClassifier, self).__init__(hidden_layer, regressor, **kwargs) self.binarizer = binarizer diff --git a/random_layer.py b/random_layer.py index 2b8e21b..ea073c9 100644 --- a/random_layer.py +++ b/random_layer.py @@ -24,7 +24,7 @@ from scipy.spatial.distance import cdist, pdist, squareform from sklearn.metrics import pairwise_distances -from sklearn.utils import check_random_state, atleast2d_or_csr +from sklearn.utils import check_random_state, check_array from sklearn.utils.extmath import safe_sparse_dot from sklearn.base import BaseEstimator, TransformerMixin @@ -108,7 +108,7 @@ def fit(self, X, y=None): ------- self """ - X = atleast2d_or_csr(X) + X = check_array(X, accept_sparse='csr') self._generate_components(X) @@ -130,7 +130,7 @@ def transform(self, X, y=None): ------- X_new : numpy array of shape [n_samples, n_components] """ - X = atleast2d_or_csr(X) + X = check_array(X, accept_sparse='csr') if (self.components_ is None): raise ValueError('No components initialized') diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..ead6470 --- /dev/null +++ b/setup.py @@ -0,0 +1,23 @@ +from setuptools import setup + + +setup( + name="Python-Elm", + version="0.0.3", + license='BSD', + url='https://github.com/volker48/Python-ELM', + description='Extreme Learning Machine', + author='David C. Lambert', + py_modules=['elm', 'random_layer'], + install_requires=['numpy', 'scipy', 'sklearn'], + classifiers=[ + 'Development Status :: 4 - Beta', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Scientific/Engineering :: Artificial Intelligence', + ] + +)