From 1c6e68554720784c66a5aa9be1fe860322dcccd5 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Tue, 11 Jul 2017 15:45:02 +0100
Subject: [PATCH] Moved modules to subpackages
---
force_bdss/cli/force_bdss.py | 7 +++----
force_bdss/core_mco_driver.py | 4 ++--
force_bdss/kpi/__init__.py | 0
force_bdss/{ => kpi}/basic_key_performance_calculator.py | 2 +-
force_bdss/{ => kpi}/i_key_performance_calculator.py | 0
force_bdss/{ => kpi}/key_performance_calculators_plugin.py | 6 +++---
force_bdss/mco/__init__.py | 0
force_bdss/{ => mco}/basic_multi_criteria_optimizer.py | 3 ++-
force_bdss/{ => mco}/i_multi_criteria_optimizers.py | 0
force_bdss/{ => mco}/multi_criteria_optimizers_plugin.py | 6 +++---
10 files changed, 14 insertions(+), 14 deletions(-)
create mode 100644 force_bdss/kpi/__init__.py
rename force_bdss/{ => kpi}/basic_key_performance_calculator.py (75%)
rename force_bdss/{ => kpi}/i_key_performance_calculator.py (100%)
rename force_bdss/{ => kpi}/key_performance_calculators_plugin.py (75%)
create mode 100644 force_bdss/mco/__init__.py
rename force_bdss/{ => mco}/basic_multi_criteria_optimizer.py (83%)
rename force_bdss/{ => mco}/i_multi_criteria_optimizers.py (100%)
rename force_bdss/{ => mco}/multi_criteria_optimizers_plugin.py (75%)
diff --git a/force_bdss/cli/force_bdss.py b/force_bdss/cli/force_bdss.py
index 20e1a6e..37541e6 100644
--- a/force_bdss/cli/force_bdss.py
+++ b/force_bdss/cli/force_bdss.py
@@ -1,13 +1,12 @@
import click
from envisage.core_plugin import CorePlugin
-import logging
from force_bdss.bdss_application import BDSSApplication
from force_bdss.core_mco_driver import CoreMCODriver
-from force_bdss.multi_criteria_optimizers_plugin import \
- MultiCriteriaOptimizersPlugin
-from force_bdss.key_performance_calculators_plugin import \
+from force_bdss.kpi.key_performance_calculators_plugin import \
KeyPerformanceCalculatorsPlugin
+from force_bdss.mco.multi_criteria_optimizers_plugin import \
+ MultiCriteriaOptimizersPlugin
@click.command()
diff --git a/force_bdss/core_mco_driver.py b/force_bdss/core_mco_driver.py
index ef1f392..c3625fc 100644
--- a/force_bdss/core_mco_driver.py
+++ b/force_bdss/core_mco_driver.py
@@ -3,8 +3,8 @@ from envisage.plugin import Plugin
from traits.has_traits import on_trait_change
from traits.trait_types import List
-from force_bdss.i_key_performance_calculator import IKeyPerformanceCalculator
-from force_bdss.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
+from force_bdss.kpi.i_key_performance_calculator import IKeyPerformanceCalculator
+from force_bdss.mco.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
class CoreMCODriver(Plugin):
diff --git a/force_bdss/kpi/__init__.py b/force_bdss/kpi/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/force_bdss/basic_key_performance_calculator.py b/force_bdss/kpi/basic_key_performance_calculator.py
similarity index 75%
rename from force_bdss/basic_key_performance_calculator.py
rename to force_bdss/kpi/basic_key_performance_calculator.py
index 63fd2e4..3b7533e 100644
--- a/force_bdss/basic_key_performance_calculator.py
+++ b/force_bdss/kpi/basic_key_performance_calculator.py
@@ -1,6 +1,6 @@
from traits.api import provides, HasStrictTraits
-from force_bdss.i_key_performance_calculator import IKeyPerformanceCalculator
+from force_bdss.kpi.i_key_performance_calculator import IKeyPerformanceCalculator
@provides(IKeyPerformanceCalculator)
diff --git a/force_bdss/i_key_performance_calculator.py b/force_bdss/kpi/i_key_performance_calculator.py
similarity index 100%
rename from force_bdss/i_key_performance_calculator.py
rename to force_bdss/kpi/i_key_performance_calculator.py
diff --git a/force_bdss/key_performance_calculators_plugin.py b/force_bdss/kpi/key_performance_calculators_plugin.py
similarity index 75%
rename from force_bdss/key_performance_calculators_plugin.py
rename to force_bdss/kpi/key_performance_calculators_plugin.py
index 082af87..8122c80 100644
--- a/force_bdss/key_performance_calculators_plugin.py
+++ b/force_bdss/kpi/key_performance_calculators_plugin.py
@@ -1,9 +1,9 @@
-from traits.api import List
from envisage.plugin import Plugin
+from traits.api import List
-from force_bdss.basic_key_performance_calculator import \
+from force_bdss.kpi.basic_key_performance_calculator import \
BasicKeyPerformanceCalculator
-from force_bdss.i_key_performance_calculator import IKeyPerformanceCalculator
+from force_bdss.kpi.i_key_performance_calculator import IKeyPerformanceCalculator
class KeyPerformanceCalculatorsPlugin(Plugin):
diff --git a/force_bdss/mco/__init__.py b/force_bdss/mco/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/force_bdss/basic_multi_criteria_optimizer.py b/force_bdss/mco/basic_multi_criteria_optimizer.py
similarity index 83%
rename from force_bdss/basic_multi_criteria_optimizer.py
rename to force_bdss/mco/basic_multi_criteria_optimizer.py
index fd56077..2fc3a35 100644
--- a/force_bdss/basic_multi_criteria_optimizer.py
+++ b/force_bdss/mco/basic_multi_criteria_optimizer.py
@@ -1,8 +1,9 @@
import subprocess
import sys
+
from traits.api import provides, HasStrictTraits
-from force_bdss.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
+from force_bdss.mco.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
@provides(IMultiCriteriaOptimizer)
diff --git a/force_bdss/i_multi_criteria_optimizers.py b/force_bdss/mco/i_multi_criteria_optimizers.py
similarity index 100%
rename from force_bdss/i_multi_criteria_optimizers.py
rename to force_bdss/mco/i_multi_criteria_optimizers.py
diff --git a/force_bdss/multi_criteria_optimizers_plugin.py b/force_bdss/mco/multi_criteria_optimizers_plugin.py
similarity index 75%
rename from force_bdss/multi_criteria_optimizers_plugin.py
rename to force_bdss/mco/multi_criteria_optimizers_plugin.py
index 07a39a0..42d6333 100644
--- a/force_bdss/multi_criteria_optimizers_plugin.py
+++ b/force_bdss/mco/multi_criteria_optimizers_plugin.py
@@ -1,9 +1,9 @@
-from traits.api import List
from envisage.plugin import Plugin
+from traits.api import List
-from force_bdss.basic_multi_criteria_optimizer import \
+from force_bdss.mco.basic_multi_criteria_optimizer import \
BasicMultiCriteriaOptimizer
-from force_bdss.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
+from force_bdss.mco.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
class MultiCriteriaOptimizersPlugin(Plugin):
--
GitLab