Merge pull request #19 from dvro/master

EnsembleStackClassifier accepting combiner as string
viisar · Oct 6, 2016 · 6126215 · 6126215
2 parents 997ffed + 27c3bde
commit 6126215
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/brew/stacking/stacker.py b/brew/stacking/stacker.py
@@ -66,9 +66,18 @@ class EnsembleStackClassifier(object):
 
     def __init__(self, stack, combiner=None):
         self.stack = stack
-        self.combiner = combiner
         if combiner is None:
-            self.combiner = Combiner(rule='majority_vote')
+            self.combiner = Combiner(rule='mean')
+        elif isinstance(combiner, str):
+            if combiner == 'majority_vote':
+                raise ValueError('EnsembleStackClassifier '
+                        'do not support majority_vote')
+            self.combiner = Combiner(rule=combiner)
+        elif isinstance(combiner, Combiner):
+            self.combiner = combiner
+        else:
+            raise ValueError('Invalid combiner!')
+
 
     def fit(self, X, y):
         self.stack.fit(X, y)