diff --git a/nifty4/data_objects/distributed_do.py b/nifty4/data_objects/distributed_do.py index 25947573cf91535d639035a2a688b34c75362579..b8eb396c84820d6c29607894a0e84df7cd0ec6dc 100644 --- a/nifty4/data_objects/distributed_do.py +++ b/nifty4/data_objects/distributed_do.py @@ -190,7 +190,7 @@ class data_object(object): return data_object(self._shape, -self._data, self._distaxis) def __abs__(self): - return data_object(self._shape, np.abs(self._data), self._distaxis) + return data_object(self._shape, abs(self._data), self._distaxis) def all(self): return self.sum() == self.size @@ -258,7 +258,7 @@ def _math_helper(x, function, out): _current_module = sys.modules[__name__] -for f in ["sqrt", "exp", "log", "tanh", "conjugate", "abs"]: +for f in ["sqrt", "exp", "log", "tanh", "conjugate"]: def func(f): def func2(x, out=None): return _math_helper(x, f, out) diff --git a/nifty4/data_objects/numpy_do.py b/nifty4/data_objects/numpy_do.py index 9e2c7354fee94d52cfdbac9ec5c61d1bbb1bad5a..ad96daf63b9fbec11d714c81b2875c48aa862aae 100644 --- a/nifty4/data_objects/numpy_do.py +++ b/nifty4/data_objects/numpy_do.py @@ -20,7 +20,7 @@ import numpy as np from numpy import ndarray as data_object -from numpy import full, empty, empty_like, sqrt, ones, zeros, vdot, abs, \ +from numpy import full, empty, empty_like, sqrt, ones, zeros, vdot, \ exp, log, tanh from .random import Random diff --git a/nifty4/domains/rg_space.py b/nifty4/domains/rg_space.py index 0d5d9d4dbc810d67fbbecfa819e0d4c6fdb381d1..5f8e0a1fdfd046a23bf7426bbb748ca295ba1176 100644 --- a/nifty4/domains/rg_space.py +++ b/nifty4/domains/rg_space.py @@ -182,10 +182,9 @@ class RGSpace(StructuredDomain): "not be the same.") # Check if the distances match, i.e. dist' = 1 / (num * dist) - if not np.all( - np.absolute(np.array(self.shape) * - np.array(self.distances) * - np.array(codomain.distances)-1) < 1e-7): + if not np.all(abs(np.array(self.shape) * + np.array(self.distances) * + np.array(codomain.distances)-1) < 1e-7): raise AttributeError("The grid-distances of domain and codomain " "do not match.") diff --git a/nifty4/field.py b/nifty4/field.py index cdb66d4736380867d34577ec64a86d58e42dbf4f..854fca142df36929263098a33a413c0cbe6ac67a 100644 --- a/nifty4/field.py +++ b/nifty4/field.py @@ -519,7 +519,7 @@ class Field(object): float The L2-norm of the field values. """ - return np.sqrt(np.abs(self.vdot(x=self))) + return np.sqrt(abs(self.vdot(x=self))) def conjugate(self): """ Returns the complex conjugate of the field. @@ -540,7 +540,7 @@ class Field(object): return Field(self._domain, -self.val) def __abs__(self): - return Field(self._domain, dobj.abs(self.val)) + return Field(self._domain, abs(self.val)) def _contraction_helper(self, op, spaces): if spaces is None: