Merge branch 'devel' of github.com:/sheffieldml/gpy into devel

This commit is contained in:
James Hensman 2015-05-28 22:22:59 +01:00
commit d67e37fcb6
3 changed files with 8 additions and 8 deletions

View file

@ -176,11 +176,11 @@ class SpikeAndSlabPosterior(VariationalPosterior):
self.mean.fix(warning=False)
self.variance.fix(warning=False)
if group_spike:
self.gamma_group = Param("binary_prob_group",binary_prob.mean(axis=0),Logistic(1e-6,1.-1e-6))
self.gamma_group = Param("binary_prob_group",binary_prob.mean(axis=0),Logistic(1e-10,1.-1e-10))
self.gamma = Param("binary_prob",binary_prob, __fixed__)
self.link_parameters(self.gamma_group,self.gamma)
else:
self.gamma = Param("binary_prob",binary_prob,Logistic(1e-6,1.-1e-6))
self.gamma = Param("binary_prob",binary_prob,Logistic(1e-10,1.-1e-10))
self.link_parameter(self.gamma)
def propogate_val(self):