Skip to content

Commit

Permalink
Fix cec-2014 no-bias
Browse files Browse the repository at this point in the history
  • Loading branch information
thieu1995 committed May 9, 2020
1 parent dd28d35 commit 9c8a074
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Optimization Function in Numpy (OpFuNu)
[![GitHub release](https://img.shields.io/badge/release-0.6.6-yellow.svg)]()
[![GitHub release](https://img.shields.io/badge/release-0.6.7-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)
Expand Down
12 changes: 6 additions & 6 deletions opfunu/cec_basic/cec2014_nobias.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def F16(solution=None, shift_num=1, rotate_num=1, f_bias=0):
return expanded_scaffer__(z) + f_bias


def F17(solution=None, shift_num=1, f_bias=0):
def F17(solution=None, shift_num=1, rotate_num=1, f_bias=0):
dim = len(solution)
n1 = int(ceil(0.3 * dim))
n2 = int(ceil(0.3 * dim)) + n1
Expand All @@ -117,7 +117,7 @@ def F17(solution=None, shift_num=1, f_bias=0):
return modified_schwefel__(x[D[:n1]]) + rastrigin__(x[D[n1:n2]]) + elliptic__(x[D[n2:]]) + f_bias


def F18(solution=None, shift_num=1, f_bias=0):
def F18(solution=None, shift_num=1, rotate_num=1, f_bias=0):
dim = len(solution)
n1 = int(ceil(0.3 * dim))
n2 = int(ceil(0.3 * dim)) + n1
Expand All @@ -126,7 +126,7 @@ def F18(solution=None, shift_num=1, f_bias=0):
return bent_cigar__(x[D[:n1]]) + hgbat__(x[D[n1:n2]]) + rastrigin__(x[D[n2:]]) + f_bias


def F19(solution=None, shift_num=1, f_bias=0):
def F19(solution=None, shift_num=1, rotate_num=1, f_bias=0):
dim = len(solution)
n1 = int(ceil(0.2 * dim))
n2 = int(ceil(0.2 * dim)) + n1
Expand All @@ -136,7 +136,7 @@ def F19(solution=None, shift_num=1, f_bias=0):
return griewank__(x[D[:n1]]) + weierstrass__(x[D[n1:n2]]) + rosenbrock__(x[D[n2:n3]]) + expanded_scaffer__(x[D[n3:]]) + f_bias


def F20(solution=None, shift_num=1, f_bias=0):
def F20(solution=None, shift_num=1, rotate_num=1, f_bias=0):
dim = len(solution)
n1 = int(ceil(0.2 * dim))
n2 = int(ceil(0.2 * dim)) + n1
Expand All @@ -146,7 +146,7 @@ def F20(solution=None, shift_num=1, f_bias=0):
return hgbat__(x[D[:n1]]) + discus__(x[D[n1:n2]]) + expanded_griewank__(x[D[n2:n3]]) + rastrigin__(x[D[n3:]]) + f_bias


def F21(solution=None, shift_num=1, f_bias=0):
def F21(solution=None, shift_num=1, rotate_num=1, f_bias=0):
dim = len(solution)
n1 = int(ceil(0.1 * dim))
n2 = int(ceil(0.2 * dim)) + n1
Expand All @@ -158,7 +158,7 @@ def F21(solution=None, shift_num=1, f_bias=0):
modified_schwefel__(x[D[n3:n4]]) + elliptic__(x[D[n4:]]) + f_bias


def F22(solution=None, shift_num=1, f_bias=0):
def F22(solution=None, shift_num=1, rotate_num=1, f_bias=0):
dim = len(solution)
n1 = int(ceil(0.1 * dim))
n2 = int(ceil(0.2 * dim)) + n1
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ def readme():

setup(
name="opfunu",
version="0.6.6",
version="0.6.7",
author="Thieu Nguyen",
author_email="[email protected]",
description="A framework of un-constrained Optimization Functions in Numpy (OpFuNu) for global optimization problems",
long_description=readme(),
long_description_content_type="text/markdown",
url="https://github.com/thieunguyen5991/opfunu",
download_url="https://github.com/thieunguyen5991/opfunu/archive/v0.6.6.zip",
download_url="https://github.com/thieunguyen5991/opfunu/archive/v0.6.7.zip",
packages=find_packages(),
include_package_data=True,
license="MIT",
Expand Down

0 comments on commit 9c8a074

Please sign in to comment.