From bce3e7e371f31543dabb313276f1fb6da1baba0f Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Fri, 14 Jul 2017 16:52:29 +0100
Subject: [PATCH] Removed dummy plugins that are no longer relevant
---
examples/test_csv.json | 2 +-
examples/test_workflow.json | 17 --------------
.../test_data_sources/__init__.py | 0
.../test_data_sources/basic/__init__.py | 0
.../test_data_sources/basic/basic_bundle.py | 20 -----------------
.../basic/basic_data_source.py | 6 -----
.../test_data_sources/basic/basic_model.py | 7 ------
.../test_data_sources/data_sources_plugin.py | 22 -------------------
.../test_data_sources/price/__init__.py | 0
.../test_data_sources/price/price_bundle.py | 21 ------------------
.../price/price_data_source.py | 6 -----
.../test_data_sources/price/price_model.py | 7 ------
.../test_data_sources/viscosity/__init__.py | 0
.../viscosity/viscosity_bundle.py | 20 -----------------
.../viscosity/viscosity_data_source.py | 6 -----
.../viscosity/viscosity_model.py | 7 ------
.../core_plugins/test_mco/basic/__init__.py | 0
.../test_mco/basic/basic_bundle.py | 21 ------------------
.../test_mco/basic/basic_model.py | 7 ------
.../test_mco/basic/basic_optimizer.py | 13 -----------
.../multi_criteria_optimizers_plugin.py | 3 +--
setup.py | 2 --
22 files changed, 2 insertions(+), 185 deletions(-)
delete mode 100644 examples/test_workflow.json
delete mode 100644 force_bdss/core_plugins/test_data_sources/__init__.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/basic/__init__.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/basic/basic_data_source.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/basic/basic_model.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/data_sources_plugin.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/price/__init__.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/price/price_bundle.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/price/price_data_source.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/price/price_model.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/viscosity/__init__.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/viscosity/viscosity_data_source.py
delete mode 100644 force_bdss/core_plugins/test_data_sources/viscosity/viscosity_model.py
delete mode 100644 force_bdss/core_plugins/test_mco/basic/__init__.py
delete mode 100644 force_bdss/core_plugins/test_mco/basic/basic_bundle.py
delete mode 100644 force_bdss/core_plugins/test_mco/basic/basic_model.py
delete mode 100644 force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
diff --git a/examples/test_csv.json b/examples/test_csv.json
index e17077c..cc26367 100644
--- a/examples/test_csv.json
+++ b/examples/test_csv.json
@@ -1,6 +1,6 @@
{
"multi_criteria_optimizer": {
- "name": "basic",
+ "name": "dakota",
"model_data": {}
},
"data_sources": [
diff --git a/examples/test_workflow.json b/examples/test_workflow.json
deleted file mode 100644
index 64e04bb..0000000
--- a/examples/test_workflow.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "multi_criteria_optimizer": {
- "name": "basic",
- "model_data": {}
- },
- "data_sources": [
- {
- "name": "viscosity",
- "model_data": {}
- },
- {
- "name": "price",
- "model_data": {}
- }
- ]
-}
-
diff --git a/force_bdss/core_plugins/test_data_sources/__init__.py b/force_bdss/core_plugins/test_data_sources/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/force_bdss/core_plugins/test_data_sources/basic/__init__.py b/force_bdss/core_plugins/test_data_sources/basic/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py b/force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py
deleted file mode 100644
index 8a99792..0000000
--- a/force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from traits.api import provides, HasStrictTraits, String
-
-from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-
-from .basic_model import BasicModel
-from .basic_data_source import BasicDataSource
-
-
-@provides(IDataSourceBundle)
-class BasicBundle(HasStrictTraits):
- name = String("basic")
-
- def create_model(self, model_data):
- return BasicModel.from_json(model_data)
-
- def create_ui(self):
- pass
-
- def create_data_source(self, application, model):
- return BasicDataSource(self, application, model)
diff --git a/force_bdss/core_plugins/test_data_sources/basic/basic_data_source.py b/force_bdss/core_plugins/test_data_sources/basic/basic_data_source.py
deleted file mode 100644
index 6705515..0000000
--- a/force_bdss/core_plugins/test_data_sources/basic/basic_data_source.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from force_bdss.data_sources.base_data_source import BaseDataSource
-
-
-class BasicDataSource(BaseDataSource):
- def run(self):
- print("Computing basic key performance indicator")
diff --git a/force_bdss/core_plugins/test_data_sources/basic/basic_model.py b/force_bdss/core_plugins/test_data_sources/basic/basic_model.py
deleted file mode 100644
index 3139ad7..0000000
--- a/force_bdss/core_plugins/test_data_sources/basic/basic_model.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from traits.has_traits import HasStrictTraits
-
-
-class BasicModel(HasStrictTraits):
- @classmethod
- def from_json(cls, model_data):
- return cls()
diff --git a/force_bdss/core_plugins/test_data_sources/data_sources_plugin.py b/force_bdss/core_plugins/test_data_sources/data_sources_plugin.py
deleted file mode 100644
index 9960da3..0000000
--- a/force_bdss/core_plugins/test_data_sources/data_sources_plugin.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from envisage.plugin import Plugin
-from traits.api import List
-
-from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-
-from .basic.basic_bundle import BasicBundle
-from .price.price_bundle import PriceBundle
-from .viscosity.viscosity_bundle import ViscosityBundle
-
-
-class DataSourcesPlugin(Plugin):
- id = "force_bdss.data_sources_plugin"
-
- data_sources = List(
- IDataSourceBundle,
- contributes_to='force.bdss.data_sources.bundles'
- )
-
- def _data_sources_default(self):
- return [BasicBundle(),
- ViscosityBundle(),
- PriceBundle()]
diff --git a/force_bdss/core_plugins/test_data_sources/price/__init__.py b/force_bdss/core_plugins/test_data_sources/price/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/force_bdss/core_plugins/test_data_sources/price/price_bundle.py b/force_bdss/core_plugins/test_data_sources/price/price_bundle.py
deleted file mode 100644
index 2721ee2..0000000
--- a/force_bdss/core_plugins/test_data_sources/price/price_bundle.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from traits.api import provides, HasStrictTraits
-from traits.trait_types import String
-
-from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-
-from .price_model import PriceModel
-from .price_data_source import PriceDataSource
-
-
-@provides(IDataSourceBundle)
-class PriceBundle(HasStrictTraits):
- name = String("price")
-
- def create_model(self, model_data):
- return PriceModel.from_json(model_data)
-
- def create_ui(self):
- pass
-
- def create_data_source(self, application, model):
- return PriceDataSource(self, application, model)
diff --git a/force_bdss/core_plugins/test_data_sources/price/price_data_source.py b/force_bdss/core_plugins/test_data_sources/price/price_data_source.py
deleted file mode 100644
index 62ec8d1..0000000
--- a/force_bdss/core_plugins/test_data_sources/price/price_data_source.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from force_bdss.data_sources.base_data_source import BaseDataSource
-
-
-class PriceDataSource(BaseDataSource):
- def run(self):
- print("Computing price")
diff --git a/force_bdss/core_plugins/test_data_sources/price/price_model.py b/force_bdss/core_plugins/test_data_sources/price/price_model.py
deleted file mode 100644
index f98449a..0000000
--- a/force_bdss/core_plugins/test_data_sources/price/price_model.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from traits.has_traits import HasStrictTraits
-
-
-class PriceModel(HasStrictTraits):
- @classmethod
- def from_json(cls, model_data):
- return cls()
diff --git a/force_bdss/core_plugins/test_data_sources/viscosity/__init__.py b/force_bdss/core_plugins/test_data_sources/viscosity/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py
deleted file mode 100644
index 6b05b06..0000000
--- a/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from traits.api import provides, HasStrictTraits, String
-
-from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-
-from .viscosity_data_source import ViscosityDataSource
-from .viscosity_model import ViscosityModel
-
-
-@provides(IDataSourceBundle)
-class ViscosityBundle(HasStrictTraits):
- name = String("viscosity")
-
- def create_model(self, model_data):
- return ViscosityModel.from_json(model_data)
-
- def create_ui(self):
- pass
-
- def create_data_source(self, application, model):
- return ViscosityDataSource(self, application, model)
diff --git a/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_data_source.py b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_data_source.py
deleted file mode 100644
index 3ebd047..0000000
--- a/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_data_source.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from force_bdss.data_sources.base_data_source import BaseDataSource
-
-
-class ViscosityDataSource(BaseDataSource):
- def run(self):
- print("Computing viscosity")
diff --git a/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_model.py b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_model.py
deleted file mode 100644
index 8168c45..0000000
--- a/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_model.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from traits.api import HasStrictTraits
-
-
-class ViscosityModel(HasStrictTraits):
- @classmethod
- def from_json(cls, model_data):
- return cls()
diff --git a/force_bdss/core_plugins/test_mco/basic/__init__.py b/force_bdss/core_plugins/test_mco/basic/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/force_bdss/core_plugins/test_mco/basic/basic_bundle.py b/force_bdss/core_plugins/test_mco/basic/basic_bundle.py
deleted file mode 100644
index a8aa0bd..0000000
--- a/force_bdss/core_plugins/test_mco/basic/basic_bundle.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from traits.has_traits import HasStrictTraits, provides
-from traits.trait_types import String
-
-from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
- IMultiCriteriaOptimizerBundle)
-from .basic_model import BasicModel
-from .basic_optimizer import BasicOptimizer
-
-
-@provides(IMultiCriteriaOptimizerBundle)
-class BasicBundle(HasStrictTraits):
- name = String("basic")
-
- def create_model(self, model_data):
- return BasicModel.from_json(model_data)
-
- def create_ui(self):
- pass
-
- def create_optimizer(self, application, model):
- return BasicOptimizer(self, application, model)
diff --git a/force_bdss/core_plugins/test_mco/basic/basic_model.py b/force_bdss/core_plugins/test_mco/basic/basic_model.py
deleted file mode 100644
index 3139ad7..0000000
--- a/force_bdss/core_plugins/test_mco/basic/basic_model.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from traits.has_traits import HasStrictTraits
-
-
-class BasicModel(HasStrictTraits):
- @classmethod
- def from_json(cls, model_data):
- return cls()
diff --git a/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py b/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
deleted file mode 100644
index 7a4f1ed..0000000
--- a/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import subprocess
-import sys
-
-from force_bdss.mco.base_multi_criteria_optimizer import (
- BaseMultiCriteriaOptimizer
-)
-
-
-class BasicOptimizer(BaseMultiCriteriaOptimizer):
- def run(self):
- print("Running Basic optimizer")
- subprocess.check_call([sys.argv[0], "--evaluate",
- self.application.workflow_filepath])
diff --git a/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
index 6976cdb..a71da01 100644
--- a/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
+++ b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
@@ -4,7 +4,6 @@ from traits.api import List
from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
IMultiCriteriaOptimizerBundle)
-from .basic.basic_bundle import BasicBundle
from .dakota.dakota_bundle import DakotaBundle
@@ -17,4 +16,4 @@ class MultiCriteriaOptimizersPlugin(Plugin):
)
def _multi_criteria_optimizers_default(self):
- return [BasicBundle(), DakotaBundle()]
+ return [DakotaBundle()]
diff --git a/setup.py b/setup.py
index 7288092..3666512 100644
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,6 @@ setup(
"force.bdss.extensions": [
"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",
"csv_extractor = force_bdss.core_plugins.csv_extractor"
".csv_extractor_plugin:CSVExtractorPlugin",
]
--
GitLab