apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-05 17:52:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into paramz

Browse source 
Conflicts:
	GPy/core/parameterization/parameter_core.py
	GPy/testing/pickle_tests.py
This commit is contained in:
mzwiessele 2015-11-02 10:11:26 +00:00
commit 5d605277bc
9 changed files with 58 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GPy/plotting/matplot_dep/mapping_plots.py
View file

@ -7,7 +7,6 @@ try:
from matplotlib import pyplot as pb
except:
pass
from .base_plots import x_frame1D, x_frame2D
def plot_mapping(self, plot_limits=None, which_data='all', which_parts='all', resolution=None, levels=20, samples=0, fignum=None, ax=None, fixed_inputs=[], linecol=Tango.colorsHex['darkBlue']):
@ -52,6 +51,7 @@ def plot_mapping(self, plot_limits=None, which_data='all', which_parts='all', re
ax = fig.add_subplot(111)
plotdims = self.input_dim - len(fixed_inputs)
from ..gpy_plot.plot_util import x_frame1D, x_frame2D
if plotdims == 1:

2
GPy/plotting/matplot_dep/variational_plots.py
View file

@ -94,7 +94,7 @@ def plot_SpikeSlab(parameterized, fignum=None, ax=None, colors=None, side_by_sid
a.set_xticklabels('')
# binary prob plot
a = fig.add_subplot(*sub2)
a.bar(x,gamma[:,i],bottom=0.,linewidth=0,width=1.0,align='center')
a.bar(x,gamma[:,i],bottom=0.,linewidth=1.,width=1.0,align='center')
a.set_xlim(x.min(), x.max())
a.set_ylim([0.,1.])
pb.draw()