... and more cleanups

demos/polynomial_fit.py

@@ -38,13 +38,13 @@ class PolynomialResponse(ift.LinearOperator):
     """
 
     def __init__(self, domain, sampling_points):
-        super(PolynomialResponse, self).__init__()
         if not (isinstance(domain, ift.UnstructuredDomain)
                 and isinstance(x, np.ndarray)):
             raise TypeError
         self._domain = ift.DomainTuple.make(domain)
         tgt = ift.UnstructuredDomain(sampling_points.shape)
         self._target = ift.DomainTuple.make(tgt)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
         sh = (self.target.size, domain.size)
         self._mat = np.empty(sh)
@@ -62,10 +62,6 @@ class PolynomialResponse(ift.LinearOperator):
             out = self._mat.conj().T.dot(val)
         return ift.from_global_data(self._tgt(mode), out)
 
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
-
 
 # Generate some mock data
 N_params = 10

nifty5/domains/dof_space.py

@@ -40,7 +40,6 @@ class DOFSpace(StructuredDomain):
     _needed_for_hash = ["_dvol"]
 
     def __init__(self, dof_weights):
-        super(DOFSpace, self).__init__()
         self._dvol = tuple(dof_weights)
 
     @property

nifty5/domains/domain.py

@@ -25,10 +25,6 @@ from ..utilities import NiftyMetaBase
 class Domain(NiftyMetaBase()):
     """The abstract class repesenting a (structured or unstructured) domain.
     """
-
-    def __init__(self):
-        self._hash = None
-
     def __repr__(self):
         raise NotImplementedError
 
@@ -40,7 +36,9 @@ class Domain(NiftyMetaBase()):
         Only members that are explicitly added to
         :attr:`._needed_for_hash` will be used for hashing.
         """
-        if self._hash is None:
+        try:
+            return self._hash
+        except AttributeError:
             h = 0
             for key in self._needed_for_hash:
                 h ^= hash(vars(self)[key])

nifty5/domains/gl_space.py

@@ -43,8 +43,6 @@ class GLSpace(StructuredDomain):
     _needed_for_hash = ["_nlat", "_nlon"]
 
     def __init__(self, nlat, nlon=None):
-        super(GLSpace, self).__init__()
-
         self._nlat = int(nlat)
         if self._nlat < 1:
             raise ValueError("nlat must be a positive number.")

nifty5/domains/hp_space.py

@@ -40,7 +40,6 @@ class HPSpace(StructuredDomain):
     _needed_for_hash = ["_nside"]
 
     def __init__(self, nside):
-        super(HPSpace, self).__init__()
         self._nside = int(nside)
         if self._nside < 1:
             raise ValueError("nside must be >=1.")

nifty5/domains/lm_space.py

@@ -48,7 +48,6 @@ class LMSpace(StructuredDomain):
     _needed_for_hash = ["_lmax", "_mmax"]
 
     def __init__(self, lmax, mmax=None):
-        super(LMSpace, self).__init__()
         self._lmax = np.int(lmax)
         if self._lmax < 0:
             raise ValueError("lmax must be >=0.")

nifty5/domains/log_rg_space.py

@@ -32,8 +32,6 @@ class LogRGSpace(StructuredDomain):
     _needed_for_hash = ['_shape', '_bindistances', '_t_0', '_harmonic']
 
     def __init__(self, shape, bindistances, t_0, harmonic=False):
-        super(LogRGSpace, self).__init__()
-
         self._harmonic = bool(harmonic)
 
         if np.isscalar(shape):

nifty5/domains/power_space.py

@@ -158,8 +158,6 @@ class PowerSpace(StructuredDomain):
             return PowerSpace.linear_binbounds(nbin, lbound, rbound)
 
     def __init__(self, harmonic_partner, binbounds=None):
-        super(PowerSpace, self).__init__()
-
         if not (isinstance(harmonic_partner, StructuredDomain) and
                 harmonic_partner.harmonic):
             raise ValueError("harmonic_partner must be a harmonic space.")

nifty5/domains/rg_space.py

@@ -51,8 +51,6 @@ class RGSpace(StructuredDomain):
     _needed_for_hash = ["_distances", "_shape", "_harmonic"]
 
     def __init__(self, shape, distances=None, harmonic=False):
-        super(RGSpace, self).__init__()
-
         self._harmonic = bool(harmonic)
         if np.isscalar(shape):
             shape = (shape,)

nifty5/domains/unstructured_domain.py

