updated to support Python 3

zw10 · zw10 · commit f2bbf3253691 · 2018-08-24T23:46:17.000+08:00
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+Updated to support Python 3. The original documentation is below, and all credit to the original author.
+
+__Zao Wu__  
+
+
 Python-ELM v0.3
 ===============
 
diff --git a/__init__.py b/__init__.py
diff --git a/elm.py b/elm.py
@@ -31,7 +31,7 @@
 from sklearn.base import BaseEstimator, ClassifierMixin, RegressorMixin
 from sklearn.preprocessing import LabelBinarizer
 
-from random_layer import RandomLayer, MLPRandomLayer
+from .random_layer import RandomLayer, MLPRandomLayer
 
 __all__ = ["ELMRegressor",
            "ELMClassifier",
diff --git 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)
 
         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)
 
         if (self.components_ is None):
             raise ValueError('No components initialized')
