Commit 58ca8d1a authored by Pumpe, Daniel (dpumpe)'s avatar Pumpe, Daniel (dpumpe)

Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy

parents 60cb3e79 41c87296
...@@ -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.nifty_meta import NiftyMeta from ..nifty_meta import NiftyMeta
from keepers import Loggable from keepers import Loggable
from future.utils import with_metaclass from future.utils import with_metaclass
......
...@@ -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 __future__ import division from __future__ import division
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
......
...@@ -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,9 +17,8 @@ ...@@ -17,9 +17,8 @@
# 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 ...minimization import ConjugateGradient
from ...field import Field
from nifty.field import Field
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):
......
from __future__ import division from __future__ import division
from builtins import str from builtins import str
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ..plotly_wrapper import PlotlyWrapper
class Colormap(PlotlyWrapper): class Colormap(PlotlyWrapper):
......
from nifty.plotting.colormap.colormap import Colormap from ..colormap.colormap import Colormap
def HighEnergyCmap(): def HighEnergyCmap():
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ..plotly_wrapper import PlotlyWrapper
class Axis(PlotlyWrapper): class Axis(PlotlyWrapper):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ..plotly_wrapper import PlotlyWrapper
class Line(PlotlyWrapper): class Line(PlotlyWrapper):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ..plotly_wrapper import PlotlyWrapper
class Marker(PlotlyWrapper): class Marker(PlotlyWrapper):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from .figure_from_plot import FigureFromPlot from .figure_from_plot import FigureFromPlot
from nifty.plotting.plots import Heatmap, HPMollweide, GLMollweide from ..plots import Heatmap, HPMollweide, GLMollweide
class Figure2D(FigureFromPlot): class Figure2D(FigureFromPlot):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import abc import abc
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ..plotly_wrapper import PlotlyWrapper
class FigureBase(PlotlyWrapper): class FigureBase(PlotlyWrapper):
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
from builtins import map from builtins import map
from builtins import str from builtins import str
import numpy as np import numpy as np
from nifty import dependency_injector as gdi from ... import dependency_injector as gdi
from .figure_base import FigureBase from .figure_base import FigureBase
from .figure_3D import Figure3D from .figure_3D import Figure3D
......
from builtins import object from builtins import object
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
from nifty.nifty_meta import NiftyMeta from ..nifty_meta import NiftyMeta
from future.utils import with_metaclass from future.utils import with_metaclass
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from nifty import dependency_injector as gdi from .... import dependency_injector as gdi
from .heatmap import Heatmap from .heatmap import Heatmap
import numpy as np import numpy as np
from nifty.plotting.descriptors import Axis from ...descriptors import Axis
from .mollweide_helper import mollweide_helper from .mollweide_helper import mollweide_helper
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
import numpy as np import numpy as np
from nifty.plotting.descriptors import Axis from ...descriptors import Axis
from nifty.plotting.colormap import Colormap from ...colormap import Colormap
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ...plotly_wrapper import PlotlyWrapper
class Heatmap(PlotlyWrapper): class Heatmap(PlotlyWrapper):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division
from nifty import dependency_injector as gdi from .... import dependency_injector as gdi
from .heatmap import Heatmap from .heatmap import Heatmap
import numpy as np import numpy as np
from nifty.plotting.descriptors import Axis from ...descriptors import Axis
from .mollweide_helper import mollweide_helper from .mollweide_helper import mollweide_helper
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import abc import abc
from nifty.plotting.plotly_wrapper import PlotlyWrapper from ...plotly_wrapper import PlotlyWrapper
from nifty.plotting.descriptors import Marker,\ from ...descriptors import Marker,\
Line Line
class ScatterPlot(PlotlyWrapper): class ScatterPlot(PlotlyWrapper):
......
import numpy as np import numpy as np
from nifty.spaces import GLSpace from ...spaces import GLSpace
from nifty.plotting.figures import Figure2D from ..figures import Figure2D
from nifty.plotting.plots import GLMollweide from ..plots import GLMollweide
from .plotter_base import PlotterBase from .plotter_base import PlotterBase
......
from nifty.spaces import HPSpace from ...spaces import HPSpace
from nifty.plotting.figures import Figure2D from ..figures import Figure2D
from nifty.plotting.plots import HPMollweide from ..plots import HPMollweide
from .plotter_base import PlotterBase from .plotter_base import PlotterBase
......
...@@ -13,13 +13,13 @@ import d2o ...@@ -13,13 +13,13 @@ import d2o
from keepers import Loggable from keepers import Loggable
from nifty.config import dependency_injector as gdi from ...config import dependency_injector as gdi
from nifty.spaces.space import Space from ...spaces.space import Space
from nifty.field import Field from ...field import Field
import nifty.nifty_utilities as utilities from ... import nifty_utilities as utilities
from nifty.plotting.figures import MultiFigure from ..figures import MultiFigure
from future.utils import with_metaclass from future.utils import with_metaclass
plotly = gdi.get('plotly') plotly = gdi.get('plotly')
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
import numpy as np import numpy as np
from nifty.spaces import PowerSpace from ...spaces import PowerSpace
from nifty.plotting.descriptors import Axis from ..descriptors import Axis
from nifty.plotting.figures import Figure2D from ..figures import Figure2D
from nifty.plotting.plots import Cartesian2D from ..plots import Cartesian2D
from .plotter_base import PlotterBase from .plotter_base import PlotterBase
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
from __future__ import division from __future__ import division
import numpy as np import numpy as np
from nifty.spaces import RGSpace from ...spaces import RGSpace
from nifty.plotting.descriptors import Axis from ..descriptors import Axis
from nifty.plotting.figures import Figure2D from ..figures import Figure2D
from nifty.plotting.plots import Cartesian2D from ..plots import Cartesian2D
from .plotter_base import PlotterBase from .plotter_base import PlotterBase
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from nifty.spaces import RGSpace from ...spaces import RGSpace
from nifty.plotting.figures import Figure2D from ..figures import Figure2D
from nifty.plotting.plots import Heatmap from ..plots import Heatmap
from .plotter_base import PlotterBase from .plotter_base import PlotterBase
......
...@@ -21,10 +21,9 @@ from builtins import range ...@@ -21,10 +21,9 @@ from builtins import range
from builtins import object from builtins import object
import numpy as np import numpy as np
from nifty.field import Field from ...field import Field
import nifty.nifty_utilities as utilities from ... import nifty_utilities as utilities
from ... import nifty_configuration as nc
from nifty import nifty_configuration as nc
from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES
......
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