unifiedbooster 0.9.0__tar.gz → 0.10.1__tar.gz

{unifiedbooster-0.9.0 → unifiedbooster-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifiedbooster
-Version: 0.9.0
+Version: 0.10.1
 Summary: Unified interface for Gradient Boosted Decision Trees
 Home-page: https://github.com/thierrymoudiki/unifiedbooster
 Author: T. Moudiki

{unifiedbooster-0.9.0 → unifiedbooster-0.10.1}/setup.py

@@ -7,7 +7,9 @@ from setuptools import setup, find_packages
 from codecs import open
 from os import path
 
-__version__ = "0.9.0"
+# subprocess.check_call(['pip', 'install', 'Cython'])
+
+__version__ = "0.10.1"
 
 here = path.abspath(path.dirname(__file__))
 

{unifiedbooster-0.9.0 → unifiedbooster-0.10.1}/unifiedbooster/gbdt_classification.py

@@ -135,9 +135,19 @@ class GBDTClassifier(GBDT, ClassifierMixin):
                     level=self.level,
                     method=self.pi_method,
                 )
-            elif model_type in ("catboost", "cb"):
+            elif model_type == "catboost":
+
+                fast_cb = dict(
+                    thread_count=-1,
+                    boosting_type="Plain",
+                    grow_policy="Depthwise",
+                    bootstrap_type="Bernoulli",
+                    subsample=0.8,
+                    verbose=False
+                )
+
                 self.model = PredictionSet(
-                    CatBoostClassifier(**self.params),
+                    CatBoostClassifier(**self.params, **fast_cb),
                     level=self.level,
                     method=self.pi_method,
                 )
@@ -160,9 +170,17 @@ class GBDTClassifier(GBDT, ClassifierMixin):
 
             if model_type in ("xgboost", "xgb"):
                 self.model = XGBClassifier(**self.params)
-            elif model_type in ("catboost", "cb"):
-                self.model = CatBoostClassifier(**self.params)
-            elif model_type in ("lightgbm", "lgb"):
+            elif model_type == "catboost":
+                fast_cb = dict(
+                    thread_count=-1,
+                    boosting_type="Plain",
+                    grow_policy="Depthwise",
+                    bootstrap_type="Bernoulli",
+                    subsample=0.8,
+                    verbose=False
+                )
+                self.model = CatBoostClassifier(**self.params, **fast_cb)
+            elif model_type == "lightgbm":
                 self.model = LGBMClassifier(**self.params)
             elif model_type in ("gradientboosting", "gb"):
                 self.model = GradientBoostingClassifier(**self.params)

{unifiedbooster-0.9.0 → unifiedbooster-0.10.1}/unifiedbooster/gbdt_regression.py

@@ -142,9 +142,17 @@ class GBDTRegressor(GBDT, RegressorMixin):
                     method=self.pi_method,
                     type_split=self.type_split
                 )
-            elif model_type in ("catboost", "cb"):
+            elif model_type == "catboost":
+                fast_cb = dict(
+                    thread_count=-1,
+                    boosting_type="Plain",
+                    grow_policy="Depthwise",
+                    bootstrap_type="Bernoulli",
+                    subsample=0.8,
+                    verbose=False
+                )
                 self.model = PredictionInterval(
-                    CatBoostRegressor(**self.params),
+                    CatBoostRegressor(**self.params, **fast_cb),
                     level=self.level,
                     method=self.pi_method,
                     type_split=self.type_split
@@ -170,9 +178,23 @@ class GBDTRegressor(GBDT, RegressorMixin):
 
             if model_type in ("xgboost", "xgb"):
                 self.model = XGBRegressor(**self.params)
+<<<<<<< HEAD
+            elif model_type == "catboost":
+                fast_cb = dict(
+                    thread_count=-1,
+                    boosting_type="Plain",
+                    grow_policy="Depthwise",
+                    bootstrap_type="Bernoulli",
+                    subsample=0.8,
+                    verbose=False
+                )
+                self.model = CatBoostRegressor(**self.params, **fast_cb)
+            elif model_type == "lightgbm":
+=======
             elif model_type in ("catboost", "cb"):
                 self.model = CatBoostRegressor(**self.params)
             elif model_type in ("lightgbm", "lgb"):
+>>>>>>> 0c97427b8cbd66d509a3cc24747eeea8b157779d
                 self.model = LGBMRegressor(**self.params)
             elif model_type in ("gradientboosting", "gb"):
                 self.model = GradientBoostingRegressor(**self.params)

{unifiedbooster-0.9.0 → unifiedbooster-0.10.1}/unifiedbooster.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifiedbooster
-Version: 0.9.0
+Version: 0.10.1
 Summary: Unified interface for Gradient Boosted Decision Trees
 Home-page: https://github.com/thierrymoudiki/unifiedbooster
 Author: T. Moudiki