Commit 62d01c10 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

merge master

parents 508800eb 41c87296
Pipeline #17123 passed with stage
in 25 minutes and 15 seconds
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes. # and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.nifty_meta import NiftyMeta from ..nifty_meta import NiftyMeta
from nifty.energies.memoization import memo from .memoization import memo
from keepers import Loggable from keepers import Loggable
from future.utils import with_metaclass from future.utils import with_metaclass
......
from nifty.energies.energy import Energy from .energy import Energy
from nifty.energies.memoization import memo from .memoization import memo
class QuadraticEnergy(Energy): class QuadraticEnergy(Energy):
......
...@@ -1123,7 +1123,7 @@ class Field(Loggable, Versionable, object): ...@@ -1123,7 +1123,7 @@ class Field(Loggable, Versionable, object):
else: else:
# create a diagonal operator which is capable of taking care of the # create a diagonal operator which is capable of taking care of the
# axes-matching # axes-matching
from nifty.operators.diagonal_operator import DiagonalOperator from .operators.diagonal_operator import DiagonalOperator
diagonal = y.val.conjugate() diagonal = y.val.conjugate()
diagonalOperator = DiagonalOperator(domain=y.domain, diagonalOperator = DiagonalOperator(domain=y.domain,
diagonal=diagonal, diagonal=diagonal,
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes. # and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.domain_object import DomainObject from ..domain_object import DomainObject
class FieldType(DomainObject): class FieldType(DomainObject):
......
from nifty.operators.endomorphic_operator import EndomorphicOperator from ...operators.endomorphic_operator import EndomorphicOperator
from nifty.operators.invertible_operator_mixin import InvertibleOperatorMixin from ...operators.invertible_operator_mixin import InvertibleOperatorMixin
from nifty.operators.diagonal_operator import DiagonalOperator from ...operators.diagonal_operator import DiagonalOperator
class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator): class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator):
......
from ...energies.energy import Energy
from ...operators.smoothness_operator import SmoothnessOperator
from . import CriticalPowerCurvature
from ...energies.memoization import memo
from nifty.energies.energy import Energy from ...sugar import generate_posterior_sample
from nifty.operators.smoothness_operator import SmoothnessOperator from ... import Field, exp
from nifty.library.critical_filter import CriticalPowerCurvature
from nifty.energies.memoization import memo
from nifty.sugar import generate_posterior_sample
from nifty import Field, exp
class CriticalPowerEnergy(Energy): class CriticalPowerEnergy(Energy):
......
from nifty.operators import EndomorphicOperator,\ from ...operators import EndomorphicOperator,\
InvertibleOperatorMixin InvertibleOperatorMixin
from nifty.energies.memoization import memo from ...energies.memoization import memo
from nifty.basic_arithmetics import clipped_exp from ...basic_arithmetics import clipped_exp
from nifty.sugar import create_composed_fft_operator from ...sugar import create_composed_fft_operator
class LogNormalWienerFilterCurvature(InvertibleOperatorMixin, class LogNormalWienerFilterCurvature(InvertibleOperatorMixin,
......
from nifty.energies.energy import Energy from ...energies.energy import Energy
from nifty.energies.memoization import memo from ...energies.memoization import memo
from nifty.library.log_normal_wiener_filter import \ from . import LogNormalWienerFilterCurvature
LogNormalWienerFilterCurvature from ...sugar import create_composed_fft_operator
from nifty.sugar import create_composed_fft_operator
class LogNormalWienerFilterEnergy(Energy): class LogNormalWienerFilterEnergy(Energy):
......
from nifty.operators import EndomorphicOperator,\ from ...operators import EndomorphicOperator,\
InvertibleOperatorMixin InvertibleOperatorMixin
class WienerFilterCurvature(InvertibleOperatorMixin, EndomorphicOperator): class WienerFilterCurvature(InvertibleOperatorMixin, EndomorphicOperator):
......
from nifty.energies.energy import Energy from ...energies.energy import Energy
from nifty.energies.memoization import memo from ...energies.memoization import memo
from nifty.library.wiener_filter import WienerFilterCurvature from . import WienerFilterCurvature
class WienerFilterEnergy(Energy): class WienerFilterEnergy(Energy):
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
from builtins import range from builtins import range
import abc import abc
from nifty.nifty_meta import NiftyMeta from ..nifty_meta import NiftyMeta
import numpy as np import numpy as np
......
...@@ -20,7 +20,7 @@ import abc ...@@ -20,7 +20,7 @@ import abc
from keepers import Loggable from keepers import Loggable
from nifty import LineEnergy from ...energies import LineEnergy
from future.utils import with_metaclass from future.utils import with_metaclass
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# and financially supported by the Studienstiftung des deutschen Volkes. # and financially supported by the Studienstiftung des deutschen Volkes.
import abc import abc
from nifty.nifty_meta import NiftyMeta from ..nifty_meta import NiftyMeta
import numpy as np import numpy as np
......
...@@ -96,7 +96,7 @@ def cast_axis_to_tuple(axis, length=None): ...@@ -96,7 +96,7 @@ def cast_axis_to_tuple(axis, length=None):
def parse_domain(domain): def parse_domain(domain):
from nifty.domain_object import DomainObject from .domain_object import DomainObject
if domain is None: if domain is None:
domain = () domain = ()
elif isinstance(domain, DomainObject): elif isinstance(domain, DomainObject):
......
...@@ -17,10 +17,9 @@ ...@@ -17,10 +17,9 @@
# and financially supported by the Studienstiftung des deutschen Volkes. # and financially supported by the Studienstiftung des deutschen Volkes.
from builtins import object from builtins import object
from nifty.minimization import ConjugateGradient from ...energies import QuadraticEnergy
from ...minimization import ConjugateGradient
from nifty.field import Field from ...field import Field
from nifty.energies import QuadraticEnergy
class InvertibleOperatorMixin(object): class InvertibleOperatorMixin(object):
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
# and financially supported by the Studienstiftung des deutschen Volkes. # and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np import numpy as np
from nifty.field import Field from ...field import Field
from nifty.spaces.power_space import PowerSpace from ...spaces.power_space import PowerSpace
from nifty.operators.endomorphic_operator import EndomorphicOperator from ..endomorphic_operator import EndomorphicOperator
from nifty import sqrt from ... import sqrt
import nifty.nifty_utilities as utilities from ... import nifty_utilities as utilities
class LaplaceOperator(EndomorphicOperator): class LaplaceOperator(EndomorphicOperator):
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
from builtins import str from builtins import str
import abc import abc
from nifty.nifty_meta import NiftyMeta from ...nifty_meta import NiftyMeta
from keepers import Loggable from keepers import Loggable
from nifty.field import Field from ...field import Field
import nifty.nifty_utilities as utilities from ... import nifty_utilities as utilities
from future.utils import with_metaclass from future.utils import with_metaclass
......
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
from builtins import range from builtins import range
import numpy as np import numpy as np
from nifty.field import Field from ...field import Field
from ..endomorphic_operator import EndomorphicOperator
from nifty.operators.endomorphic_operator import EndomorphicOperator
class ProjectionOperator(EndomorphicOperator): class ProjectionOperator(EndomorphicOperator):
......
from builtins import range from builtins import range
import numpy as np import numpy as np
from nifty import Field,\ from ... import Field,\
FieldArray FieldArray
from nifty.operators.linear_operator import LinearOperator from ..linear_operator import LinearOperator
from nifty.operators.smoothing_operator import SmoothingOperator from ..smoothing_operator import SmoothingOperator
from nifty.operators.composed_operator import ComposedOperator from ..composed_operator import ComposedOperator
from nifty.operators.diagonal_operator import DiagonalOperator from ..diagonal_operator import DiagonalOperator
class ResponseOperator(LinearOperator): class ResponseOperator(LinearOperator):
......
from ...spaces.power_space import PowerSpace
from nifty.spaces.power_space import PowerSpace from ..endomorphic_operator import EndomorphicOperator
from nifty.operators.endomorphic_operator import EndomorphicOperator from ..laplace_operator import LaplaceOperator
from nifty.operators.laplace_operator import LaplaceOperator
class SmoothnessOperator(EndomorphicOperator): class SmoothnessOperator(EndomorphicOperator):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment