vdtc_missing data corrections

This commit is contained in:
Max Zwiessele 2014-02-26 08:33:45 +00:00
parent d29fa56af2
commit 3c0f89bf53
2 changed files with 7 additions and 8 deletions

View file

@ -2,12 +2,11 @@
# Licensed under the BSD 3-clause license (see LICENSE.txt) # Licensed under the BSD 3-clause license (see LICENSE.txt)
import numpy as np import numpy as np
from ..util.linalg import mdot
from gp import GP from gp import GP
from parameterization.param import Param from parameterization.param import Param
from ..inference.latent_function_inference import var_dtc from ..inference.latent_function_inference import var_dtc
from .. import likelihoods from .. import likelihoods
from parameterization.variational import NormalPosterior from parameterization.variational import VariationalPosterior
class SparseGP(GP): class SparseGP(GP):
""" """

View file

@ -204,14 +204,14 @@ class VarDTCMissingData(object):
def inference(self, kern, X, Z, likelihood, Y): def inference(self, kern, X, Z, likelihood, Y):
if isinstance(X, VariationalPosterior): if isinstance(X, VariationalPosterior):
uncertain_inputs = True uncertain_inputs = True
psi0 = kern.psi0(Z, X) psi0_all = kern.psi0(Z, X)
psi1 = kern.psi1(Z, X) psi1_all = kern.psi1(Z, X)
psi2 = kern.psi2(Z, X) psi2_all = kern.psi2(Z, X)
else: else:
uncertain_inputs = False uncertain_inputs = False
psi0 = kern.Kdiag(X) psi0_all = kern.Kdiag(X)
psi1 = kern.K(X, Z) psi1_all = kern.K(X, Z)
psi2 = None psi2_all = None
Ys, traces = self._Y(Y) Ys, traces = self._Y(Y)
beta_all = 1./likelihood.variance beta_all = 1./likelihood.variance