Merge branch 'devel' into fix-state_space_cython-misc

This commit is contained in:
Alexander Pitchford 2019-01-10 11:24:41 +00:00
commit 4bc87d5c89
8 changed files with 87 additions and 70 deletions

View file

@ -1,5 +1,24 @@
# Changelog # Changelog
## v1.9.6 (2018-10-30)
## New
* Added a new class that enables using multiple likelihoods [@esiivola]
* Alex grig kalman new [@AlexGrig, @mzwiessele]
## Fix
* fix typo in docstring for GP.opimize() [@RobRomijnders]
* Updates to posterior sampling [@lawrennd]
* Jayanthkoushik cython fix [@jayanthkoushik, @mzwiessele]
* Added missing columns (:), fixed indentation [@vlavorini]
* Fix the bug in the prediction of full covariance matrix [@zhenwendai]
## v1.9.5 (2018-09-02) ## v1.9.5 (2018-09-02)
@ -11999,5 +12018,3 @@
* Core file. [Nicolo Fusi] * Core file. [Nicolo Fusi]
* Initial commit. [Nicolò Fusi] * Initial commit. [Nicolò Fusi]

View file

@ -1 +1 @@
__version__ = "1.9.5" __version__ = "1.9.6"

View file

@ -245,6 +245,7 @@ class Posterior(object):
for i in range(var.shape[1]): for i in range(var.shape[1]):
var[:, i] = (Kxx - (np.sum(np.dot(woodbury_inv[:, :, i].T, Kx) * Kx, 0))) var[:, i] = (Kxx - (np.sum(np.dot(woodbury_inv[:, :, i].T, Kx) * Kx, 0)))
var = var var = var
var = np.clip(var, 1e-15, np.inf)
else: else:
psi0_star = kern.psi0(pred_var, Xnew) psi0_star = kern.psi0(pred_var, Xnew)
psi1_star = kern.psi1(pred_var, Xnew) psi1_star = kern.psi1(pred_var, Xnew)

View file

@ -122,7 +122,7 @@ class MatplotlibPlots(AbstractPlottingLibrary):
def barplot(self, ax, x, height, width=0.8, bottom=0, color=Tango.colorsHex['mediumBlue'], label=None, **kwargs): def barplot(self, ax, x, height, width=0.8, bottom=0, color=Tango.colorsHex['mediumBlue'], label=None, **kwargs):
if 'align' not in kwargs: if 'align' not in kwargs:
kwargs['align'] = 'center' kwargs['align'] = 'center'
return ax.bar(left=x, height=height, width=width, return ax.bar(x=x, height=height, width=width,
bottom=bottom, label=label, color=color, bottom=bottom, label=label, color=color,
**kwargs) **kwargs)

View file

@ -238,7 +238,7 @@ class MiscTests(unittest.TestCase):
# Not easy to check if woodbury_inv is correct in itself as it requires a large derivation and expression # Not easy to check if woodbury_inv is correct in itself as it requires a large derivation and expression
Kinv = m.posterior.woodbury_inv Kinv = m.posterior.woodbury_inv
K_hat = k.K(self.X_new) - k.K(self.X_new, Z).dot(Kinv).dot(k.K(Z, self.X_new)) K_hat = k.K(self.X_new) - k.K(self.X_new, Z).dot(Kinv).dot(k.K(Z, self.X_new))
K_hat = np.clip(K_hat, 1e-15, np.inf) # K_hat = np.clip(K_hat, 1e-15, np.inf)
mu, covar = m.predict_noiseless(self.X_new, full_cov=True) mu, covar = m.predict_noiseless(self.X_new, full_cov=True)
self.assertEquals(mu.shape, (self.N_new, self.D)) self.assertEquals(mu.shape, (self.N_new, self.D))

View file

@ -3,7 +3,7 @@ environment:
secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00=
COVERALLS_REPO_TOKEN: COVERALLS_REPO_TOKEN:
secure: d3Luic/ESkGaWnZrvWZTKrzO+xaVwJWaRCEP0F+K/9DQGPSRZsJ/Du5g3s4XF+tS secure: d3Luic/ESkGaWnZrvWZTKrzO+xaVwJWaRCEP0F+K/9DQGPSRZsJ/Du5g3s4XF+tS
gpy_version: 1.9.5 gpy_version: 1.9.6
matrix: matrix:
- PYTHON_VERSION: 2.7 - PYTHON_VERSION: 2.7
MINICONDA: C:\Miniconda-x64 MINICONDA: C:\Miniconda-x64

View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 1.9.5 current_version = 1.9.6
tag = True tag = True
commit = True commit = True
@ -12,4 +12,3 @@ upload-dir = doc/build/html
[medatdata] [medatdata]
description-file = README.rst description-file = README.rst

View file

@ -164,7 +164,7 @@ setup(name = 'GPy',
'optional':['mpi4py', 'optional':['mpi4py',
'ipython>=4.0.0', 'ipython>=4.0.0',
], ],
'plotting':['matplotlib >= 1.3', 'plotting':['matplotlib >= 3.0',
'plotly >= 1.8.6'], 'plotly >= 1.8.6'],
'notebook':['jupyter_client >= 4.0.6', 'notebook':['jupyter_client >= 4.0.6',
'ipywidgets >= 4.0.3', 'ipywidgets >= 4.0.3',