@@ -38,7 +38,6 @@ class UnstructuredDomain(Domain):
     _needed_for_hash = ["_shape"]
 
     def __init__(self, shape):
-        super(UnstructuredDomain, self).__init__()
         try:
             self._shape = tuple([int(i) for i in shape])
         except TypeError:

nifty5/library/los_response.py

@@ -134,9 +134,8 @@ class LOSResponse(LinearOperator):
     """
 
     def __init__(self, domain, starts, ends, sigmas_low=None, sigmas_up=None):
-
-        super(LOSResponse, self).__init__()
         self._domain = DomainTuple.make(domain)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
         if ((not isinstance(self.domain[0], RGSpace)) or
                 (len(self._domain) != 1)):
@@ -221,10 +220,6 @@ class LOSResponse(LinearOperator):
 
         self._target = DomainTuple.make(UnstructuredDomain(nlos))
 
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
-
     def apply(self, x, mode):
         self._check_input(x, mode)
         if mode == self.TIMES:

nifty5/minimization/descent_minimizer.py

@@ -42,7 +42,6 @@ class DescentMinimizer(Minimizer):
     """
 
     def __init__(self, controller, line_searcher=LineSearchStrongWolfe()):
-        super(DescentMinimizer, self).__init__()
         self._controller = controller
         self.line_searcher = line_searcher
 

nifty5/minimization/energy.py

@@ -47,7 +47,6 @@ class Energy(NiftyMetaBase()):
     """
 
     def __init__(self, position):
-        super(Energy, self).__init__()
         self._position = position
         self._gradnorm = None
 

nifty5/minimization/gradient_norm_controller.py

@@ -47,7 +47,6 @@ class GradientNormController(IterationController):
 
     def __init__(self, tol_abs_gradnorm=None, tol_rel_gradnorm=None,
                  convergence_level=1, iteration_limit=None, name=None):
-        super(GradientNormController, self).__init__()
         self._tol_abs_gradnorm = tol_abs_gradnorm
         self._tol_rel_gradnorm = tol_rel_gradnorm
         self._convergence_level = convergence_level

nifty5/minimization/line_energy.py

@@ -50,7 +50,6 @@ class LineEnergy(object):
     """
 
     def __init__(self, line_position, energy, line_direction, offset=0.):
-        super(LineEnergy, self).__init__()
         self._line_position = float(line_position)
         self._line_direction = line_direction
 

nifty5/minimization/scipy_minimizer.py

@@ -74,7 +74,6 @@ class ScipyMinimizer(Minimizer):
     """
 
     def __init__(self, method, options, need_hessp, bounds):
-        super(ScipyMinimizer, self).__init__()
         if not dobj.is_numpy():
             raise NotImplementedError
         self._method = method
@@ -130,7 +129,6 @@ def L_BFGS_B(ftol, gtol, maxiter, maxcor=10, disp=False, bounds=None):
 
 class ScipyCG(Minimizer):
     def __init__(self, tol, maxiter):
-        super(ScipyCG, self).__init__()
         if not dobj.is_numpy():
             raise NotImplementedError
         self._tol = tol

nifty5/operators/block_diagonal_operator.py

@@ -33,21 +33,16 @@ class BlockDiagonalOperator(EndomorphicOperator):
             dictionary with operators domain names as keys and
             LinearOperators as items
         """
-        super(BlockDiagonalOperator, self).__init__()
         if not isinstance(domain, MultiDomain):
             raise TypeError("MultiDomain expected")
         if not isinstance(operators, tuple):
             raise TypeError("tuple expected")
         self._domain = domain
         self._ops = operators
-        self._cap = self._all_ops
+        self._capability = self._all_ops
         for op in self._ops:
             if op is not None:
-                self._cap &= op.capability
-
-    @property
-    def capability(self):
-        return self._cap
+                self._capability &= op.capability
 
     def apply(self, x, mode):
         self._check_input(x, mode)

nifty5/operators/central_zero_padder.py

@@ -16,8 +16,6 @@ from .. import dobj
 #           highest frequency.
 class CentralZeroPadder(LinearOperator):
     def __init__(self, domain, new_shape, space=0):
-        super(CentralZeroPadder, self).__init__()
-
         self._domain = DomainTuple.make(domain)
         self._space = utilities.infer_space(self._domain, space)
         dom = self._domain[self._space]
@@ -35,6 +33,7 @@ class CentralZeroPadder(LinearOperator):
         self._target = list(self._domain)
         self._target[self._space] = tgt
         self._target = DomainTuple.make(self._target)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
         slicer = []
         axes = self._target.axes[self._space]
