Merge pull request #25 from oemof/revision/network_submodule

Split network.network into submodules

CHANGELOG.rst

@@ -15,3 +15,9 @@ Changelog
 * Improved testing
 * Explicitly defined API
 
+
+0.5.0
+-----
+
+* Improved code quality
+

src/oemof/network/__init__.py

@@ -6,13 +6,15 @@
 from . import network
 from .network import Bus
 from .network import Component
+from .network import Edge
 from .network import Sink
 from .network import Source
 from .network import Transformer
 
 __all__ = [
     "Bus",
     "Component",
+    "Edge",
     "energy_system",
     "graph",
     "groupings",

src/oemof/network/energy_system.py

@@ -99,7 +99,7 @@ class EnergySystem:
     >>> bus is es.groups['electricity']
     False
     >>> es.groups['electricity']
-    "<oemof.network.network.Bus: 'electricity'>"
+    "<oemof.network.network.nodes.Bus: 'electricity'>"
 
     For simple user defined groupings, you can just supply a function that
     computes a key from an :class:`entity <oemof.core.network.Entity>` and the

src/oemof/network/groupings.py

@@ -20,7 +20,7 @@
 from itertools import chain
 from itertools import filterfalse
 
-from oemof.network.network import Edge
+from oemof.network.network.edge import Edge
 
 # TODO: Update docstrings.
 #