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

fixed conflict in plotting

Browse source
This commit is contained in:
James Hensman 2015-08-12 16:04:58 +01:00
parent a07eea143e
commit dbbf4a2e69
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/plotting/matplot_dep/models_plots.py
View file

@ -17,12 +17,8 @@ def plot_fit(model, plot_limits=None, which_data_rows='all',
which_data_ycols='all', fixed_inputs=[], which_data_ycols='all', fixed_inputs=[],
levels=20, samples=0, fignum=None, ax=None, resolution=None, levels=20, samples=0, fignum=None, ax=None, resolution=None,
plot_raw=False, plot_raw=False,
<<<<<<< HEAD
linecol=Tango.colorsHex['darkBlue'],fillcol=Tango.colorsHex['lightBlue'], Y_metadata=None, data_symbol='kx', linecol=Tango.colorsHex['darkBlue'],fillcol=Tango.colorsHex['lightBlue'], Y_metadata=None, data_symbol='kx',
apply_link=False, samples_f=0, plot_uncertain_inputs=True, predict_kw=None): apply_link=False, samples_f=0, plot_uncertain_inputs=True, predict_kw=None):
=======
linecol='#3300FF',fillcol='#00FFFF', Y_metadata=None, data_symbol='kx'):
>>>>>>> e115778d743c8979af2a10143e33861b88fb883a
""" """
Plot the posterior of the GP. Plot the posterior of the GP.
- In one dimension, the function is plotted with a shaded region identifying two standard deviations. - In one dimension, the function is plotted with a shaded region identifying two standard deviations.