@@ -53,10 +52,6 @@ class CentralZeroPadder(LinearOperator):
                     self.slicer[i] = tuple(tmp)
         self.slicer = tuple(self.slicer)
 
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
-
     def apply(self, x, mode):
         self._check_input(x, mode)
         x = x.val

nifty5/operators/chain_operator.py

@@ -31,7 +31,6 @@ class ChainOperator(LinearOperator):
     def __init__(self, ops, _callingfrommake=False):
         if not _callingfrommake:
             raise NotImplementedError
-        super(ChainOperator, self).__init__()
         self._ops = ops
         self._capability = self._all_ops
         for op in ops:
@@ -132,10 +131,6 @@ class ChainOperator(LinearOperator):
             return self.make([op._flip_modes(trafo) for op in self._ops])
         raise ValueError("invalid operator transformation")
 
-    @property
-    def capability(self):
-        return self._capability
-
     def apply(self, x, mode):
         self._check_mode(mode)
         t_ops = self._ops if mode & self._backwards else reversed(self._ops)

nifty5/operators/diagonal_operator.py

@@ -57,8 +57,6 @@ class DiagonalOperator(EndomorphicOperator):
     """
 
     def __init__(self, diagonal, domain=None, spaces=None):
-        super(DiagonalOperator, self).__init__()
-
         if not isinstance(diagonal, Field):
             raise TypeError("Field object required")
         if domain is None:
@@ -99,6 +97,7 @@ class DiagonalOperator(EndomorphicOperator):
     def _fill_rest(self):
         self._ldiag.flags.writeable = False
         self._complex = utilities.iscomplextype(self._ldiag.dtype)
+        self._capability = self._all_ops
         if not self._complex:
             lmin = self._ldiag.min() if self._ldiag.size > 0 else 1.
             self._diagmin = dobj.np_allreduce_min(np.array(lmin))[()]
@@ -150,10 +149,6 @@ class DiagonalOperator(EndomorphicOperator):
             return Field.from_local_data(x.domain, x.local_data*xdiag)
         return Field.from_local_data(x.domain, x.local_data/xdiag)
 
-    @property
-    def capability(self):
-        return self._all_ops
-
     def _flip_modes(self, trafo):
         xdiag = self._ldiag
         if self._complex and (trafo & self.ADJOINT_BIT):

nifty5/operators/dof_distributor.py

@@ -54,8 +54,6 @@ class DOFDistributor(LinearOperator):
     """
 
     def __init__(self, dofdex, target=None, space=None):
-        super(DOFDistributor, self).__init__()
-
         if target is None:
             target = dofdex.domain
         self._target = DomainTuple.make(target)
@@ -98,6 +96,7 @@ class DOFDistributor(LinearOperator):
         dom = list(self._target)
         dom[self._space] = other_space
         self._domain = DomainTuple.make(dom)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
         if dobj.default_distaxis() in self._domain.axes[self._space]:
             dofdex = dobj.local_data(dofdex)
@@ -142,7 +141,3 @@ class DOFDistributor(LinearOperator):
     def apply(self, x, mode):
         self._check_input(x, mode)
         return self._times(x) if mode == self.TIMES else self._adjoint_times(x)
-
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES

nifty5/operators/domain_distributor.py

@@ -35,6 +35,7 @@ class DomainDistributor(LinearOperator):
         self._domain = [tgt for i, tgt in enumerate(self._target)
                         if i in self._spaces]
         self._domain = DomainTuple.make(self._domain)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
     def apply(self, x, mode):
         self._check_input(x, mode)
@@ -49,7 +50,3 @@ class DomainDistributor(LinearOperator):
         else:
             return x.sum([s for s in range(len(x.domain))
                           if s not in self._spaces])
-
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES

nifty5/operators/energy_operators.py

@@ -36,7 +36,6 @@ class EnergyOperator(Operator):
 
 class SquaredNormOperator(EnergyOperator):
     def __init__(self, domain):
-        super(SquaredNormOperator, self).__init__()
         self._domain = domain
 
     def apply(self, x):
@@ -50,7 +49,6 @@ class SquaredNormOperator(EnergyOperator):
 class QuadraticFormOperator(EnergyOperator):
     def __init__(self, op):
         from .endomorphic_operator import EndomorphicOperator
