fix handling of priors

t-vi · Nov 6, 2017 · 20209b8 · 20209b8
1 parent 13ff9a4
commit 20209b8
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 117 deletions.
diff --git a/candlegp/models/model.py b/candlegp/models/model.py
@@ -83,7 +83,7 @@ def objective(self):
         pos_objective = self.compute_log_likelihood()
         for param in self.parameters():
             if isinstance(param, parameter.ParamWithPrior):
-                pos_objective += param.get_prior()
+                pos_objective = pos_objective + param.get_prior()
         return -pos_objective
 
     def forward(self):

diff --git a/candlegp/parameter.py b/candlegp/parameter.py
@@ -53,8 +53,8 @@ def get_prior(self):
         if self.prior is None:
             return 0.0
 
-        log_jacobian = self.log_jacobian().sum() #(unconstrained_tensor)
-        logp_var = self.prior.logp(self.get()).sum()
+        log_jacobian = self.log_jacobian() #(unconstrained_tensor)
+        logp_var = self.prior.logp(self.get())
         return log_jacobian+logp_var
 
 class PositiveParam(ParamWithPrior): # log(1+exp(r))

diff --git a/notebooks/gp_regression.ipynb b/notebooks/gp_regression.ipynb