Move Node functionality from Entity to Node

src/oemof/network/network/entity.py

@@ -14,9 +14,6 @@
 
 from functools import total_ordering
 
-from .helpers import Inputs
-from .helpers import Outputs
-
 
 @total_ordering
 class Entity:
@@ -56,9 +53,6 @@ class Entity:
 
     __slots__ = [
         "_label",
-        "_in_edges",
-        "_inputs",
-        "_outputs",
         "custom_properties",
     ]
 
@@ -67,8 +61,6 @@ def __init__(self, label=None, *, custom_properties=None, **kwargs):
         if custom_properties is None:
             custom_properties = {}
         self.custom_properties = custom_properties
-        self._inputs = Inputs(self)
-        self._outputs = Outputs(self)
 
     def __eq__(self, other):
         return id(self) == id(other)
@@ -105,24 +97,3 @@ def label(self):
     @label.setter
     def label(self, label):
         self._label = label
-
-    @property
-    def inputs(self):
-        """dict:
-        Dictionary mapping input :class:`Entities <Entity>` :obj:`n` to
-        :class:`Edge`s from :obj:`n` into :obj:`self`.
-        If :obj:`self` is an :class:`Edge`, returns a dict containing the
-        :class:`Edge`'s single input node as the key and the flow as the value.
-        """
-        return self._inputs
-
-    @property
-    def outputs(self):
-        """dict:
-        Dictionary mapping output :class:`Entities <Entity>` :obj:`n` to
-        :class:`Edges` from :obj:`self` into :obj:`n`.
-        If :obj:`self` is an :class:`Edge`, returns a dict containing the
-        :class:`Edge`'s single output node as the key and the flow as the
-        value.
-        """
-        return self._outputs

src/oemof/network/network/nodes.py

@@ -15,6 +15,8 @@
 
 from .edge import Edge
 from .entity import Entity
+from .helpers import Inputs
+from .helpers import Outputs
 
 
 class Node(Entity):
@@ -40,9 +42,13 @@ class Node(Entity):
         A dictionary mapping output nodes to corresponding outflows.
     """
 
+    __slots__ = ["_in_edges", "_inputs", "_outputs"]
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self._inputs = Inputs(self)
+        self._outputs = Outputs(self)
         self._in_edges = set()
 
         msg = "{} {!r} of {!r} not an instance of Node but of {}."
@@ -69,6 +75,27 @@ def __init__(self, *args, **kwargs):
             edge.input = self
             edge.output = o
 
+    @property
+    def inputs(self):
+        """dict:
+        Dictionary mapping input :class:`Entities <Entity>` :obj:`n` to
+        :class:`Edge`s from :obj:`n` into :obj:`self`.
+        If :obj:`self` is an :class:`Edge`, returns a dict containing the
+        :class:`Edge`'s single input node as the key and the flow as the value.
+        """
+        return self._inputs
+
+    @property
+    def outputs(self):
+        """dict:
+        Dictionary mapping output :class:`Entities <Entity>` :obj:`n` to
+        :class:`Edges` from :obj:`self` into :obj:`n`.
+        If :obj:`self` is an :class:`Edge`, returns a dict containing the
+        :class:`Edge`'s single output node as the key and the flow as the
+        value.
+        """
+        return self._outputs
+
 
 _deprecation_warning = (
     "Usage of {} is deprecated. Use oemof.network.Node instead."