From 5b7566dfac89eaf3ac3d9c214c5feda1dda032a6 Mon Sep 17 00:00:00 2001 From: kcutajar Date: Mon, 9 May 2016 16:21:10 +0200 Subject: [PATCH] Removed erreneous lines indicating merge conflicts --- GPy/core/gp_grid.py | 7 ------- .../latent_function_inference/gaussian_grid_inference.py | 9 +-------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/GPy/core/gp_grid.py b/GPy/core/gp_grid.py index adf611b8..64815016 100644 --- a/GPy/core/gp_grid.py +++ b/GPy/core/gp_grid.py @@ -69,17 +69,10 @@ class GpGrid(GP): x = b N = 1 G = np.zeros(D) -<<<<<<< HEAD for d in range(D): G[d] = len(A[d]) N = np.prod(G) 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') Z = np.dot(A[d], X) Z = Z.T diff --git a/GPy/inference/latent_function_inference/gaussian_grid_inference.py b/GPy/inference/latent_function_inference/gaussian_grid_inference.py index b9702b92..aeefa8e7 100644 --- a/GPy/inference/latent_function_inference/gaussian_grid_inference.py +++ b/GPy/inference/latent_function_inference/gaussian_grid_inference.py @@ -37,17 +37,10 @@ class GaussianGridInference(LatentFunctionInference): N = 1 D = len(A) G = np.zeros((D,1)) -<<<<<<< HEAD for d in range(0, D): G[d] = len(A[d]) N = np.prod(G) 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') Z = np.dot(A[d], X) Z = Z.T @@ -116,6 +109,6 @@ class GaussianGridInference(LatentFunctionInference): dL_dLen = derivs[:D] dL_dVar = derivs[D] dL_dThetaL = derivs[D+1] - + return GridPosterior(alpha_kron=alpha_kron, QTs=QTs, Qs=Qs, V_kron=V_kron), \ log_likelihood, {'dL_dLen':dL_dLen, 'dL_dVar':dL_dVar, 'dL_dthetaL':dL_dThetaL}