unifiedbooster 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

unifiedbooster/gbdt_classification.py

@@ -170,7 +170,6 @@ class GBDTClassifier(GBDT, ClassifierMixin):
 
             if model_type in ("xgboost", "xgb"):
                 self.model = XGBClassifier(**self.params)
-<<<<<<< HEAD
             elif model_type == "catboost":
                 fast_cb = dict(
                     thread_count=-1,
@@ -182,11 +181,6 @@ class GBDTClassifier(GBDT, ClassifierMixin):
                 )
                 self.model = CatBoostClassifier(**self.params, **fast_cb)
             elif model_type == "lightgbm":
-=======
-            elif model_type in ("catboost", "cb"):
-                self.model = CatBoostClassifier(**self.params)
-            elif model_type in ("lightgbm", "lgb"):
->>>>>>> 0c97427b8cbd66d509a3cc24747eeea8b157779d
                 self.model = LGBMClassifier(**self.params)
             elif model_type in ("gradientboosting", "gb"):
                 self.model = GradientBoostingClassifier(**self.params)

unifiedbooster/gbdt_regression.py

@@ -178,7 +178,6 @@ 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,
@@ -190,11 +189,6 @@ class GBDTRegressor(GBDT, RegressorMixin):
                 )
                 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.10.0.dist-info → unifiedbooster-0.10.2.dist-info}/METADATA

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

{unifiedbooster-0.10.0.dist-info → unifiedbooster-0.10.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 unifiedbooster/__init__.py,sha256=8FEkWCZ2tT8xcW46Z0X_BS9_r0kQWVAu37IncLq6QWU,301
 unifiedbooster/gbdt.py,sha256=FSaZngKlFR943cq1QclZlsOFjM6tmX446e6GeoGtA6Q,5176
-unifiedbooster/gbdt_classification.py,sha256=9buXrIR3By3rvyEaYiPv4o7gFAuqJA_L6_uIT1vqRO0,6614
-unifiedbooster/gbdt_regression.py,sha256=Zcy2jok5NkT1hVFtbI5TDioWzxlyCvRURYgfKwBo73A,6538
+unifiedbooster/gbdt_classification.py,sha256=vwVuTMAaNYFQsZGt2Rcp90MyvbDbnJvnqriMuULTLmE,6378
+unifiedbooster/gbdt_regression.py,sha256=ISgMAXm_jYeNNqQ5BYDUZShCHp_f-1D2FpYspLT1m8I,6303
 unifiedbooster/gpoptimization.py,sha256=UoT20E5dfhREiY7Cqo0vCktBzDBRnnG_6Xyg426vdfk,15238
 unifiedbooster/nonconformist/__init__.py,sha256=sHEakjPhqUhmZwawAv34bHcTDmF1uZvqvGLIMjOM0B0,739
 unifiedbooster/nonconformist/acp.py,sha256=SrfBVCWjXvntkBJ7GXTFYE6i6NU3Pv-5ibwhpItDKDw,11553
@@ -15,9 +15,9 @@ unifiedbooster/predictioninterval/__init__.py,sha256=I1X1omp6Bsuzfm7z8TCSICe2175
 unifiedbooster/predictioninterval/predictioninterval.py,sha256=6XQnJQDpsWG-uu5yFxeZQewnrErAjZLzv21YvtarXZQ,11164
 unifiedbooster/predictionset/__init__.py,sha256=IGhWVX8-VeZ15HeLFWu8QeKCz7DIE4TlEXMjTnB3VdE,70
 unifiedbooster/predictionset/predictionset.py,sha256=C38rC1qAhhXa8YUJjVB3yjYjPXToU1HVXBRoBevsRxk,3308
-unifiedbooster-0.10.0.dist-info/licenses/LICENSE,sha256=3rWw63btcdqbC0XMnpzCQhxDP8Vx7yKkKS7EDgJiY_4,1061
-unifiedbooster-0.10.0.dist-info/METADATA,sha256=fWymK7HzbDfARFxbQEsRYQHinNDbtwHvmYFx2e1lCIo,1152
-unifiedbooster-0.10.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-unifiedbooster-0.10.0.dist-info/entry_points.txt,sha256=OVNTsCzMYnaJ11WIByB7G8Lym_dj-ERKZyQxWFUcW30,59
-unifiedbooster-0.10.0.dist-info/top_level.txt,sha256=gOMxxpRtx8_nJXTWsXJDFkNeCsjSJQPs6aUXKK5_nI4,15
-unifiedbooster-0.10.0.dist-info/RECORD,,
+unifiedbooster-0.10.2.dist-info/licenses/LICENSE,sha256=3rWw63btcdqbC0XMnpzCQhxDP8Vx7yKkKS7EDgJiY_4,1061
+unifiedbooster-0.10.2.dist-info/METADATA,sha256=ARHYoKX3dBBVD8_XLzcvb5mYXl49qTPjzYt020G0pRY,1152
+unifiedbooster-0.10.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+unifiedbooster-0.10.2.dist-info/entry_points.txt,sha256=OVNTsCzMYnaJ11WIByB7G8Lym_dj-ERKZyQxWFUcW30,59
+unifiedbooster-0.10.2.dist-info/top_level.txt,sha256=gOMxxpRtx8_nJXTWsXJDFkNeCsjSJQPs6aUXKK5_nI4,15
+unifiedbooster-0.10.2.dist-info/RECORD,,