From 1031ed71f92aa0e420ebbdcf2ca427c98e54adff Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Wed, 6 Jun 2018 11:28:03 +0100
Subject: [PATCH] Removed now useless checks as they are checked via traits
---
force_bdss/mco/base_mco_factory.py | 21 --------------------
force_bdss/ui_hooks/base_ui_hooks_factory.py | 8 --------
2 files changed, 29 deletions(-)
diff --git a/force_bdss/mco/base_mco_factory.py b/force_bdss/mco/base_mco_factory.py
index f7fff09..c823655 100644
--- a/force_bdss/mco/base_mco_factory.py
+++ b/force_bdss/mco/base_mco_factory.py
@@ -92,13 +92,6 @@ class BaseMCOFactory(HasStrictTraits):
BaseMCO
The optimizer
"""
- if self.optimizer_class is None:
- msg = ("optimizer_class cannot be None in {}. Either define "
- "optimizer_class or reimplement create_optimizer on "
- "your factory class.".format(self.__class__.__name__))
- log.error(msg)
- raise RuntimeError(msg)
-
return self.optimizer_class(self)
def create_model(self, model_data=None):
@@ -122,13 +115,6 @@ class BaseMCOFactory(HasStrictTraits):
if model_data is None:
model_data = {}
- if self.model_class is None:
- msg = ("model_class cannot be None in {}. Either define "
- "model_class or reimplement create_model on your "
- "factory class.".format(self.__class__.__name__))
- log.error(msg)
- raise RuntimeError(msg)
-
return self.model_class(self, **model_data)
def create_communicator(self):
@@ -140,13 +126,6 @@ class BaseMCOFactory(HasStrictTraits):
BaseMCOCommunicator
An instance of the communicator
"""
- if self.communicator_class is None:
- msg = ("communicator_class cannot be None in {}. Either define "
- "communicator_class or reimplement create_communicator on "
- "your factory class.".format(self.__class__.__name__))
- log.error(msg)
- raise RuntimeError(msg)
-
return self.communicator_class(self)
def parameter_factories(self):
diff --git a/force_bdss/ui_hooks/base_ui_hooks_factory.py b/force_bdss/ui_hooks/base_ui_hooks_factory.py
index af62ffb..2aaa66c 100644
--- a/force_bdss/ui_hooks/base_ui_hooks_factory.py
+++ b/force_bdss/ui_hooks/base_ui_hooks_factory.py
@@ -79,12 +79,4 @@ class BaseUIHooksFactory(HasStrictTraits):
-------
BaseUIHooksManager
"""
- if self.ui_hooks_manager_class is None:
- msg = ("ui_hooks_manager_class cannot be None in {}. Either "
- "define ui_hooks_manager_class or reimplement "
- "create_ui_hooks_manager on "
- "your factory class.".format(self.__class__.__name__))
- log.error(msg)
- raise RuntimeError(msg)
-
return self.ui_hooks_manager_class(self)
--
GitLab