mirror of
https://github.com/SheffieldML/GPy.git
synced 2026-05-07 11:02:38 +02:00
var[:,None] added in full_cov = false, sparse_GP
This commit is contained in:
parent
7a54660689
commit
049e60f16b
2 changed files with 3 additions and 4 deletions
|
|
@ -133,7 +133,7 @@ class GP(model):
|
||||||
KiKx = np.dot(self.Ki,Kx)
|
KiKx = np.dot(self.Ki,Kx)
|
||||||
if full_cov:
|
if full_cov:
|
||||||
Kxx = self.kern.K(_Xnew, slices1=slices,slices2=slices)
|
Kxx = self.kern.K(_Xnew, slices1=slices,slices2=slices)
|
||||||
var = Kxx - np.dot(KiKx.T,Kx) #NOTE is the shape of v right?
|
var = Kxx - np.dot(KiKx.T,Kx) #NOTE this won't work for plotting
|
||||||
else:
|
else:
|
||||||
Kxx = self.kern.Kdiag(_Xnew, slices=slices)
|
Kxx = self.kern.Kdiag(_Xnew, slices=slices)
|
||||||
var = Kxx - np.sum(np.multiply(KiKx,Kx),0)
|
var = Kxx - np.sum(np.multiply(KiKx,Kx),0)
|
||||||
|
|
|
||||||
|
|
@ -196,15 +196,14 @@ class sparse_GP(GP):
|
||||||
|
|
||||||
Kx = self.kern.K(self.Z, Xnew)
|
Kx = self.kern.K(self.Z, Xnew)
|
||||||
mu = mdot(Kx.T, self.C/self.scale_factor, self.psi1V)
|
mu = mdot(Kx.T, self.C/self.scale_factor, self.psi1V)
|
||||||
|
|
||||||
if full_cov:
|
if full_cov:
|
||||||
Kxx = self.kern.K(Xnew)
|
Kxx = self.kern.K(Xnew)
|
||||||
var = Kxx - mdot(Kx.T, (self.Kmmi - self.C/self.scale_factor**2), Kx)
|
var = Kxx - mdot(Kx.T, (self.Kmmi - self.C/self.scale_factor**2), Kx) #NOTE thiswon't work for plotting
|
||||||
else:
|
else:
|
||||||
Kxx = self.kern.Kdiag(Xnew)
|
Kxx = self.kern.Kdiag(Xnew)
|
||||||
var = Kxx - np.sum(Kx*np.dot(self.Kmmi - self.C/self.scale_factor**2, Kx),0)
|
var = Kxx - np.sum(Kx*np.dot(self.Kmmi - self.C/self.scale_factor**2, Kx),0)
|
||||||
|
|
||||||
return mu,var
|
return mu,var[:,None]
|
||||||
|
|
||||||
def plot(self, *args, **kwargs):
|
def plot(self, *args, **kwargs):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue