Merge branch 'devel' into pickle

This commit is contained in:
Max Zwiessele 2013-06-25 17:44:52 +01:00
commit 1e06ca2d40
66 changed files with 768 additions and 193 deletions

View file

@ -1,13 +1,12 @@
# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
# Licensed under the BSD 3-clause license (see LICENSE.txt)
import numpy as np
import pylab as pb
from ..core.parameterised import Parameterised
from kernpart import Kernpart
from parts.kernpart import Kernpart
import itertools
from prod import prod
from parts.prod import Prod as prod
class kern(Parameterised):
def __init__(self, input_dim, parts=[], input_slices=None):