Merge branch 'develop' of gitbox:pandapower into develop

CHANGELOG.rst

@@ -11,7 +11,8 @@ unreleased
 - [ADDED] generator lookup to allow multiple generators at one bus
 - [ADDED] bad data detection for state estimation
 - [CHANGED] from_ppc: no detect_trafo anymore, several gen at each node possible
-- [ADDED] networks: case118, case300, cigre_network_mv with_der='all' der
+- [CHANGED] validate_from_ppc: improved validation behaviour by means of duplicated gen and branch rearangement
+- [ADDED] networks: case33bw, case118, case300, case1354pegase, case2869pegase, case9241pegase, GBreducednetwork, GBnetwork, iceland, cigre_network_mv with_der='all' der
 
 [1.1.1] - 2017-01-12
 ----------------------

doc/networks.rst

@@ -9,14 +9,14 @@ The pandapower networks modul contains simple test networks, randomly generated
 
 You can find documentation for the individual modules here:
 
-.. toctree:: 
+.. toctree::
     :maxdepth: 2
 
     networks/example
     networks/test
     networks/cigre
     networks/mv_oberrhein
-    networks/ieee
+    networks/power_system_test_cases
     networks/kerber
-	
-	
+
+

doc/networks/cigre.rst

@@ -1,3 +1,4 @@
+
 ==============
 CIGRE Networks
 ==============
@@ -177,6 +178,3 @@ Low voltage distribution network
 	:width: 42em
 	:alt: alternate Text
 	:align: center
-
-
----------------------------

doc/networks/power_system_test_cases.rst

@@ -0,0 +1,111 @@
+====================
+Power System Test Cases
+====================
+
+.. note::
+
+    All Power System Test Cases were converted from `PYPOWER <https:/pypi.python.org/pypi/PYPOWER>`_ or `MATPOWER <http://www.pserc.cornell.edu/matpower/>`_ case files.
+
+
+Case 4gs
+------------
+
+.. autofunction:: pandapower.networks.case4gs
+
+---------------------------
+
+Case 6ww
+--------------
+
+.. autofunction:: pandapower.networks.case6ww
+
+---------------------------
+
+Case 9
+--------
+
+.. autofunction:: pandapower.networks.case9
+
+
+---------------------------
+
+Case 14
+---------
+
+.. autofunction:: pandapower.networks.case14
+
+---------------------------
+
+Case 24_ieee_rts
+
+---------------------------
+
+.. autofunction:: pandapower.networks.case24_ieee_rts
+
+---------------------------
+
+Case 30
+--------
+
+.. autofunction:: pandapower.networks.case30
+
+---------------------------
+
+Case 33bw
+---------
+
+.. autofunction:: pandapower.networks.case33bw
+
+Case 39
+---------
+
+.. autofunction:: pandapower.networks.case39
+
+---------------------------
+
+Case 57
+---------
+
+.. autofunction:: pandapower.networks.case57
+
+---------------------------
+
+Case 118
+------------------------------------
+
+.. autofunction:: pandapower.networks.case118
+
+Case 300
+------------------------------------
+
+.. autofunction:: pandapower.networks.case300
+
+Case 1354pegase
+------------------------------------
+
+.. autofunction:: pandapower.networks.case1354pegase
+
+Case 2869pegase
+------------------------------------
+
+.. autofunction:: pandapower.networks.case2869pegase
+
+Case 9241pegase
+------------------------------------
+
+.. autofunction:: pandapower.networks.case9241pegase
+
+Case GB network
+------------------------------------
+
+.. autofunction:: pandapower.networks.GBnetwork
+
+Case GB reduced network
+------------------------------------
+
+.. autofunction:: pandapower.networks.GBreducednetwork
+
+Case iceland
+------------------------------------
+
+.. autofunction:: pandapower.networks.iceland

pandapower/__init__.py

@@ -9,4 +9,4 @@
 import pandas as pd
 pd.options.mode.chained_assignment = None  # default='warn'
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"