improve imports

nifty4/__init__.py

-from __future__ import division
 from .version import __version__
-from .field import *
-from .domain_tuple import DomainTuple
+
+from . import dobj
+
 from .domain_object import DomainObject
-from .utilities import *
-from .minimization import *
-from .spaces import *
-from .operators import *
-from .probing import *
+from .domain_tuple import DomainTuple
+
+from .spaces.field_array import FieldArray
+from .spaces.space import Space
+from .spaces.rg_space import RGSpace
+from .spaces.lm_space import LMSpace
+from .spaces.hp_space import HPSpace
+from .spaces.gl_space import GLSpace
+from .spaces.dof_space import DOFSpace
+from .spaces.power_space import PowerSpace
+
+from .operators.linear_operator import LinearOperator
+from .operators.endomorphic_operator import EndomorphicOperator
+from .operators.scaling_operator import ScalingOperator
+from .operators.diagonal_operator import DiagonalOperator
+from .operators.fft_operator import FFTOperator
+from .operators.fft_smoothing_operator import FFTSmoothingOperator
+from .operators.direct_smoothing_operator import DirectSmoothingOperator
+from .operators.response_operator import ResponseOperator
+from .operators.laplace_operator import LaplaceOperator
+from .operators.power_projection_operator import PowerProjectionOperator
+from .operators.inversion_enabler import InversionEnabler
+
+from .field import Field, sqrt, exp, log
+
+from .probing.prober import Prober
+from .probing.diagonal_prober_mixin import DiagonalProberMixin
+from .probing.trace_prober_mixin import TraceProberMixin
+
+from .minimization.line_search import LineSearch
+from .minimization.line_search_strong_wolfe import LineSearchStrongWolfe
+from .minimization.iteration_controller import IterationController
+from .minimization.gradient_norm_controller import GradientNormController
+from .minimization.minimizer import Minimizer
+from .minimization.conjugate_gradient import ConjugateGradient
+from .minimization.nonlinear_cg import NonlinearCG
+from .minimization.descent_minimizer import DescentMinimizer
+from .minimization.steepest_descent import SteepestDescent
+from .minimization.vl_bfgs import VL_BFGS
+from .minimization.relaxed_newton import RelaxedNewton
+from .minimization.energy import Energy
+from .minimization.quadratic_energy import QuadraticEnergy
+from .minimization.line_energy import LineEnergy
+
 from .sugar import *
-from .plotting import plot
+from .plotting.plot import plot
 from . import library
-from . import dobj

nifty4/library/critical_power_curvature.py

@@ -16,7 +16,8 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ..operators import InversionEnabler, DiagonalOperator
+from ..operators.inversion_enabler import InversionEnabler
+from ..operators.diagonal_operator import DiagonalOperator
 
 
 def CriticalPowerCurvature(theta, T, inverter):

nifty4/library/log_normal_wiener_filter_curvature.py

@@ -16,7 +16,7 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ..operators import InversionEnabler
+from ..operators.inversion_enabler import InversionEnabler
 
 
 def LogNormalWienerFilterCurvature(R, N, S, fft, expp_sspace, inverter):

nifty4/library/nonlinear_power_curvature.py

@@ -16,7 +16,7 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ..operators import InversionEnabler
+from ..operators.inversion_enabler import InversionEnabler
 from .response_operators import LinearizedPowerResponse
 
 

nifty4/library/wiener_filter_curvature.py

@@ -16,7 +16,8 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ..operators import EndomorphicOperator, InversionEnabler
+from ..operators.endomorphic_operator import EndomorphicOperator
+from ..operators.inversion_enabler import InversionEnabler
 from ..field import Field, sqrt
 from ..sugar import power_analyze, power_synthesize
 

nifty4/minimization/__init__.py

-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
-from .descent_minimizer import DescentMinimizer
-from .steepest_descent import SteepestDescent
-from .vl_bfgs import VL_BFGS
-from .relaxed_newton import RelaxedNewton
-from .energy import Energy
-from .quadratic_energy import QuadraticEnergy
-from .line_energy import LineEnergy

nifty4/minimization/conjugate_gradient.py

@@ -18,7 +18,8 @@
 
 from __future__ import division
 from .minimizer import Minimizer
-from .. import Field, dobj
+from ..field import Field
+from .. import dobj
 from ..utilities import general_axpy
 
 

nifty4/operators/__init__.py

-from __future__ import division
-from .linear_operator import LinearOperator
-from .diagonal_operator import DiagonalOperator
-from .endomorphic_operator import EndomorphicOperator
-from .fft_smoothing_operator import FFTSmoothingOperator
-from .direct_smoothing_operator import DirectSmoothingOperator
-from .fft_operator import FFTOperator
-from .inversion_enabler import InversionEnabler
-from .response_operator import ResponseOperator
-from .laplace_operator import LaplaceOperator
-from .smoothness_operator import SmoothnessOperator
-from .power_projection_operator import PowerProjectionOperator
-from .dof_projection_operator import DOFProjectionOperator
-from .chain_operator import ChainOperator
-from .sum_operator import SumOperator
-from .scaling_operator import ScalingOperator
-from .inverse_operator import InverseOperator
-from .adjoint_operator import AdjointOperator

nifty4/operators/direct_smoothing_operator.py

@@ -20,8 +20,11 @@ from __future__ import division
 from builtins import range
 import numpy as np
 from .endomorphic_operator import EndomorphicOperator
-from .. import dobj, utilities, Field, DomainTuple
-from ..spaces import PowerSpace
+from .. import dobj
+from .. import utilities
+from ..field import Field
+from ..domain_tuple import DomainTuple
+from ..spaces.power_space import PowerSpace
 
 
 class DirectSmoothingOperator(EndomorphicOperator):

nifty4/operators/dof_projection_operator.py

@@ -19,8 +19,10 @@
 import numpy as np
 from .linear_operator import LinearOperator
 from ..utilities import infer_space
-from .. import Field, DomainTuple, dobj
-from ..spaces import DOFSpace
+from ..field import Field
+from ..domain_tuple import DomainTuple
+from .. import dobj
+from ..spaces.dof_space import DOFSpace
 
 
 class DOFProjectionOperator(LinearOperator):

nifty4/operators/fft_operator.py

@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from .. import DomainTuple
-from ..spaces import RGSpace
+from ..domain_tuple import DomainTuple
+from ..spaces.rg_space import RGSpace
 from ..utilities import infer_space
 from .linear_operator import LinearOperator
 from .fft_operator_support import RGRGTransformation, SphericalTransformation

nifty4/operators/fft_smoothing_operator.py

@@ -20,7 +20,7 @@ from .scaling_operator import ScalingOperator
 from .fft_operator import FFTOperator
 from ..utilities import infer_space
 from .diagonal_operator import DiagonalOperator
-from .. import DomainTuple
+from ..domain_tuple import DomainTuple
 
 
 def FFTSmoothingOperator(domain, sigma, space=None):

nifty4/operators/laplace_operator.py

@@ -21,7 +21,7 @@ from ..field import Field
 from ..spaces.power_space import PowerSpace
 from .endomorphic_operator import EndomorphicOperator
 from ..utilities import infer_space
-from .. import DomainTuple
+from ..domain_tuple import DomainTuple
 from .. import dobj
 
 

nifty4/operators/power_projection_operator.py

@@ -17,9 +17,9 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from .dof_projection_operator import DOFProjectionOperator
-from .. import DomainTuple
+from ..domain_tuple import DomainTuple
 from ..utilities import infer_space
-from ..spaces import PowerSpace
+from ..spaces.power_space import PowerSpace
 
 
 class PowerProjectionOperator(DOFProjectionOperator):

nifty4/operators/response_operator.py

@@ -16,7 +16,9 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from .. import Field, FieldArray, DomainTuple
+from ..field import Field
+from ..spaces.field_array import FieldArray
+from ..domain_tuple import DomainTuple
 from .linear_operator import LinearOperator
 from .fft_smoothing_operator import FFTSmoothingOperator
 from .diagonal_operator import DiagonalOperator

nifty4/plotting/__init__.py

-from .plot import plot

nifty4/probing/__init__.py

-from .prober import Prober
-from .diagonal_prober_mixin import DiagonalProberMixin
-from .trace_prober_mixin import TraceProberMixin

nifty4/spaces/__init__.py

-from .gl_space import GLSpace
-from .hp_space import HPSpace
-from .lm_space import LMSpace
-from .power_space import PowerSpace
-from .dof_space import DOFSpace
-from .rg_space import RGSpace
-from .space import Space
-from .field_array import FieldArray

nifty4/sugar.py

@@ -17,9 +17,14 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from . import Space, PowerSpace, Field, DiagonalOperator,\
-              PowerProjectionOperator, FFTOperator, sqrt, DomainTuple, dobj,\
-              utilities
+from .spaces.space import Space
+from .spaces.power_space import PowerSpace
+from .field import Field, sqrt
+from .operators.diagonal_operator import DiagonalOperator
+from .operators.power_projection_operator import PowerProjectionOperator
+from .operators.fft_operator import FFTOperator
+from .domain_tuple import DomainTuple
+from . import dobj, utilities
 
 __all__ = ['PS_field',
            'power_analyze',