发布0.0.2版本

1. 完善原BAS边界无处理的问题
2. 加demo
3. 依赖astartool工具包

Signed-off-by: A.Star <[email protected]>

Author: ASTARCHEN

Diff for: bas/__init__.py

@@ -8,4 +8,11 @@
 # @Software: PyCharm
 
 from bas.rbas import RBAS
-__version__ = '0.0.1'
+from bas.bas import BAS
+
+from astartool.setuptool import get_version
+
+version = (0, 0, 2, 'final', 0)
+__version__ = get_version(version)
+
+del get_version

Diff for: bas/bas.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Author: 河北雪域网络科技有限公司 A.Star
+# @contact: [email protected]
+# @site: www.snowland.ltd
+# @file: bas.py
+# @time: 2019/7/25 11:15
+# @Software: PyCharm
+
+
+__author__ = 'A.Star'
+
+from matplotlib import pylab as plt
+import numpy as np
+from copy import deepcopy
+from slapy.swarm.bas import BASEngine
+
+npa = np.array
+npr = np.random
+
+# 带边界处理的BAS
+
+
+class BAS(BASEngine):
+    def __init__(self, steps=100, eps=0.01, chromosome=None, dim=2, bound=None, fitness_function=None, *,
+                 fitness_value=-np.inf, init_method='random', step0=1, c=5, eta=0.95, **kwargs):
+        super().__init__(steps, eps, chromosome, dim, bound, fitness_function, fitness_value=fitness_value,
+                         init_method=init_method, **kwargs)
+        self.eta = eta
+        self.c = c
+        self.step = step0
+
+    def update(self, *args, **kwargs):
+        d0 = self.step / self.c
+        dir = npr.rand(self.dim) - 1
+        dir = dir / (self.eps + np.linalg.norm(dir))
+        xleft = self.chromosome + dir * d0
+        fleft = self.fitness_function(xleft)
+        xright = self.chromosome - dir * d0
+        fright = self.fitness_function(xright)
+        self.chromosome -= self.step * dir * np.sign(-fleft + fright)
+        # 边界处理规则
+        self.transboundary()
+
+        if self.fitness() > self.gbest.fitness_value:
+            self.gbest = deepcopy(self)
+        self.step *= self.eta
+
+    def fitness(self, *args, **kwargs):
+        return super(BASEngine, self).fitness(*args, **kwargs)
+
+    def initialize(self, *args, **kwargs):
+        super(BASEngine, self).initialize(*args, **kwargs)
+        self.gbest = deepcopy(self)
+        self.best = []
+        self.path = []
+
+    def analysis(self, *args, **kwargs):
+        print('-' * 15)
+        print("best:", self.best)
+        print('-' * 15)
+        print("path:", self.path)
+        print('-' * 15)
+        plt.figure(1)
+        path = npa(self.path)
+        plt.plot(path[:, 0], path[:, 1], 'r+-')
+        plt.figure(2)
+        plt.title('itor in each steps')
+        plt.plot(self.best, 'r-', label='best')
+        plt.xlabel("Iteration")
+        plt.ylabel("function value")
+        plt.show()
+        print(self.gbest.chromosome)
+
+    def record(self, *args, **kwargs):
+        print(len(self.path))
+        self.path.append(deepcopy(self.chromosome))
+        self.best.append(self.fitness_value)

Diff for: bas/rbas.py

@@ -15,6 +15,10 @@
 npr = np.random
 
 
+
+# 模拟退火结合的BAS
+
+
 class RBASEngine(BASEngine):
     def __init__(self, steps=100, eps=0.01, chromosome=None, dim=2, bound=None, fitness_function=None, *,
                  fitness_value=-np.inf, init_method='random', step0=1, c=5, eta=0.95, **kwargs):

Diff for: bas/demo.py renamed to demo/demo.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Author: 河北雪域网络科技有限公司 A.Star
+# @contact: [email protected]
+# @site: www.snowland.ltd
+# @file: demo2.py
+# @time: 2019/7/25 10:52
+# @Software: PyCharm
+
+
+__author__ = 'A.Star'
+
+from bas import BAS
+
+
+def f(x):
+    c, d = x
+    return 1 / ((1 + (c + d + 1) ** 2 * (19 - 14 * c + 3 * d ** 2 - 14 * d + 6 * c * d + 3 * d ** 2)) * (
+            30 + (2 * c - 3 * d) ** 2 * (18 - 32 * c + 12 * c ** 2 + 48 * d - 36 * c * d + 27 * d ** 2)))
+
+
+if __name__ == '__main__':
+    bas_engine = BAS(
+        steps=500,
+        dim=2,
+        fitness_function=f,
+        step=1,
+        eta=0.95,
+        bound=[[-2, 2], [-2, 2]],
+        transboundary_rules='mod'
+    )
+    bas_engine.run()

Diff for: demo/demo2.py

@@ -1,2 +1,3 @@
-snowland-algorithm==0.0.7
-numpy>=1.0.0
+snowland-algorithm>=0.0.7
+numpy>=1.0.0
+astartool>=0.0.2

Diff for: requirements.txt

@@ -11,12 +11,14 @@
 
 from setuptools import setup, find_packages
 import bas
+from astartool.setuptool import load_install_requires
+
 
 setup(
     name="pybas",
     version=bas.__version__,
     description=(
-        'Python implementation algorithm'
+        'Beetle Antennae Search Algorithm for python 3.x'
     ),
     long_description=open('README.rst').read(),
     author='A.Star',
@@ -43,8 +45,5 @@
         'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries'
     ],
-    install_requires=[
-        'snowland-algorithm==0.0.7',
-        'numpy>=1.0.0'
-    ],
+    install_requires=load_install_requires(),
 )