an assortment of fixes

This commit is contained in:
James Hensman 2013-06-05 14:52:37 +01:00
parent 7040b26f41
commit 56a4bc4e21
5 changed files with 13 additions and 19 deletions

View file

@ -224,14 +224,10 @@ class model(parameterised):
for s in positive_strings:
for i in self.grep_param_names(".*"+s):
if not (i in currently_constrained):
#to_make_positive.append(re.escape(param_names[i]))
to_make_positive.append(i)
if len(to_make_positive):
#self.constrain_positive('(' + '|'.join(to_make_positive) + ')')
self.constrain_positive(np.asarray(to_make_positive))
def objective_function(self, x):
"""
The objective function passed to the optimizer. It combines the likelihood and the priors.