From a48076e1f572e2f8ff6c63b073613923d8cfd42b Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 17 May 2018 17:30:11 +0100
Subject: [PATCH] Updated interfaces
---
.../data_sources/i_data_source_factory.py | 28 +++++++-----
force_bdss/mco/i_mco_factory.py | 44 ++++++++++++++-----
.../i_notification_listener_factory.py | 26 ++++++++---
force_bdss/ui_hooks/i_ui_hooks_factory.py | 25 ++++++++---
4 files changed, 89 insertions(+), 34 deletions(-)
diff --git a/force_bdss/data_sources/i_data_source_factory.py b/force_bdss/data_sources/i_data_source_factory.py
index 9af71bf..bbeb624 100644
--- a/force_bdss/data_sources/i_data_source_factory.py
+++ b/force_bdss/data_sources/i_data_source_factory.py
@@ -1,5 +1,5 @@
from envisage.api import Plugin
-from traits.api import Interface, String, Instance, Type
+from traits.api import Interface, Str, Instance, Type
class IDataSourceFactory(Interface):
@@ -8,22 +8,30 @@ class IDataSourceFactory(Interface):
Refer to the BaseDataSourceFactory for documentation.
"""
- id = String()
+ id = Str()
- name = String()
+ name = Str()
data_source_class = Type(
- "force_bdss.data_sources.base_data_source.BaseDataSource"
+ "force_bdss.data_sources.base_data_source.BaseDataSource",
+ allow_none=False
)
model_class = Type(
- "force_bdss.data_sources.base_data_source_model.BaseDataSourceModel"
+ "force_bdss.data_sources.base_data_source_model.BaseDataSourceModel",
+ allow_none=False
)
- plugin = Instance(Plugin)
+ plugin = Instance(Plugin, allow_none=False)
- def create_data_source(self):
- """"""
+ def get_data_source_class(self):
+ pass
- def create_model(self, model_data=None):
- """"""
+ def get_model_class(self):
+ pass
+
+ def get_name(self):
+ pass
+
+ def get_identifier(self):
+ pass
diff --git a/force_bdss/mco/i_mco_factory.py b/force_bdss/mco/i_mco_factory.py
index bc58e15..9791017 100644
--- a/force_bdss/mco/i_mco_factory.py
+++ b/force_bdss/mco/i_mco_factory.py
@@ -1,4 +1,4 @@
-from traits.api import Interface, String, Instance, Type
+from traits.api import Interface, Str, Instance, Type
from envisage.plugin import Plugin
@@ -8,29 +8,51 @@ class IMCOFactory(Interface):
Refer to BaseMCOFactory for documentation
"""
- id = String()
+ id = Str()
- name = String()
+ name = Str()
optimizer_class = Type(
- "force_bdss.mco.base_mco.BaseMCO"
+ "force_bdss.mco.base_mco.BaseMCO",
+ allow_none=False
)
model_class = Type(
- "force_bdss.mco.base_mco_communicator.BaseMCOCommunicator"
+ "force_bdss.mco.base_mco_communicator.BaseMCOCommunicator",
+ allow_none=False
+
)
communicator_class = Type(
- "force_bdss.mco.base_mco_model.BaseMCOModel"
+ "force_bdss.mco.base_mco_model.BaseMCOModel",
+ allow_none=False
)
- plugin = Instance(Plugin)
+ plugin = Instance(Plugin, allow_none=False)
+
+ def get_model_class(self):
+ pass
+
+ def get_communicator_class(self):
+ pass
+
+ def get_optimizer_class(self):
+ pass
+
+ def get_identifier(self):
+ pass
+
+ def get_name(self):
+ pass
def create_optimizer(self):
- """"""
+ pass
- def create_model(self, model_data=None):
- """"""
+ def create_model(self):
+ pass
def create_communicator(self):
- """"""
+ pass
+
+ def parameter_factories(self):
+ pass
diff --git a/force_bdss/notification_listeners/i_notification_listener_factory.py b/force_bdss/notification_listeners/i_notification_listener_factory.py
index c1cc05a..3474685 100644
--- a/force_bdss/notification_listeners/i_notification_listener_factory.py
+++ b/force_bdss/notification_listeners/i_notification_listener_factory.py
@@ -16,18 +16,32 @@ class INotificationListenerFactory(Interface):
listener_class = Type(
"force_bdss.notification_listeners"
- ".base_notification_listener.BaseNotificationListener"
+ ".base_notification_listener.BaseNotificationListener",
+ allow_none=False,
)
model_class = Type(
"force_bdss.notification_listeners"
- ".base_notification_listener_model.BaseNotificationListenerModel"
+ ".base_notification_listener_model.BaseNotificationListenerModel",
+ allow_none=False
)
- plugin = Instance(Plugin)
+ plugin = Instance(Plugin, allow_none=False)
+
+ def get_name(self):
+ pass
+
+ def get_identifier(self):
+ pass
+
+ def get_model_class(self):
+ pass
+
+ def get_listener_class(self):
+ pass
def create_listener(self):
- """"""
+ pass
- def create_model(self, model_data=None):
- """"""
+ def create_model(self):
+ pass
diff --git a/force_bdss/ui_hooks/i_ui_hooks_factory.py b/force_bdss/ui_hooks/i_ui_hooks_factory.py
index f702a96..c809f3a 100644
--- a/force_bdss/ui_hooks/i_ui_hooks_factory.py
+++ b/force_bdss/ui_hooks/i_ui_hooks_factory.py
@@ -1,4 +1,4 @@
-from traits.api import Interface, String, Instance, Type
+from traits.api import Interface, Str, Instance, Type
from envisage.plugin import Plugin
@@ -8,15 +8,26 @@ class IUIHooksFactory(Interface):
Refer to the BaseUIHooksFactory for documentation.
"""
- id = String()
+ id = Str()
- name = String()
+ name = Str()
ui_hooks_manager_class = Type(
- "force_bdss.ui_hooks.base_ui_hooks_manager.BaseUIHooksManager"
+ "force_bdss.ui_hooks.base_ui_hooks_manager.BaseUIHooksManager",
+ allow_none=False
+
)
- plugin = Instance(Plugin)
+ plugin = Instance(Plugin, allow_none=False)
+
+ def get_ui_hooks_manager_class(self):
+ pass
+
+ def get_name(self):
+ pass
+
+ def get_identifier(self):
+ pass
- def create_hook_manager(self):
- """"""
+ def create_ui_hooks_manager(self):
+ pass
--
GitLab