apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-09 12:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

all the product_orthogonal have been changed to prod_orthogonal for consistency

Browse source
This commit is contained in:
Nicolas 2013-03-11 10:33:29 +00:00
parent f881e65761
commit ec748e2d6b
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
GPy/kern/constructors.py
View file

@ -18,8 +18,8 @@ from Brownian import Brownian as Brownianpart
from periodic_exponential import periodic_exponential as periodic_exponentialpart
from periodic_Matern32 import periodic_Matern32 as periodic_Matern32part
from periodic_Matern52 import periodic_Matern52 as periodic_Matern52part
from product import product as productpart
from product_orthogonal import product_orthogonal as product_orthogonalpart
from prod import prod as prodpart
from prod_orthogonal import prod_orthogonal as prod_orthogonalpart
from symmetric import symmetric as symmetric_part
from coregionalise import coregionalise as coregionalise_part
#TODO these s=constructors are not as clean as we'd like. Tidy the code up
@ -245,7 +245,7 @@ def periodic_Matern52(D,variance=1., lengthscale=None, period=2*np.pi,n_freq=10,
part = periodic_Matern52part(D,variance, lengthscale, period, n_freq, lower, upper)
return kern(D, [part])
def product(k1,k2):
def prod(k1,k2):
"""
Construct a product kernel over D from two kernels over D
@ -253,10 +253,10 @@ def product(k1,k2):
:type k1, k2: kernpart
:rtype: kernel object
"""
part = productpart(k1,k2)
part = prodpart(k1,k2)
return kern(k1.D, [part])
def product_orthogonal(k1,k2):
def prod_orthogonal(k1,k2):
"""
Construct a product kernel over D1 x D2 from a kernel over D1 and another over D2.
@ -264,7 +264,7 @@ def product_orthogonal(k1,k2):
:type k1, k2: kernpart
:rtype: kernel object
"""
part = product_orthogonalpart(k1,k2)
part = prod_orthogonalpart(k1,k2)
return kern(k1.D+k2.D, [part])
def symmetric(k):