bugfix in imports for python 3

claesenm · May 15, 2015 · 11a279f · 11a279f
1 parent 7f5741f
commit 11a279f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/optunity/solvers/CMAES.py b/optunity/solvers/CMAES.py
@@ -35,7 +35,7 @@
 
 from .solver_registry import register_solver
 from .util import Solver, _copydoc
-import util
+from . import util
 
 _numpy_available = True
 try:

diff --git a/optunity/solvers/GridSearch.py b/optunity/solvers/GridSearch.py
@@ -36,7 +36,7 @@
 from ..functions import static_key_order
 from .solver_registry import register_solver
 from .util import Solver, _copydoc, shrink_bounds
-import util
+from . import util
 
 # http://stackoverflow.com/a/15978862
 def nth_root(val, n):

diff --git a/optunity/solvers/NelderMead.py b/optunity/solvers/NelderMead.py
@@ -36,7 +36,7 @@
 from .. import functions as fun
 from .solver_registry import register_solver
 from .util import Solver, _copydoc
-import util
+from . import util
 
 @register_solver('nelder-mead',
                  'simplex method for unconstrained optimization',

diff --git a/optunity/solvers/ParticleSwarm.py b/optunity/solvers/ParticleSwarm.py
@@ -38,7 +38,7 @@
 
 from .solver_registry import register_solver
 from .util import Solver, _copydoc, uniform_in_bounds
-import util
+from . import util
 
 @register_solver('particle swarm',
                  'particle swarm optimization',

diff --git a/optunity/solvers/RandomSearch.py b/optunity/solvers/RandomSearch.py
@@ -36,7 +36,7 @@
 from ..functions import static_key_order
 from .solver_registry import register_solver
 from .util import Solver, _copydoc, shrink_bounds, uniform_in_bounds
-import util
+from . import util
 
 @register_solver('random search',
                  'random parameter tuples sampled uniformly within box constraints',

diff --git a/optunity/solvers/__init__.py b/optunity/solvers/__init__.py
@@ -55,3 +55,4 @@
 from .NelderMead import NelderMead
 from .ParticleSwarm import ParticleSwarm
 from .CMAES import CMA_ES
+#from .TPE import TPE