code quality improvement

combo/models/classifier_comb.py

@@ -268,7 +268,7 @@ def __init__(self, base_clfs, method='average', threshold=0.5,
         if method not in ['average', 'maximization', 'majority_vote',
                           'median']:
             raise ValueError("{method} is not a valid parameter.".format(
-                shape=method))
+                method=method))
 
         self.method = method
         check_parameter(threshold, 0, 1, include_left=False,
@@ -346,7 +346,7 @@ def predict(self, X):
 
         return (agg_score >= self.threshold).astype('int').ravel()
 
-    def predict_proba(self, X, method='average'):
+    def predict_proba(self, X):
         """Return probability estimates for the test data X.
 
         Parameters

combo/models/cluster_comb.py

@@ -51,16 +51,13 @@ def __init__(self, estimators, pre_fitted=False):
         self.pre_fitted = pre_fitted
 
     @abstractmethod
-    def fit(self, X, y):
+    def fit(self, X):
         """Fit detector.
 
         Parameters
         ----------
         X : numpy array of shape (n_samples, n_features)
             The input samples.
-
-        y : numpy array of shape (n_samples,), optional (default=None)
-            The ground truth of the input samples (labels).
         """
         pass
 

combo/models/sklearn_base.py

@@ -4,11 +4,9 @@
 # Author: Yue Zhao <zhaoy@cmu.edu>
 # License: BSD 2 clause
 
-from __future__ import division
-from __future__ import print_function
 
 import numpy as np
-import sklearn
+
 from joblib.parallel import cpu_count
 
 

combo/test/test_classifier_comb.py

@@ -248,7 +248,7 @@ def test_parameters(self):
                     self.clf.base_clfs is not None)
 
         # print clf details
-        self.clf
+        print(self.clf)
 
         # set parameters
         self.clf.set_params()