Merge branch 'devel' of github.com:SheffieldML/GPy into devel

This commit is contained in:
James Hensman 2013-11-27 12:32:06 +00:00
commit 5ea9725502
2 changed files with 3 additions and 1 deletions

View file

@ -861,6 +861,7 @@ def kern_test(kern, X=None, X2=None, output_ind=None, verbose=False, X_positive=
if X_positive: if X_positive:
X = abs(X) X = abs(X)
if output_ind is not None: if output_ind is not None:
assert(output_ind<kern.input_dim)
X[:, output_ind] = np.random.randint(low=0,high=kern.parts[0].output_dim, size=X.shape[0]) X[:, output_ind] = np.random.randint(low=0,high=kern.parts[0].output_dim, size=X.shape[0])
import ipdb; ipdb.set_trace() import ipdb; ipdb.set_trace()
if X2==None: if X2==None:
@ -868,6 +869,7 @@ def kern_test(kern, X=None, X2=None, output_ind=None, verbose=False, X_positive=
if X_positive: if X_positive:
X2 = abs(X2) X2 = abs(X2)
if output_ind is not None: if output_ind is not None:
assert(output_ind<kern.input_dim)
X2[:, output_ind] = np.random.randint(low=0, high=kern.parts[0].output_dim, size=X2.shape[0]) X2[:, output_ind] = np.random.randint(low=0, high=kern.parts[0].output_dim, size=X2.shape[0])
if verbose: if verbose:

View file

@ -36,7 +36,7 @@ class KernelTests(unittest.TestCase):
def test_eq_sympykernel(self): def test_eq_sympykernel(self):
if SYMPY_AVAILABLE: if SYMPY_AVAILABLE:
kern = GPy.kern.eq_sympy(5, 3) kern = GPy.kern.eq_sympy(5, 3)
self.assertTrue(GPy.kern.kern_test(kern, output_ind=3, verbose=verbose)) self.assertTrue(GPy.kern.kern_test(kern, output_ind=4, verbose=verbose))
def test_ode1_eqkernel(self): def test_ode1_eqkernel(self):
if SYMPY_AVAILABLE: if SYMPY_AVAILABLE: