From fe085d96af181f6ee129c40c24268cc045f7192d Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 26 Apr 2018 15:28:25 +0100
Subject: [PATCH] Removed KPI from reader and writer
---
force_bdss/io/workflow_reader.py | 32 --------------------------------
force_bdss/io/workflow_writer.py | 3 ---
2 files changed, 35 deletions(-)
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index c2d78ab..5f286d8 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -91,7 +91,6 @@ class WorkflowReader(HasStrictTraits):
wf_data = json_data["workflow"]
wf.mco = self._extract_mco(wf_data)
wf.execution_layers[:] = self._extract_execution_layers(wf_data)
- wf.kpi_calculators[:] = self._extract_kpi_calculators(wf_data)
wf.notification_listeners[:] = \
self._extract_notification_listeners(wf_data)
except KeyError as e:
@@ -167,37 +166,6 @@ class WorkflowReader(HasStrictTraits):
return layers
- def _extract_kpi_calculators(self, wf_data):
- """Extracts the KPI calculators from the workflow dictionary data.
-
- Parameters
- ----------
- wf_data: dict
- the content of the workflow key in the top level dictionary data.
-
- Returns
- -------
- list of BaseKPICalculatorModel instances. Each BaseKPICalculatorModel
- is an instance of the specific model class. The list can be
- empty.
- """
- registry = self.factory_registry
-
- kpi_calculators = []
- for kpic_entry in wf_data["kpi_calculators"]:
- kpic_id = kpic_entry["id"]
- kpic_factory = registry.kpi_calculator_factory_by_id(kpic_id)
- model_data = kpic_entry["model_data"]
- model_data["input_slot_info"] = self._extract_input_slot_info(
- model_data["input_slot_info"]
- )
-
- kpi_calculators.append(
- kpic_factory.create_model(model_data)
- )
-
- return kpi_calculators
-
def _extract_mco_parameters(self, mco_id, parameters_data):
"""Extracts the MCO parameters from the data as dictionary.
diff --git a/force_bdss/io/workflow_writer.py b/force_bdss/io/workflow_writer.py
index 22a7f18..f47981f 100644
--- a/force_bdss/io/workflow_writer.py
+++ b/force_bdss/io/workflow_writer.py
@@ -25,9 +25,6 @@ class WorkflowWriter(HasStrictTraits):
def _workflow_data(self, workflow):
workflow_data = {
"mco": self._mco_data(workflow.mco),
- "kpi_calculators": [
- self._model_data(kpic)
- for kpic in workflow.kpi_calculators],
"execution_layers": [
self._execution_layer_data(el)
for el in workflow.execution_layers],
--
GitLab