diff --git a/doc/source/api/force_bdss.core_plugins.csv_extractor.csv_extractor.rst b/doc/source/api/force_bdss.core_plugins.csv_extractor.csv_extractor.rst
deleted file mode 100644
index eb9a8509315b24c69de6a77b936592048374add4..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.csv_extractor.csv_extractor.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-force_bdss.core_plugins.csv_extractor.csv_extractor package
-===========================================================
-
-Submodules
-----------
-
-force_bdss.core_plugins.csv_extractor.csv_extractor.csv_extractor_bundle module
--------------------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.csv_extractor.csv_extractor.csv_extractor_bundle
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.csv_extractor.csv_extractor.csv_extractor_data_source module
-------------------------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.csv_extractor.csv_extractor.csv_extractor_data_source
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.csv_extractor.csv_extractor.csv_extractor_model module
-------------------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.csv_extractor.csv_extractor.csv_extractor_model
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.csv_extractor.csv_extractor
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.csv_extractor.rst b/doc/source/api/force_bdss.core_plugins.csv_extractor.rst
deleted file mode 100644
index 0b4cece628842cc691eebb71d9ecac82ed0685e9..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.csv_extractor.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-force_bdss.core_plugins.csv_extractor package
-=============================================
-
-Subpackages
------------
-
-.. toctree::
-
- force_bdss.core_plugins.csv_extractor.csv_extractor
-
-Submodules
-----------
-
-force_bdss.core_plugins.csv_extractor.csv_extractor_plugin module
------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.csv_extractor.csv_extractor_plugin
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.csv_extractor
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
new file mode 100644
index 0000000000000000000000000000000000000000..7ec4b2b1d243ecb8fc04c04497b4121bc34ed3f3
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
@@ -0,0 +1,38 @@
+force_bdss.core_plugins.dummy.csv_extractor package
+===================================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle module
+-----------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source module
+----------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_model module
+----------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_model
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
new file mode 100644
index 0000000000000000000000000000000000000000..2745070d829bff45eb8b4b0d34dd2627a2b68083
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
@@ -0,0 +1,46 @@
+force_bdss.core_plugins.dummy.dummy_dakota package
+==================================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle module
+---------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator module
+---------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_model module
+--------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_model
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_optimizer module
+------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_optimizer
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
new file mode 100644
index 0000000000000000000000000000000000000000..4dde56d64e83459eba0472215ae60afae8bab801
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
@@ -0,0 +1,38 @@
+force_bdss.core_plugins.dummy.dummy_kpi_calculator package
+==========================================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator module
+------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle module
+-------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_model module
+------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_model
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
new file mode 100644
index 0000000000000000000000000000000000000000..58c3acc608d06dec0a289a566d0d61b46bf6b2a1
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
@@ -0,0 +1,38 @@
+force_bdss.core_plugins.dummy.kpi_adder package
+===============================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle module
+---------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator module
+-------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_model module
+--------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_model
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.rst b/doc/source/api/force_bdss.core_plugins.dummy.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9855728ad131b97dced0c75b7475654a5e3766b7
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.rst
@@ -0,0 +1,32 @@
+force_bdss.core_plugins.dummy package
+=====================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+ force_bdss.core_plugins.dummy.csv_extractor
+ force_bdss.core_plugins.dummy.dummy_dakota
+ force_bdss.core_plugins.dummy.dummy_kpi_calculator
+ force_bdss.core_plugins.dummy.kpi_adder
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy.dummy_plugin module
+-------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_plugin
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_kpi.kpi_adder.rst b/doc/source/api/force_bdss.core_plugins.dummy_kpi.kpi_adder.rst
deleted file mode 100644
index 74c22bbf83eb1253bac59fb763d7bfde0c83cee4..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.dummy_kpi.kpi_adder.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-force_bdss.core_plugins.dummy_kpi.kpi_adder package
-===================================================
-
-Submodules
-----------
-
-force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_bundle module
--------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_bundle
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_calculator module
------------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_calculator
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_model module
-------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_model
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_kpi.rst b/doc/source/api/force_bdss.core_plugins.dummy_kpi.rst
deleted file mode 100644
index 65df6152c71a9b0636cd111adaeef0505c4f5b16..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.dummy_kpi.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-force_bdss.core_plugins.dummy_kpi package
-=========================================
-
-Subpackages
------------
-
-.. toctree::
-
- force_bdss.core_plugins.dummy_kpi.kpi_adder
-
-Submodules
-----------
-
-force_bdss.core_plugins.dummy_kpi.dummy_kpi_calculator_plugin module
---------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_kpi.dummy_kpi_calculator_plugin
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.dummy_kpi
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_mco.dakota.rst b/doc/source/api/force_bdss.core_plugins.dummy_mco.dakota.rst
deleted file mode 100644
index 0fb9f293acb6bf09e1c563b2b3d7ac990d5d7c7a..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.dummy_mco.dakota.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-force_bdss.core_plugins.dummy_mco.dakota package
-================================================
-
-Submodules
-----------
-
-force_bdss.core_plugins.dummy_mco.dakota.dakota_bundle module
--------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_bundle
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.dummy_mco.dakota.dakota_communicator module
--------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_communicator
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.dummy_mco.dakota.dakota_model module
-------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_model
- :members:
- :undoc-members:
- :show-inheritance:
-
-force_bdss.core_plugins.dummy_mco.dakota.dakota_optimizer module
-----------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_optimizer
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco.dakota
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_mco.rst b/doc/source/api/force_bdss.core_plugins.dummy_mco.rst
deleted file mode 100644
index fdd8c5d18c6dbb0ee97c7d335c353723f5c000fd..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.dummy_mco.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-force_bdss.core_plugins.dummy_mco package
-=========================================
-
-Subpackages
------------
-
-.. toctree::
-
- force_bdss.core_plugins.dummy_mco.dakota
-
-Submodules
-----------
-
-force_bdss.core_plugins.dummy_mco.multi_criteria_optimizers_plugin module
--------------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco.multi_criteria_optimizers_plugin
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.dummy_mco
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.rst b/doc/source/api/force_bdss.core_plugins.rst
index 329a28dc7a9635e8f400a52ec569eb5bb2467266..aabfada58813a84466b0ca4252d7d6277ad032df 100644
--- a/doc/source/api/force_bdss.core_plugins.rst
+++ b/doc/source/api/force_bdss.core_plugins.rst
@@ -6,9 +6,7 @@ Subpackages
.. toctree::
- force_bdss.core_plugins.csv_extractor
- force_bdss.core_plugins.dummy_kpi
- force_bdss.core_plugins.dummy_mco
+ force_bdss.core_plugins.dummy
Module contents
---------------
diff --git a/doc/source/api/force_bdss.data_sources.tests.rst b/doc/source/api/force_bdss.data_sources.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..067997cbdb5e09e2db0e7b93d0aa7f87d3082e40
--- /dev/null
+++ b/doc/source/api/force_bdss.data_sources.tests.rst
@@ -0,0 +1,30 @@
+force_bdss.data_sources.tests package
+=====================================
+
+Submodules
+----------
+
+force_bdss.data_sources.tests.test_base_data_source module
+----------------------------------------------------------
+
+.. automodule:: force_bdss.data_sources.tests.test_base_data_source
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.data_sources.tests.test_base_data_source_bundle module
+-----------------------------------------------------------------
+
+.. automodule:: force_bdss.data_sources.tests.test_base_data_source_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.data_sources.tests
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.kpi.tests.rst b/doc/source/api/force_bdss.kpi.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9c7eb6c4e91b36ebafe7b82c5da3f3dfa08efb20
--- /dev/null
+++ b/doc/source/api/force_bdss.kpi.tests.rst
@@ -0,0 +1,30 @@
+force_bdss.kpi.tests package
+============================
+
+Submodules
+----------
+
+force_bdss.kpi.tests.test_base_kpi_calculator module
+----------------------------------------------------
+
+.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.kpi.tests.test_base_kpi_calculator_bundle module
+-----------------------------------------------------------
+
+.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.kpi.tests
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.mco.parameters.rst b/doc/source/api/force_bdss.mco.parameters.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f289f438bb64123f0dff84ac4d30be8e342d72db
--- /dev/null
+++ b/doc/source/api/force_bdss.mco.parameters.rst
@@ -0,0 +1,53 @@
+force_bdss.mco.parameters package
+=================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+ force_bdss.mco.parameters.tests
+
+Submodules
+----------
+
+force_bdss.mco.parameters.base_mco_parameter module
+---------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.base_mco_parameter
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.parameters.base_mco_parameter_factory module
+-----------------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.base_mco_parameter_factory
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.parameters.core_mco_parameters module
+----------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.core_mco_parameters
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.parameters.mco_parameter_factory_registry module
+---------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.mco_parameter_factory_registry
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.mco.parameters
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.mco.parameters.tests.rst b/doc/source/api/force_bdss.mco.parameters.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..694cb158a833bfa1c3860bf12166bd71ab93788a
--- /dev/null
+++ b/doc/source/api/force_bdss.mco.parameters.tests.rst
@@ -0,0 +1,46 @@
+force_bdss.mco.parameters.tests package
+=======================================
+
+Submodules
+----------
+
+force_bdss.mco.parameters.tests.test_base_mco_parameter module
+--------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.tests.test_base_mco_parameter
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.parameters.tests.test_base_mco_parameter_factory module
+----------------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.tests.test_base_mco_parameter_factory
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.parameters.tests.test_core_mco_parameters module
+---------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.tests.test_core_mco_parameters
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.parameters.tests.test_parameter_factory_registry module
+----------------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.parameters.tests.test_parameter_factory_registry
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.mco.parameters.tests
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/source/api/force_bdss.mco.rst b/doc/source/api/force_bdss.mco.rst
index b0d6621d2d4ac9deddb6a41968a50e0a9d3e1ffe..8b2a6e33dc0f4d464f7f10a9130d930f9ad53a85 100644
--- a/doc/source/api/force_bdss.mco.rst
+++ b/doc/source/api/force_bdss.mco.rst
@@ -6,6 +6,7 @@ Subpackages
.. toctree::
+ force_bdss.mco.parameters
force_bdss.mco.tests
Submodules
diff --git a/doc/source/api/force_bdss.mco.tests.rst b/doc/source/api/force_bdss.mco.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9eb3cabfbc9be6083e0cc1e618267aa4fe82b955
--- /dev/null
+++ b/doc/source/api/force_bdss.mco.tests.rst
@@ -0,0 +1,38 @@
+force_bdss.mco.tests package
+============================
+
+Submodules
+----------
+
+force_bdss.mco.tests.test_base_mco_communicator module
+------------------------------------------------------
+
+.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.tests.test_base_multi_criteria_optimizer module
+--------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.tests.test_base_multi_criteria_optimizer
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+force_bdss.mco.tests.test_base_multi_criteria_optimizer_bundle module
+---------------------------------------------------------------------
+
+.. automodule:: force_bdss.mco.tests.test_base_multi_criteria_optimizer_bundle
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.mco.tests
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py b/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py
deleted file mode 100644
index 9020fc8242456ecf6ed6a5af947e3633e010c323..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from force_bdss.api import BaseExtensionPlugin
-
-from .csv_extractor.csv_extractor_bundle import CSVExtractorBundle
-
-
-class CSVExtractorPlugin(BaseExtensionPlugin):
- def _data_source_bundles_default(self):
- return [CSVExtractorBundle()]
diff --git a/force_bdss/core_plugins/csv_extractor/__init__.py b/force_bdss/core_plugins/dummy/csv_extractor/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/csv_extractor/__init__.py
rename to force_bdss/core_plugins/dummy/csv_extractor/__init__.py
diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py b/force_bdss/core_plugins/dummy/csv_extractor/csv_extractor_bundle.py
similarity index 100%
rename from force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
rename to force_bdss/core_plugins/dummy/csv_extractor/csv_extractor_bundle.py
diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py b/force_bdss/core_plugins/dummy/csv_extractor/csv_extractor_data_source.py
similarity index 100%
rename from force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py
rename to force_bdss/core_plugins/dummy/csv_extractor/csv_extractor_data_source.py
diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py b/force_bdss/core_plugins/dummy/csv_extractor/csv_extractor_model.py
similarity index 100%
rename from force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py
rename to force_bdss/core_plugins/dummy/csv_extractor/csv_extractor_model.py
diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/__init__.py b/force_bdss/core_plugins/dummy/dummy_data_source/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/csv_extractor/csv_extractor/__init__.py
rename to force_bdss/core_plugins/dummy/dummy_data_source/__init__.py
diff --git a/force_bdss/core_plugins/dummy/dummy_plugin.py b/force_bdss/core_plugins/dummy/dummy_plugin.py
index 01850726513c44d0f888bbb610b5b0da3a991ff4..3eca5b37262bfaab0416ee01c82e5287e5455a2f 100644
--- a/force_bdss/core_plugins/dummy/dummy_plugin.py
+++ b/force_bdss/core_plugins/dummy/dummy_plugin.py
@@ -1,4 +1,6 @@
from force_bdss.api import BaseExtensionPlugin
+from .csv_extractor.csv_extractor_bundle import CSVExtractorBundle
+from .kpi_adder.kpi_adder_bundle import KPIAdderBundle
from .dummy_dakota.dakota_bundle import DummyDakotaBundle
from .dummy_data_source.dummy_data_source_bundle import DummyDataSourceBundle
from .dummy_kpi_calculator.dummy_kpi_calculator_bundle import (
@@ -8,10 +10,12 @@ from .dummy_kpi_calculator.dummy_kpi_calculator_bundle import (
class DummyPlugin(BaseExtensionPlugin):
def _data_source_bundles_default(self):
- return [DummyDataSourceBundle()]
+ return [DummyDataSourceBundle(),
+ CSVExtractorBundle()]
def _mco_bundles_default(self):
return [DummyDakotaBundle()]
def _kpi_calculator_bundles_default(self):
- return [DummyKPICalculatorBundle()]
+ return [DummyKPICalculatorBundle(),
+ KPIAdderBundle()]
diff --git a/force_bdss/core_plugins/dummy_kpi/__init__.py b/force_bdss/core_plugins/dummy/kpi_adder/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/dummy_kpi/__init__.py
rename to force_bdss/core_plugins/dummy/kpi_adder/__init__.py
diff --git a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py b/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_bundle.py
similarity index 100%
rename from force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
rename to force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_bundle.py
diff --git a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_calculator.py b/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_calculator.py
similarity index 100%
rename from force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_calculator.py
rename to force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_calculator.py
diff --git a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_model.py b/force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_model.py
similarity index 100%
rename from force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_model.py
rename to force_bdss/core_plugins/dummy/kpi_adder/kpi_adder_model.py
diff --git a/force_bdss/core_plugins/dummy_kpi/dummy_kpi_calculator_plugin.py b/force_bdss/core_plugins/dummy_kpi/dummy_kpi_calculator_plugin.py
deleted file mode 100644
index 1e427722e65776c7a016c03227be085fba7bd57e..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/dummy_kpi/dummy_kpi_calculator_plugin.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from force_bdss.api import BaseExtensionPlugin
-
-from .kpi_adder.kpi_adder_bundle import KPIAdderBundle
-
-
-class DummyKPICalculatorPlugin(BaseExtensionPlugin):
- def _kpi_calculator_bundles_default(self):
- return [KPIAdderBundle()]
diff --git a/force_bdss/core_plugins/dummy_kpi/kpi_adder/__init__.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/force_bdss/core_plugins/dummy_mco/__init__.py b/force_bdss/core_plugins/dummy_mco/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/__init__.py b/force_bdss/core_plugins/dummy_mco/dakota/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
deleted file mode 100644
index e4d9f441bf4dbcce63ac1de06a53a56dc35d693b..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from traits.api import String
-from force_bdss.api import bundle_id, BaseMultiCriteriaOptimizerBundle
-
-from .dakota_communicator import DakotaCommunicator
-from .dakota_model import DakotaModel
-from .dakota_optimizer import DakotaOptimizer
-
-
-class DakotaBundle(BaseMultiCriteriaOptimizerBundle):
- id = String(bundle_id("enthought", "dakota"))
-
- name = "Dakota"
-
- def create_model(self, model_data=None):
- if model_data is None:
- model_data = {}
- return DakotaModel(self, **model_data)
-
- def create_optimizer(self, application, model):
- return DakotaOptimizer(self, application, model)
-
- def create_communicator(self, application, model):
- return DakotaCommunicator(self, application, model)
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/dakota_communicator.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_communicator.py
deleted file mode 100644
index 1605eba63e872ff85dae5df694d566b425c84550..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/dummy_mco/dakota/dakota_communicator.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import sys
-import numpy
-
-from force_bdss.api import DataSourceParameters, BaseMCOCommunicator
-
-
-class DakotaCommunicator(BaseMCOCommunicator):
- def receive_from_mco(self):
- data = sys.stdin.read()
- values = list(map(float, data.split()))
-
- parameters = self.model.parameters
-
- if len(values) != len(parameters):
- raise ValueError(
- "The passed information length is {}, "
- "but the model specifies {} values.".format(
- len(values), len(parameters)
- ))
-
- value_types = [p.value_type for p in parameters]
- value_names = [p.value_name for p in parameters]
-
- return DataSourceParameters(
- value_names=value_names,
- value_types=value_types,
- values=numpy.array(values)
- )
-
- def send_to_mco(self, kpi_results):
- data = " ".join(
- [" ".join(list(map(str, r.values.tolist()))) for r in kpi_results]
- )
- sys.stdout.write(data)
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/dakota_model.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_model.py
deleted file mode 100644
index b4c081a6b38bd5478f4287624411c5ce185cd01d..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/dummy_mco/dakota/dakota_model.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from traits.api import List, String
-
-from force_bdss.api import BaseMCOModel
-
-
-class DakotaModel(BaseMCOModel):
- value_types = List(String)
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/dakota_optimizer.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_optimizer.py
deleted file mode 100644
index 6b607cfce35432d286642465e36e90387f5a6c34..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/dummy_mco/dakota/dakota_optimizer.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import subprocess
-
-import sys
-
-from force_bdss.api import BaseMultiCriteriaOptimizer
-
-
-class DakotaOptimizer(BaseMultiCriteriaOptimizer):
- def run(self):
- print("Running dakota optimizer")
- for initial_value in range(10):
- ps = subprocess.Popen(
- [sys.argv[0],
- "--evaluate",
- self.application.workflow_filepath],
- stdout=subprocess.PIPE,
- stdin=subprocess.PIPE)
-
- out = ps.communicate("{}".format(initial_value).encode("utf-8"))
- print("{}: {}".format(initial_value, out[0].decode("utf-8")))
diff --git a/force_bdss/core_plugins/dummy_mco/multi_criteria_optimizers_plugin.py b/force_bdss/core_plugins/dummy_mco/multi_criteria_optimizers_plugin.py
deleted file mode 100644
index 1fe302b5eb40afb1ef8610b6889fac38ccf06ca4..0000000000000000000000000000000000000000
--- a/force_bdss/core_plugins/dummy_mco/multi_criteria_optimizers_plugin.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from force_bdss.api import BaseExtensionPlugin
-
-from .dakota.dakota_bundle import DakotaBundle
-
-
-class MultiCriteriaOptimizersPlugin(BaseExtensionPlugin):
- def _mco_bundles_default(self):
- return [DakotaBundle()]
diff --git a/force_bdss/mco/parameters/core_mco_parameters.py b/force_bdss/mco/parameters/core_mco_parameters.py
index e33559151c8ac348d846bc19a55387249f242d37..b9efa4e4f0b3921507420d2f64e16eddbce8da65 100644
--- a/force_bdss/mco/parameters/core_mco_parameters.py
+++ b/force_bdss/mco/parameters/core_mco_parameters.py
@@ -9,9 +9,9 @@ from force_bdss.mco.parameters.base_mco_parameter_factory import \
class RangedMCOParameter(BaseMCOParameter):
"""Expresses a MCO parameter that has a range between two floating
point values."""
- initial_value = Float()
- upper_bound = Float()
- lower_bound = Float()
+ initial_value = Float(0.0)
+ lower_bound = Float(0.0)
+ upper_bound = Float(1.0)
class RangedMCOParameterFactory(BaseMCOParameterFactory):
diff --git a/force_bdss/tests/fixtures/test_csv.json b/force_bdss/tests/fixtures/test_csv.json
index dbd1a9d9c205cfa1b8fdc9d59676a83f187b05a9..a774071ffaf48e8893ef2a51fdc68d5eeecb94bd 100644
--- a/force_bdss/tests/fixtures/test_csv.json
+++ b/force_bdss/tests/fixtures/test_csv.json
@@ -2,12 +2,15 @@
"version": "1",
"workflow": {
"multi_criteria_optimizer": {
- "id": "force.bdss.bundle.enthought.dakota",
+ "id": "force.bdss.bundle.enthought.dummy_dakota",
"model_data": {
"parameters" : [
{
"id": "force.bdss.mco_parameter.enthought.ranged",
"model_data": {
+ "initial_value": 3,
+ "lower_bound": 0,
+ "upper_bound": 10
}
}
]
diff --git a/setup.py b/setup.py
index 28dc7d9729bb3de994b6abf8c9a12636082b1080..9429bc9b5ec0fb1080280e1eedd00be192c07a95 100644
--- a/setup.py
+++ b/setup.py
@@ -10,12 +10,6 @@ setup(
'force_bdss = force_bdss.cli.force_bdss:run',
],
"force.bdss.extensions": [
- "mco = force_bdss.core_plugins.dummy_mco."
- "multi_criteria_optimizers_plugin:MultiCriteriaOptimizersPlugin",
- "csv_extractor = force_bdss.core_plugins.csv_extractor"
- ".csv_extractor_plugin:CSVExtractorPlugin",
- "kpi_adder = force_bdss.core_plugins.dummy_kpi"
- ".dummy_kpi_calculator_plugin:DummyKPICalculatorPlugin",
"dummy = force_bdss.core_plugins.dummy.dummy_plugin:DummyPlugin",
]
},