Disuse subclasses of oemof.network.Node

src/oemof/solph/buses/_bus.py

@@ -15,13 +15,13 @@
 
 """
 
-from oemof.network import network as on
+from oemof.network import Node
 from pyomo.core import BuildAction
 from pyomo.core import Constraint
 from pyomo.core.base.block import ScalarBlock
 
 
-class Bus(on.Bus):
+class Bus(Node):
     """A balance object. Every component has to be connected to buses.
 
     The sum of all inputs of a Bus object must equal the sum of all outputs

src/oemof/solph/components/_converter.py

@@ -23,7 +23,7 @@
 
 from warnings import warn
 
-from oemof.network import network as on
+from oemof.network import Node
 from pyomo.core import BuildAction
 from pyomo.core import Constraint
 from pyomo.core.base.block import ScalarBlock
@@ -32,7 +32,7 @@
 from oemof.solph._plumbing import sequence
 
 
-class Converter(on.Transformer):
+class Converter(Node):
     """A linear ConverterBlock object with n inputs and n outputs.
 
     Node object that relates any number of inflow and outflows with

src/oemof/solph/components/_generic_chp.py

@@ -19,7 +19,7 @@
 """
 
 import numpy as np
-from oemof.network import network
+from oemof.network import Node
 from pyomo.core.base.block import ScalarBlock
 from pyomo.environ import Binary
 from pyomo.environ import Constraint
@@ -30,7 +30,7 @@
 from oemof.solph._plumbing import sequence
 
 
-class GenericCHP(network.Transformer):
+class GenericCHP(Node):
     r"""
     Component `GenericCHP` to model combined heat and power plants.
 

src/oemof/solph/components/_generic_storage.py

@@ -23,7 +23,7 @@
 from warnings import warn
 
 import numpy as np
-from oemof.network import network
+from oemof.network import Node
 from oemof.tools import debugging
 from oemof.tools import economics
 from pyomo.core.base.block import ScalarBlock
@@ -40,7 +40,7 @@
 from oemof.solph._plumbing import sequence as solph_sequence
 
 
-class GenericStorage(network.Component):
+class GenericStorage(Node):
     r"""
     Component `GenericStorage` to model with basic characteristics of storages.
 

src/oemof/solph/components/_link.py

@@ -18,7 +18,7 @@
 """
 from warnings import warn
 
-from oemof.network import network as on
+from oemof.network import Node
 from oemof.tools import debugging
 from pyomo.core import Set
 from pyomo.core.base.block import ScalarBlock
@@ -29,7 +29,7 @@
 from oemof.solph._plumbing import sequence
 
 
-class Link(on.Transformer):
+class Link(Node):
     """A Link object with 2 inputs and 2 outputs.
 
     Parameters

src/oemof/solph/components/_offset_converter.py

@@ -21,7 +21,7 @@
 
 from warnings import warn
 
-from oemof.network import network
+from oemof.network import Node
 from pyomo.core import BuildAction
 from pyomo.core.base.block import ScalarBlock
 from pyomo.environ import Constraint
@@ -30,7 +30,7 @@
 from oemof.solph._plumbing import sequence
 
 
-class OffsetConverter(network.Transformer):
+class OffsetConverter(Node):
     """An object with one input and one output and two coefficients to model
     part load behaviour.
 

src/oemof/solph/components/_sink.py

@@ -15,11 +15,11 @@
 """
 from warnings import warn
 
-from oemof.network import network as on
+from oemof.network import Node
 from oemof.tools import debugging
 
 
-class Sink(on.Sink):
+class Sink(Node):
     """A component which is designed for one input flow.
 
     Parameters

src/oemof/solph/components/_source.py

@@ -16,11 +16,11 @@
 
 from warnings import warn
 
-from oemof.network import network as on
+from oemof.network import Node
 from oemof.tools import debugging
 
 
-class Source(on.Source):
+class Source(Node):
     """A component which is designed for one output flow.
 
     Parameters

src/oemof/solph/components/experimental/_generic_caes.py

@@ -17,7 +17,7 @@
 
 """
 
-from oemof.network import network as on
+from oemof.network import Node
 from pyomo.core.base.block import ScalarBlock
 from pyomo.environ import Binary
 from pyomo.environ import Constraint
@@ -26,7 +26,7 @@
 from pyomo.environ import Var
 
 
-class GenericCAES(on.Transformer):
+class GenericCAES(Node):
     """
     Component `GenericCAES` to model arbitrary compressed air energy storages.
 

src/oemof/solph/components/experimental/_piecewise_linear_converter.py

@@ -17,7 +17,7 @@
 
 """
 
-from oemof.network import network as on
+from oemof.network import Node
 from pyomo.core.base.block import ScalarBlock
 from pyomo.environ import BuildAction
 from pyomo.environ import Constraint
@@ -26,7 +26,7 @@
 from pyomo.environ import Var
 
 
-class PiecewiseLinearConverter(on.Transformer):
+class PiecewiseLinearConverter(Node):
     """Component to model an energy converter with one input and one output
     and an arbitrary piecewise linear conversion function.
 

src/oemof/solph/flows/_flow.py

@@ -23,14 +23,14 @@
 from warnings import warn
 
 import numpy as np
-from oemof.network import network as on
+from oemof.network import Edge
 from oemof.tools import debugging
 
 from oemof.solph._options import Investment
 from oemof.solph._plumbing import sequence
 
 
-class Flow(on.Edge):
+class Flow(Edge):
     r"""Defines a flow between two nodes.
 
     Keyword arguments are used to set the attributes of this flow. Parameters