diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b1a3122..cce8b96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,6 @@ jobs: pip install -q --upgrade pip pip install -q -r requirements.txt pip install -q --upgrade codecov coverage black flake8 codacy-coverage - pip install -q git+https://github.com/doctorado-ml/mfs - name: Lint run: | black --check --diff stree diff --git a/Makefile b/Makefile index 89249ca..dc9eb8f 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ doc: ## Update documentation build: ## Build package rm -fr dist/* + rm -fr build/* python setup.py sdist bdist_wheel doc-clean: ## Update documentation diff --git a/docs/requirements.txt b/docs/requirements.txt index acff299..aa89e55 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ sphinx sphinx-rtd-theme myst-parser -git+https://github.com/doctorado-ml/stree +mufs \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2fb21fa..3c9fd56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ scikit-learn>0.24 -mfs \ No newline at end of file +mufs \ No newline at end of file diff --git a/setup.py b/setup.py index b9ea1eb..ee60a5c 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ setuptools.setup( "Topic :: Scientific/Engineering :: Artificial Intelligence", "Intended Audience :: Science/Research", ], - install_requires=["scikit-learn", "numpy", "mfs"], + install_requires=["scikit-learn", "mufs"], test_suite="stree.tests", zip_safe=False, ) diff --git a/stree/Splitter.py b/stree/Splitter.py index b321617..b972992 100644 --- a/stree/Splitter.py +++ b/stree/Splitter.py @@ -12,7 +12,7 @@ from sklearn.feature_selection import SelectKBest, mutual_info_classif from sklearn.preprocessing import StandardScaler from sklearn.svm import SVC from sklearn.exceptions import ConvergenceWarning -from mfs import MFS +from mufs import MUFS class Snode: @@ -312,8 +312,8 @@ class Splitter: tuple indices of the features selected """ - mfs = MFS(max_features=max_features, discrete=False) - return mfs.cfs(dataset, labels).get_results() + mufs = MUFS(max_features=max_features, discrete=False) + return mufs.cfs(dataset, labels).get_results() @staticmethod def _fs_fcbf( @@ -336,8 +336,8 @@ class Splitter: tuple indices of the features selected """ - mfs = MFS(max_features=max_features, discrete=False) - return mfs.fcbf(dataset, labels, 5e-4).get_results() + mufs = MUFS(max_features=max_features, discrete=False) + return mufs.fcbf(dataset, labels, 5e-4).get_results() def partition_impurity(self, y: np.array) -> np.array: return self.criterion_function(y) diff --git a/stree/__init__.py b/stree/__init__.py index d68b2e6..cc78506 100644 --- a/stree/__init__.py +++ b/stree/__init__.py @@ -1,6 +1,6 @@ from .Strees import Stree, Siterator -__version__ = "1.2" +__version__ = "1.2.1" __author__ = "Ricardo Montañana Gómez" __copyright__ = "Copyright 2020-2021, Ricardo Montañana Gómez"