some more merge conflicts resolved for syncing with the current devel branch of main GPy

This commit is contained in:
Akash Kumar Dhaka 2017-08-10 11:51:48 +03:00
commit 8b24b492f1

View file

@ -124,7 +124,6 @@ class Binomial(Likelihood):
""" """
N = Y_metadata['trials'] N = Y_metadata['trials']
np.testing.assert_array_equal(N.shape, y.shape) np.testing.assert_array_equal(N.shape, y.shape)
Ny = N-y Ny = N-y
t1 = np.zeros(y.shape) t1 = np.zeros(y.shape)
t2 = np.zeros(y.shape) t2 = np.zeros(y.shape)