Renamed InputSlotMap to InputSlotInfo

force_bdss/core/input_slot_map.py

@@ -3,7 +3,7 @@ from traits.api import HasStrictTraits, Enum
 from ..local_traits import Identifier
 
 
-class InputSlotMap(HasStrictTraits):
+class InputSlotInfo(HasStrictTraits):
     """
     Class that specifies the origin of data for the slots of a data source
     or KPI calculator.

force_bdss/core/tests/test_input_slot_map.py

 import unittest
 from traits.api import TraitError
 
-from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.input_slot_map import InputSlotInfo
 
 
 class TestDataValue(unittest.TestCase):
     def test_initialization(self):
-        slotmap = InputSlotMap()
+        slotmap = InputSlotInfo()
 
         self.assertEqual(slotmap.source, "Environment")
         self.assertEqual(slotmap.name, "")

force_bdss/data_sources/base_data_source_model.py

 from traits.api import ABCHasStrictTraits, Instance, List, Event
 
-from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.input_slot_map import InputSlotInfo
 from force_bdss.local_traits import Identifier
 from .i_data_source_factory import IDataSourceFactory
 
@@ -20,7 +20,7 @@ class BaseDataSourceModel(ABCHasStrictTraits):
     #: Specifies binding between input slots and source for that value.
     #: Each InputSlotMap instance specifies this information for each of the
     #: slots.
-    input_slot_maps = List(Instance(InputSlotMap), visible=False)
+    input_slot_maps = List(Instance(InputSlotInfo), visible=False)
 
     #: Allows to assign names to the output slots, so that they can be
     #: referenced somewhere else (e.g. the KPICalculators).

force_bdss/data_sources/tests/test_base_data_source_model.py

 import unittest
 
-from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.input_slot_map import InputSlotInfo
 
 try:
     import mock
@@ -28,10 +28,10 @@ class TestBaseDataSourceModel(unittest.TestCase):
             })
 
         model.input_slot_maps = [
-            InputSlotMap(
+            InputSlotInfo(
                 name="foo"
             ),
-            InputSlotMap(
+            InputSlotInfo(
                 name="bar"
             )
         ]

force_bdss/io/workflow_reader.py

@@ -3,7 +3,7 @@ import logging
 
 from traits.api import HasStrictTraits, Instance
 
-from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.input_slot_map import InputSlotInfo
 from force_bdss.core.workflow import Workflow
 from ..factory_registry_plugin import IFactoryRegistryPlugin
 
@@ -218,7 +218,7 @@ class WorkflowReader(HasStrictTraits):
         return parameters
 
     def _extract_input_slot_maps(self, maps_data):
-        return [InputSlotMap(**d) for d in maps_data]
+        return [InputSlotInfo(**d) for d in maps_data]
 
     def _extract_notification_listeners(self, wf_data):
         registry = self.factory_registry

force_bdss/kpi/base_kpi_calculator_model.py

 from traits.api import ABCHasStrictTraits, Instance, List, Event
 
 from force_bdss.local_traits import Identifier
-from ..core.input_slot_map import InputSlotMap
+from ..core.input_slot_map import InputSlotInfo
 from .i_kpi_calculator_factory import IKPICalculatorFactory
 
 
@@ -20,7 +20,7 @@ class BaseKPICalculatorModel(ABCHasStrictTraits):
     #: Specifies binding between input slots and source for that value.
     #: Each InputSlotMap instance specifies this information for each of the
     #: slots.
-    input_slot_maps = List(Instance(InputSlotMap), visible=False)
+    input_slot_maps = List(Instance(InputSlotInfo), visible=False)
 
     #: Allows to assign names to the output slots, so that they can be
     #: referenced somewhere else (e.g. the KPICalculators).

force_bdss/kpi/tests/test_base_kpi_calculator_model.py

 import unittest
 
-from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.input_slot_map import InputSlotInfo
 from force_bdss.kpi.base_kpi_calculator_factory import BaseKPICalculatorFactory
 from force_bdss.kpi.base_kpi_calculator_model import BaseKPICalculatorModel
 
@@ -27,10 +27,10 @@ class TestBaseKPICalculatorModel(unittest.TestCase):
             })
 
         model.input_slot_maps = [
-            InputSlotMap(
+            InputSlotInfo(
                 name="foo"
             ),
-            InputSlotMap(
+            InputSlotInfo(
                 name="bar"
             )
         ]

force_bdss/tests/test_core_evaluation_driver.py

@@ -11,7 +11,7 @@ from force_bdss.tests.probe_classes.data_source import ProbeDataSourceFactory
 from force_bdss.tests.probe_classes.kpi_calculator import (
     ProbeKPICalculatorFactory)
 
-from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.input_slot_map import InputSlotInfo
 from force_bdss.core.data_value import DataValue
 from force_bdss.core.slot import Slot
 from force_bdss.tests import fixtures
@@ -156,8 +156,8 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         ]
 
         slot_map = (
-            InputSlotMap(name="baz"),
-            InputSlotMap(name="bar")
+            InputSlotInfo(name="baz"),
+            InputSlotInfo(name="bar")
         )
 
         slots = (
@@ -171,7 +171,7 @@ class TestCoreEvaluationDriver(unittest.TestCase):
 
         # Check the errors. Only one slot map for two slots.
         slot_map = (
-            InputSlotMap(name="baz"),
+            InputSlotInfo(name="baz"),
         )
 
         with testfixtures.LogCapture():
@@ -184,8 +184,8 @@ class TestCoreEvaluationDriver(unittest.TestCase):
 
         # missing value in the given data values.
         slot_map = (
-            InputSlotMap(name="blap"),
-            InputSlotMap(name="bar")
+            InputSlotInfo(name="blap"),
+            InputSlotInfo(name="bar")
         )
 
         with testfixtures.LogCapture():
@@ -214,8 +214,8 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         evaluator_model = ds_factory.create_model()
 
         evaluator_model.input_slot_maps = [
-            InputSlotMap(name="foo"),
-            InputSlotMap(name="quux")
+            InputSlotInfo(name="foo"),
+            InputSlotInfo(name="quux")
         ]
         evaluator_model.output_slot_names = ["one", "", "three"]
 
@@ -289,16 +289,16 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         # Layer 0
         model = adder_factory.create_model()
         model.input_slot_maps = [
-            InputSlotMap(name="in1"),
-            InputSlotMap(name="in2")
+            InputSlotInfo(name="in1"),
+            InputSlotInfo(name="in2")
         ]
         model.output_slot_names = ["res1"]
         wf.execution_layers[0].append(model)
 
         model = adder_factory.create_model()
         model.input_slot_maps = [
-            InputSlotMap(name="in3"),
-            InputSlotMap(name="in4")
+            InputSlotInfo(name="in3"),
+            InputSlotInfo(name="in4")
         ]
         model.output_slot_names = ["res2"]
         wf.execution_layers[0].append(model)
@@ -306,8 +306,8 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         # layer 1
         model = adder_factory.create_model()
         model.input_slot_maps = [
-            InputSlotMap(name="res1"),
-            InputSlotMap(name="res2")
+            InputSlotInfo(name="res1"),
+            InputSlotInfo(name="res2")
         ]
         model.output_slot_names = ["res3"]
         wf.execution_layers[1].append(model)
@@ -315,8 +315,8 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         # layer 2
         model = multiplier_factory.create_model()
         model.input_slot_maps = [
-            InputSlotMap(name="res3"),
-            InputSlotMap(name="res1")
+            InputSlotInfo(name="res3"),
+            InputSlotInfo(name="res1")
         ]
         model.output_slot_names = ["res4"]
         wf.execution_layers[2].append(model)
@@ -324,8 +324,8 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         # KPI layer
         model = multiplier_kpi_factory.create_model()
         model.input_slot_maps = [
-            InputSlotMap(name="res4"),
-            InputSlotMap(name="res2")
+            InputSlotInfo(name="res4"),
+            InputSlotInfo(name="res2")
         ]
         model.output_slot_names = ["out1"]
         wf.kpi_calculators.append(model)