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

merged conflict in tutorial's tests (again)

Browse source
This commit is contained in:
Nicolas 2013-06-05 17:32:26 +01:00
parent a56072b159
commit e511a7ba03
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/examples/tutorials.py
View file

@ -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:]) Y = 0.5*X[:,:1] + 0.5*X[:,1:] + 2*np.sin(X[:,:1]) * np.sin(X[:,1:])
# Create GP regression model # Create GP regression model
<<<<<<< HEAD
m = GPy.models.GP_regression(X,Y,Kanova)
=======
m = GPy.models.GPRegression(X, Y, Kanova) m = GPy.models.GPRegression(X, Y, Kanova)
pb.figure(figsize=(5,5)) pb.figure(figsize=(5,5))
>>>>>>> efbf169a6a17d824234d538553ffcbe0c4bddc40
m.plot() m.plot()
pb.figure(figsize=(20,3)) pb.figure(figsize=(20,3))