Merge pull request #161 from NiaOrg/fix-version-1

fix Bat and Hybrid Bat algorithm

.pycodestyle.ini

@@ -5,4 +5,4 @@
 # E501: line too long (checked by PyLint)
 # E711: comparison to None (used to improve test style)
 # E712: comparison to True (used to improve test style)
-ignore = E401,E402,E501,E711,E712
+ignore = E401,E402,E501,W504,E711,E712

.pylint.ini

@@ -125,7 +125,9 @@ disable=print-statement,
         similarities,
         too-many-locals,
         too-many-statements,
-        too-many-instance-attributes
+        too-many-instance-attributes,
+        old-style-class,
+        W504
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

Makefile

@@ -82,7 +82,7 @@ pydocstyle: install
 
 PYTEST := pipenv run py.test
 COVERAGE := pipenv run coverage
-COVERAGE_SPACE := pipenv run coverage.space
+COVERAGE_SPACE := pipenv run coveragespace
 
 RANDOM_SEED ?= $(shell date +%s)
 FAILURES := .cache/v/cache/lastfailed

NiaPy/__init__.py

@@ -21,7 +21,7 @@
 logger.setLevel('INFO')
 
 
-class Runner(object):
+class Runner:
     r"""Runner utility feature.
 
     Feature which enables running multiple algorithms with multiple benchmarks.

NiaPy/algorithms/basic/abc.py

@@ -5,7 +5,7 @@
 __all__ = ['ArtificialBeeColonyAlgorithm']
 
 
-class SolutionABC(object):
+class SolutionABC:
 
     def __init__(self, D, LB, UB):
         self.D = D
@@ -34,7 +34,7 @@ def toString(self):
         pass
 
 
-class ArtificialBeeColonyAlgorithm(object):
+class ArtificialBeeColonyAlgorithm:
     r"""Implementation of Artificial Bee Colony algorithm.
 
     **Algorithm:** Artificial Bee Colony algorithm

NiaPy/algorithms/basic/ba.py

@@ -4,7 +4,7 @@
 __all__ = ['BatAlgorithm']
 
 
-class BatAlgorithm(object):
+class BatAlgorithm:
     r"""Implementation of Bat algorithm.
 
     **Algorithm:** Bat algorithm
@@ -126,7 +126,7 @@ def move_bat(self):
         while self.eval_flag is not False:
             for i in range(self.NP):
                 rnd = random.uniform(0, 1)
-                self.Q[i] = self.Qmin + (self.Qmin - self.Qmax) * rnd
+                self.Q[i] = self.Qmin + (self.Qmax - self.Qmin) * rnd
                 for j in range(self.D):
                     self.v[i][j] = self.v[i][j] + (self.Sol[i][j] -
                                                    self.best[j]) * self.Q[i]

NiaPy/algorithms/basic/de.py

@@ -5,7 +5,7 @@
 __all__ = ['DifferentialEvolutionAlgorithm']
 
 
-class SolutionDE(object):
+class SolutionDE:
 
     def __init__(self, D, LB, UB):
         self.D = D
@@ -34,7 +34,7 @@ def __eq__(self, other):
         return self.Solution == other.Solution and self.Fitness == other.Fitness
 
 
-class DifferentialEvolutionAlgorithm(object):
+class DifferentialEvolutionAlgorithm:
     r"""Implementation of Differential evolution algorithm.
 
     **Algorithm:** Differential evolution algorithm

NiaPy/algorithms/basic/fa.py

@@ -5,7 +5,7 @@
 __all__ = ['FireflyAlgorithm']
 
 
-class FireflyAlgorithm(object):
+class FireflyAlgorithm:
     r"""Implementation of Firefly algorithm.
 
     **Algorithm:** Firefly algorithm

NiaPy/algorithms/basic/fpa.py

@@ -6,7 +6,7 @@
 __all__ = ['FlowerPollinationAlgorithm']
 
 
-class FlowerPollinationAlgorithm(object):
+class FlowerPollinationAlgorithm:
     r"""Implementation of Flower Pollination algorithm.
 
     **Algorithm:** Flower Pollination algorithm

NiaPy/algorithms/basic/ga.py

@@ -5,7 +5,7 @@
 __all__ = ['GeneticAlgorithm']
 
 
-class Chromosome(object):
+class Chromosome:
     def __init__(self, D, LB, UB):
         self.D = D
         self.LB = LB
