diff --git a/EDAspy.egg-info/PKG-INFO b/EDAspy.egg-info/PKG-INFO index 1c7c9c8..038a72b 100644 --- a/EDAspy.egg-info/PKG-INFO +++ b/EDAspy.egg-info/PKG-INFO @@ -1,17 +1,17 @@ Metadata-Version: 2.1 Name: EDAspy -Version: 1.1.1 +Version: 1.1.2 Summary: EDAspy is a Python package that implements Estimation of Distribution Algorithms. EDAspy allows toeither use already existing implementations or customize the EDAs baseline easily building it bymodules so new research can be easily developed. It also has several benchmarks for comparisons. Home-page: https://github.com/VicentePerezSoloviev/EDAspy Author: Vicente P. Soloviev Author-email: vicente.perez.soloviev@gmail.com License: MIT -Download-URL: https://github.com/VicentePerezSoloviev/EDAspy/archive/1.1.1.tar.gz +Download-URL: https://github.com/VicentePerezSoloviev/EDAspy/archive/1.1.2.tar.gz Description: # [![PyPI](https://img.shields.io/pypi/v/edaspy)](https://pypi.python.org/pypi/EDAspy/) [![PyPI license](https://img.shields.io/pypi/l/EDAspy.svg)](https://pypi.python.org/pypi/EDAspy/) - [![Downloads](https://static.pepy.tech/personalized-badge/edaspy?period=total&units=none&left_color=grey&right_color=blue&left_text=downloads)](https://pepy.tech/project/edaspy) + [![Downloads](https://static.pepy.tech/badge/edaspy)](https://pepy.tech/project/edaspy) [![Documentation Status](https://readthedocs.org/projects/edaspy/badge/?version=latest)](https://edaspy.readthedocs.io/en/latest/?badge=latest) # EDAspy @@ -48,7 +48,10 @@ Description: # =3.0 +Requires-Python: >=3.8 Description-Content-Type: text/markdown diff --git a/EDAspy.egg-info/SOURCES.txt b/EDAspy.egg-info/SOURCES.txt index 2dca6e4..6ddf40b 100644 --- a/EDAspy.egg-info/SOURCES.txt +++ b/EDAspy.egg-info/SOURCES.txt @@ -18,20 +18,25 @@ EDAspy/optimization/custom/__init__.py EDAspy/optimization/custom/eda_custom.py EDAspy/optimization/custom/initialization_models/__init__.py EDAspy/optimization/custom/initialization_models/_generation_init.py +EDAspy/optimization/custom/initialization_models/categorical_geninit.py +EDAspy/optimization/custom/initialization_models/latin_hypercube_sampling_geninit.py EDAspy/optimization/custom/initialization_models/multi_gauss_geninit.py EDAspy/optimization/custom/initialization_models/uni_bin_geninit.py EDAspy/optimization/custom/initialization_models/uni_gauss_geninit.py EDAspy/optimization/custom/initialization_models/uniform_geninit.py EDAspy/optimization/custom/probabilistic_models/__init__.py EDAspy/optimization/custom/probabilistic_models/_probabilistic_model.py +EDAspy/optimization/custom/probabilistic_models/discrete_bayesian_network.py EDAspy/optimization/custom/probabilistic_models/gaussian_bayesian_network.py EDAspy/optimization/custom/probabilistic_models/kde_bayesian_network.py EDAspy/optimization/custom/probabilistic_models/multivariate_gaussian.py EDAspy/optimization/custom/probabilistic_models/semiparametric_bayesian_network.py EDAspy/optimization/custom/probabilistic_models/univariate_binary.py +EDAspy/optimization/custom/probabilistic_models/univariate_categorical.py EDAspy/optimization/custom/probabilistic_models/univariate_gaussian.py EDAspy/optimization/custom/probabilistic_models/univariate_kde.py EDAspy/optimization/multivariate/__init__.py +EDAspy/optimization/multivariate/ebna.py EDAspy/optimization/multivariate/egna.py EDAspy/optimization/multivariate/emna.py EDAspy/optimization/multivariate/keda.py @@ -39,21 +44,27 @@ EDAspy/optimization/multivariate/speda.py EDAspy/optimization/univariate/__init__.py EDAspy/optimization/univariate/keda.py EDAspy/optimization/univariate/umda_binary.py +EDAspy/optimization/univariate/umda_categorical.py EDAspy/optimization/univariate/umda_continuous.py -EDAspy/timeseries/TS_transformations.py -EDAspy/timeseries/TransformationsFeatureSelection.py -EDAspy/timeseries/__init__.py tests/__init__.py -tests/test_egna.py -tests/test_emna.py -tests/test_gbn.py -tests/test_geninit.py -tests/test_kdebn.py -tests/test_keda.py -tests/test_multivariate_keda.py -tests/test_pm.py -tests/test_spbn.py -tests/test_speda.py -tests/test_umdac.py -tests/test_umdad.py -tests/test_univariate_keda.py \ No newline at end of file +tests/edas_multivariate/__init__.py +tests/edas_multivariate/test_ebna.py +tests/edas_multivariate/test_egna.py +tests/edas_multivariate/test_emna.py +tests/edas_multivariate/test_multivariate_keda.py +tests/edas_multivariate/test_speda.py +tests/edas_univariate/__init__.py +tests/edas_univariate/test_umdac.py +tests/edas_univariate/test_umdacat.py +tests/edas_univariate/test_umdad.py +tests/edas_univariate/test_univariate_keda.py +tests/inits/__init__.py +tests/inits/test_geninit.py +tests/pms/__init__.py +tests/pms/test_discrete_bn.py +tests/pms/test_gbn.py +tests/pms/test_kdebn.py +tests/pms/test_spbn.py +tests/pms/test_uni_bin_pm.py +tests/pms/test_uni_cat_pm.py +tests/pms/test_uni_gauss_pm.py \ No newline at end of file diff --git a/EDAspy/optimization/custom/probabilistic_models/discrete_bayesian_network.py b/EDAspy/optimization/custom/probabilistic_models/discrete_bayesian_network.py index b0193eb..89f2de8 100644 --- a/EDAspy/optimization/custom/probabilistic_models/discrete_bayesian_network.py +++ b/EDAspy/optimization/custom/probabilistic_models/discrete_bayesian_network.py @@ -4,7 +4,7 @@ import numpy as np import pandas as pd from pgmpy.models import BayesianNetwork -from pgmpy.estimators import BicScore, ExhaustiveSearch, MaximumLikelihoodEstimator +from pgmpy.estimators import HillClimbSearch, MaximumLikelihoodEstimator from ._probabilistic_model import ProbabilisticModel @@ -47,9 +47,8 @@ def learn(self, dataset: np.array, *args, **kwargs): self.pm.add_nodes_from(self.variables) # learn structure - bic = BicScore(data) - es = ExhaustiveSearch(data, scoring_method=bic) - best_structure = es.estimate() + es = HillClimbSearch(data) + best_structure = es.estimate(scoring_method='bicscore', max_iter=1000, show_progress=False) for edge in best_structure.edges(): self.pm.add_edge(edge[0], edge[1]) diff --git a/docs/_build/doctrees/EDAspy.benchmarks.doctree b/docs/_build/doctrees/EDAspy.benchmarks.doctree index 6bd00aa..9a4fa21 100644 Binary files a/docs/_build/doctrees/EDAspy.benchmarks.doctree and b/docs/_build/doctrees/EDAspy.benchmarks.doctree differ diff --git a/docs/_build/doctrees/EDAspy.doctree b/docs/_build/doctrees/EDAspy.doctree index de4ad90..4d1879c 100644 Binary files a/docs/_build/doctrees/EDAspy.doctree and b/docs/_build/doctrees/EDAspy.doctree differ diff --git a/docs/_build/doctrees/EDAspy.optimization.custom.doctree b/docs/_build/doctrees/EDAspy.optimization.custom.doctree index 3c4a919..93fe953 100644 Binary files a/docs/_build/doctrees/EDAspy.optimization.custom.doctree and b/docs/_build/doctrees/EDAspy.optimization.custom.doctree differ diff --git a/docs/_build/doctrees/EDAspy.optimization.custom.initialization_models.doctree b/docs/_build/doctrees/EDAspy.optimization.custom.initialization_models.doctree index c84107d..32e0015 100644 Binary files a/docs/_build/doctrees/EDAspy.optimization.custom.initialization_models.doctree and b/docs/_build/doctrees/EDAspy.optimization.custom.initialization_models.doctree differ diff --git a/docs/_build/doctrees/EDAspy.optimization.custom.probabilistic_models.doctree b/docs/_build/doctrees/EDAspy.optimization.custom.probabilistic_models.doctree index 746b5ba..5168269 100644 Binary files a/docs/_build/doctrees/EDAspy.optimization.custom.probabilistic_models.doctree and b/docs/_build/doctrees/EDAspy.optimization.custom.probabilistic_models.doctree differ diff --git a/docs/_build/doctrees/EDAspy.optimization.doctree b/docs/_build/doctrees/EDAspy.optimization.doctree index ea43fc8..85b811b 100644 Binary files a/docs/_build/doctrees/EDAspy.optimization.doctree and b/docs/_build/doctrees/EDAspy.optimization.doctree differ diff --git a/docs/_build/doctrees/EDAspy.optimization.multivariate.doctree b/docs/_build/doctrees/EDAspy.optimization.multivariate.doctree index 36554bb..3b84146 100644 Binary files a/docs/_build/doctrees/EDAspy.optimization.multivariate.doctree and b/docs/_build/doctrees/EDAspy.optimization.multivariate.doctree differ diff --git a/docs/_build/doctrees/EDAspy.optimization.univariate.doctree b/docs/_build/doctrees/EDAspy.optimization.univariate.doctree index b0f36e1..438a785 100644 Binary files a/docs/_build/doctrees/EDAspy.optimization.univariate.doctree and b/docs/_build/doctrees/EDAspy.optimization.univariate.doctree differ diff --git a/docs/_build/doctrees/categorical_optimization.doctree b/docs/_build/doctrees/categorical_optimization.doctree index 51fae47..d7889a4 100644 Binary files a/docs/_build/doctrees/categorical_optimization.doctree and b/docs/_build/doctrees/categorical_optimization.doctree differ diff --git a/docs/_build/doctrees/changelog.doctree b/docs/_build/doctrees/changelog.doctree index dc718fa..da40f2f 100644 Binary files a/docs/_build/doctrees/changelog.doctree and b/docs/_build/doctrees/changelog.doctree differ diff --git a/docs/_build/doctrees/eda_custom.doctree b/docs/_build/doctrees/eda_custom.doctree index b0ebee9..16c21da 100644 Binary files a/docs/_build/doctrees/eda_custom.doctree and b/docs/_build/doctrees/eda_custom.doctree differ diff --git a/docs/_build/doctrees/egna_opt.doctree b/docs/_build/doctrees/egna_opt.doctree index 8dddbc2..0662548 100644 Binary files a/docs/_build/doctrees/egna_opt.doctree and b/docs/_build/doctrees/egna_opt.doctree differ diff --git a/docs/_build/doctrees/emna_opt.doctree b/docs/_build/doctrees/emna_opt.doctree index 5413966..a093d48 100644 Binary files a/docs/_build/doctrees/emna_opt.doctree and b/docs/_build/doctrees/emna_opt.doctree differ diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle index 069511e..e06c097 100644 Binary files a/docs/_build/doctrees/environment.pickle and b/docs/_build/doctrees/environment.pickle differ diff --git a/docs/_build/doctrees/examples.doctree b/docs/_build/doctrees/examples.doctree index ec5f62f..67168a2 100644 Binary files a/docs/_build/doctrees/examples.doctree and b/docs/_build/doctrees/examples.doctree differ diff --git a/docs/_build/doctrees/feature_selection_umdad.doctree b/docs/_build/doctrees/feature_selection_umdad.doctree index 388190b..a42cf0d 100644 Binary files a/docs/_build/doctrees/feature_selection_umdad.doctree and b/docs/_build/doctrees/feature_selection_umdad.doctree differ diff --git a/docs/_build/doctrees/hyperparameter_umdac.doctree b/docs/_build/doctrees/hyperparameter_umdac.doctree index 5c8b3e1..12d6385 100644 Binary files a/docs/_build/doctrees/hyperparameter_umdac.doctree and b/docs/_build/doctrees/hyperparameter_umdac.doctree differ diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree index ded03c4..0c9489c 100644 Binary files a/docs/_build/doctrees/index.doctree and b/docs/_build/doctrees/index.doctree differ diff --git a/docs/_build/doctrees/installation.doctree b/docs/_build/doctrees/installation.doctree index 3dd7b1e..be2a237 100644 Binary files a/docs/_build/doctrees/installation.doctree and b/docs/_build/doctrees/installation.doctree differ diff --git a/docs/_build/doctrees/introduction.doctree b/docs/_build/doctrees/introduction.doctree index 9cc32d5..9bc8219 100644 Binary files a/docs/_build/doctrees/introduction.doctree and b/docs/_build/doctrees/introduction.doctree differ diff --git a/docs/_build/doctrees/modules.doctree b/docs/_build/doctrees/modules.doctree index 011964b..ad35dac 100644 Binary files a/docs/_build/doctrees/modules.doctree and b/docs/_build/doctrees/modules.doctree differ diff --git a/docs/_build/doctrees/multivariate_keda_opt.doctree b/docs/_build/doctrees/multivariate_keda_opt.doctree index 082dc06..206cb1c 100644 Binary files a/docs/_build/doctrees/multivariate_keda_opt.doctree and b/docs/_build/doctrees/multivariate_keda_opt.doctree differ diff --git a/docs/_build/doctrees/speda_opt.doctree b/docs/_build/doctrees/speda_opt.doctree index 3ced832..bf85804 100644 Binary files a/docs/_build/doctrees/speda_opt.doctree and b/docs/_build/doctrees/speda_opt.doctree differ diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo index fbf4bdb..96faa26 100644 --- a/docs/_build/html/.buildinfo +++ b/docs/_build/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 548cc20651cbb788240a69431335e19f +config: b17ce3ec747fb292f205046b405d7595 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_build/html/EDAspy.benchmarks.html b/docs/_build/html/EDAspy.benchmarks.html index 1e2a7b2..9cbd66b 100644 --- a/docs/_build/html/EDAspy.benchmarks.html +++ b/docs/_build/html/EDAspy.benchmarks.html @@ -4,7 +4,7 @@ - EDAspy.benchmarks package — EDAspy 1.1.2 documentation + EDAspy.benchmarks package — EDAspy 1.1.3 documentation