From eba0b63dc9274fcc4e8ec3c8a92c7a0c684c3da3 Mon Sep 17 00:00:00 2001 From: Vytautas Jancauskas Date: Tue, 24 Nov 2020 14:21:48 +0100 Subject: [PATCH] fix a bug in qmc analysis --- easyvvuq/analysis/qmc_analysis.py | 4 ++-- tests/test_analysis_qmc_analysis.py | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/easyvvuq/analysis/qmc_analysis.py b/easyvvuq/analysis/qmc_analysis.py index 84476c63c..8b6df0fb0 100644 --- a/easyvvuq/analysis/qmc_analysis.py +++ b/easyvvuq/analysis/qmc_analysis.py @@ -135,9 +135,9 @@ def get_samples(self, data_frame): """ samples = {k: [] for k in self.qoi_cols} - for run_id in data_frame.run_id.unique(): + for run_id in data_frame[('run_id', 0)].unique(): for k in self.qoi_cols: - data = data_frame.loc[data_frame['run_id'] == run_id][k] + data = data_frame.loc[data_frame[('run_id', 0)] == run_id][k] samples[k].append(data.values) return samples diff --git a/tests/test_analysis_qmc_analysis.py b/tests/test_analysis_qmc_analysis.py index 2f4c24369..b32e78b4e 100644 --- a/tests/test_analysis_qmc_analysis.py +++ b/tests/test_analysis_qmc_analysis.py @@ -14,11 +14,13 @@ def test_analyse(): "b": cp.Uniform(0.0, 1.0) } sampler = QMCSampler(vary, 100) - samples = [] + samples = {('run_id', 0): [], ('a', 0): [], ('b', 0): [], ('a+b', 0): []} for i, sample in enumerate(sampler): - samples.append( - [i, sample['a'], sample['b'], sample['a'] + sample['b']]) - df = pd.DataFrame(samples, columns=['run_id', 'a', 'b', 'a+b']) + samples[('run_id', 0)].append(i) + samples[('a', 0)].append(sample['a']) + samples[('b', 0)].append(sample['b']) + samples[('a+b', 0)].append(sample['a'] + sample['b']) + df = pd.DataFrame(samples) analysis = QMCAnalysis(sampler) results = analysis.analyse(df)