From 26aeb5e1dbb937367648e6c8ad339fe068bc5cff Mon Sep 17 00:00:00 2001 From: James Hensman Date: Wed, 26 Feb 2014 13:37:15 +0000 Subject: [PATCH] lengthscale fixes --- GPy/kern/_src/stationary.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/GPy/kern/_src/stationary.py b/GPy/kern/_src/stationary.py index 2d0d284a..b3c648fc 100644 --- a/GPy/kern/_src/stationary.py +++ b/GPy/kern/_src/stationary.py @@ -73,16 +73,9 @@ class Stationary(Kern): """ if self.ARD: - if X2 is None: - Xl = X/self.lengthscale - Xsq = np.sum(np.square(Xl),1) - return np.sqrt(np.sqrt(-2.*tdot(Xl) +(Xsq[:,None] + Xsq[None,:]))) - else: - X1l = X/self.lengthscale - X2l = X2/self.lengthscale - X1sq = np.sum(np.square(X1l),1) - X2sq = np.sum(np.square(X2l),1) - return np.sqrt(-2.*np.dot(X, X2.T) + (X1sq[:,None] + X2sq[None,:])) + if X2 is not None: + X2 = X2 / self.lengthscale + return self._unscaled_dist(X/self.lengthscale, X2) else: return self._unscaled_dist(X, X2)/self.lengthscale