Skip to content
Snippets Groups Projects
Commit 323caf7f authored by Stefano Borini's avatar Stefano Borini Committed by GitHub
Browse files

Merge pull request #17 from force-h2020/add-empty-initialization-for-models

Add empty initialisation for models
parents 620d008e 37b81068
No related branches found
No related tags found
No related merge requests found
......@@ -11,8 +11,11 @@ from .csv_extractor_data_source import CSVExtractorDataSource
class CSVExtractorBundle(HasStrictTraits):
name = String("csv_extractor")
def create_model(self, model_data):
return CSVExtractorModel.from_json(model_data)
def create_model(self, model_data=None):
if model_data is None:
return CSVExtractorModel()
else:
return CSVExtractorModel.from_json(model_data)
def create_data_source(self, application, model):
return CSVExtractorDataSource(self, application, model)
......@@ -11,8 +11,11 @@ from .kpi_adder_calculator import KPIAdderCalculator
class KPIAdderBundle(HasStrictTraits):
name = String("kpi_adder")
def create_model(self, model_data):
return KPIAdderModel.from_json(model_data)
def create_model(self, model_data=None):
if model_data is None:
return KPIAdderModel()
else:
return KPIAdderModel.from_json(model_data)
def create_data_source(self, application, model):
return KPIAdderCalculator(self, application, model)
......@@ -14,8 +14,11 @@ from .dakota_optimizer import DakotaOptimizer
class DakotaBundle(HasStrictTraits):
name = String("dakota")
def create_model(self, model_data):
return DakotaModel.from_json(model_data)
def create_model(self, model_data=None):
if model_data is None:
return DakotaModel()
else:
return DakotaModel.from_json(model_data)
def create_optimizer(self, application, model):
return DakotaOptimizer(self, application, model)
......
......@@ -7,5 +7,5 @@ class IDataSourceBundle(Interface):
def create_data_source(self, application, model):
pass
def create_model(self, model_data):
def create_model(self, model_data=None):
pass
......@@ -7,5 +7,5 @@ class IKPICalculatorBundle(Interface):
def create_kpi_calculator(self, application, model):
pass
def create_model(self, model_data):
def create_model(self, model_data=None):
pass
......@@ -7,7 +7,7 @@ class IMultiCriteriaOptimizerBundle(Interface):
def create_optimizer(self, application, model):
pass
def create_model(self, model_data):
def create_model(self, model_data=None):
pass
def create_communicator(self, model_data):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment