From 4a5104a745e2d0c378431a92e666d2a89be2c88f Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Tue, 1 Aug 2017 16:40:57 +0100
Subject: [PATCH] Fixed tests
---
.../core_plugins/dummy/dummy_dakota/dakota_communicator.py | 4 ++--
.../core_plugins/dummy/kpi_adder/kpi_adder_calculator.py | 2 ++
force_bdss/mco/parameters/base_mco_parameter.py | 4 ++--
force_bdss/tests/fixtures/test_csv.json | 7 ++++++-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/force_bdss/core_plugins/dummy/dummy_dakota/dakota_communicator.py b/force_bdss/core_plugins/dummy/dummy_dakota/dakota_communicator.py
index e1d10fd..fbcb6f9 100644
--- a/force_bdss/core_plugins/dummy/dummy_dakota/dakota_communicator.py
+++ b/force_bdss/core_plugins/dummy/dummy_dakota/dakota_communicator.py
@@ -9,8 +9,8 @@ class DummyDakotaCommunicator(BaseMCOCommunicator):
def receive_from_mco(self, model):
data = sys.stdin.read()
values = list(map(float, data.split()))
- value_names = [p.value_name for p in model.parameters]
- value_types = [p.value_type for p in model.parameters]
+ value_names = [p.name for p in model.parameters]
+ value_types = [p.type for p in model.parameters]
return [
DataValue(type=type_, name=name, value=value)
diff --git a/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_calculator.py b/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_calculator.py
index ff4b7ce..793810e 100644
--- a/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_calculator.py
+++ b/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_calculator.py
@@ -22,6 +22,8 @@ class KPIAdderCalculator(BaseKPICalculator):
return (
(
Slot(type=model.cuba_type_in),
+ Slot(type=model.cuba_type_in),
+ Slot(type=model.cuba_type_in),
),
(
Slot(type=model.cuba_type_out),
diff --git a/force_bdss/mco/parameters/base_mco_parameter.py b/force_bdss/mco/parameters/base_mco_parameter.py
index 51f4503..5e09fcd 100644
--- a/force_bdss/mco/parameters/base_mco_parameter.py
+++ b/force_bdss/mco/parameters/base_mco_parameter.py
@@ -14,10 +14,10 @@ class BaseMCOParameter(HasStrictTraits):
factory = Instance(BaseMCOParameterFactory, visible=False, transient=True)
#: A user defined name for the parameter
- value_name = String()
+ name = String()
#: A CUBA key describing the type of the parameter
- value_type = String()
+ type = String()
def __init__(self, factory, *args, **kwargs):
self.factory = factory
diff --git a/force_bdss/tests/fixtures/test_csv.json b/force_bdss/tests/fixtures/test_csv.json
index 880e66e..65df788 100644
--- a/force_bdss/tests/fixtures/test_csv.json
+++ b/force_bdss/tests/fixtures/test_csv.json
@@ -10,7 +10,9 @@
"model_data": {
"initial_value": 3,
"lower_bound": 0,
- "upper_bound": 10
+ "upper_bound": 10,
+ "name": "p0",
+ "type": "PRESSURE"
}
}
]
@@ -53,6 +55,9 @@
"cuba_type_in": "PRESSURE",
"cuba_type_out": "TOTAL_PRESSURE",
"input_slot_maps": [
+ {
+ "name": "p0"
+ },
{
"name": "p1"
},
--
GitLab