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

domain and trtansformations namespace prettyfying

Browse source
This commit is contained in:
Max Zwiessele 2013-10-11 17:26:04 +01:00
parent 780daac03e
commit 2018368d8d
5 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
GPy/core/model.py
View file

@ -9,7 +9,7 @@ from GPy.util.misc import opt_wrapper
from parameterized import Parameterized
import multiprocessing as mp
import numpy as np
from GPy.core.domains import POSITIVE, REAL
from GPy.core.domains import _POSITIVE, _REAL
from numpy.linalg.linalg import LinAlgError
# import numdifftools as ndt
@ -93,8 +93,8 @@ class Model(Parameterized):
# check constraints are okay
if what.domain is POSITIVE:
constrained_positive_indices = [i for i, t in zip(self.constrained_indices, self.constraints) if t.domain is POSITIVE]
if what.domain is _POSITIVE:
constrained_positive_indices = [i for i, t in zip(self.constrained_indices, self.constraints) if t.domain is _POSITIVE]
if len(constrained_positive_indices):
constrained_positive_indices = np.hstack(constrained_positive_indices)
else:
@ -107,7 +107,7 @@ class Model(Parameterized):
print '\n'.join([n for i, n in enumerate(self._get_param_names()) if i in unconst])
print '\n'
self.constrain_positive(unconst)
elif what.domain is REAL:
elif what.domain is _REAL:
assert not np.any(which[:, None] == self.all_constrained_indices()), "constraint and prior incompatible"
else:
raise ValueError, "prior not recognised"