Merge branch 'dev' of github.com:openego/eDisGo into dev

openego · Sep 6, 2018 · d5a66a3 · d5a66a3
2 parents 28a11b8 + c02de84
commit d5a66a3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/doc/api/edisgo.flex_opt.rst b/doc/api/edisgo.flex_opt.rst
@@ -68,6 +68,13 @@ edisgo.flex\_opt.storage\_operation module
     :undoc-members:
     :show-inheritance:
 
+edisgo.flex\_opt.storage\_positioning module
+----------------------------------------------
+
+.. automodule:: edisgo.flex_opt.storage_positioning
+    :members:
+    :undoc-members:
+    :show-inheritance:
 
 Module contents
 ---------------

diff --git a/doc/api/edisgo.tools.rst b/doc/api/edisgo.tools.rst
@@ -28,6 +28,14 @@ edisgo.tools.geo module
     :undoc-members:
     :show-inheritance:
 
+edisgo.tools.plots module
+--------------------------
+
+.. automodule:: edisgo.tools.plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 edisgo.tools.pypsa\_io module
 -----------------------------
 

diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
@@ -8,6 +8,7 @@ Changelog for each release.
     :local:
     :backlinks: top
 
+.. include::  whatsnew/v0-0-6.rst
 .. include::  whatsnew/v0-0-5.rst
 .. include::  whatsnew/v0-0-3.rst
 .. include::  whatsnew/v0-0-2.rst
diff --git a/edisgo/examples/example.py b/edisgo/examples/example.py
@@ -58,7 +58,7 @@
 
         # set up worst-case scenario
         edisgo = EDisGo(ding0_grid=os.path.join('data', dingo_grid),
-                        worst_case_analysis='worst-case-feedin')
+                        worst_case_analysis='worst-case')
 
         try:
             # Calculate grid expansion costs before generator import
@@ -78,7 +78,6 @@
 
             # Clear results
             edisgo.network.results = Results(edisgo.network)
-            edisgo.network.pypsa = None
 
             # Calculate grid expansion costs after generator import
             logging.info('Grid expansion after generator import.')