Adapt likelihoods init to check for sympy.

This commit is contained in:
Neil Lawrence 2014-04-03 09:15:33 +02:00
commit 19b3784389
5 changed files with 17 additions and 9 deletions

View file

@ -4,7 +4,7 @@
import itertools import itertools
import numpy import numpy
from parameter_core import OptimizationHandlable, adjust_name_for_printing from parameter_core import OptimizationHandlable, adjust_name_for_printing
from array_core import ObsAr from observable_array import ObsAr
###### printing ###### printing
__constraints_name__ = "Constraint" __constraints_name__ = "Constraint"

View file

@ -4,11 +4,19 @@ from gaussian import Gaussian
from gamma import Gamma from gamma import Gamma
from poisson import Poisson from poisson import Poisson
from student_t import StudentT from student_t import StudentT
from sstudent_t import SstudentT
from likelihood import Likelihood from likelihood import Likelihood
from mixed_noise import MixedNoise from mixed_noise import MixedNoise
from symbolic import Symbolic # TODO need to fix this in a config file.
from negative_binomial import Negative_binomial try:
from skew_normal import Skew_normal import sympy as sym
from skew_exponential import Skew_exponential sympy_available=True
from null_category import Null_category except ImportError:
sympy_available=False
if sympy_available:
# These are likelihoods that rely on symbolic.
from symbolic import Symbolic
from sstudent_t import SstudentT
from negative_binomial import Negative_binomial
from skew_normal import Skew_normal
from skew_exponential import Skew_exponential
from null_category import Null_category

View file

@ -7,7 +7,7 @@ import unittest
import GPy import GPy
import numpy as np import numpy as np
from GPy.core.parameterization.parameter_core import HierarchyError from GPy.core.parameterization.parameter_core import HierarchyError
from GPy.core.parameterization.array_core import ObsAr from GPy.core.parameterization.observable_array import ObsAr
class ArrayCoreTest(unittest.TestCase): class ArrayCoreTest(unittest.TestCase):
def setUp(self): def setUp(self):

View file

@ -10,7 +10,7 @@ from GPy.core.parameterization.index_operations import ParameterIndexOperations,
ParameterIndexOperationsView ParameterIndexOperationsView
import tempfile import tempfile
from GPy.core.parameterization.param import Param from GPy.core.parameterization.param import Param
from GPy.core.parameterization.array_core import ObsAr from GPy.core.parameterization.observable_array import ObsAr
from GPy.core.parameterization.priors import Gaussian from GPy.core.parameterization.priors import Gaussian
from GPy.kern._src.rbf import RBF from GPy.kern._src.rbf import RBF
from GPy.kern._src.linear import Linear from GPy.kern._src.linear import Linear