unifiedbooster 0.1.0__tar.gz → 0.1.2__tar.gz

{unifiedbooster-0.1.0 → unifiedbooster-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unifiedbooster
-Version: 0.1.0
+Version: 0.1.2
 Summary: Call R functions from Python
 Home-page: https://github.com/thierrymoudiki/unifiedbooster
 Author: T. Moudiki

{unifiedbooster-0.1.0 → unifiedbooster-0.1.2}/setup.py

@@ -10,7 +10,7 @@ from os import path
 
 subprocess.check_call(['pip', 'install', 'Cython'])
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 here = path.abspath(path.dirname(__file__))
 

{unifiedbooster-0.1.0 → unifiedbooster-0.1.2}/unifiedbooster/gbdt_classification.py

@@ -24,7 +24,7 @@ class GBDTClassifier(BaseEstimator, ClassifierMixin):
         # subsample
         # max_depth
         # lightgbm -----
-        # num_iterations
+        # n_estimators
         # learning_rate
         # bagging_fraction
         # max_depth        
@@ -43,12 +43,13 @@ class GBDTClassifier(BaseEstimator, ClassifierMixin):
                 **kwargs
             }
         elif self.model_type == "lightgbm":
+             verbose = self.verbosity - 1 if self.verbosity==0 else self.verbosity
              self.params = {
-                'num_iterations': self.n_estimators,
+                'n_estimators': self.n_estimators,
                 'learning_rate': self.learning_rate,
                 'bagging_fraction': self.subsample,
                 'max_depth': self.max_depth,
-                'verbose': self.verbosity - 1 if self.verbosity==0 else self.verbosity
+                'verbose': verbose,
                 **kwargs
             }
         elif self.model_type == "catboost":
@@ -57,14 +58,14 @@ class GBDTClassifier(BaseEstimator, ClassifierMixin):
                 'learning_rate': self.learning_rate,
                 'rsm': self.subsample,
                 'depth': self.max_depth,
-                'verbose': self.verbosity
+                'verbose': self.verbosity,
                 **kwargs
             }           
         
         if model_type == 'xgboost':
             self.model = XGBClassifier(**self.params)
         elif model_type == 'catboost':            
-            self.model = CatBoostClassifier(**self.params, logging_level='Silent')
+            self.model = CatBoostClassifier(**self.params)
         elif model_type == 'lightgbm':
             self.model = LGBMClassifier(**self.params)
         else:

{unifiedbooster-0.1.0 → unifiedbooster-0.1.2}/unifiedbooster/gbdt_regression.py

@@ -24,7 +24,7 @@ class GBDTRegressor(BaseEstimator, RegressorMixin):
         # subsample
         # max_depth
         # lightgbm -----
-        # num_iterations
+        # n_estimators
         # learning_rate
         # bagging_fraction
         # max_depth        
@@ -43,12 +43,13 @@ class GBDTRegressor(BaseEstimator, RegressorMixin):
                 **kwargs
             }
         elif self.model_type == "lightgbm":
+             verbose = self.verbosity - 1 if self.verbosity==0 else self.verbosity
              self.params = {
-                'num_iterations': self.n_estimators,
+                'n_estimators': self.n_estimators,
                 'learning_rate': self.learning_rate,
                 'bagging_fraction': self.subsample,
                 'max_depth': self.max_depth,
-                'verbose': self.verbosity - 1 if self.verbosity==0 else self.verbosity
+                'verbose': verbose,
                 **kwargs
             }
         elif self.model_type == "catboost":
@@ -57,14 +58,14 @@ class GBDTRegressor(BaseEstimator, RegressorMixin):
                 'learning_rate': self.learning_rate,
                 'rsm': self.subsample,
                 'depth': self.max_depth,
-                'verbose': self.verbosity
+                'verbose': self.verbosity,
                 **kwargs
             }           
         
         if model_type == 'xgboost':
             self.model = XGBRegressor(**self.params)
         elif model_type == 'catboost':            
-            self.model = CatBoostRegressor(**self.params, logging_level='Silent')
+            self.model = CatBoostRegressor(**self.params)
         elif model_type == 'lightgbm':
             self.model = LGBMRegressor(**self.params)
         else:

{unifiedbooster-0.1.0 → unifiedbooster-0.1.2}/unifiedbooster.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unifiedbooster
-Version: 0.1.0
+Version: 0.1.2
 Summary: Call R functions from Python
 Home-page: https://github.com/thierrymoudiki/unifiedbooster
 Author: T. Moudiki