-        super(QuadraticFormOperator, self).__init__()
         if not isinstance(op, EndomorphicOperator):
             raise TypeError("op must be an EndomorphicOperator")
         self._op = op
@@ -67,7 +65,6 @@ class QuadraticFormOperator(EnergyOperator):
 
 class GaussianEnergy(EnergyOperator):
     def __init__(self, mean=None, covariance=None, domain=None):
-        super(GaussianEnergy, self).__init__()
         self._domain = None
         if mean is not None:
             self._checkEquivalence(mean.domain)
@@ -132,7 +129,6 @@ class BernoulliEnergy(EnergyOperator):
 
 class Hamiltonian(EnergyOperator):
     def __init__(self, lh, ic_samp=None):
-        super(Hamiltonian, self).__init__()
         self._lh = lh
         self._prior = GaussianEnergy(domain=lh.domain)
         self._ic_samp = ic_samp
@@ -156,7 +152,6 @@ class SampledKullbachLeiblerDivergence(EnergyOperator):
         h: Hamiltonian
         N: Number of samples to be used
         """
-        super(SampledKullbachLeiblerDivergence, self).__init__()
         self._h = h
         self._domain = h.domain
         self._res_samples = tuple(res_samples)

nifty5/operators/exp_transform.py

@@ -33,6 +33,7 @@ from ..utilities import infer_space, special_add_at
 class ExpTransform(LinearOperator):
     def __init__(self, target, dof, space=0):
         self._target = DomainTuple.make(target)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
         self._space = infer_space(self._target, space)
         tgt = self._target[self._space]
         if not ((isinstance(tgt, RGSpace) and tgt.harmonic) or
@@ -115,7 +116,3 @@ class ExpTransform(LinearOperator):
             if d == ax:
                 x = dobj.redistribute(x, dist=ax)
         return Field(self._tgt(mode), val=x)
-
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES

nifty5/operators/field_zero_padder.py

@@ -13,7 +13,6 @@ from .. import utilities
 
 class FieldZeroPadder(LinearOperator):
     def __init__(self, domain, new_shape, space=0):
-        super(FieldZeroPadder, self).__init__()
         self._domain = DomainTuple.make(domain)
         self._space = utilities.infer_space(self._domain, space)
         dom = self._domain[self._space]
@@ -30,10 +29,7 @@ class FieldZeroPadder(LinearOperator):
         self._target = list(self._domain)
         self._target[self._space] = tgt
         self._target = DomainTuple.make(self._target)
-
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
     def apply(self, x, mode):
         self._check_input(x, mode)

nifty5/operators/harmonic_operators.py

@@ -57,10 +57,9 @@ class FFTOperator(LinearOperator):
     """
 
     def __init__(self, domain, target=None, space=None):
-        super(FFTOperator, self).__init__()
-
         # Initialize domain and target
         self._domain = DomainTuple.make(domain)
+        self._capability = self._all_ops
         self._space = utilities.infer_space(self._domain, space)
 
         adom = self._domain[self._space]
@@ -127,10 +126,6 @@ class FFTOperator(LinearOperator):
             fct *= self._target[self._space].scalar_dvol
         return Tval if fct == 1 else Tval*fct
 
-    @property
-    def capability(self):
-        return self._all_ops
-
 
 class HartleyOperator(LinearOperator):
     """Transforms between a pair of position and harmonic RGSpaces.
@@ -162,10 +157,9 @@ class HartleyOperator(LinearOperator):
     """
 
     def __init__(self, domain, target=None, space=None):
-        super(HartleyOperator, self).__init__()
-
         # Initialize domain and target
         self._domain = DomainTuple.make(domain)
+        self._capability = self._all_ops
         self._space = utilities.infer_space(self._domain, space)
 
         adom = self._domain[self._space]
@@ -239,10 +233,6 @@ class HartleyOperator(LinearOperator):
             fct = self._target[self._space].scalar_dvol
         return Tval if fct == 1 else Tval*fct
 
-    @property
-    def capability(self):
-        return self._all_ops
-
 
 class SHTOperator(LinearOperator):
     """Transforms between a harmonic domain on the sphere and a position
@@ -272,10 +262,9 @@ class SHTOperator(LinearOperator):
     """
 
     def __init__(self, domain, target=None, space=None):
-        super(SHTOperator, self).__init__()
-
         # Initialize domain and target
         self._domain = DomainTuple.make(domain)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
         self._space = utilities.infer_space(self._domain, space)
 
         hspc = self._domain[self._space]
