Resolve merge conflicts

This commit is contained in:
Mike Croucher 2015-04-01 11:44:20 +01:00
commit e82b5fe773
31 changed files with 1729 additions and 731 deletions

View file

@ -7,7 +7,7 @@ from .kern import Kern,CombinationKernel
from .independent_outputs import index_to_slices
import itertools
class DiffGenomeKern(Kern):
class DEtime(Kern):
def __init__(self, kernel, idx_p, Xp, index_dim=-1, name='DiffGenomeKern'):
self.idx_p = idx_p