diff --git a/nifty5/models/constant.py b/nifty5/models/constant.py index 5a4d39c7243c9a8f9fe7b4e8aace7a2bf0d95f70..5d3fc9cce7044d93c34d15c463b09577b2d73d7f 100644 --- a/nifty5/models/constant.py +++ b/nifty5/models/constant.py @@ -1,4 +1,4 @@ -from ..operators import MultiSkyGradientOperator +from ..operators.model_gradient_operator import ModelGradientOperator from .model import Model @@ -9,9 +9,8 @@ class Constant(Model): self._value = self._constant - self._gradient = MultiSkyGradientOperator({}, - position.domain, - self.value.domain) + self._gradient = ModelGradientOperator({}, position.domain, + self.value.domain) def at(self, position): return self.__class__(position, self._constant) diff --git a/nifty5/operators/__init__.py b/nifty5/operators/__init__.py index cd44a4da33ca3230b2e91e7cb44998312e78916e..03a580a2503a31babf03f031014732a5b5350d05 100644 --- a/nifty5/operators/__init__.py +++ b/nifty5/operators/__init__.py @@ -12,7 +12,7 @@ from .power_distributor import PowerDistributor from .sampling_enabler import SamplingEnabler from .sandwich_operator import SandwichOperator from .scaling_operator import ScalingOperator -from .sky_gradient_operator import MultiSkyGradientOperator +from .model_gradient_operator import ModelGradientOperator from .smoothness_operator import SmoothnessOperator __all__ = ["LinearOperator", "EndomorphicOperator", "ScalingOperator", @@ -20,4 +20,4 @@ __all__ = ["LinearOperator", "EndomorphicOperator", "ScalingOperator", "FFTSmoothingOperator", "GeometryRemover", "LaplaceOperator", "SmoothnessOperator", "PowerDistributor", "InversionEnabler", "SandwichOperator", "SamplingEnabler", - "DOFDistributor", "MultiSkyGradientOperator"] + "DOFDistributor", "ModelGradientOperator"] diff --git a/nifty5/operators/sky_gradient_operator.py b/nifty5/operators/model_gradient_operator.py similarity index 90% rename from nifty5/operators/sky_gradient_operator.py rename to nifty5/operators/model_gradient_operator.py index 0e2813bdbdcd84e316c9205a755a574d04ff9309..a8a4560456f5b61d0b6654235c580709a3bbd007 100644 --- a/nifty5/operators/sky_gradient_operator.py +++ b/nifty5/operators/model_gradient_operator.py @@ -1,11 +1,12 @@ -from ..multi import MultiDomain, MultiField +from ..multi.multi_domain import MultiDomain +from ..multi.multi_field import MultiField from ..sugar import full from .linear_operator import LinearOperator -class MultiSkyGradientOperator(LinearOperator): +class ModelGradientOperator(LinearOperator): def __init__(self, gradients, domain, target): - super(MultiSkyGradientOperator, self).__init__() + super(ModelGradientOperator, self).__init__() self._gradients = gradients gradients_domain = MultiField(self._gradients).domain self._domain = MultiDomain.make(domain)