Fix issue #7.

probcomp · Dec 20, 2015 · 98d17b8 · 98d17b8
1 parent 7879a5c
commit 98d17b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/gpmcc/dists/exponential_uc.py b/gpmcc/dists/exponential_uc.py
@@ -47,8 +47,10 @@ def predictive_logp(self, x):
         return ExponentialUC.calc_predictive_logp(x, self.mu)
 
     def marginal_logp(self):
-        lp = ExponentialUC.calc_log_likelihood(self.N, self.sum_x, self.mu)
-        return lp
+        data_logp = ExponentialUC.calc_log_likelihood(self.N, self.sum_x,
+            self.mu)
+        prior_logp = ExponentialUC.calc_log_prior(self.mu, self.a, self.b)
+        return data_logp + prior_logp
 
     def singleton_logp(self, x):
         return ExponentialUC.calc_predictive_logp(x, self.mu)

diff --git a/gpmcc/dists/normal_uc.py b/gpmcc/dists/normal_uc.py
@@ -61,9 +61,11 @@ def predictive_logp(self, x):
         return NormalUC.calc_predictive_logp(x, self.mu, self.rho)
 
     def marginal_logp(self):
-        lp = NormalUC.calc_log_likelihood(self.N, self.sum_x, self.sum_x_sq,
-            self.rho, self.mu)
-        return lp
+        data_logp = NormalUC.calc_log_likelihood(self.N, self.sum_x,
+            self.sum_x_sq, self.rho, self.mu)
+        prior_logp = NormalUC.calc_log_prior(self.mu, self.rho, self.m,
+            self.r, self.s, self.nu)
+        return data_logp + prior_logp
 
     def singleton_logp(self, x):
         return NormalUC.calc_predictive_logp(x, self.mu, self.rho)