From c003b2f34d90e1e2304b2721d1287318a88fab63 Mon Sep 17 00:00:00 2001 From: James Hensman Date: Wed, 5 Dec 2012 09:10:27 -0800 Subject: [PATCH] Minor edits --- GPy/inference/optimization.py | 2 +- GPy/models/sparse_GP_regression.py | 6 +++++- GPy/models/uncollapsed_sparse_GP.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/GPy/inference/optimization.py b/GPy/inference/optimization.py index 5f9a7a73..bad1e041 100644 --- a/GPy/inference/optimization.py +++ b/GPy/inference/optimization.py @@ -9,7 +9,7 @@ import pylab as pb import datetime as dt class Optimizer(): - def __init__(self, x_init, f_fp, f, fp , messages = False, max_f_eval = 1e4, ftol = None, gtol = None, xtol = None): + def __init__(self, x_init, f_fp, f, fp , messages=False, max_f_eval=1e4, ftol=None, gtol=None, xtol=None): """ Superclass for all the optimizers. diff --git a/GPy/models/sparse_GP_regression.py b/GPy/models/sparse_GP_regression.py index 92280bc8..38aeef08 100644 --- a/GPy/models/sparse_GP_regression.py +++ b/GPy/models/sparse_GP_regression.py @@ -37,7 +37,7 @@ class sparse_GP_regression(GP_regression): :type normalize_(X|Y): bool """ - def __init__(self,X,Y,kernel=None, beta=100., Z=None,Zslices=None,M=10,normalize_X=False,normalize_Y=False): + def __init__(self,X,Y,kernel=None, X_uncertainty=None, beta=100., Z=None,Zslices=None,M=10,normalize_X=False,normalize_Y=False): self.beta = beta if Z is None: self.Z = np.random.permutation(X.copy())[:M] @@ -56,6 +56,10 @@ class sparse_GP_regression(GP_regression): GP_regression.__init__(self, X, Y, kernel=kernel, normalize_X=normalize_X, normalize_Y=normalize_Y) self.trYYT = np.sum(np.square(self.Y)) + #normalise X uncertainty also + if self.has_uncertain_inputs: + self.X_uncertainty /= np.square(self._Xstd) + def set_param(self, p): self.Z = p[:self.M*self.Q].reshape(self.M, self.Q) self.beta = p[self.M*self.Q] diff --git a/GPy/models/uncollapsed_sparse_GP.py b/GPy/models/uncollapsed_sparse_GP.py index b07b1134..b5d4b054 100644 --- a/GPy/models/uncollapsed_sparse_GP.py +++ b/GPy/models/uncollapsed_sparse_GP.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, GPy authors (see AUTHORS.txt). +# Copyright (c) 2012 James Hensman # Licensed under the BSD 3-clause license (see LICENSE.txt) import numpy as np