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

fix: Fixed numpy 1.12 indexing and shape preservation

Browse source
This commit is contained in:
mzwiessele 2017-02-23 14:45:18 +00:00
parent afe37dbfd8
commit 6cd13ac2b3
9 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
GPy/likelihoods/binomial.py
View file

@ -63,7 +63,8 @@ class Binomial(Likelihood):
:rtype: float
"""
N = Y_metadata['trials']
assert N.shape == y.shape
np.testing.assert_array_equal(N.shape, y.shape)
nchoosey = special.gammaln(N+1) - special.gammaln(y+1) - special.gammaln(N-y+1)
return nchoosey + y*np.log(inv_link_f) + (N-y)*np.log(1.-inv_link_f)
@ -83,7 +84,8 @@ class Binomial(Likelihood):
:rtype: Nx1 array
"""
N = Y_metadata['trials']
assert N.shape == y.shape
np.testing.assert_array_equal(N.shape, y.shape)
return y/inv_link_f - (N-y)/(1.-inv_link_f)
def d2logpdf_dlink2(self, inv_link_f, y, Y_metadata=None):
@ -108,7 +110,7 @@ class Binomial(Likelihood):
(the distribution for y_i depends only on inverse link of f_i not on inverse link of f_(j!=i)
"""
N = Y_metadata['trials']
assert N.shape == y.shape
np.testing.assert_array_equal(N.shape, y.shape)
return -y/np.square(inv_link_f) - (N-y)/np.square(1.-inv_link_f)
def d3logpdf_dlink3(self, inv_link_f, y, Y_metadata=None):
@ -131,7 +133,8 @@ class Binomial(Likelihood):
(the distribution for y_i depends only on inverse link of f_i not on inverse link of f_(j!=i)
"""
N = Y_metadata['trials']
assert N.shape == y.shape
np.testing.assert_array_equal(N.shape, y.shape)
inv_link_f2 = np.square(inv_link_f)
return 2*y/inv_link_f**3 - 2*(N-y)/(1.-inv_link_f)**3