From ece7b47f8dbcd5d8bc9c696e08bf329415189e5c Mon Sep 17 00:00:00 2001
From: Philipp Arras <parras@mpa-garching.mpg.de>
Date: Fri, 15 Jun 2018 18:04:30 +0200
Subject: [PATCH] More renamings
---
nifty4/models/__init__.py | 6 +++---
nifty4/models/constant.py | 4 ++--
nifty4/models/{position.py => variable.py} | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
rename nifty4/models/{position.py => variable.py} (78%)
diff --git a/nifty4/models/__init__.py b/nifty4/models/__init__.py
index 849df31a5..8c9c918d4 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 abca44f80..5a4d39c72 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 908f7498e..3c485089c 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)
--
GitLab