From e511a7ba03de1ac14c1b6fc4df08e901f489496e Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 5 Jun 2013 17:32:26 +0100 Subject: [PATCH] merged conflict in tutorial's tests (again) --- GPy/examples/tutorials.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/GPy/examples/tutorials.py b/GPy/examples/tutorials.py index fc33d2bc..4371d7a8 100644 --- a/GPy/examples/tutorials.py +++ b/GPy/examples/tutorials.py @@ -114,12 +114,8 @@ 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 -<<<<<<< HEAD - m = GPy.models.GP_regression(X,Y,Kanova) -======= m = GPy.models.GPRegression(X, Y, Kanova) pb.figure(figsize=(5,5)) ->>>>>>> efbf169a6a17d824234d538553ffcbe0c4bddc40 m.plot() pb.figure(figsize=(20,3))