From 5411da8a0e87b91657a22202895fa236074cffdb Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 27 Jul 2017 11:08:26 +0100
Subject: [PATCH] Changed also the model naming
---
force_bdss/core_evaluation_driver.py | 2 +-
force_bdss/core_mco_driver.py | 2 +-
force_bdss/io/tests/test_workflow_writer.py | 13 ++++++-------
force_bdss/io/workflow_reader.py | 8 ++++----
force_bdss/io/workflow_writer.py | 10 +++++-----
force_bdss/tests/fixtures/test_csv.json | 2 +-
force_bdss/workspecs/workflow.py | 2 +-
7 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/force_bdss/core_evaluation_driver.py b/force_bdss/core_evaluation_driver.py
index d28def3..61dac3e 100644
--- a/force_bdss/core_evaluation_driver.py
+++ b/force_bdss/core_evaluation_driver.py
@@ -23,7 +23,7 @@ class CoreEvaluationDriver(BaseCoreDriver):
print(str(e), file=sys.stderr)
sys.exit(1)
- mco_model = workflow.multi_criteria_optimizer
+ mco_model = workflow.mco
mco_bundle = mco_model.bundle
mco_communicator = mco_bundle.create_communicator(
self.application,
diff --git a/force_bdss/core_mco_driver.py b/force_bdss/core_mco_driver.py
index 4d3d52a..07973cc 100644
--- a/force_bdss/core_mco_driver.py
+++ b/force_bdss/core_mco_driver.py
@@ -24,7 +24,7 @@ class CoreMCODriver(BaseCoreDriver):
print(str(e), file=sys.stderr)
sys.exit(1)
- mco_model = workflow.multi_criteria_optimizer
+ mco_model = workflow.mco
mco_bundle = mco_model.bundle
mco = mco_bundle.create_optimizer(self.application, mco_model)
mco.run()
diff --git a/force_bdss/io/tests/test_workflow_writer.py b/force_bdss/io/tests/test_workflow_writer.py
index 6f6c5aa..af32cd5 100644
--- a/force_bdss/io/tests/test_workflow_writer.py
+++ b/force_bdss/io/tests/test_workflow_writer.py
@@ -18,8 +18,7 @@ except ImportError:
from force_bdss.ids import bundle_id, mco_parameter_id
from force_bdss.io.workflow_writer import WorkflowWriter
from force_bdss.mco.base_mco_model import BaseMCOModel
-from force_bdss.mco.i_mco_bundle import \
- IMCOBundle
+from force_bdss.mco.i_mco_bundle import IMCOBundle
from force_bdss.workspecs.workflow import Workflow
@@ -49,7 +48,7 @@ class TestWorkflowWriter(unittest.TestCase):
result = json.loads(fp.getvalue())
self.assertIn("version", result)
self.assertIn("workflow", result)
- self.assertIn("multi_criteria_optimizer", result["workflow"])
+ self.assertIn("mco", result["workflow"])
self.assertIn("data_sources", result["workflow"])
self.assertIn("kpi_calculators", result["workflow"])
@@ -62,16 +61,16 @@ class TestWorkflowWriter(unittest.TestCase):
wfreader = WorkflowReader(self.mock_registry,
self.mock_mco_parameter_registry)
wf_result = wfreader.read(fp)
- self.assertEqual(wf_result.multi_criteria_optimizer.bundle.id,
- wf.multi_criteria_optimizer.bundle.id)
+ self.assertEqual(wf_result.mco.bundle.id,
+ wf.mco.bundle.id)
def _create_mock_workflow(self):
wf = Workflow()
- wf.multi_criteria_optimizer = BaseMCOModel(
+ wf.mco = BaseMCOModel(
mock.Mock(
spec=IMCOBundle,
id=bundle_id("enthought", "mock")))
- wf.multi_criteria_optimizer.parameters = [
+ wf.mco.parameters = [
BaseMCOParameter(
factory=mock.Mock(
spec=BaseMCOParameterFactory,
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index e713497..e12e13f 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -93,7 +93,7 @@ class WorkflowReader(HasStrictTraits):
try:
wf_data = json_data["workflow"]
- wf.multi_criteria_optimizer = self._extract_mco(wf_data)
+ wf.mco = self._extract_mco(wf_data)
wf.data_sources[:] = self._extract_data_sources(wf_data)
wf.kpi_calculators[:] = self._extract_kpi_calculators(wf_data)
except KeyError as e:
@@ -118,7 +118,7 @@ class WorkflowReader(HasStrictTraits):
"""
registry = self.bundle_registry
- mco_data = wf_data.get("multi_criteria_optimizer")
+ mco_data = wf_data.get("mco")
if mco_data is None:
# The file was saved without setting an MCO.
# The file is valid, we simply can't run any optimization yet.
@@ -126,11 +126,11 @@ class WorkflowReader(HasStrictTraits):
mco_id = mco_data["id"]
mco_bundle = registry.mco_bundle_by_id(mco_id)
- model_data = wf_data["multi_criteria_optimizer"]["model_data"]
+ model_data = wf_data["mco"]["model_data"]
model_data["parameters"] = self._extract_mco_parameters(
model_data["parameters"])
model = mco_bundle.create_model(
- wf_data["multi_criteria_optimizer"]["model_data"])
+ wf_data["mco"]["model_data"])
return model
def _extract_data_sources(self, wf_data):
diff --git a/force_bdss/io/workflow_writer.py b/force_bdss/io/workflow_writer.py
index b757d03..5ba53f1 100644
--- a/force_bdss/io/workflow_writer.py
+++ b/force_bdss/io/workflow_writer.py
@@ -23,13 +23,13 @@ class WorkflowWriter(HasStrictTraits):
}
wf_data = data["workflow"]
- wf_data["multi_criteria_optimizer"] = {
- "id": workflow.multi_criteria_optimizer.bundle.id,
- "model_data": workflow.multi_criteria_optimizer.__getstate__()
+ wf_data["mco"] = {
+ "id": workflow.mco.bundle.id,
+ "model_data": workflow.mco.__getstate__()
}
parameters_data = []
- for param in wf_data["multi_criteria_optimizer"]["model_data"]["parameters"]: # noqa
+ for param in wf_data["mco"]["model_data"]["parameters"]: # noqa
parameters_data.append(
{
"id": param.factory.id,
@@ -37,7 +37,7 @@ class WorkflowWriter(HasStrictTraits):
}
)
- wf_data["multi_criteria_optimizer"]["model_data"]["parameters"] = parameters_data # noqa
+ wf_data["mco"]["model_data"]["parameters"] = parameters_data # noqa
kpic_data = []
for kpic in workflow.kpi_calculators:
diff --git a/force_bdss/tests/fixtures/test_csv.json b/force_bdss/tests/fixtures/test_csv.json
index a774071..669ea67 100644
--- a/force_bdss/tests/fixtures/test_csv.json
+++ b/force_bdss/tests/fixtures/test_csv.json
@@ -1,7 +1,7 @@
{
"version": "1",
"workflow": {
- "multi_criteria_optimizer": {
+ "mco": {
"id": "force.bdss.bundle.enthought.dummy_dakota",
"model_data": {
"parameters" : [
diff --git a/force_bdss/workspecs/workflow.py b/force_bdss/workspecs/workflow.py
index b7963a0..0d70947 100644
--- a/force_bdss/workspecs/workflow.py
+++ b/force_bdss/workspecs/workflow.py
@@ -9,7 +9,7 @@ class Workflow(HasStrictTraits):
"""Model object that represents the Workflow as a whole"""
#: Contains the bundle-specific MCO Model object.
#: Can be None if no MCO has been specified yet.
- multi_criteria_optimizer = Instance(BaseMCOModel, allow_none=True)
+ mco = Instance(BaseMCOModel, allow_none=True)
#: Contains the bundle-specific DataSource Model objects.
#: The list can be empty
--
GitLab