diff --git a/GPy/examples/dimensionality_reduction.py b/GPy/examples/dimensionality_reduction.py index df643935..60726b1d 100644 --- a/GPy/examples/dimensionality_reduction.py +++ b/GPy/examples/dimensionality_reduction.py @@ -297,7 +297,7 @@ def mrd_simulation(optimize=True, plot=True, plot_sim=True, **kw): if optimize: print "Optimizing Model:" - m.optimize('scg', messages=1, max_iters=5e4, max_f_eval=5e4) + m.optimize('scg', messages=1, max_iters=5e4, max_f_eval=5e4, gtol=.05) if plot: m.plot_X_1d("MRD Latent Space 1D") m.plot_scales("MRD Scales") diff --git a/GPy/examples/tutorials.py b/GPy/examples/tutorials.py index 5d2dd41c..bd403ae8 100644 --- a/GPy/examples/tutorials.py +++ b/GPy/examples/tutorials.py @@ -19,7 +19,7 @@ def tuto_GP_regression(): kernel = GPy.kern.rbf(D=1, variance=1., lengthscale=1.) - m = GPy.models.GP_regression(X,Y,kernel) + m = GPy.models.GPRegression(X, Y, kernel) print m m.plot() @@ -47,7 +47,7 @@ def tuto_GP_regression(): ker = GPy.kern.Matern52(2,ARD=True) + GPy.kern.white(2) # create simple GP model - m = GPy.models.GP_regression(X,Y,ker) + m = GPy.models.GPRegression(X, Y, ker) # contrain all parameters to be positive m.constrain_positive('') @@ -145,7 +145,7 @@ def tuto_kernel_overview(): Y = 0.5*X[:,:1] + 0.5*X[:,1:] + 2*np.sin(X[:,:1]) * np.sin(X[:,1:]) # Create GP regression model - m = GPy.models.GP_regression(X,Y,Kanova) + m = GPy.models.GPRegression(X, Y, Kanova) pb.figure(figsize=(5,5)) m.plot() @@ -196,5 +196,5 @@ def model_interaction(): X = np.random.randn(20,1) Y = np.sin(X) + np.random.randn(*X.shape)*0.01 + 5. k = GPy.kern.rbf(1) + GPy.kern.bias(1) - return GPy.models.GP_regression(X,Y,kernel=k) + return GPy.models.GPRegression(X, Y, kernel=k) diff --git a/GPy/models/mrd.py b/GPy/models/mrd.py index aa3a97a3..4300f113 100644 --- a/GPy/models/mrd.py +++ b/GPy/models/mrd.py @@ -273,8 +273,8 @@ class MRD(model): else: return pylab.gcf() - def plot_X_1d(self): - return self.gref.plot_X_1d() + def plot_X_1d(self, *a, **kw): + return self.gref.plot_X_1d(*a, **kw) def plot_X(self, fignum=None, ax=None): fig = self._handle_plotting(fignum, ax, lambda i, g, ax: ax.imshow(g.X))