diff --git a/GPy/examples/tutorials.py b/GPy/examples/tutorials.py index be550e01..9d892b8e 100644 --- a/GPy/examples/tutorials.py +++ b/GPy/examples/tutorials.py @@ -90,7 +90,7 @@ def tuto_kernel_overview(): # Sum of kernels k_add = k1.add(k2) - k_addorth = k1.add_orthogonal(k2) + k_addorth = k1.add_orthogonal(k2) pb.figure(figsize=(8,8)) pb.subplot(2,2,1) @@ -199,3 +199,10 @@ def tuto_kernel_overview(): WN[100] = 1. pb.subplot(3,4,i+1) pb.plot(X,WN,'b') + +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) + diff --git a/doc/GPy.examples.rst b/doc/GPy.examples.rst index ec283d21..d369de41 100644 --- a/doc/GPy.examples.rst +++ b/doc/GPy.examples.rst @@ -73,18 +73,10 @@ examples Package :undoc-members: :show-inheritance: -:mod:`tuto_GP_regression` Module --------------------------------- +:mod:`tutorials` Module +----------------------- -.. automodule:: GPy.examples.tuto_GP_regression - :members: - :undoc-members: - :show-inheritance: - -:mod:`tuto_kernel_overview` Module ----------------------------------- - -.. automodule:: GPy.examples.tuto_kernel_overview +.. automodule:: GPy.examples.tutorials :members: :undoc-members: :show-inheritance: diff --git a/doc/GPy.rst b/doc/GPy.rst index 3fd4bcfd..242a22bc 100644 --- a/doc/GPy.rst +++ b/doc/GPy.rst @@ -9,6 +9,14 @@ GPy Package :undoc-members: :show-inheritance: +:mod:`test_coreg` Module +------------------------ + +.. automodule:: GPy.test_coreg + :members: + :undoc-members: + :show-inheritance: + Subpackages ----------- @@ -20,5 +28,6 @@ Subpackages GPy.kern GPy.likelihoods GPy.models + GPy.testing GPy.util diff --git a/doc/index.rst b/doc/index.rst index b62ff6a7..5066278f 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -8,9 +8,10 @@ Welcome to GPy's documentation! For a quick start, you can have a look at one of the tutorials: * `Basic Gaussian process regression `_ +* `Interacting with models `_ * `A kernel overview `_ * Advanced GP regression (Forthcoming) -* Writting kernels (Forthcoming) +* Writing kernels (Forthcoming) You may also be interested by some examples in the GPy/examples folder.