From 3c0f89bf53ea681cf8dcaf00df8d4c438fb32b63 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 26 Feb 2014 08:33:45 +0000 Subject: [PATCH] vdtc_missing data corrections --- GPy/core/sparse_gp.py | 3 +-- GPy/inference/latent_function_inference/var_dtc.py | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/GPy/core/sparse_gp.py b/GPy/core/sparse_gp.py index b1a3c12e..15a4e1f8 100644 --- a/GPy/core/sparse_gp.py +++ b/GPy/core/sparse_gp.py @@ -2,12 +2,11 @@ # Licensed under the BSD 3-clause license (see LICENSE.txt) import numpy as np -from ..util.linalg import mdot from gp import GP from parameterization.param import Param from ..inference.latent_function_inference import var_dtc from .. import likelihoods -from parameterization.variational import NormalPosterior +from parameterization.variational import VariationalPosterior class SparseGP(GP): """ diff --git a/GPy/inference/latent_function_inference/var_dtc.py b/GPy/inference/latent_function_inference/var_dtc.py index 66ab3cbe..fec61204 100644 --- a/GPy/inference/latent_function_inference/var_dtc.py +++ b/GPy/inference/latent_function_inference/var_dtc.py @@ -204,14 +204,14 @@ class VarDTCMissingData(object): def inference(self, kern, X, Z, likelihood, Y): if isinstance(X, VariationalPosterior): uncertain_inputs = True - psi0 = kern.psi0(Z, X) - psi1 = kern.psi1(Z, X) - psi2 = kern.psi2(Z, X) + psi0_all = kern.psi0(Z, X) + psi1_all = kern.psi1(Z, X) + psi2_all = kern.psi2(Z, X) else: uncertain_inputs = False - psi0 = kern.Kdiag(X) - psi1 = kern.K(X, Z) - psi2 = None + psi0_all = kern.Kdiag(X) + psi1_all = kern.K(X, Z) + psi2_all = None Ys, traces = self._Y(Y) beta_all = 1./likelihood.variance