Skip to content

Commit 0d8f2e4

Browse files
Merge pull request #247 from kb2623/development
Fixes and improvements
2 parents eec8f5e + ad501fe commit 0d8f2e4

File tree

235 files changed

+18845
-17929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+18845
-17929
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.0.0rc9
2+
current_version = 2.0.0rc10
33
commit = True
44
tag = True
55
parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))(\-?((rc)?(?P<rc>\d+))?)

CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [2.0.0rc10](https://github.com/NiaOrg/NiaPy/tree/2.0.0rc10) (2019-11-12)
4+
5+
[Full Changelog](https://github.com/NiaOrg/NiaPy/compare/2.0.0rc9...2.0.0rc10)
6+
7+
**Implemented enhancements:**
8+
9+
- PSO binary functionality [\#187](https://github.com/NiaOrg/NiaPy/issues/187)
10+
- Development [\#233](https://github.com/NiaOrg/NiaPy/pull/233) ([kb2623](https://github.com/kb2623))
11+
12+
**Fixed bugs:**
13+
14+
- FSS implementation [\#186](https://github.com/NiaOrg/NiaPy/issues/186)
15+
- FPA implementation [\#185](https://github.com/NiaOrg/NiaPy/issues/185)
16+
317
## [2.0.0rc9](https://github.com/NiaOrg/NiaPy/tree/2.0.0rc9) (2019-11-11)
418

519
[Full Changelog](https://github.com/NiaOrg/NiaPy/compare/2.0.0rc8...2.0.0rc9)
@@ -240,6 +254,7 @@
240254
- CS fix [\#103](https://github.com/NiaOrg/NiaPy/pull/103) ([mlaky88](https://github.com/mlaky88))
241255
- Documentation [\#102](https://github.com/NiaOrg/NiaPy/pull/102) ([GregaVrbancic](https://github.com/GregaVrbancic))
242256
- Finishing runner [\#101](https://github.com/NiaOrg/NiaPy/pull/101) ([GregaVrbancic](https://github.com/GregaVrbancic))
257+
- version 0.1.2a1 [\#99](https://github.com/NiaOrg/NiaPy/pull/99) ([GregaVrbancic](https://github.com/GregaVrbancic))
243258

244259
## [0.1.3a2](https://github.com/NiaOrg/NiaPy/tree/0.1.3a2) (2018-02-26)
245260

@@ -271,7 +286,6 @@
271286

272287
**Merged pull requests:**
273288

274-
- version 0.1.2a1 [\#99](https://github.com/NiaOrg/NiaPy/pull/99) ([GregaVrbancic](https://github.com/GregaVrbancic))
275289
- ga fix [\#98](https://github.com/NiaOrg/NiaPy/pull/98) ([mlaky88](https://github.com/mlaky88))
276290
- test fix [\#97](https://github.com/NiaOrg/NiaPy/pull/97) ([lucijabrezocnik](https://github.com/lucijabrezocnik))
277291
- fix docs [\#96](https://github.com/NiaOrg/NiaPy/pull/96) ([GregaVrbancic](https://github.com/GregaVrbancic))
@@ -334,7 +348,6 @@
334348
- description added [\#36](https://github.com/NiaOrg/NiaPy/pull/36) ([lucijabrezocnik](https://github.com/lucijabrezocnik))
335349
- Feature functions2 [\#35](https://github.com/NiaOrg/NiaPy/pull/35) ([lucijabrezocnik](https://github.com/lucijabrezocnik))
336350
- add runner export to xlsx [\#34](https://github.com/NiaOrg/NiaPy/pull/34) ([GregaVrbancic](https://github.com/GregaVrbancic))
337-
- Runner export [\#33](https://github.com/NiaOrg/NiaPy/pull/33) ([GregaVrbancic](https://github.com/GregaVrbancic))
338351
- Feature functions2 [\#32](https://github.com/NiaOrg/NiaPy/pull/32) ([lucijabrezocnik](https://github.com/lucijabrezocnik))
339352

340353

NiaPy/__init__.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,24 @@
55
from __future__ import print_function
66

77

8-
from NiaPy import util, algorithms, benchmarks, task
8+
from NiaPy import (
9+
util,
10+
algorithms,
11+
benchmarks,
12+
task
13+
)
914
from NiaPy.runner import Runner
15+
from NiaPy.factory import Factory
1016

11-
__all__ = ["algorithms", "benchmarks", "util", "task", "Runner"]
17+
__all__ = [
18+
"algorithms",
19+
"benchmarks",
20+
"util",
21+
"task",
22+
"Runner",
23+
"Factory"
24+
]
1225
__project__ = "NiaPy"
13-
__version__ = "2.0.0rc9"
26+
__version__ = "2.0.0rc10"
1427

1528
VERSION = "{0} v{1}".format(__project__, __version__)

NiaPy/algorithms/__init__.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
from NiaPy.algorithms import basic
66
from NiaPy.algorithms import modified
77
from NiaPy.algorithms import other
8-
from NiaPy.algorithms.algorithm import Algorithm, Individual, defaultNumPyInit, defaultIndividualInit
9-
from NiaPy.algorithms.statistics import BasicStatistics
10-
from NiaPy.algorithms.utility import AlgorithmUtility
8+
from NiaPy.algorithms.algorithm import Algorithm
9+
from NiaPy.algorithms.individual import (
10+
Individual,
11+
defaultNumPyInit,
12+
defaultIndividualInit
13+
)
1114

1215
__all__ = [
13-
'basic',
14-
'modified',
15-
'other',
16-
'Algorithm',
17-
'defaultNumPyInit',
18-
'defaultIndividualInit',
19-
'Individual',
20-
'BasicStatistics',
21-
'AlgorithmUtility'
16+
'Individual',
17+
'defaultNumPyInit',
18+
'defaultIndividualInit',
19+
'Algorithm',
20+
'basic',
21+
'modified',
22+
'other'
2223
]

0 commit comments

Comments
 (0)