diff --git a/GPy/models/mrd.py b/GPy/models/mrd.py index 547f096f..029a9d00 100644 --- a/GPy/models/mrd.py +++ b/GPy/models/mrd.py @@ -127,8 +127,6 @@ class MRD(BayesianGPLVMMiniBatch): self.unlink_parameter(self.likelihood) self.unlink_parameter(self.kern) - del self.kern - del self.likelihood self.num_data = Ylist[0].shape[0] if isinstance(batchsize, int): @@ -156,7 +154,11 @@ class MRD(BayesianGPLVMMiniBatch): self.link_parameter(spgp, i+2) self.bgplvms.append(spgp) - self.posterior = None + b = self.bgplvms[0] + self.posterior = b.posterior + self.kern = b.kern + self.likelihood = b.likelihood + self.logger.info("init done") def parameters_changed(self): diff --git a/GPy/plotting/gpy_plot/latent_plots.py b/GPy/plotting/gpy_plot/latent_plots.py index 5427e013..f522d297 100644 --- a/GPy/plotting/gpy_plot/latent_plots.py +++ b/GPy/plotting/gpy_plot/latent_plots.py @@ -131,7 +131,9 @@ def plot_latent_inducing(self, Z = self.Z.values labels = np.array(['inducing'] * Z.shape[0]) - scatters = _plot_latent_scatter(canvas, Z, sig_dims, labels, marker, num_samples, projection=projection, **kwargs) + kwargs['marker'] = marker + update_not_existing_kwargs(kwargs, pl().defaults.inducing_2d) # @UndefinedVariable + scatters = _plot_latent_scatter(canvas, Z, sig_dims, labels, num_samples=num_samples, projection=projection, **kwargs) return pl().add_to_canvas(canvas, dict(scatter=scatters), legend=legend) diff --git a/GPy/plotting/matplot_dep/defaults.py b/GPy/plotting/matplot_dep/defaults.py index 7b782b60..38b08dd1 100644 --- a/GPy/plotting/matplot_dep/defaults.py +++ b/GPy/plotting/matplot_dep/defaults.py @@ -46,8 +46,8 @@ it gives back an empty default, when defaults are not defined. data_1d = dict(lw=1.5, marker='x', color='k') data_2d = dict(s=35, edgecolors='none', linewidth=0., cmap=cm.get_cmap('hot'), alpha=.5) inducing_1d = dict(lw=0, s=500, facecolors=Tango.colorsHex['darkRed']) -inducing_2d = dict(s=14, edgecolors='k', linewidth=.4, facecolors='white', alpha=.5, marker='^') -inducing_3d = dict(lw=.3, s=500, facecolors='white', edgecolors='k') +inducing_2d = dict(s=17, edgecolor='k', linewidth=.4, color='white', alpha=.5, marker='^') +inducing_3d = dict(lw=.3, s=500, color=Tango.colorsHex['darkRed'], edgecolor='k') xerrorbar = dict(color='k', fmt='none', elinewidth=.5, alpha=.5) yerrorbar = dict(color=Tango.colorsHex['darkRed'], fmt='none', elinewidth=.5, alpha=.5) @@ -71,5 +71,5 @@ ard = dict(edgecolor='k', linewidth=1.2) latent = dict(aspect='auto', cmap='Greys', interpolation='bicubic') gradient = dict(aspect='auto', cmap='RdBu', interpolation='nearest', alpha=.7) magnification = dict(aspect='auto', cmap='Greys', interpolation='bicubic') -latent_scatter = dict(s=40, linewidth=.2, edgecolor='k', alpha=.9) +latent_scatter = dict(s=20, linewidth=.2, edgecolor='k', alpha=.9) annotation = dict(fontdict=dict(family='sans-serif', weight='light', fontsize=9), zorder=.3, alpha=.7) diff --git a/GPy/plotting/matplot_dep/variational_plots.py b/GPy/plotting/matplot_dep/variational_plots.py index 34681552..ca8b1e86 100644 --- a/GPy/plotting/matplot_dep/variational_plots.py +++ b/GPy/plotting/matplot_dep/variational_plots.py @@ -15,7 +15,9 @@ def plot(parameterized, fignum=None, ax=None, colors=None, figsize=(12, 6)): if ax is None: fig = pb.figure(num=fignum, figsize=figsize) if colors is None: - colors = pb.gca()._get_lines.color_cycle + from ..Tango import mediumList + from itertools import cycle + colors = cycle(mediumList) pb.clf() else: colors = iter(colors) @@ -64,7 +66,9 @@ def plot_SpikeSlab(parameterized, fignum=None, ax=None, colors=None, side_by_sid else: fig = pb.figure(num=fignum, figsize=(8, min(12, (2 * parameterized.mean.shape[1])))) if colors is None: - colors = pb.gca()._get_lines.color_cycle + from ..Tango import mediumList + from itertools import cycle + colors = cycle(mediumList) pb.clf() else: colors = iter(colors) diff --git a/GPy/testing/baseline/bayesian_gplvm_gradient.png b/GPy/testing/baseline/bayesian_gplvm_gradient.png index b38967c5..e607caad 100644 Binary files a/GPy/testing/baseline/bayesian_gplvm_gradient.png and b/GPy/testing/baseline/bayesian_gplvm_gradient.png differ diff --git a/GPy/testing/baseline/bayesian_gplvm_inducing.png b/GPy/testing/baseline/bayesian_gplvm_inducing.png index 5be11441..dd7e66f2 100644 Binary files a/GPy/testing/baseline/bayesian_gplvm_inducing.png and b/GPy/testing/baseline/bayesian_gplvm_inducing.png differ diff --git a/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png b/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png index b9c87203..ae541f2e 100644 Binary files a/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png and b/GPy/testing/baseline/bayesian_gplvm_inducing_3d.png differ diff --git a/GPy/testing/baseline/bayesian_gplvm_latent.png b/GPy/testing/baseline/bayesian_gplvm_latent.png index 640d6fa4..85c17a6e 100644 Binary files a/GPy/testing/baseline/bayesian_gplvm_latent.png and b/GPy/testing/baseline/bayesian_gplvm_latent.png differ diff --git a/GPy/testing/baseline/bayesian_gplvm_latent_3d.png b/GPy/testing/baseline/bayesian_gplvm_latent_3d.png index f35b47c3..1bba1b64 100644 Binary files a/GPy/testing/baseline/bayesian_gplvm_latent_3d.png and b/GPy/testing/baseline/bayesian_gplvm_latent_3d.png differ diff --git a/GPy/testing/baseline/bayesian_gplvm_magnification.png b/GPy/testing/baseline/bayesian_gplvm_magnification.png index 132d9139..1799b87c 100644 Binary files a/GPy/testing/baseline/bayesian_gplvm_magnification.png and b/GPy/testing/baseline/bayesian_gplvm_magnification.png differ diff --git a/GPy/testing/baseline/coverage_3d_plot.png b/GPy/testing/baseline/coverage_3d_plot.png index eee1fda8..62638b03 100644 Binary files a/GPy/testing/baseline/coverage_3d_plot.png and b/GPy/testing/baseline/coverage_3d_plot.png differ diff --git a/GPy/testing/baseline/coverage_annotation_interact.png b/GPy/testing/baseline/coverage_annotation_interact.png index ccf46609..f51d20d2 100644 Binary files a/GPy/testing/baseline/coverage_annotation_interact.png and b/GPy/testing/baseline/coverage_annotation_interact.png differ diff --git a/GPy/testing/baseline/coverage_gradient.png b/GPy/testing/baseline/coverage_gradient.png index 37df285c..aa4b6718 100644 Binary files a/GPy/testing/baseline/coverage_gradient.png and b/GPy/testing/baseline/coverage_gradient.png differ diff --git a/GPy/testing/baseline/coverage_imshow_interact.png b/GPy/testing/baseline/coverage_imshow_interact.png index 1492a44e..879bfcef 100644 Binary files a/GPy/testing/baseline/coverage_imshow_interact.png and b/GPy/testing/baseline/coverage_imshow_interact.png differ diff --git a/GPy/testing/baseline/gp_2d_data.png b/GPy/testing/baseline/gp_2d_data.png index b05cd33a..7c8cf204 100644 Binary files a/GPy/testing/baseline/gp_2d_data.png and b/GPy/testing/baseline/gp_2d_data.png differ diff --git a/GPy/testing/baseline/gp_2d_in_error.png b/GPy/testing/baseline/gp_2d_in_error.png index 239c0cf1..b3168e7c 100644 Binary files a/GPy/testing/baseline/gp_2d_in_error.png and b/GPy/testing/baseline/gp_2d_in_error.png differ diff --git a/GPy/testing/baseline/gp_2d_inducing.png b/GPy/testing/baseline/gp_2d_inducing.png index a27f518a..f669c9af 100644 Binary files a/GPy/testing/baseline/gp_2d_inducing.png and b/GPy/testing/baseline/gp_2d_inducing.png differ diff --git a/GPy/testing/baseline/gp_2d_mean.png b/GPy/testing/baseline/gp_2d_mean.png index a039a18f..02fb271f 100644 Binary files a/GPy/testing/baseline/gp_2d_mean.png and b/GPy/testing/baseline/gp_2d_mean.png differ diff --git a/GPy/testing/baseline/gp_3d_data.png b/GPy/testing/baseline/gp_3d_data.png index ae00c349..45e3ca49 100644 Binary files a/GPy/testing/baseline/gp_3d_data.png and b/GPy/testing/baseline/gp_3d_data.png differ diff --git a/GPy/testing/baseline/gp_3d_inducing.png b/GPy/testing/baseline/gp_3d_inducing.png index 75891947..35dada70 100644 Binary files a/GPy/testing/baseline/gp_3d_inducing.png and b/GPy/testing/baseline/gp_3d_inducing.png differ diff --git a/GPy/testing/baseline/gp_3d_mean.png b/GPy/testing/baseline/gp_3d_mean.png index 85fb2f7a..5433934d 100644 Binary files a/GPy/testing/baseline/gp_3d_mean.png and b/GPy/testing/baseline/gp_3d_mean.png differ diff --git a/GPy/testing/baseline/gp_class_likelihood.png b/GPy/testing/baseline/gp_class_likelihood.png index bc8eb686..d99a004f 100644 Binary files a/GPy/testing/baseline/gp_class_likelihood.png and b/GPy/testing/baseline/gp_class_likelihood.png differ diff --git a/GPy/testing/baseline/gp_class_raw.png b/GPy/testing/baseline/gp_class_raw.png index ec1f5dcf..1d6990e0 100644 Binary files a/GPy/testing/baseline/gp_class_raw.png and b/GPy/testing/baseline/gp_class_raw.png differ diff --git a/GPy/testing/baseline/gp_class_raw_link.png b/GPy/testing/baseline/gp_class_raw_link.png index c036e55e..9c207acd 100644 Binary files a/GPy/testing/baseline/gp_class_raw_link.png and b/GPy/testing/baseline/gp_class_raw_link.png differ diff --git a/GPy/testing/baseline/gp_conf.png b/GPy/testing/baseline/gp_conf.png index d2a167f6..13885af3 100644 Binary files a/GPy/testing/baseline/gp_conf.png and b/GPy/testing/baseline/gp_conf.png differ diff --git a/GPy/testing/baseline/gp_data.png b/GPy/testing/baseline/gp_data.png index 0db86377..780fe389 100644 Binary files a/GPy/testing/baseline/gp_data.png and b/GPy/testing/baseline/gp_data.png differ diff --git a/GPy/testing/baseline/gp_density.png b/GPy/testing/baseline/gp_density.png index 3e8a63cb..34d4c925 100644 Binary files a/GPy/testing/baseline/gp_density.png and b/GPy/testing/baseline/gp_density.png differ diff --git a/GPy/testing/baseline/gp_in_error.png b/GPy/testing/baseline/gp_in_error.png index a8f6645a..8c8d13de 100644 Binary files a/GPy/testing/baseline/gp_in_error.png and b/GPy/testing/baseline/gp_in_error.png differ diff --git a/GPy/testing/baseline/gp_mean.png b/GPy/testing/baseline/gp_mean.png index 63dc710c..b1019869 100644 Binary files a/GPy/testing/baseline/gp_mean.png and b/GPy/testing/baseline/gp_mean.png differ diff --git a/GPy/testing/baseline/gp_out_error.png b/GPy/testing/baseline/gp_out_error.png index 3003fb48..696786f4 100644 Binary files a/GPy/testing/baseline/gp_out_error.png and b/GPy/testing/baseline/gp_out_error.png differ diff --git a/GPy/testing/baseline/gp_samples.png b/GPy/testing/baseline/gp_samples.png index d2139c6b..95dbd4ff 100644 Binary files a/GPy/testing/baseline/gp_samples.png and b/GPy/testing/baseline/gp_samples.png differ diff --git a/GPy/testing/baseline/gplvm_gradient.png b/GPy/testing/baseline/gplvm_gradient.png index 9f44577b..d3d0dc72 100644 Binary files a/GPy/testing/baseline/gplvm_gradient.png and b/GPy/testing/baseline/gplvm_gradient.png differ diff --git a/GPy/testing/baseline/gplvm_latent.png b/GPy/testing/baseline/gplvm_latent.png index 58e2c9d8..5d3c92ae 100644 Binary files a/GPy/testing/baseline/gplvm_latent.png and b/GPy/testing/baseline/gplvm_latent.png differ diff --git a/GPy/testing/baseline/gplvm_latent_3d.png b/GPy/testing/baseline/gplvm_latent_3d.png index f35b47c3..1bba1b64 100644 Binary files a/GPy/testing/baseline/gplvm_latent_3d.png and b/GPy/testing/baseline/gplvm_latent_3d.png differ diff --git a/GPy/testing/baseline/gplvm_magnification.png b/GPy/testing/baseline/gplvm_magnification.png index 673c093a..372275a5 100644 Binary files a/GPy/testing/baseline/gplvm_magnification.png and b/GPy/testing/baseline/gplvm_magnification.png differ diff --git a/GPy/testing/baseline/kern_ARD.png b/GPy/testing/baseline/kern_ARD.png index ff7bc67a..e56a5312 100644 Binary files a/GPy/testing/baseline/kern_ARD.png and b/GPy/testing/baseline/kern_ARD.png differ diff --git a/GPy/testing/baseline/kern_cov_1d.png b/GPy/testing/baseline/kern_cov_1d.png index 06e9e4bc..64c3a57f 100644 Binary files a/GPy/testing/baseline/kern_cov_1d.png and b/GPy/testing/baseline/kern_cov_1d.png differ diff --git a/GPy/testing/baseline/kern_cov_2d.png b/GPy/testing/baseline/kern_cov_2d.png index 4f94b6f4..1df0e5d0 100644 Binary files a/GPy/testing/baseline/kern_cov_2d.png and b/GPy/testing/baseline/kern_cov_2d.png differ diff --git a/GPy/testing/baseline/kern_cov_3d.png b/GPy/testing/baseline/kern_cov_3d.png index 362f54bc..52bff7cb 100644 Binary files a/GPy/testing/baseline/kern_cov_3d.png and b/GPy/testing/baseline/kern_cov_3d.png differ diff --git a/GPy/testing/baseline/kern_cov_no_lim.png b/GPy/testing/baseline/kern_cov_no_lim.png index a399ea37..f8b91507 100644 Binary files a/GPy/testing/baseline/kern_cov_no_lim.png and b/GPy/testing/baseline/kern_cov_no_lim.png differ diff --git a/GPy/testing/baseline/sparse_gp_class_likelihood.png b/GPy/testing/baseline/sparse_gp_class_likelihood.png index 4f6c91e5..55449be4 100644 Binary files a/GPy/testing/baseline/sparse_gp_class_likelihood.png and b/GPy/testing/baseline/sparse_gp_class_likelihood.png differ diff --git a/GPy/testing/baseline/sparse_gp_class_raw.png b/GPy/testing/baseline/sparse_gp_class_raw.png index 250059fb..484d15f9 100644 Binary files a/GPy/testing/baseline/sparse_gp_class_raw.png and b/GPy/testing/baseline/sparse_gp_class_raw.png differ diff --git a/GPy/testing/baseline/sparse_gp_class_raw_link.png b/GPy/testing/baseline/sparse_gp_class_raw_link.png index fb582a33..c5742464 100644 Binary files a/GPy/testing/baseline/sparse_gp_class_raw_link.png and b/GPy/testing/baseline/sparse_gp_class_raw_link.png differ diff --git a/GPy/testing/baseline/sparse_gp_data_error.png b/GPy/testing/baseline/sparse_gp_data_error.png index 9c4eeffa..9fe65c58 100644 Binary files a/GPy/testing/baseline/sparse_gp_data_error.png and b/GPy/testing/baseline/sparse_gp_data_error.png differ diff --git a/GPy/testing/plotting_tests.py b/GPy/testing/plotting_tests.py index fbadb55a..3d5ccbd1 100644 --- a/GPy/testing/plotting_tests.py +++ b/GPy/testing/plotting_tests.py @@ -110,7 +110,8 @@ def _image_comparison(baseline_images, extensions=['pdf','svg','png'], tol=11): transparent=True, edgecolor='none', facecolor='none', - bbox='tight') + #bbox='tight' + ) for num, base in zip(plt.get_fignums(), baseline_images): for ext in extensions: #plt.close(num)