diff --git a/nifty4/models/__init__.py b/nifty4/models/__init__.py index 849df31a58dc820de4053ae117d4aa5355470444..8c9c918d4040a077936d5c4c6ecfdafc2e6745b6 100644 --- a/nifty4/models/__init__.py +++ b/nifty4/models/__init__.py @@ -1,7 +1,7 @@ -from .constant import ConstantModel +from .constant import Constant from .local_nonlinearity import LocalModel from .model import LinearModel, Model -from .position import PositionModel +from .variable import Variable -__all__ = ['Model', 'ConstantModel', 'LocalModel', 'PositionModel', +__all__ = ['Model', 'Constant', 'LocalModel', 'Variable', 'LinearModel'] diff --git a/nifty4/models/constant.py b/nifty4/models/constant.py index abca44f8054ccc75021a6f423e43528341be85ba..5a4d39c7243c9a8f9fe7b4e8aace7a2bf0d95f70 100644 --- a/nifty4/models/constant.py +++ b/nifty4/models/constant.py @@ -2,9 +2,9 @@ from ..operators import MultiSkyGradientOperator from .model import Model -class ConstantModel(Model): +class Constant(Model): def __init__(self, position, constant): - super(ConstantModel, self).__init__(position) + super(Constant, self).__init__(position) self._constant = constant self._value = self._constant diff --git a/nifty4/models/position.py b/nifty4/models/variable.py similarity index 78% rename from nifty4/models/position.py rename to nifty4/models/variable.py index 908f7498ea5779d1f101027987ab6252f9dea8fa..3c485089cabb5742699cd48d035a6ffd8e14017d 100644 --- a/nifty4/models/position.py +++ b/nifty4/models/variable.py @@ -3,12 +3,12 @@ import nifty4 as ift from .model import Model -class PositionModel(Model): +class Variable(Model): """ Returns the MultiField. """ def __init__(self, position): - super(PositionModel, self).__init__(position) + super(Variable, self).__init__(position) self._value = position self._gradient = ift.ScalingOperator(1., position.domain)