Commit a54dd65c authored by theos's avatar theos

Merge branch 'master' into smooth_operator

# Conflicts:
#	nifty/spaces/space/space.py
parents eaeab258 369994b1
......@@ -223,11 +223,8 @@ class Space(object):
else:
return False
def pre_cast(self, x, axes=None):
return x
def post_cast(self, x, axes=None):
return x
def __ne__(self, x):
return not self.__eq__(x)
@abc.abstractproperty
def harmonic(self):
......@@ -272,14 +269,15 @@ class Space(object):
"""
raise NotImplementedError
def get_distance_array(self, distribution_strategy):
raise NotImplementedError(about._errors.cstring(
"ERROR: There is no generic get_distance_array for "
"Space base class."))
def pre_cast(self, x, axes=None):
return x
def post_cast(self, x, axes=None):
return x
def get_smoothing_kernel_function(self, sigma):
def compute_k_array(self, distribution_strategy):
raise NotImplementedError(about._errors.cstring(
"ERROR: There is no generic smoothing function for Space class."))
"ERROR: There is no generic k_array for Space base class."))
def hermitian_decomposition(self, x, axes=None):
raise NotImplementedError
......
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