Merge branch 'NIFTy_4' into nifty_doc_mr

nifty4/__init__.py

@@ -2,7 +2,7 @@ from .version import __version__
 
 from . import dobj
 
-from .spaces import *
+from .domains import *
 
 from .domain_tuple import DomainTuple
 
@@ -19,5 +19,6 @@ from .plotting.plot import plot
 from . import library
 from . import extra
 
-__all__ = spaces.__all__ + operators.__all__ +minimization.__all__ + \
+__all__ = ["__version__", "dobj", "DomainTuple"] + \
+          domains.__all__ + operators.__all__ + minimization.__all__ + \
           ["DomainTuple", "Field", "sqrt", "exp", "log"]

nifty4/domain_tuple.py

@@ -17,7 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from functools import reduce
-from .spaces.domain import Domain
+from .domains.domain import Domain
 
 
 class DomainTuple(object):

nifty4/minimization/__init__.py

@@ -14,7 +14,8 @@ from .energy import Energy
 from .quadratic_energy import QuadraticEnergy
 from .line_energy import LineEnergy
 
-__all__ = ["LineSearch", "IterationController", "GradientNormController",
+__all__ = ["LineSearch", "LineSearchStrongWolfe", "IterationController",
+           "GradientNormController",
            "Minimizer", "ConjugateGradient", "NonlinearCG", "DescentMinimizer",
            "SteepestDescent", "VL_BFGS", "RelaxedNewton", "NewtonCG",
            "L_BFGS_B", "Energy", "QuadraticEnergy", "LineEnergy"]

nifty4/operators/dof_projection_operator.py

@@ -22,7 +22,7 @@ from ..utilities import infer_space
 from ..field import Field
 from ..domain_tuple import DomainTuple
 from .. import dobj
-from ..spaces.dof_space import DOFSpace
+from ..domains.dof_space import DOFSpace
 
 
 class DOFProjectionOperator(LinearOperator):

nifty4/operators/fft_operator.py

@@ -18,7 +18,7 @@
 
 import numpy as np
 from ..domain_tuple import DomainTuple
-from ..spaces.rg_space import RGSpace
+from ..domains.rg_space import RGSpace
 from .linear_operator import LinearOperator
 from .. import dobj
 from .. import utilities

nifty4/operators/geometry_remover.py

@@ -17,7 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from ..field import Field
-from ..spaces.unstructured_domain import UnstructuredDomain
+from ..domains.unstructured_domain import UnstructuredDomain
 from ..domain_tuple import DomainTuple
 from .linear_operator import LinearOperator
 

nifty4/operators/harmonic_transform_operator.py

@@ -18,12 +18,12 @@
 
 import numpy as np
 from ..domain_tuple import DomainTuple
-from ..spaces.rg_space import RGSpace
+from ..domains.rg_space import RGSpace
 from .linear_operator import LinearOperator
 from .. import dobj
 from .. import utilities
 from ..field import Field
-from ..spaces.gl_space import GLSpace
+from ..domains.gl_space import GLSpace
 
 
 class HarmonicTransformOperator(LinearOperator):

nifty4/operators/laplace_operator.py

@@ -18,7 +18,7 @@
 
 import numpy as np
 from ..field import Field
-from ..spaces.power_space import PowerSpace
+from ..domains.power_space import PowerSpace
 from .endomorphic_operator import EndomorphicOperator
 from ..utilities import infer_space
 from ..domain_tuple import DomainTuple

nifty4/operators/power_projection_operator.py

@@ -19,7 +19,7 @@
 from .dof_projection_operator import DOFProjectionOperator
 from ..domain_tuple import DomainTuple
 from ..utilities import infer_space
-from ..spaces.power_space import PowerSpace
+from ..domains.power_space import PowerSpace
 
 
 class PowerProjectionOperator(DOFProjectionOperator):

nifty4/sugar.py

@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from .spaces.structured_domain import StructuredDomain
-from .spaces.power_space import PowerSpace
+from .domains.structured_domain import StructuredDomain
+from .domains.power_space import PowerSpace
 from .field import Field, sqrt
 from .operators.diagonal_operator import DiagonalOperator
 from .operators.power_projection_operator import PowerProjectionOperator