diff --git a/MANIFEST.in b/MANIFEST.in index c72327d..a86fff7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,5 @@ include README.md LICENSE -include opfunu/cec/cec2005/support_data/*.txt \ No newline at end of file +include opfunu/cec/cec2005/support_data/*.txt +include opfunu/cec/cec2008/support_data/*.txt +include opfunu/cec/cec2010/support_data/*.txt +include opfunu/cec/cec2014/support_data/*.txt \ No newline at end of file diff --git a/README.md b/README.md index 059fe6e..9122e0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Optimization Function in Numpy (OpFuNu) -[![GitHub release](https://img.shields.io/badge/release-0.5.1-yellow.svg)]() +[![GitHub release](https://img.shields.io/badge/release-0.6.0-yellow.svg)]() [![Wheel](https://img.shields.io/pypi/wheel/gensim.svg)](https://pypi.python.org/pypi/opfunu) [![PyPI version](https://badge.fury.io/py/opfunu.svg)](https://badge.fury.io/py/opfunu) [![DOI version](https://zenodo.org/badge/DOI/10.5281/zenodo.3620960.svg)](https://badge.fury.io/py/opfunu) @@ -52,38 +52,35 @@ print(cec_func.C1(cec_sol)) # using function in print(cec_func.C30(cec_sol)) -## CEC 2005 +## CEC-2005 or CEC-2008 import numpy as np -from opfunu.cec.cec2005.F1 import Model +from opfunu.cec.cec2005.F1 import Model as f1 +from opfunu.cec.cec2008.F7 import Model as f7 -t1 = Model() -temp = np.array([0.5, 1, 1.5, 2, 3, 0.9, 1.2, 2, 1, 5]) +solution = np.array([0.5, 1, 1.5, 2, 3, 0.9, 1.2, 2, 1, 5]) + +t1 = f1() result = t1._main__(temp) print(result) - -## CEC 2008 - -import numpy as np -from opfunu.cec.cec2008.F7 import Model -t1 = Model() - -temp = np.array([0.5, 1, 1.5, 2, 3, 0.9, 1.2, 2, 1, 5]) -result = t1._main__(temp) +t2 = f7() +result = t2._main__(temp) print(result) -## CEC 2010 +## CEC-2010 or CEC-2014 import numpy as np from opfunu.cec.cec2010.function import F1, F2, ..., F12,.. +from opfunu.cec.cec2014.function import F1, F2, ...., F28 solution = np.random.uniform(0, 1, 1000) result = F12(temp) print(result) + ... ``` diff --git a/setup.py b/setup.py index 52ab0fa..90bca46 100644 --- a/setup.py +++ b/setup.py @@ -7,14 +7,14 @@ def readme(): setup( name="opfunu", - version="0.5.1", + version="0.6.0", author="Thieu Nguyen", author_email="nguyenthieu2102@gmail.com", description="A python (Numpy) package for Un-constrained Optimization Functions", long_description=readme(), long_description_content_type="text/markdown", url="https://github.com/thieunguyen5991/opfunu", - download_url="https://github.com/thieunguyen5991/opfunu/archive/v0.5.1.zip", + download_url="https://github.com/thieunguyen5991/opfunu/archive/v0.6.0.zip", packages=find_packages(), include_package_data=True, license="MIT",