apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-15 06:52:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning on warping functions

Browse source
This commit is contained in:
beckdaniel 2016-02-24 11:07:31 +00:00
parent c129900768
commit 03e59b764d
1 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
GPy/util/warping_functions.py
View file

@ -153,7 +153,9 @@ class TanhWarpingFunction(WarpingFunction):
class TanhWarpingFunction_d(WarpingFunction): class TanhWarpingFunction_d(WarpingFunction):
def __init__(self, n_terms=3, initial_y=None): def __init__(self, n_terms=3, initial_y=None):
"""n_terms specifies the number of tanh terms to be used""" """
n_terms specifies the number of tanh terms to be used
"""
self.n_terms = n_terms self.n_terms = n_terms
self.num_parameters = 3 * self.n_terms + 1 self.num_parameters = 3 * self.n_terms + 1
self.psi = np.ones((self.n_terms, 3)) self.psi = np.ones((self.n_terms, 3))
@ -298,12 +300,7 @@ class LogFunction(WarpingFunction):
""" """
def __init__(self): def __init__(self):
self.num_parameters = 0 self.num_parameters = 0
#self.psi = Param('psi', np.zeros((1,3)))
#self.d = Param('%s' % ('d'), 0.0, Logexp())
super(LogFunction, self).__init__(name='log') super(LogFunction, self).__init__(name='log')
#self.link_parameter(self.psi)
#self.link_parameter(self.d)
def f(self, y): def f(self, y):
return np.log(y) return np.log(y)
@ -315,11 +312,9 @@ class LogFunction(WarpingFunction):
pass pass
def fgrad_y_psi(self, y, return_covar_chain=False): def fgrad_y_psi(self, y, return_covar_chain=False):
gradients = np.zeros((y.shape[0], y.shape[1], len(self.psi), 4))
gradients = 0
if return_covar_chain: if return_covar_chain:
return gradients, gradients return 0, 0
return gradients return 0
def f_inv(self, z, y=None): def f_inv(self, z, y=None):
return np.exp(z) return np.exp(z)
@ -332,12 +327,7 @@ class IdentityFunction(WarpingFunction):
""" """
def __init__(self): def __init__(self):
self.num_parameters = 0 self.num_parameters = 0
#self.psi = Param('psi', np.zeros((1,3)))
#self.d = Param('%s' % ('d'), 0.0, Logexp())
super(IdentityFunction, self).__init__(name='identity') super(IdentityFunction, self).__init__(name='identity')
#self.link_parameter(self.psi)
#self.link_parameter(self.d)
def f(self, y): def f(self, y):
return y return y
@ -349,11 +339,9 @@ class IdentityFunction(WarpingFunction):
pass pass
def fgrad_y_psi(self, y, return_covar_chain=False): def fgrad_y_psi(self, y, return_covar_chain=False):
gradients = np.zeros((y.shape[0], y.shape[1], len(self.psi), 4))
gradients = 0
if return_covar_chain: if return_covar_chain:
return gradients, gradients return 0, 0
return gradients return 0
def f_inv(self, z, y=None): def f_inv(self, z, y=None):
return z return z