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

Changed naming from old derivatives of likelihoods to new ones

Browse source 
in noise distributions
This commit is contained in:
Alan Saul 2013-10-22 15:22:27 +01:00
parent eacf622ac7
commit 5f9d7eb709
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
GPy/likelihoods/noise_models/noise_distributions.py
View file

@ -80,7 +80,7 @@ class NoiseDistribution(object):
:param sigma: cavity distribution standard deviation
"""
return .5*((gp-mu)/sigma)**2 + self._nlog_mass(gp,obs)
return .5*((gp-mu)/sigma)**2 - self.logpdf(gp,obs)
def _dnlog_product_dgp(self,gp,obs,mu,sigma):
"""
@ -92,7 +92,7 @@ class NoiseDistribution(object):
:param sigma: cavity distribution standard deviation
"""
return (gp - mu)/sigma**2 + self._dnlog_mass_dgp(gp,obs)
return (gp - mu)/sigma**2 - self.dlogpdf_df(gp,obs)
def _d2nlog_product_dgp2(self,gp,obs,mu,sigma):
"""
@ -104,7 +104,7 @@ class NoiseDistribution(object):
:param sigma: cavity distribution standard deviation
"""
return 1./sigma**2 + self._d2nlog_mass_dgp2(gp,obs)
return 1./sigma**2 - self.d2logpdf_df2(gp,obs)
def _product_mode(self,obs,mu,sigma):
"""
@ -166,8 +166,8 @@ class NoiseDistribution(object):
"""
mu = v/tau
mu_hat = self._product_mode(obs,mu,np.sqrt(1./tau))
sigma2_hat = 1./(tau + self._d2nlog_mass_dgp2(mu_hat,obs))
Z_hat = np.exp(-.5*tau*(mu_hat-mu)**2) * self._mass(mu_hat,obs)*np.sqrt(tau*sigma2_hat)
sigma2_hat = 1./(tau - self.d2logpdf_df2(mu_hat,obs))
Z_hat = np.exp(-.5*tau*(mu_hat-mu)**2) * self.pdf(mu_hat,obs)*np.sqrt(tau*sigma2_hat)
return Z_hat,mu_hat,sigma2_hat
def _nlog_conditional_mean_scaled(self,gp,mu,sigma):