@@ -351,10 +340,6 @@ class SHTOperator(LinearOperator):
             odat = dobj.redistribute(odat, dist=dobj.distaxis(x.val))
         return Field(tdom, odat)
 
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
-
 
 class HarmonicTransformOperator(LinearOperator):
     """Transforms between a harmonic domain and a position domain counterpart.
@@ -384,8 +369,6 @@ class HarmonicTransformOperator(LinearOperator):
     """
 
     def __init__(self, domain, target=None, space=None):
-        super(HarmonicTransformOperator, self).__init__()
-
         domain = DomainTuple.make(domain)
         space = utilities.infer_space(domain, space)
 
@@ -399,15 +382,12 @@ class HarmonicTransformOperator(LinearOperator):
             self._op = SHTOperator(domain, target, space)
         self._domain = self._op.domain
         self._target = self._op.target
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
     def apply(self, x, mode):
         self._check_input(x, mode)
         return self._op.apply(x, mode)
 
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
-
 
 def HarmonicSmoothingOperator(domain, sigma, space=None):
     """ This function returns an operator that carries out a smoothing with

nifty5/operators/inversion_enabler.py

@@ -51,15 +51,11 @@ class InversionEnabler(EndomorphicOperator):
     """
 
     def __init__(self, op, iteration_controller, approximation=None):
-        super(InversionEnabler, self).__init__()
         self._op = op
         self._ic = iteration_controller
         self._approximation = approximation
         self._domain = op.domain
-
-    @property
-    def capability(self):
-        return self._addInverse[self._op.capability]
+        self._capability = self._addInverse[self._op.capability]
 
     def apply(self, x, mode):
         self._check_mode(mode)

nifty5/operators/laplace_operator.py

@@ -47,8 +47,8 @@ class LaplaceOperator(EndomorphicOperator):
     """
 
     def __init__(self, domain, space=None, logarithmic=True):
-        super(LaplaceOperator, self).__init__()
         self._domain = DomainTuple.make(domain)
+        self._capability = self.TIMES | self.ADJOINT_TIMES
         self._space = infer_space(self._domain, space)
 
         if not isinstance(self._domain[self._space], PowerSpace):
@@ -68,10 +68,6 @@ class LaplaceOperator(EndomorphicOperator):
         self._dposc[1:] += self._dpos
         self._dposc *= 0.5
 
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES
-
     def _times(self, x):
         axes = x.domain.axes[self._space]
         axis = axes[0]

nifty5/operators/linear_operator.py

@@ -145,7 +145,7 @@ class LinearOperator(Operator):
         :attr:`INVERSE_TIMES`, and :attr:`ADJOINT_INVERSE_TIMES`,
         joined together by the "|" operator.
         """
-        raise NotImplementedError
+        return self._capability
 
     def apply(self, x, mode):
         """ Applies the Operator to a given `x`, in a specified `mode`.

nifty5/operators/mask_operator.py

@@ -38,6 +38,7 @@ class MaskOperator(LinearOperator):
         self._domain = DomainTuple.make(mask.domain)
         self._mask = np.logical_not(mask.to_global_data())
         self._target = DomainTuple.make(UnstructuredDomain(self._mask.sum()))
+        self._capability = self.TIMES | self.ADJOINT_TIMES
 
     def data_indices(self):
         if len(self.domain.shape) == 1:
@@ -55,7 +56,3 @@ class MaskOperator(LinearOperator):
         res[self._mask] = x
         res[~self._mask] = 0
         return Field.from_global_data(self.domain, res)
-
-    @property
-    def capability(self):
-        return self.TIMES | self.ADJOINT_TIMES

nifty5/operators/operator_adapter.py

@@ -45,17 +45,13 @@ class OperatorAdapter(LinearOperator):
     """
 
     def __init__(self, op, op_transform):
-        super(OperatorAdapter, self).__init__()
         self._op = op
         self._trafo = int(op_transform)
         if self._trafo < 1 or self._trafo > 3:
             raise ValueError("invalid operator transformation")
         self._domain = self._op._dom(1 << self._trafo)
         self._target = self._op._tgt(1 << self._trafo)
-
-    @property
-    def capability(self):
-        return self._capTable[self._trafo][self._op.capability]
+        self._capability = self._capTable[self._trafo][self._op.capability]
 
     def _flip_modes(self, trafo):
         newtrafo = trafo ^ self._trafo

nifty5/operators/qht_operator.py

@@ -59,6 +59,7 @@ class QHTOperator(LinearOperator):