From 799a4fd1df29740eb05b811f274d613a75defcd6 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Fri, 21 Jul 2017 17:38:20 +0100
Subject: [PATCH] Added value_names to the KPICalculatorResult as well
---
.../core_plugins/dummy/dummy_data_source/dummy_data_source.py | 1 +
.../dummy/dummy_kpi_calculator/dummy_kpi_calculator.py | 1 +
force_bdss/kpi/kpi_calculator_result.py | 1 +
3 files changed, 3 insertions(+)
diff --git a/force_bdss/core_plugins/dummy/dummy_data_source/dummy_data_source.py b/force_bdss/core_plugins/dummy/dummy_data_source/dummy_data_source.py
index 20004b3..a94c6b9 100644
--- a/force_bdss/core_plugins/dummy/dummy_data_source/dummy_data_source.py
+++ b/force_bdss/core_plugins/dummy/dummy_data_source/dummy_data_source.py
@@ -6,6 +6,7 @@ class DummyDataSource(BaseDataSource):
print(parameters)
return DataSourceResult(
originator=self,
+ value_names=parameters.value_names,
value_types=parameters.value_types,
values=parameters.values.reshape(
parameters.values.shape + (1,)))
diff --git a/force_bdss/core_plugins/dummy/dummy_kpi_calculator/dummy_kpi_calculator.py b/force_bdss/core_plugins/dummy/dummy_kpi_calculator/dummy_kpi_calculator.py
index aeee468..5245c7c 100644
--- a/force_bdss/core_plugins/dummy/dummy_kpi_calculator/dummy_kpi_calculator.py
+++ b/force_bdss/core_plugins/dummy/dummy_kpi_calculator/dummy_kpi_calculator.py
@@ -7,6 +7,7 @@ class DummyKPICalculator(BaseKPICalculator):
def run(self, data_source_results):
return KPICalculatorResult(
originator=self,
+ value_names=data_source_results[0].value_names,
value_types=data_source_results[0].value_types,
values=data_source_results[0].values.reshape(
data_source_results[0].values.shape[:-1]))
diff --git a/force_bdss/kpi/kpi_calculator_result.py b/force_bdss/kpi/kpi_calculator_result.py
index 4998c39..155332d 100644
--- a/force_bdss/kpi/kpi_calculator_result.py
+++ b/force_bdss/kpi/kpi_calculator_result.py
@@ -5,6 +5,7 @@ from .base_kpi_calculator import BaseKPICalculator
class KPICalculatorResult(HasTraits):
originator = Instance(BaseKPICalculator)
+ value_names = List(String)
value_types = List(String)
values = Array(shape=(None, ))
accuracy = ArrayOrNone(shape=(None, ))
--
GitLab