From 32f5c416ab4c15f954c96343a39071b4e7d6b6d5 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Fri, 14 Jul 2017 13:47:44 +0100
Subject: [PATCH] Moved also MCO to separate plugin
---
force_bdss/core_plugins/test_mco/__init__.py | 0
force_bdss/core_plugins/test_mco/basic/__init__.py | 0
.../{mco => core_plugins/test_mco/basic}/basic_bundle.py | 3 ++-
.../{mco => core_plugins/test_mco/basic}/basic_model.py | 0
.../test_mco/basic}/basic_optimizer.py | 3 ++-
force_bdss/core_plugins/test_mco/dakota/__init__.py | 0
.../test_mco/dakota}/dakota_bundle.py | 8 +++++---
.../{mco => core_plugins/test_mco/dakota}/dakota_model.py | 2 +-
.../test_mco/dakota}/dakota_optimizer.py | 3 ++-
.../test_mco}/multi_criteria_optimizers_plugin.py | 7 ++++---
setup.py | 7 ++-----
11 files changed, 18 insertions(+), 15 deletions(-)
create mode 100644 force_bdss/core_plugins/test_mco/__init__.py
create mode 100644 force_bdss/core_plugins/test_mco/basic/__init__.py
rename force_bdss/{mco => core_plugins/test_mco/basic}/basic_bundle.py (84%)
rename force_bdss/{mco => core_plugins/test_mco/basic}/basic_model.py (100%)
rename force_bdss/{mco => core_plugins/test_mco/basic}/basic_optimizer.py (83%)
create mode 100644 force_bdss/core_plugins/test_mco/dakota/__init__.py
rename force_bdss/{mco => core_plugins/test_mco/dakota}/dakota_bundle.py (70%)
rename force_bdss/{mco => core_plugins/test_mco/dakota}/dakota_model.py (70%)
rename force_bdss/{mco => core_plugins/test_mco/dakota}/dakota_optimizer.py (83%)
rename force_bdss/{mco => core_plugins/test_mco}/multi_criteria_optimizers_plugin.py (74%)
diff --git a/force_bdss/core_plugins/test_mco/__init__.py b/force_bdss/core_plugins/test_mco/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/force_bdss/core_plugins/test_mco/basic/__init__.py b/force_bdss/core_plugins/test_mco/basic/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/force_bdss/mco/basic_bundle.py b/force_bdss/core_plugins/test_mco/basic/basic_bundle.py
similarity index 84%
rename from force_bdss/mco/basic_bundle.py
rename to force_bdss/core_plugins/test_mco/basic/basic_bundle.py
index a673f31..a8aa0bd 100644
--- a/force_bdss/mco/basic_bundle.py
+++ b/force_bdss/core_plugins/test_mco/basic/basic_bundle.py
@@ -1,7 +1,8 @@
from traits.has_traits import HasStrictTraits, provides
from traits.trait_types import String
-from .i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
+ IMultiCriteriaOptimizerBundle)
from .basic_model import BasicModel
from .basic_optimizer import BasicOptimizer
diff --git a/force_bdss/mco/basic_model.py b/force_bdss/core_plugins/test_mco/basic/basic_model.py
similarity index 100%
rename from force_bdss/mco/basic_model.py
rename to force_bdss/core_plugins/test_mco/basic/basic_model.py
diff --git a/force_bdss/mco/basic_optimizer.py b/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
similarity index 83%
rename from force_bdss/mco/basic_optimizer.py
rename to force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
index cc7477a..7a4f1ed 100644
--- a/force_bdss/mco/basic_optimizer.py
+++ b/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
@@ -1,8 +1,9 @@
import subprocess
import sys
-from force_bdss.mco.base_multi_criteria_optimizer import \
+from force_bdss.mco.base_multi_criteria_optimizer import (
BaseMultiCriteriaOptimizer
+)
class BasicOptimizer(BaseMultiCriteriaOptimizer):
diff --git a/force_bdss/core_plugins/test_mco/dakota/__init__.py b/force_bdss/core_plugins/test_mco/dakota/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/force_bdss/mco/dakota_bundle.py b/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
similarity index 70%
rename from force_bdss/mco/dakota_bundle.py
rename to force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
index 1ad413b..dd0ef08 100644
--- a/force_bdss/mco/dakota_bundle.py
+++ b/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
@@ -1,9 +1,11 @@
from traits.has_traits import HasStrictTraits, provides
from traits.trait_types import String
-from force_bdss.mco.dakota_optimizer import DakotaOptimizer
-from force_bdss.mco.dakota_model import DakotaModel
-from .i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
+ IMultiCriteriaOptimizerBundle)
+
+from .dakota_model import DakotaModel
+from .dakota_optimizer import DakotaOptimizer
@provides(IMultiCriteriaOptimizerBundle)
diff --git a/force_bdss/mco/dakota_model.py b/force_bdss/core_plugins/test_mco/dakota/dakota_model.py
similarity index 70%
rename from force_bdss/mco/dakota_model.py
rename to force_bdss/core_plugins/test_mco/dakota/dakota_model.py
index 76b572f..ed6ff34 100644
--- a/force_bdss/mco/dakota_model.py
+++ b/force_bdss/core_plugins/test_mco/dakota/dakota_model.py
@@ -1,4 +1,4 @@
-from traits.has_traits import HasStrictTraits
+from traits.api import HasStrictTraits
class DakotaModel(HasStrictTraits):
diff --git a/force_bdss/mco/dakota_optimizer.py b/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
similarity index 83%
rename from force_bdss/mco/dakota_optimizer.py
rename to force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
index dc80532..0f8f064 100644
--- a/force_bdss/mco/dakota_optimizer.py
+++ b/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
@@ -2,8 +2,9 @@ import subprocess
import sys
-from force_bdss.mco.base_multi_criteria_optimizer import \
+from force_bdss.mco.base_multi_criteria_optimizer import (
BaseMultiCriteriaOptimizer
+)
class DakotaOptimizer(BaseMultiCriteriaOptimizer):
diff --git a/force_bdss/mco/multi_criteria_optimizers_plugin.py b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
similarity index 74%
rename from force_bdss/mco/multi_criteria_optimizers_plugin.py
rename to force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
index 55095a2..6976cdb 100644
--- a/force_bdss/mco/multi_criteria_optimizers_plugin.py
+++ b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
@@ -1,10 +1,11 @@
from envisage.plugin import Plugin
from traits.api import List
-from .i_multi_criteria_optimizer_bundle import (
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
IMultiCriteriaOptimizerBundle)
-from .dakota_bundle import DakotaBundle
-from .basic_bundle import BasicBundle
+
+from .basic.basic_bundle import BasicBundle
+from .dakota.dakota_bundle import DakotaBundle
class MultiCriteriaOptimizersPlugin(Plugin):
diff --git a/setup.py b/setup.py
index 7eeb17c..3fedf2d 100644
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,8 @@ setup(
'force_bdss = force_bdss.cli.force_bdss:run',
],
"force.bdss.extensions": [
- "mco = force_bdss.mco.multi_criteria_optimizers_plugin:"
- "MultiCriteriaOptimizersPlugin",
- "data_source = force_bdss.core_plugins."
- "test_data_sources.data_sources_plugin:"
- "DataSourcesPlugin",
+ "mco = force_bdss.core_plugins.test_mco.multi_criteria_optimizers_plugin:MultiCriteriaOptimizersPlugin",
+ "data_source = force_bdss.core_plugins.test_data_sources.data_sources_plugin:DataSourcesPlugin",
]
},
packages=find_packages(),
--
GitLab