Skip to content

Commit

Permalink
Changed directory name to avoid conflict
Browse files Browse the repository at this point in the history
tools.hypervolume is the indicator function imported by tools.indicator
  • Loading branch information
fmder committed Oct 21, 2014
1 parent e02084b commit 88c148e
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions deap/benchmarks/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

try:
# try importing the C version
from ..tools.hypervolume import hv
from ..tools._hypervolume import hv
except ImportError:
# fallback on python version
from ..tools.hypervolume import pyhv as hv
from ..tools._hypervolume import pyhv as hv

class translate(object):
"""Decorator for evaluation functions, it translates the objective
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions deap/tools/indicator.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

try:
# try importing the C version
from .hypervolume import hv as hv
from ._hypervolume import hv as hv
except ImportError:
# fallback on python version
from .hypervolume import pyhv as hv
from ._hypervolume import pyhv as hv

def hypervolume(front, **kargs):
"""Returns the index of the individual with the least the hypervolume
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def run_setup(build_ext):
if build_ext:
extra_modules = list()

hv_module = Extension("deap.tools.hypervolume.hv", sources=["deap/tools/hypervolume/_hv.c", "deap/tools/hypervolume/hv.cpp"])
hv_module = Extension("deap.tools._hypervolume.hv", sources=["deap/tools/_hypervolume/_hv.c", "deap/tools/_hypervolume/hv.cpp"])
extra_modules.append(hv_module)

setup(name='deap',
Expand All @@ -54,7 +54,7 @@ def run_setup(build_ext):
author='deap Development Team',
author_email='[email protected]',
url='http://deap.googlecode.com',
packages=['deap', 'deap.tools', 'deap.tools.hypervolume', 'deap.benchmarks', 'deap.tests'],
packages=['deap', 'deap.tools', 'deap.tools._hypervolume', 'deap.benchmarks', 'deap.tests'],
platforms=['any'],
keywords=['evolutionary algorithms','genetic algorithms','genetic programming','cma-es','ga','gp','es','pso'],
license='LGPL',
Expand Down

0 comments on commit 88c148e

Please sign in to comment.