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

Fixed conflicts

Browse source
This commit is contained in:
kcutajar 2016-05-09 15:57:53 +02:00
commit debdb545dc
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
GPy/core/gp_grid.py
View file

@ -69,10 +69,17 @@ class GpGrid(GP):
x = b x = b
N = 1 N = 1
G = np.zeros(D) G = np.zeros(D)
<<<<<<< HEAD
for d in range(D): for d in range(D):
G[d] = len(A[d]) G[d] = len(A[d])
N = np.prod(G) N = np.prod(G)
for d in range(D-1, -1, -1): for d in range(D-1, -1, -1):
=======
for d in xrange(D):
G[d] = len(A[d])
N = np.prod(G)
for d in xrange(D-1, -1, -1):
>>>>>>> 1fc93236c46ddd1b7bd7f73ef26dc51af4cd2181
X = np.reshape(x, (G[d], round(N/G[d])), order='F') X = np.reshape(x, (G[d], round(N/G[d])), order='F')
Z = np.dot(A[d], X) Z = np.dot(A[d], X)
Z = Z.T Z = Z.T

7
GPy/inference/latent_function_inference/gaussian_grid_inference.py
View file

@ -37,10 +37,17 @@ class GaussianGridInference(LatentFunctionInference):
N = 1 N = 1
D = len(A) D = len(A)
G = np.zeros((D,1)) G = np.zeros((D,1))
<<<<<<< HEAD
for d in range(0, D): for d in range(0, D):
G[d] = len(A[d]) G[d] = len(A[d])
N = np.prod(G) N = np.prod(G)
for d in range(D-1, -1, -1): for d in range(D-1, -1, -1):
=======
for d in xrange(0, D):
G[d] = len(A[d])
N = np.prod(G)
for d in xrange(D-1, -1, -1):
>>>>>>> 1fc93236c46ddd1b7bd7f73ef26dc51af4cd2181
X = np.reshape(x, (G[d], round(N/G[d])), order='F') X = np.reshape(x, (G[d], round(N/G[d])), order='F')
Z = np.dot(A[d], X) Z = np.dot(A[d], X)
Z = Z.T Z = Z.T

3
GPy/kern/__init__.py
View file

@ -29,6 +29,8 @@ from .src.splitKern import SplitKern,DEtime
from .src.splitKern import DEtime as DiffGenomeKern from .src.splitKern import DEtime as DiffGenomeKern
from .src.spline import Spline from .src.spline import Spline
from .src.basis_funcs import LogisticBasisFuncKernel, LinearSlopeBasisFuncKernel, BasisFuncKernel, ChangePointBasisFuncKernel, DomainKernel from .src.basis_funcs import LogisticBasisFuncKernel, LinearSlopeBasisFuncKernel, BasisFuncKernel, ChangePointBasisFuncKernel, DomainKernel
from .src.grid_kerns import GridRBF
from .src.sde_matern import sde_Matern32 from .src.sde_matern import sde_Matern32
from .src.sde_matern import sde_Matern52 from .src.sde_matern import sde_Matern52
from .src.sde_linear import sde_Linear from .src.sde_linear import sde_Linear
@ -36,4 +38,3 @@ from .src.sde_standard_periodic import sde_StdPeriodic
from .src.sde_static import sde_White, sde_Bias from .src.sde_static import sde_White, sde_Bias
from .src.sde_stationary import sde_RBF,sde_Exponential,sde_RatQuad from .src.sde_stationary import sde_RBF,sde_Exponential,sde_RatQuad
from .src.sde_brownian import sde_Brownian from .src.sde_brownian import sde_Brownian
from .src.grid_kerns import GridRBF