Merge pull request #31 from Techtonique/v0180

V0180
Techtonique · May 6, 2024 · 0885d9f · 0885d9f
2 parents ef93a00 + 117099a
commit 0885d9f
Show file tree

Hide file tree

Showing 19 changed files with 1,739 additions and 1,676 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -30,8 +30,8 @@ jobs:
       - name: Run examples 
         run: pip install .&&find examples -maxdepth 2 -name "*.py" -exec  python3 {} \;
 
-      #- name: Publish to PyPI                
-      #  uses: pypa/gh-action-pypi-publish@release/v1
-      #  with:
-      #     password: ${{ secrets.PYPI_GLOBAL_MLSAUCE }}
-      #     repository-url: https://upload.pypi.org/legacy/          
+      - name: Publish to PyPI                
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+           password: ${{ secrets.PYPI_GLOBAL_MLSAUCE }}
+           repository-url: https://upload.pypi.org/legacy/          
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-# version 0.18.0
+# version 0.18.2
 
 - Gaussian weights in `LSBoostRegressor` and `LSBoostClassifier` randomized hidden layer
 

diff --git a/examples/lsboost_classifier.py b/examples/lsboost_classifier.py
@@ -270,3 +270,16 @@
 print(time()-start)
 
 
+obj = ms.LSBoostClassifier(solver="lasso", 
+                           n_clusters=3, degree=2, 
+                           clustering_method="gmm",
+                           weights_distr="gaussian")
+print(obj.get_params())
+start = time()
+obj.fit(X_train, y_train)
+print(time()-start)
+start = time()
+print(obj.score(X_test, y_test))
+print(time()-start)
+
+
diff --git a/mlsauce-docs/mlsauce.html b/mlsauce-docs/mlsauce.html
diff --git a/mlsauce-docs/mlsauce/booster.html b/mlsauce-docs/mlsauce/booster.html
diff --git a/mlsauce-docs/search.js b/mlsauce-docs/search.js
diff --git a/mlsauce.egg-info/PKG-INFO b/mlsauce.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlsauce
-Version: 0.18.1
+Version: 0.18.2
 Summary: Miscellaneous Statistical/Machine Learning tools
 Maintainer: T. Moudiki
 Maintainer-email: [email protected]

diff --git a/mlsauce/adaopt/_adaoptc.cpython-311-darwin.so b/mlsauce/adaopt/_adaoptc.cpython-311-darwin.so
diff --git a/mlsauce/adaopt/setup2.py b/mlsauce/adaopt/setup2.py
@@ -1,5 +1,5 @@
 import os
-from distutils.core import setup
+from setuptools import setup
 from Cython.Build import cythonize
 
 dir_path = os.path.dirname(os.path.realpath(__file__))

diff --git a/mlsauce/booster/_booster_classifier.py b/mlsauce/booster/_booster_classifier.py
@@ -5,6 +5,7 @@
 from sklearn.base import BaseEstimator
 from sklearn.base import ClassifierMixin
 from sklearn.preprocessing import PolynomialFeatures
+
 try:
     from . import _boosterc as boosterc
 except ImportError:
@@ -77,7 +78,7 @@ class LSBoostClassifier(BaseEstimator, ClassifierMixin):
 
         degree: int
             degree of features interactions to include in the model
-        
+
         weights_distr: str
             distribution of weights for constructing the model's hidden layer;
             currently 'uniform', 'gaussian'
@@ -105,7 +106,7 @@ def __init__(
         clustering_method="kmeans",
         cluster_scaling="standard",
         degree=0,
-        weights_distr="uniform"
+        weights_distr="uniform",
     ):
         if n_clusters > 0:
             assert clustering_method in (

diff --git a/mlsauce/booster/_booster_regressor.py b/mlsauce/booster/_booster_regressor.py
@@ -5,6 +5,7 @@
 from sklearn.base import BaseEstimator
 from sklearn.base import RegressorMixin
 from sklearn.preprocessing import PolynomialFeatures
+
 try:
     from . import _boosterc as boosterc
 except ImportError:
@@ -87,9 +88,9 @@ class LSBoostRegressor(BaseEstimator, RegressorMixin):
 
         degree: int
             degree of features interactions to include in the model
-        
+
         weights_distr: str
-            distribution of weights for constructing the model's hidden layer; 
+            distribution of weights for constructing the model's hidden layer;
             either 'uniform' or 'gaussian'
 
     """
@@ -118,7 +119,7 @@ def __init__(
         clustering_method="kmeans",
         cluster_scaling="standard",
         degree=0,
-        weights_distr="uniform"
+        weights_distr="uniform",
     ):
         if n_clusters > 0:
             assert clustering_method in (

diff --git a/mlsauce/booster/_boosterc.cpython-311-darwin.so b/mlsauce/booster/_boosterc.cpython-311-darwin.so
diff --git a/mlsauce/lasso/_lassoc.cpython-311-darwin.so b/mlsauce/lasso/_lassoc.cpython-311-darwin.so
diff --git a/mlsauce/lasso/setup2.py b/mlsauce/lasso/setup2.py
@@ -1,5 +1,5 @@
 import os
-from distutils.core import setup
+from setuptools import setup
 from Cython.Build import cythonize
 
 dir_path = os.path.dirname(os.path.realpath(__file__))

diff --git a/mlsauce/ridge/_ridgec.cpython-311-darwin.so b/mlsauce/ridge/_ridgec.cpython-311-darwin.so
diff --git a/mlsauce/ridge/setup2.py b/mlsauce/ridge/setup2.py
@@ -1,5 +1,5 @@
 import os
-from distutils.core import setup
+from setuptools import setup
 from Cython.Build import cythonize
 
 dir_path = os.path.dirname(os.path.realpath(__file__))

diff --git a/mlsauce/stump/_stumpc.cpython-311-darwin.so b/mlsauce/stump/_stumpc.cpython-311-darwin.so
diff --git a/mlsauce/stump/setup2.py b/mlsauce/stump/setup2.py
@@ -1,5 +1,5 @@
 import os
-from distutils.core import setup
+from setuptools import setup
 from Cython.Build import cythonize
 
 dir_path = os.path.dirname(os.path.realpath(__file__))

diff --git a/setup.py b/setup.py
@@ -37,7 +37,7 @@
 MAINTAINER_EMAIL = '[email protected]'
 LICENSE = 'BSD3 Clause Clear'
 
-__version__ = '0.18.1'
+__version__ = '0.18.2'
 
 VERSION = __version__