From 50a68e1a65f95386b5dccee5cd968fec03038356 Mon Sep 17 00:00:00 2001 From: James Hensman Date: Mon, 29 Apr 2013 12:11:36 +0100 Subject: [PATCH] Yak shaving --- GPy/models/GPLVM.py | 6 +++--- GPy/models/sparse_GP.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/GPy/models/GPLVM.py b/GPy/models/GPLVM.py index c0d9429a..157fe1c3 100644 --- a/GPy/models/GPLVM.py +++ b/GPy/models/GPLVM.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, GPy authors (see AUTHORS.txt). +### Copyright (c) 2012, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) @@ -91,8 +91,8 @@ class GPLVM(GP): Xtest_full[:, :2] = Xtest mu, var, low, up = self.predict(Xtest_full) var = var[:, :1] - ax.imshow(var.reshape(resolution, resolution).T[::-1, :], - extent=[xmin[0], xmax[0], xmin[1], xmax[1]], cmap=pb.cm.binary,interpolation='bilinear') + ax.imshow(var.reshape(resolution, resolution).T, + extent=[xmin[0], xmax[0], xmin[1], xmax[1]], cmap=pb.cm.binary,interpolation='bilinear',origin='lower') for i,ul in enumerate(np.unique(labels)): if type(ul) is np.string_: diff --git a/GPy/models/sparse_GP.py b/GPy/models/sparse_GP.py index a085090d..58f02cca 100644 --- a/GPy/models/sparse_GP.py +++ b/GPy/models/sparse_GP.py @@ -102,13 +102,14 @@ class sparse_GP(GP): tmp = linalg.lapack.flapack.dtrtrs(self.Lm,np.asfortranarray(self.Bi),lower=1,trans=1)[0] self.C = linalg.lapack.flapack.dtrtrs(self.Lm,np.asfortranarray(tmp.T),lower=1,trans=1)[0] - #self.Cpsi1V = np.dot(self.C,self.psi1V) #back substutue C into psi1V tmp,info1 = linalg.lapack.flapack.dtrtrs(self.Lm,np.asfortranarray(self.psi1V),lower=1,trans=0) tmp,info2 = linalg.lapack.flapack.dpotrs(self.LB,tmp,lower=1) self.Cpsi1V,info3 = linalg.lapack.flapack.dtrtrs(self.Lm,tmp,lower=1,trans=1) + #self.Cpsi1V = np.dot(self.C,self.psi1V) + + self.Cpsi1VVpsi1 = np.dot(self.Cpsi1V,self.psi1V.T) - self.Cpsi1VVpsi1 = np.dot(self.Cpsi1V,self.psi1V.T) #TODO: stabilize? self.E = tdot(self.Cpsi1V/sf)