Reorder imports and delete unused imports

nifty5/dobj.py

@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from .compat import *
 
+from .compat import *
 
 try:
     from mpi4py import MPI

nifty5/domain_tuple.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from .compat import *
 from .domains.domain import Domain
 

nifty5/field.py

@@ -17,11 +17,12 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from .compat import *
+
 import numpy as np
-from . import utilities
+
+from . import dobj, utilities
+from .compat import *
 from .domain_tuple import DomainTuple
-from . import dobj
 
 
 class Field(object):

nifty5/logger.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from .compat import *
 
 

nifty5/minimization/conjugate_gradient.py

@@ -17,9 +17,10 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
-from .minimizer import Minimizer
 from ..logger import logger
+from .minimizer import Minimizer
 
 
 class ConjugateGradient(Minimizer):

nifty5/minimization/descent_minimizer.py

@@ -17,11 +17,13 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import abc
-from .minimizer import Minimizer
-from .line_search_strong_wolfe import LineSearchStrongWolfe
+
+from ..compat import *
 from ..logger import logger
+from .line_search_strong_wolfe import LineSearchStrongWolfe
+from .minimizer import Minimizer
 
 
 class DescentMinimizer(Minimizer):

nifty5/minimization/energy.py

@@ -17,9 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
-import numpy as np
-from ..field import Field
 from ..utilities import NiftyMetaBase, memo
 
 

nifty5/minimization/energy_sum.py

@@ -17,8 +17,9 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
-from ..utilities import memo, my_lincomb_simple, my_lincomb
+from ..utilities import memo, my_lincomb, my_lincomb_simple
 from .energy import Energy
 
 

nifty5/minimization/gradient_norm_controller.py

@@ -17,9 +17,10 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
-from .iteration_controller import IterationController
 from ..logger import logger
+from .iteration_controller import IterationController
 
 
 class GradientNormController(IterationController):

nifty5/minimization/iteration_controller.py

@@ -17,8 +17,10 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import abc
+
+from ..compat import *
 from ..utilities import NiftyMetaBase
 
 

nifty5/minimization/l_bfgs.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
 from ..logger import logger
 from .descent_minimizer import DescentMinimizer

nifty5/minimization/line_energy.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
 
 

nifty5/minimization/line_search.py

@@ -17,8 +17,10 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import abc
+
+from ..compat import *
 from ..utilities import NiftyMetaBase
 
 

nifty5/minimization/line_search_strong_wolfe.py

@@ -17,11 +17,13 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import numpy as np
-from .line_search import LineSearch
-from .line_energy import LineEnergy
+
+from ..compat import *
 from ..logger import logger
+from .line_energy import LineEnergy
+from .line_search import LineSearch
 
 
 class LineSearchStrongWolfe(LineSearch):

nifty5/minimization/minimizer.py

@@ -17,8 +17,10 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import abc
+
+from ..compat import *
 from ..utilities import NiftyMetaBase
 
 

nifty5/minimization/nonlinear_cg.py

@@ -17,9 +17,10 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
-from .minimizer import Minimizer
 from .line_search_strong_wolfe import LineSearchStrongWolfe
+from .minimizer import Minimizer
 
 
 class NonlinearCG(Minimizer):

nifty5/minimization/quadratic_energy.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
 from .energy import Energy
 

nifty5/minimization/relaxed_newton.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
 from .descent_minimizer import DescentMinimizer
 from .line_search_strong_wolfe import LineSearchStrongWolfe

nifty5/minimization/scipy_minimizer.py

@@ -17,12 +17,13 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
+from .. import dobj
 from ..compat import *
-from .minimizer import Minimizer
 from ..field import Field
-from .. import dobj
 from ..logger import logger
 from .iteration_controller import IterationController
+from .minimizer import Minimizer
 
 
 def _toNdarray(fld):

nifty5/minimization/steepest_descent.py

@@ -17,6 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
+
 from ..compat import *
 from .descent_minimizer import DescentMinimizer