@@ -36,7 +36,7 @@ def toString(self):
         print([i for i in self.Solution])
 
 
-class GeneticAlgorithm(object):
+class GeneticAlgorithm:
     r"""Implementation of Genetic algorithm.
 
     **Algorithm:** Genetic algorithm

NiaPy/algorithms/basic/gwo.py

@@ -4,7 +4,7 @@
 __all__ = ['GreyWolfOptimizer']
 
 
-class GreyWolfOptimizer(object):
+class GreyWolfOptimizer:
     r"""Implementation of Grey wolf optimizer.
 
     **Algorithm:** Grey wolf optimizer
@@ -104,12 +104,11 @@ def move(self):
                     self.Alpha_score = Fit
                     self.Alpha_pos = self.Positions[i]
 
-                if ((Fit > self.Alpha_score) and (Fit < self.Beta_score)):
+                if self.Alpha_score < Fit < self.Beta_score:
                     self.Beta_score = Fit
                     self.Beta_pos = self.Positions[i]
 
-                if ((Fit > self.Alpha_score) and (Fit > self.Beta_score) and
-                        (Fit < self.Delta_score)):
+                if self.Alpha_score < Fit and self.Beta_score < Fit < self.Delta_score:
                     self.Delta_score = Fit
                     self.Delta_pos = self.Positions[i]
 

NiaPy/algorithms/basic/pso.py

@@ -6,7 +6,7 @@
 __all__ = ['ParticleSwarmAlgorithm']
 
 
-class ParticleSwarmAlgorithm(object):
+class ParticleSwarmAlgorithm:
     r"""Implementation of Particle Swarm Optimization algorithm.
 
     **Algorithm:** Particle Swarm Optimization algorithm

NiaPy/algorithms/modified/hba.py

@@ -4,7 +4,7 @@
 __all__ = ['HybridBatAlgorithm']
 
 
-class HybridBatAlgorithm(object):
+class HybridBatAlgorithm:
     r"""Implementation of Hybrid bat algorithm.
 
     **Algorithm:** Hybrid bat algorithm
@@ -126,7 +126,7 @@ def move_bat(self):
         while self.eval_flag is not False:
             for i in range(self.NP):
                 rnd = random.uniform(0, 1)
-                self.Q[i] = self.Qmin + (self.Qmin - self.Qmax) * rnd
+                self.Q[i] = self.Qmin + (self.Qmax - self.Qmin) * rnd
 
                 j = None
                 for j in range(self.D):

NiaPy/algorithms/modified/jde.py

@@ -5,7 +5,7 @@
 __all__ = ['SelfAdaptiveDifferentialEvolutionAlgorithm']
 
 
-class SolutionjDE(object):
+class SolutionjDE:
 
     def __init__(self, D, LB, UB, F, CR):
         self.D = D
@@ -39,7 +39,7 @@ def __eq__(self, other):
         return self.Solution == other.Solution and self.Fitness == other.Fitness
 
 
-class SelfAdaptiveDifferentialEvolutionAlgorithm(object):
+class SelfAdaptiveDifferentialEvolutionAlgorithm:
     r"""Implementation of Self-adaptive differential evolution algorithm.
 
     **Algorithm:** Self-adaptive differential evolution algorithm

NiaPy/benchmarks/ackley.py

@@ -5,7 +5,7 @@
 __all__ = ['Ackley']
 
 
-class Ackley(object):
+class Ackley:
     r"""Implementation of Ackley function.
 
     Date: 2018

NiaPy/benchmarks/alpine.py

@@ -7,7 +7,7 @@
 __all__ = ['Alpine1', 'Alpine2']
 
 
-class Alpine1(object):
+class Alpine1:
     r"""Implementation of Alpine1 function.
 
     Date: 2018
@@ -61,7 +61,7 @@ def evaluate(D, sol):
         return evaluate
 
 
-class Alpine2(object):
+class Alpine2:
     r"""Implementation of Alpine2 function.
 
     Date: 2018

NiaPy/benchmarks/chungReynolds.py

@@ -5,7 +5,7 @@
 __all__ = ['ChungReynolds']
 
 
-class ChungReynolds(object):
+class ChungReynolds:
     r"""Implementation of Chung Reynolds functions.
 
     Date: 2018

NiaPy/benchmarks/csendes.py

@@ -5,7 +5,7 @@
 __all__ = ['Csendes']
 
 
-class Csendes(object):
+class Csendes:
     r"""Implementation of Csendes function.
 
     Date: 2018

