rearranging

nifty/minimization/__init__.py

-from .line_searching import *
-from .iteration_controlling import *
+from .line_search import LineSearch
+from .line_search_strong_wolfe import LineSearchStrongWolfe
+from .iteration_controller import IterationController
+from .gradient_norm_controller import GradientNormController
 from .minimizer import Minimizer
 from .conjugate_gradient import ConjugateGradient
 from .nonlinear_cg import NonlinearCG

nifty/minimization/descent_minimizer.py

@@ -19,7 +19,7 @@
 from __future__ import division
 import abc
 from .minimizer import Minimizer
-from .line_searching import LineSearchStrongWolfe
+from .line_search_strong_wolfe import LineSearchStrongWolfe
 
 
 class DescentMinimizer(Minimizer):

nifty/minimization/iteration_controlling/gradient_norm_controller.py → nifty/minimization/gradient_norm_controller.py

@@ -17,7 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from .iteration_controller import IterationController
-from ... import dobj
+from .. import dobj
 
 
 class GradientNormController(IterationController):

nifty/minimization/iteration_controlling/iteration_controller.py → nifty/minimization/iteration_controller.py

@@ -18,7 +18,7 @@
 
 from builtins import range
 import abc
-from ...utilities import NiftyMeta
+from ..utilities import NiftyMeta
 from future.utils import with_metaclass
 
 

nifty/minimization/iteration_controlling/__init__.py

-from .iteration_controller import IterationController
-from .gradient_norm_controller import GradientNormController

nifty/minimization/line_searching/line_search_strong_wolfe.py → nifty/minimization/line_search_strong_wolfe.py

@@ -20,8 +20,8 @@ from __future__ import division
 from builtins import range
 import numpy as np
 from .line_search import LineSearch
-from ...energies import LineEnergy
-from ... import dobj
+from ..energies import LineEnergy
+from .. import dobj
 
 
 class LineSearchStrongWolfe(LineSearch):

nifty/minimization/line_searching/__init__.py

-from .line_search import LineSearch
-from .line_search_strong_wolfe import LineSearchStrongWolfe

nifty/minimization/nonlinear_cg.py

@@ -18,7 +18,7 @@
 
 from __future__ import division
 from .minimizer import Minimizer
-from .line_searching import LineSearchStrongWolfe
+from .line_search_strong_wolfe import LineSearchStrongWolfe
 
 
 class NonlinearCG(Minimizer):

nifty/minimization/relaxed_newton.py

@@ -17,7 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from .descent_minimizer import DescentMinimizer
-from .line_searching import LineSearchStrongWolfe
+from .line_search_strong_wolfe import LineSearchStrongWolfe
 
 
 class RelaxedNewton(DescentMinimizer):

nifty/minimization/vl_bfgs.py

@@ -21,7 +21,7 @@ from builtins import range
 from builtins import object
 import numpy as np
 from .descent_minimizer import DescentMinimizer
-from .line_searching import LineSearchStrongWolfe
+from .line_search_strong_wolfe import LineSearchStrongWolfe
 
 
 class VL_BFGS(DescentMinimizer):