From 44db547c517c6e012030ce1aa1a2e3991712c632 Mon Sep 17 00:00:00 2001
From: Theo Steininger <theo.steininger@ipt.ai>
Date: Fri, 8 Sep 2017 01:11:29 +0200
Subject: [PATCH] Fixed bug in Pipeline
---
.../likelihoods/ensemble_likelihood/ensemble_likelihood.py | 6 ++----
imagine/pipeline.py | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py b/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py
index 42c44fd..b894379 100644
--- a/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py
+++ b/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py
@@ -110,9 +110,7 @@ class EnsembleLikelihood(Likelihood):
u_a_c_val = np.einsum(c_weighted_val, [1], a_u_val, [0, 1])
first_summand = A.inverse_times(c)
- self.logger.debug("Calculated first summand.")
second_summand_val = np.einsum(middle, [0, 1], u_a_c_val, [1])
- self.logger.debug("Intermediate step.")
second_summand_val = np.einsum(a_u_val, [0, 1],
second_summand_val, [0])
second_summand_val *= -1
@@ -122,8 +120,8 @@ class EnsembleLikelihood(Likelihood):
result_1 = -c.vdot(first_summand)
result_2 = -c.vdot(second_summand)
result = result_1 + result_2
- self.logger.debug("Calculated: %f + %f = %f" %
- (result_1, result_2, result))
+ self.logger.debug("Calculated (%s): %f + %f = %f" %
+ (self.observable_name, result_1, result_2, result))
# result_array[i] = result
# total_result = result_array.mean()
diff --git a/imagine/pipeline.py b/imagine/pipeline.py
index 8e018eb..d3dd074 100644
--- a/imagine/pipeline.py
+++ b/imagine/pipeline.py
@@ -72,7 +72,7 @@ class Pipeline(Loggable, object):
def likelihood(self, likelihood):
self.logger.debug("Setting likelihood.")
self._likelihood = ()
- if not (isinstance(likelihood, list) and
+ if not (isinstance(likelihood, list) or
isinstance(likelihood, tuple)):
likelihood = [likelihood]
for l in likelihood:
--
GitLab