From fe3bad72003ac1d489c909d78c43f70aedc30ffc Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Mon, 9 Jan 2017 10:59:51 +0000 Subject: [PATCH 1/4] fix: plotting also allows 3D (capitals) --- GPy/plotting/gpy_plot/gp_plots.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/GPy/plotting/gpy_plot/gp_plots.py b/GPy/plotting/gpy_plot/gp_plots.py index 702aeb7b..1283b6a7 100644 --- a/GPy/plotting/gpy_plot/gp_plots.py +++ b/GPy/plotting/gpy_plot/gp_plots.py @@ -81,6 +81,7 @@ def _plot_mean(self, canvas, helper_data, helper_prediction, **kwargs): _, free_dims, Xgrid, x, y, _, _, resolution = helper_data + plots = dict() if len(free_dims)<=2: mu, _, _ = helper_prediction if len(free_dims)==1: @@ -88,12 +89,12 @@ def _plot_mean(self, canvas, helper_data, helper_prediction, update_not_existing_kwargs(kwargs, pl().defaults.meanplot_1d) # @UndefinedVariable plots = dict(gpmean=[pl().plot(canvas, Xgrid[:, free_dims], mu, label=label, **kwargs)]) else: - if projection == '2d': + if projection.lower() in '2d': update_not_existing_kwargs(kwargs, pl().defaults.meanplot_2d) # @UndefinedVariable plots = dict(gpmean=[pl().contour(canvas, x[:,0], y[0,:], mu.reshape(resolution, resolution).T, levels=levels, label=label, **kwargs)]) - elif projection == '3d': + elif projection.lower() in '3d': update_not_existing_kwargs(kwargs, pl().defaults.meanplot_3d) # @UndefinedVariable plots = dict(gpmean=[pl().surface(canvas, x, y, mu.reshape(resolution, resolution), From b6d2cf4406fc653c086e212f6bf5c2f1d0aa78cc Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Mon, 9 Jan 2017 11:01:30 +0000 Subject: [PATCH 2/4] fix: removed additional dict line --- GPy/plotting/gpy_plot/gp_plots.py | 1 - 1 file changed, 1 deletion(-) diff --git a/GPy/plotting/gpy_plot/gp_plots.py b/GPy/plotting/gpy_plot/gp_plots.py index 1283b6a7..230d47f0 100644 --- a/GPy/plotting/gpy_plot/gp_plots.py +++ b/GPy/plotting/gpy_plot/gp_plots.py @@ -81,7 +81,6 @@ def _plot_mean(self, canvas, helper_data, helper_prediction, **kwargs): _, free_dims, Xgrid, x, y, _, _, resolution = helper_data - plots = dict() if len(free_dims)<=2: mu, _, _ = helper_prediction if len(free_dims)==1: From 3608cff438aef6a06d99da6d654807f89114fdfa Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Mon, 9 Jan 2017 11:05:20 +0000 Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=201.5.6=20=E2=86=92=201.5.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GPy/__version__.py | 2 +- appveyor.yml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GPy/__version__.py b/GPy/__version__.py index d0113b35..91da9033 100644 --- a/GPy/__version__.py +++ b/GPy/__version__.py @@ -1 +1 @@ -__version__ = "1.5.6" +__version__ = "1.5.7" diff --git a/appveyor.yml b/appveyor.yml index 3738ea1d..06cf2f43 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ environment: secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00= COVERALLS_REPO_TOKEN: secure: d3Luic/ESkGaWnZrvWZTKrzO+xaVwJWaRCEP0F+K/9DQGPSRZsJ/Du5g3s4XF+tS - gpy_version: 1.5.6 + gpy_version: 1.5.7 matrix: - PYTHON_VERSION: 2.7 MINICONDA: C:\Miniconda-x64 diff --git a/setup.cfg b/setup.cfg index 77a46f72..7cb51c9d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.6 +current_version = 1.5.7 tag = True commit = True From b17b92043cf9992212052375806c7a15c2ba6138 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Tue, 10 Jan 2017 12:53:34 +0000 Subject: [PATCH 4/4] chg: pkg: CHANGELOG update --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 167b4ddc..c26a8719 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## v1.5.7 (2017-01-09) + +### Fix + +* Removed additional dict line. [mzwiessele] + +* Plotting also allows 3D (capitals) [mzwiessele] + +* Fallback for when no environment variables are set (#467) [Safrone] + + * fix: dev: add or in home directory getting + + adds another or when getting the home directory with os.getenv() so that if neither $HOME nor $USERPROFILE environment variable is set, os.path.join() will not fail by getting a None and the config will revert to the default configuration file. + + * fix: remove extra statement + +### Other + +* Bump version: 1.5.6 → 1.5.7. [mzwiessele] + +* Changed the order of the operations, ensuring that the covariance matrix is symmetric despite numerical precision issues. Suggested by Alan. [Teo de Campos] + +* Delete gmm_bayesian_gplvm.py. [beiwang] + +* Gmm_creation. [beiwang] + +* Gmm_creation. [beiwang] + + ## v1.5.6 (2016-11-07) ### New