diff --git a/GPy/testing/kernel_tests.py b/GPy/testing/kernel_tests.py index eafde0ec..6b620406 100644 --- a/GPy/testing/kernel_tests.py +++ b/GPy/testing/kernel_tests.py @@ -395,14 +395,12 @@ class KernelTestsNonContinuous(unittest.TestCase): self.X2[:(N0*2), -1] = 0 self.X2[(N0*2):, -1] = 1 - #@unittest.expectedFailure def test_IndependentOutputs(self): k = [GPy.kern.RBF(1, active_dims=[1], name='rbf1'), GPy.kern.RBF(self.D, active_dims=range(self.D), name='rbf012'), GPy.kern.RBF(2, active_dims=[0,2], name='rbf02')] kern = GPy.kern.IndependentOutputs(k, -1, name='ind_split') np.testing.assert_array_equal(kern.active_dims, [-1,0,1,2]) np.testing.assert_array_equal(kern._all_dims_active, [0,1,2,-1]) - #@skip('Gradients for independend outputs with different X do not work correctly') def testIndependendGradients(self): k = GPy.kern.RBF(self.D, active_dims=range(self.D)) kern = GPy.kern.IndependentOutputs(k, -1, 'ind_single') @@ -411,14 +409,12 @@ class KernelTestsNonContinuous(unittest.TestCase): kern = GPy.kern.IndependentOutputs(k, -1, name='ind_split') self.assertTrue(check_kernel_gradient_functions(kern, X=self.X, X2=self.X2, verbose=verbose, fixed_X_dims=-1)) - #@unittest.expectedFailure def test_Hierarchical(self): k = [GPy.kern.RBF(2, active_dims=[0,2], name='rbf1'), GPy.kern.RBF(2, active_dims=[0,2], name='rbf2')] kern = GPy.kern.IndependentOutputs(k, -1, name='ind_split') np.testing.assert_array_equal(kern.active_dims, [-1,0,2]) np.testing.assert_array_equal(kern._all_dims_active, [0,1,2,-1]) - #@skip('Gradients for independend outputs with different X do not work correctly') def test_Hierarchical_gradients(self): k = [GPy.kern.RBF(2, active_dims=[0,2], name='rbf1'), GPy.kern.RBF(2, active_dims=[0,2], name='rbf2')] kern = GPy.kern.IndependentOutputs(k, -1, name='ind_split')