fixed Alan's dependency nightmare.

This commit is contained in:
James Hensman 2013-06-04 16:21:00 +01:00
parent f403e5b0b7
commit d84ae52d41
3 changed files with 5 additions and 4 deletions

View file

@ -2,16 +2,17 @@
# Licensed under the BSD 3-clause license (see LICENSE.txt) # Licensed under the BSD 3-clause license (see LICENSE.txt)
import kern import core
import models import models
import inference import inference
import util import util
import examples import examples
from core import priors
import likelihoods import likelihoods
import testing import testing
from numpy.testing import Tester from numpy.testing import Tester
from nose.tools import nottest from nose.tools import nottest
import kern
from core import priors
@nottest @nottest
def tests(): def tests():

View file

@ -4,7 +4,7 @@ from .. import kern
from ..util.plot import gpplot, Tango, x_frame1D, x_frame2D from ..util.plot import gpplot, Tango, x_frame1D, x_frame2D
import pylab as pb import pylab as pb
class GPBase(model): class GPBase(model.model):
""" """
Gaussian Process model for holding shared behaviour between Gaussian Process model for holding shared behaviour between
sprase_GP and GP models sprase_GP and GP models

View file

@ -8,7 +8,7 @@ import sys, pdb
# from .. import kern # from .. import kern
# from ..core import model # from ..core import model
# from ..util.linalg import pdinv, PCA # from ..util.linalg import pdinv, PCA
from ..core import GPLVM from GPLVM import GPLVM
from sparse_GP_regression import sparse_GP_regression from sparse_GP_regression import sparse_GP_regression
class sparse_GPLVM(sparse_GP_regression, GPLVM): class sparse_GPLVM(sparse_GP_regression, GPLVM):