unifiedbooster 0.4.2__py3-none-any.whl → 0.5.0__py3-none-any.whl

unifiedbooster/gbdt.py

@@ -90,7 +90,9 @@ class GBDT(BaseEstimator):
                 "depth": self.max_depth,
                 "verbose": self.verbose,
                 "random_seed": self.seed,
-                "bootstrap_type": "MVS",
+                "boosting_type": "Plain",
+                "leaf_estimation_iterations": 1,                
+                "bootstrap_type": "Bernoulli",
                 **kwargs,
             }
         elif self.model_type == "gradientboosting":

unifiedbooster/gbdt_classification.py

@@ -51,42 +51,42 @@ class GBDTClassifier(GBDT, ClassifierMixin):
 
     Examples:
 
-    ```python
-    import unifiedbooster as ub
-    from sklearn.datasets import load_iris
-    from sklearn.model_selection import train_test_split
-    from sklearn.metrics import accuracy_score
-
-    # Load dataset
-    iris = load_iris()
-    X, y = iris.data, iris.target
-
-    # Split dataset into training and testing sets
-    X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_state=42)
-
-    # Initialize the unified regressor (example with XGBoost)
-    regressor1 = ub.GBDTClassifier(model_type='xgboost')
-    #regressor2 = ub.GBDTClassifier(model_type='catboost')
-    regressor3 = ub.GBDTClassifier(model_type='lightgbm')
-
-    # Fit the model
-    regressor1.fit(X_train, y_train)
-    #regressor2.fit(X_train, y_train)
-    regressor3.fit(X_train, y_train)
-
-    # Predict on the test set
-    y_pred1 = regressor1.predict(X_test)
-    #y_pred2 = regressor2.predict(X_test)
-    y_pred3 = regressor3.predict(X_test)
-
-    # Evaluate the model
-    accuracy1 = accuracy_score(y_test, y_pred1)
-    #accuracy2 = accuracy_score(y_test, y_pred2)
-    accuracy3 = accuracy_score(y_test, y_pred3)
-    print(f"Classification Accuracy xgboost: {accuracy1:.2f}")
-    #print(f"Classification Accuracy catboost: {accuracy2:.2f}")
-    print(f"Classification Accuracy lightgbm: {accuracy3:.2f}")
-    ```
+        ```python
+        import unifiedbooster as ub
+        from sklearn.datasets import load_iris
+        from sklearn.model_selection import train_test_split
+        from sklearn.metrics import accuracy_score
+
+        # Load dataset
+        iris = load_iris()
+        X, y = iris.data, iris.target
+
+        # Split dataset into training and testing sets
+        X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_state=42)
+
+        # Initialize the unified regressor (example with XGBoost)
+        regressor1 = ub.GBDTClassifier(model_type='xgboost')
+        #regressor2 = ub.GBDTClassifier(model_type='catboost')
+        regressor3 = ub.GBDTClassifier(model_type='lightgbm')
+
+        # Fit the model
+        regressor1.fit(X_train, y_train)
+        #regressor2.fit(X_train, y_train)
+        regressor3.fit(X_train, y_train)
+
+        # Predict on the test set
+        y_pred1 = regressor1.predict(X_test)
+        #y_pred2 = regressor2.predict(X_test)
+        y_pred3 = regressor3.predict(X_test)
+
+        # Evaluate the model
+        accuracy1 = accuracy_score(y_test, y_pred1)
+        #accuracy2 = accuracy_score(y_test, y_pred2)
+        accuracy3 = accuracy_score(y_test, y_pred3)
+        print(f"Classification Accuracy xgboost: {accuracy1:.2f}")
+        #print(f"Classification Accuracy catboost: {accuracy2:.2f}")
+        print(f"Classification Accuracy lightgbm: {accuracy3:.2f}")
+        ```
     """
 
     def __init__(

unifiedbooster/gbdt_regression.py

@@ -51,42 +51,42 @@ class GBDTRegressor(GBDT, RegressorMixin):
 
     Examples:
 
-    ```python
-    import unifiedbooster as ub
-    from sklearn.datasets import fetch_california_housing
-    from sklearn.model_selection import train_test_split
-    from sklearn.metrics import mean_squared_error
-
-    # Load dataset
-    housing = fetch_california_housing()
-    X, y = housing.data, housing.target
-
-    # Split dataset into training and testing sets
-    X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_state=42)
-
-    # Initialize the unified regressor (example with XGBoost)
-    regressor1 = ub.GBDTRegressor(model_type='xgboost')
-    #regressor2 = ub.GBDTRegressor(model_type='catboost')
-    regressor3 = ub.GBDTRegressor(model_type='lightgbm')
-
-    # Fit the model
-    regressor1.fit(X_train, y_train)
-    #regressor2.fit(X_train, y_train)
-    regressor3.fit(X_train, y_train)
-
-    # Predict on the test set
-    y_pred1 = regressor1.predict(X_test)
-    #y_pred2 = regressor2.predict(X_test)
-    y_pred3 = regressor3.predict(X_test)
-
-    # Evaluate the model
-    mse1 = mean_squared_error(y_test, y_pred1)
-    #mse2 = mean_squared_error(y_test, y_pred2)
-    mse3 = mean_squared_error(y_test, y_pred3)
-    print(f"Regression Mean Squared Error xgboost: {mse1:.2f}")
-    #print(f"Regression Mean Squared Error catboost: {mse2:.2f}")
-    print(f"Regression Mean Squared Error lightgbm: {mse3:.2f}")
-    ```
+        ```python
+        import unifiedbooster as ub
+        from sklearn.datasets import fetch_california_housing
+        from sklearn.model_selection import train_test_split
+        from sklearn.metrics import mean_squared_error
+
+        # Load dataset
+        housing = fetch_california_housing()
+        X, y = housing.data, housing.target
+
+        # Split dataset into training and testing sets
+        X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_state=42)
+
+        # Initialize the unified regressor (example with XGBoost)
+        regressor1 = ub.GBDTRegressor(model_type='xgboost')
+        #regressor2 = ub.GBDTRegressor(model_type='catboost')
+        regressor3 = ub.GBDTRegressor(model_type='lightgbm')
+
+        # Fit the model
+        regressor1.fit(X_train, y_train)
+        #regressor2.fit(X_train, y_train)
+        regressor3.fit(X_train, y_train)
+
+        # Predict on the test set
+        y_pred1 = regressor1.predict(X_test)
+        #y_pred2 = regressor2.predict(X_test)
+        y_pred3 = regressor3.predict(X_test)
+
+        # Evaluate the model
+        mse1 = mean_squared_error(y_test, y_pred1)
+        #mse2 = mean_squared_error(y_test, y_pred2)
+        mse3 = mean_squared_error(y_test, y_pred3)
+        print(f"Regression Mean Squared Error xgboost: {mse1:.2f}")
+        #print(f"Regression Mean Squared Error catboost: {mse2:.2f}")
+        print(f"Regression Mean Squared Error lightgbm: {mse3:.2f}")
+        ```
     """
 
     def __init__(

unifiedbooster/gpoptimization.py

@@ -325,9 +325,14 @@ def lazy_cross_val_optim(
     Examples:
 
         ```python
+        import os 
         import unifiedbooster as ub
         from sklearn.datasets import load_breast_cancer
         from sklearn.model_selection import train_test_split
+        from sklearn.metrics import accuracy_score
+        from time import time
+
+        print(f"\n ----- Running: {os.path.basename(__file__)}... ----- \n")
 
         dataset = load_breast_cancer()
         X, y = dataset.data, dataset.target
@@ -335,25 +340,26 @@ def lazy_cross_val_optim(
             X, y, test_size=0.2, random_state=42
         )
 
-        res1 = ub.cross_val_optim(
+        start = time()
+        res4 = ub.lazy_cross_val_optim(
             X_train,
             y_train,
-            X_test=None,
-            y_test=None,
+            X_test=X_test,
+            y_test=y_test,
             model_type="lightgbm",
             type_fit="classification",
             scoring="accuracy",
             n_estimators=100,
-            surrogate_obj=None,
             cv=5,
             n_jobs=None,
             n_init=10,
             n_iter=190,
             abs_tol=1e-3,
-            verbose=2,
             seed=123,
+            customize=False
         )
-        print(res1)
+        print(f"Elapsed: {time()-start}")
+        print(res4)
         ```
     """
 

{unifiedbooster-0.4.2.dist-info → unifiedbooster-0.5.0.dist-info}/METADATA

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

unifiedbooster-0.5.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+unifiedbooster/__init__.py,sha256=8FEkWCZ2tT8xcW46Z0X_BS9_r0kQWVAu37IncLq6QWU,301
+unifiedbooster/gbdt.py,sha256=u5Sjw-V8BlDS4LUo_SNOfuz66EFcJhP1Al6Es41R_X8,4932
+unifiedbooster/gbdt_classification.py,sha256=wifw86cUvsyiKSz8MTxIgH6j7Gd1voIxXUiJVsE68bk,4219
+unifiedbooster/gbdt_regression.py,sha256=YQIDtW4hV7DxHAHuoMMkD1aRy0dzVXxx2rwPu3InTA8,3710
+unifiedbooster/gpoptimization.py,sha256=S-yZI8qI_QZyoCqWj8MT0a2Djlo3YrYRjyXApLS9FXM,12831
+unifiedbooster-0.5.0.dist-info/LICENSE,sha256=3rWw63btcdqbC0XMnpzCQhxDP8Vx7yKkKS7EDgJiY_4,1061
+unifiedbooster-0.5.0.dist-info/METADATA,sha256=mao-q4w_f26KVwKSy4ZPEJBZQIRARtXsWEN7t7JEwRw,955
+unifiedbooster-0.5.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+unifiedbooster-0.5.0.dist-info/entry_points.txt,sha256=OVNTsCzMYnaJ11WIByB7G8Lym_dj-ERKZyQxWFUcW30,59
+unifiedbooster-0.5.0.dist-info/top_level.txt,sha256=gOMxxpRtx8_nJXTWsXJDFkNeCsjSJQPs6aUXKK5_nI4,15
+unifiedbooster-0.5.0.dist-info/RECORD,,

unifiedbooster-0.4.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-unifiedbooster/__init__.py,sha256=8FEkWCZ2tT8xcW46Z0X_BS9_r0kQWVAu37IncLq6QWU,301
-unifiedbooster/gbdt.py,sha256=1qVdOeoEyBxxbJ7HBHZegGJo2d2onXs73o8_JntOtN8,4819
-unifiedbooster/gbdt_classification.py,sha256=RLoM_lCmvEDrpNLRFlEzwKBA2oc0mkYUVKLFOTYAPrs,4099
-unifiedbooster/gbdt_regression.py,sha256=Eavj3mV5Lsjpx-d03GLgT8GrwEYuBmBEWkUyDPcJu_g,3590
-unifiedbooster/gpoptimization.py,sha256=xomHqQHu1wvG2wDdmErY8fYgB39pmNMo0-IvJdwEpoM,12606
-unifiedbooster-0.4.2.dist-info/LICENSE,sha256=3rWw63btcdqbC0XMnpzCQhxDP8Vx7yKkKS7EDgJiY_4,1061
-unifiedbooster-0.4.2.dist-info/METADATA,sha256=FiWDX64O41lbiNDL406XjArYUcnoIKKAZjNdxkzbHGo,955
-unifiedbooster-0.4.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-unifiedbooster-0.4.2.dist-info/entry_points.txt,sha256=OVNTsCzMYnaJ11WIByB7G8Lym_dj-ERKZyQxWFUcW30,59
-unifiedbooster-0.4.2.dist-info/top_level.txt,sha256=gOMxxpRtx8_nJXTWsXJDFkNeCsjSJQPs6aUXKK5_nI4,15
-unifiedbooster-0.4.2.dist-info/RECORD,,