Merge branch 'master' into master

VowpalWabbit · May 6, 2016 · 17755b7 · 17755b7
2 parents 772e530 + 2a74ccb
commit 17755b7
Show file tree

Hide file tree

Showing 12 changed files with 1,363 additions and 1,331 deletions.
diff --git a/python/sklearn_vw.py b/python/sklearn_vw.py
@@ -196,7 +196,7 @@ def __init__(self,
 
         Contextual Bandit Optimization
         cb (int): Use contextual bandit learning with specified costs
-        cbify (int): Convert multiclass bandit learning on K classes to contextual bandit optimization
+        cbify (int): Convert multiclass on <k> classes into a contextual bandit problem
 
         Returns
         -------