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

merged conflicts after merging in master to newGP branch

Browse source
This commit is contained in:
James Hensman 2013-01-31 09:24:00 +00:00
commit 791d240d96
45 changed files with 13510 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GPy/models/__init__.py
View file

@ -2,8 +2,9 @@
# Licensed under the BSD 3-clause license (see LICENSE.txt)
from GP_regression import GP_regression
from sparse_GP_regression import sparse_GP_regression
#from GP_regression import GP_regression
#from sparse_GP_regression import sparse_GP_regression
# ^^ remove these?
from GPLVM import GPLVM
from warped_GP import warpedGP
from generalized_FITC import generalized_FITC
@ -11,3 +12,4 @@ from sparse_GPLVM import sparse_GPLVM
from uncollapsed_sparse_GP import uncollapsed_sparse_GP
from GP import GP
from sparse_GP import sparse_GP
from BGPLVM import Bayesian_GPLVM