Commit 1bd43e72 authored by Philipp Arras's avatar Philipp Arras
Browse files

Renamings

parent 1a1822c3
...@@ -4,7 +4,7 @@ from . import dobj ...@@ -4,7 +4,7 @@ from . import dobj
from .domains import * from .domains import *
from .domain_tuple import DomainTuple from .domain_tuple import DomainTuple
from .field import Field from .field import Field
from .nonlinear_operators import * from .models import *
from .operators import * from .operators import *
from .probing.utils import probe_with_posterior_samples, probe_diagonal, \ from .probing.utils import probe_with_posterior_samples, probe_diagonal, \
StatCalculator StatCalculator
......
from .nonlinear_operator import NonlinearOperator, LinearModel
from .constant import ConstantModel from .constant import ConstantModel
from .local_nonlinearity import LocalModel from .local_nonlinearity import LocalModel
from .model import LinearModel, Model
from .position import PositionModel from .position import PositionModel
__all__ = ['NonlinearOperator', 'ConstantModel', 'LocalModel', 'PositionModel', __all__ = ['Model', 'ConstantModel', 'LocalModel', 'PositionModel',
'LinearModel'] 'LinearModel']
from ..operators import MultiSkyGradientOperator from ..operators import MultiSkyGradientOperator
from .nonlinear_operator import NonlinearOperator from .model import Model
class ConstantModel(NonlinearOperator): class ConstantModel(Model):
def __init__(self, position, constant): def __init__(self, position, constant):
super(ConstantModel, self).__init__(position) super(ConstantModel, self).__init__(position)
self._constant = constant self._constant = constant
......
from nifty4.sugar import makeOp from nifty4.sugar import makeOp
from .nonlinear_operator import NonlinearOperator from .model import Model
class LocalModel(NonlinearOperator): class LocalModel(Model):
def __init__(self, position, inp, nonlinearity): def __init__(self, position, inp, nonlinearity):
""" """
Computes nonlinearity(inp) Computes nonlinearity(inp)
......
...@@ -3,7 +3,7 @@ import nifty4 as ift ...@@ -3,7 +3,7 @@ import nifty4 as ift
from .selection_operator import SelectionOperator from .selection_operator import SelectionOperator
class NonlinearOperator(object): class Model(object):
def __init__(self, position): def __init__(self, position):
self._position = position self._position = position
...@@ -27,17 +27,17 @@ class NonlinearOperator(object): ...@@ -27,17 +27,17 @@ class NonlinearOperator(object):
return sel(self) return sel(self)
def __add__(self, other): def __add__(self, other):
assert isinstance(other, NonlinearOperator) assert isinstance(other, Model)
return Add.make(self, other) return Add.make(self, other)
def __sub__(self, other): def __sub__(self, other):
assert isinstance(other, NonlinearOperator) assert isinstance(other, Model)
return Add.make(self, (-1) * other) return Add.make(self, (-1) * other)
def __mul__(self, other): def __mul__(self, other):
if isinstance(other, (float, int)): if isinstance(other, (float, int)):
return ScalarMul(self._position, other, self) return ScalarMul(self._position, other, self)
if isinstance(other, NonlinearOperator): if isinstance(other, Model):
return Mul.make(self, other) return Mul.make(self, other)
raise NotImplementedError raise NotImplementedError
...@@ -56,7 +56,7 @@ def _joint_position(op1, op2): ...@@ -56,7 +56,7 @@ def _joint_position(op1, op2):
return ift.MultiField(ab) return ift.MultiField(ab)
class Mul(NonlinearOperator): class Mul(Model):
""" """
Please note: If you multiply two operators which share some keys in the Please note: If you multiply two operators which share some keys in the
position but have different values there, it is not guaranteed which value position but have different values there, it is not guaranteed which value
...@@ -81,7 +81,7 @@ class Mul(NonlinearOperator): ...@@ -81,7 +81,7 @@ class Mul(NonlinearOperator):
return self.__class__(position, self._op1, self._op2) return self.__class__(position, self._op1, self._op2)
class Add(NonlinearOperator): class Add(Model):
""" """
Please note: If you add two operators which share some keys in the position Please note: If you add two operators which share some keys in the position
but have different values there, it is not guaranteed which value will be but have different values there, it is not guaranteed which value will be
...@@ -105,11 +105,11 @@ class Add(NonlinearOperator): ...@@ -105,11 +105,11 @@ class Add(NonlinearOperator):
return self.__class__(position, self._op1, self._op2) return self.__class__(position, self._op1, self._op2)
class ScalarMul(NonlinearOperator): class ScalarMul(Model):
def __init__(self, position, factor, op): def __init__(self, position, factor, op):
super(ScalarMul, self).__init__(position) super(ScalarMul, self).__init__(position)
assert isinstance(factor, (float, int)) assert isinstance(factor, (float, int))
assert isinstance(op, NonlinearOperator) assert isinstance(op, Model)
self._op = op.at(position) self._op = op.at(position)
self._factor = factor self._factor = factor
...@@ -121,7 +121,7 @@ class ScalarMul(NonlinearOperator): ...@@ -121,7 +121,7 @@ class ScalarMul(NonlinearOperator):
return self.__class__(position, self._factor, self._op) return self.__class__(position, self._factor, self._op)
class LinearModel(NonlinearOperator): class LinearModel(Model):
def __init__(self, inp, lin_op): def __init__(self, inp, lin_op):
""" """
Computes lin_op(inp) where lin_op is a Linear Operator Computes lin_op(inp) where lin_op is a Linear Operator
......
import nifty4 as ift import nifty4 as ift
from .nonlinear_operator import NonlinearOperator from .model import Model
class PositionModel(NonlinearOperator): class PositionModel(Model):
""" """
Returns the MultiField. Returns the MultiField.
""" """
......
...@@ -198,9 +198,9 @@ class LinearOperator(NiftyMetaBase()): ...@@ -198,9 +198,9 @@ class LinearOperator(NiftyMetaBase()):
raise NotImplementedError raise NotImplementedError
def __call__(self, x): def __call__(self, x):
from ..nonlinear_operators import LinearModel, NonlinearOperator from ..models import LinearModel, Model
"""Same as :meth:`times`""" """Same as :meth:`times`"""
if isinstance(x, NonlinearOperator): if isinstance(x, Model):
return LinearModel(x, self) return LinearModel(x, self)
return self.apply(x, self.TIMES) return self.apply(x, self.TIMES)
......
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