[dir] structure preserved

GPy/testing/examples_tests.py

@@ -25,7 +25,7 @@ def model_checkgrads(model):
     return model.checkgrad(step=1e-4)
 
 def model_instance(model):
-    return isinstance(model, GPy.core.probabilistic_model.Model)
+    return isinstance(model, GPy.core.model.Model)
 
 def flatten_nested(lst):
     result = []

GPy/testing/gp_tests.py

@@ -5,7 +5,7 @@ Created on 4 Sep 2015
 '''
 import unittest
 import numpy as np, GPy
-from ..core.variational import NormalPosterior
+from GPy.core.parameterization.variational import NormalPosterior
 
 class Test(unittest.TestCase):
 

GPy/testing/kernel_tests.py

@@ -16,7 +16,7 @@ except ImportError:
     config.set('cython', 'working', 'False')
 
 
-class Kern_check_model(GPy.core.ProbabilisticModel):
+class Kern_check_model(GPy.core.Model):
     """
     This is a dummy model class used as a base class for checking that the
     gradients of a given kernel are implemented correctly. It enables
@@ -456,7 +456,7 @@ class KernelTestsProductWithZeroValues(unittest.TestCase):
 class Kernel_Psi_statistics_GradientTests(unittest.TestCase):
 
     def setUp(self):
-        from GPy.core.variational import NormalPosterior
+        from GPy.core.parameterization.variational import NormalPosterior
         N,M,Q = 100,20,3
 
         X = np.random.randn(N,Q)

GPy/testing/mapping_tests.py

@@ -5,7 +5,7 @@ import unittest
 import numpy as np
 import GPy
 
-class MappingGradChecker(GPy.core.ProbabilisticModel):
+class MappingGradChecker(GPy.core.Model):
     """
     This class has everything we need to check the gradient of a mapping. It
     implement a simple likelihood which is a weighted sum of the outputs of the

GPy/testing/pickle_tests.py

@@ -9,7 +9,7 @@ import pickle
 import numpy as np
 import tempfile
 from GPy.examples.dimensionality_reduction import mrd_simulation
-from GPy.core.variational import NormalPosterior
+from GPy.core.parameterization.variational import NormalPosterior
 from GPy.models.gp_regression import GPRegression
 from functools import reduce
 

GPy/testing/rv_transformation_tests.py

@@ -10,12 +10,12 @@ import scipy.stats as st
 import GPy
 
 
-class TestModel(GPy.core.ProbabilisticModel):
+class TestModel(GPy.core.Model):
     """
     A simple GPy model with one parameter.
     """
     def __init__(self, theta=1.):
-        GPy.core.ProbabilisticModel.__init__(self, 'test_model')
+        GPy.core.Model.__init__(self, 'test_model')
         theta = GPy.core.Param('theta', theta)
         self.link_parameter(theta)