re-merged. only RA's errors (probit?) remain

This commit is contained in:
James Hensman 2013-06-04 17:38:05 +01:00
parent 29790e327a
commit 6d64559f1f
2 changed files with 6 additions and 6 deletions

View file

@ -20,7 +20,7 @@ from GPy.core.domains import POSITIVE, REAL
class model(parameterised):
def __init__(self):
parameterised.__init__(self)
self.priors = [None for i in range(self._get_params().size)]
self.priors = None
self.optimization_runs = []
self.sampling_runs = []
self.preferred_optimizer = 'tnc'
@ -55,7 +55,7 @@ class model(parameterised):
if self.priors is None:
self.priors = [None for i in range(self._get_params().size)]
which = self.grep_param_names(which)
which = self.grep_param_names(regexp)
# check tied situation
tie_partial_matches = [tie for tie in self.tied_indices if (not set(tie).isdisjoint(set(which))) & (not set(tie) == set(which))]