From e8e9b2892aefb48a6cc11c2b9c754fbfa4f1364a Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Wed, 19 Jul 2017 17:06:15 +0100
Subject: [PATCH] Reworked plugins to honor the new interface
---
.../csv_extractor/csv_extractor/csv_extractor_bundle.py | 6 +++---
.../core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py | 6 +++---
force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py | 5 ++---
force_bdss/data_sources/base_data_source_model.py | 2 +-
force_bdss/kpi/base_kpi_calculator_model.py | 2 +-
force_bdss/mco/base_mco_model.py | 2 +-
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
index 3ef2128..a44b5e1 100644
--- a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
+++ b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
@@ -12,9 +12,9 @@ class CSVExtractorBundle(HasStrictTraits):
def create_model(self, model_data=None):
if model_data is None:
- return CSVExtractorModel()
- else:
- return CSVExtractorModel.from_json(model_data)
+ model_data = {}
+
+ return CSVExtractorModel(self, **model_data)
def create_data_source(self, application, model):
return CSVExtractorDataSource(self, application, model)
diff --git a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
index a76456c..2968895 100644
--- a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
+++ b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
@@ -13,9 +13,9 @@ class KPIAdderBundle(HasStrictTraits):
def create_model(self, model_data=None):
if model_data is None:
- return KPIAdderModel()
- else:
- return KPIAdderModel.from_json(model_data)
+ model_data = {}
+
+ return KPIAdderModel(self, **model_data)
def create_data_source(self, application, model):
return KPIAdderCalculator(self, application, model)
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
index 1388051..07e4dd3 100644
--- a/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
+++ b/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
@@ -12,9 +12,8 @@ class DakotaBundle(HasStrictTraits):
def create_model(self, model_data=None):
if model_data is None:
- return DakotaModel()
- else:
- return DakotaModel.from_json(model_data)
+ model_data = {}
+ return DakotaModel(self, **model_data)
def create_optimizer(self, application, model):
return DakotaOptimizer(self, application, model)
diff --git a/force_bdss/data_sources/base_data_source_model.py b/force_bdss/data_sources/base_data_source_model.py
index f3ebea6..bf8367f 100644
--- a/force_bdss/data_sources/base_data_source_model.py
+++ b/force_bdss/data_sources/base_data_source_model.py
@@ -8,4 +8,4 @@ class BaseDataSourceModel(ABCHasStrictTraits):
def __init__(self, bundle, *args, **kwargs):
self.bundle = bundle
- super(BaseDataSourceModel, self).__init__(self, *args, **kwargs)
+ super(BaseDataSourceModel, self).__init__(*args, **kwargs)
diff --git a/force_bdss/kpi/base_kpi_calculator_model.py b/force_bdss/kpi/base_kpi_calculator_model.py
index 512be3e..9882fa6 100644
--- a/force_bdss/kpi/base_kpi_calculator_model.py
+++ b/force_bdss/kpi/base_kpi_calculator_model.py
@@ -8,4 +8,4 @@ class BaseKPICalculatorModel(ABCHasStrictTraits):
def __init__(self, bundle, *args, **kwargs):
self.bundle = bundle
- super(BaseKPICalculatorModel, self).__init__(self, *args, **kwargs)
+ super(BaseKPICalculatorModel, self).__init__(*args, **kwargs)
diff --git a/force_bdss/mco/base_mco_model.py b/force_bdss/mco/base_mco_model.py
index b263045..2c1bee9 100644
--- a/force_bdss/mco/base_mco_model.py
+++ b/force_bdss/mco/base_mco_model.py
@@ -8,4 +8,4 @@ class BaseMCOModel(ABCHasStrictTraits):
def __init__(self, bundle, *args, **kwargs):
self.bundle = bundle
- super(BaseMCOModel, self).__init__(self, *args, **kwargs)
+ super(BaseMCOModel, self).__init__(*args, **kwargs)
--
GitLab