NiaPy/benchmarks/griewank.py

@@ -5,7 +5,7 @@
 __all__ = ['Griewank']
 
 
-class Griewank(object):
+class Griewank:
     r"""Implementation of Griewank function.
 
     Date: 2018

NiaPy/benchmarks/happyCat.py

@@ -5,7 +5,7 @@
 __all__ = ['HappyCat']
 
 
-class HappyCat(object):
+class HappyCat:
     r"""Implementation of Happy cat function.
 
     Date: 2018

NiaPy/benchmarks/pinter.py

@@ -5,7 +5,7 @@
 __all__ = ['Pinter']
 
 
-class Pinter(object):
+class Pinter:
     r"""Implementation of Pintér function.
 
     Date: 2018

NiaPy/benchmarks/qing.py

@@ -5,7 +5,7 @@
 __all__ = ['Qing']
 
 
-class Qing(object):
+class Qing:
     r"""Implementation of Qing function.
 
     Date: 2018

NiaPy/benchmarks/quintic.py

@@ -5,7 +5,7 @@
 __all__ = ['Quintic']
 
 
-class Quintic(object):
+class Quintic:
     r"""Implementation of Quintic function.
 
     Date: 2018

NiaPy/benchmarks/rastrigin.py

@@ -5,7 +5,7 @@
 __all__ = ['Rastrigin']
 
 
-class Rastrigin(object):
+class Rastrigin:
     r"""Implementation of Rastrigin benchmark function.
 
     Date: 2018

NiaPy/benchmarks/ridge.py

@@ -5,7 +5,7 @@
 __all__ = ['Ridge']
 
 
-class Ridge(object):
+class Ridge:
     r"""Implementation of Ridge function.
 
     Date: 2018

NiaPy/benchmarks/rosenbrock.py

@@ -5,7 +5,7 @@
 __all__ = ['Rosenbrock']
 
 
-class Rosenbrock(object):
+class Rosenbrock:
     r"""Implementation of Rosenbrock benchmark function.
 
     Date: 2018

NiaPy/benchmarks/salomon.py

@@ -5,7 +5,7 @@
 __all__ = ['Salomon']
 
 
-class Salomon(object):
+class Salomon:
     r"""Implementation of Salomon function.
 
     Date: 2018

NiaPy/benchmarks/schumerSteiglitz.py

@@ -5,7 +5,7 @@
 __all__ = ['SchumerSteiglitz']
 
 
-class SchumerSteiglitz(object):
+class SchumerSteiglitz:
     r"""Implementation of Schumer Steiglitz function.
 
     Date: 2018

NiaPy/benchmarks/schwefel.py

@@ -7,7 +7,7 @@
 __all__ = ['Schwefel', 'Schwefel221', 'Schwefel222']
 
 
-class Schwefel(object):
+class Schwefel:
     r"""Implementation of Schewel function.
 
     Date: 2018
@@ -58,7 +58,7 @@ def evaluate(D, sol):
         return evaluate
 
 
-class Schwefel221(object):
+class Schwefel221:
     r"""Schwefel 2.21 function implementation.
 
     Date: 2018
@@ -112,7 +112,7 @@ def evaluate(D, sol):
         return evaluate
 
 
-class Schwefel222(object):
+class Schwefel222:
     r"""Schwefel 2.22 function implementation.
 
     Date: 2018

NiaPy/benchmarks/sphere.py

@@ -6,7 +6,7 @@
 __all__ = ['Sphere']
 
 
-class Sphere(object):
+class Sphere:
     r"""Implementation of Sphere functions.
 
     Date: 2018

NiaPy/benchmarks/step.py

@@ -7,7 +7,7 @@
 __all__ = ['Step', 'Step2', 'Step3']
 
 
-class Step(object):
+class Step:
     r"""Implementation of Step function.
 
     Date: 2018
@@ -64,7 +64,7 @@ def evaluate(D, sol):
         return evaluate
 
 
-class Step2(object):
+class Step2:
     r"""Step2 function implementation.
 
     Date: 2018
@@ -119,7 +119,7 @@ def evaluate(D, sol):
         return evaluate
 
 
-class Step3(object):
+class Step3:
     r"""Step3 function implementation.
 
     Date: 2018