Skip to content

Commit

Permalink
pandapower 1.2.2: technical report, readme, changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
lthurner committed Mar 22, 2017
1 parent 76447de commit 7688357
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 29 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Change Log
=============

[1.2.2] - 2017-03-22
--------------------
- [CHANGED] Minor refactoring in pd2ppc
- [ADDED] Technical Report

[1.2.1] - 2017-03-21
--------------------
- [FIXED] Readme for PyPi

[1.2.0] - 2017-03-21
--------------------
- [CHANGED] net.line.imax_ka to net.line.max_i_ka for consistency reasons
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
pandapower
=============

.. image:: https://readthedocs.org/projects/pandapower/badge/?version=v1.2.0
:target: http://pandapower.readthedocs.io/en/develop/?badge=develop
.. image:: https://readthedocs.org/projects/pandapower/badge/?version=v1.2.2
:target: http://pandapower.readthedocs.io/
:alt: Documentation Status

.. image:: https://img.shields.io/pypi/v/pandapower.svg
Expand All @@ -12,7 +12,7 @@ pandapower
.. image:: https://img.shields.io/pypi/pyversions/pandapower.svg
:target: https://pypi.python.org/pypi/pandapower

.. image:: https://travis-ci.org/lthurner/pandapower.svg?branch=develop
.. image:: https://travis-ci.org/lthurner/pandapower.svg?branch=master
:target: https://travis-ci.org/lthurner/pandapower

.. image:: https://coveralls.io/repos/github/lthurner/pandapower/badge.svg?branch=develop
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
# The short X.Y version.
version = '1.2'
# The full version, including alpha/beta/rc tags.
release = '1.2.0'
release = '1.2.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Binary file removed doc/getting_started/calc_times.png
Binary file not shown.
Binary file modified doc/getting_started/pandapower.pdf
Binary file not shown.
2 changes: 2 additions & 0 deletions doc/latex_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ pandapower
elements
std_types_latex
powerflow
shortcircuit
estimation
topology
networks
plotting
file_io
converter
toolbox
2 changes: 1 addition & 1 deletion pandapower/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
import pandas as pd
pd.options.mode.chained_assignment = None # default='warn'

__version__ = "1.2.0"
__version__ = "1.2.2"
20 changes: 10 additions & 10 deletions pandapower/build_branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,16 +540,16 @@ def _switch_branches(net, ppc):
to_bus = to_bus[~np.isnan(to_bus)].values.astype(int)

# set branch in ppc out of service if from and to bus are at a line which is in service
if from_bus.size and to_bus.size:
# get from and to buses of these branches
ppc_from = bus_lookup[from_bus]
ppc_to = bus_lookup[to_bus]
ppc_idx = np.in1d(ppc['branch'][:, 0], ppc_from)\
& np.in1d(ppc['branch'][:, 1], ppc_to)
ppc["branch"][ppc_idx, BR_STATUS] = 0

# drop from in service lines as well
lines_is = lines_is.drop(sw_elem[~m])
# if from_bus.size and to_bus.size:
# # get from and to buses of these branches
# ppc_from = bus_lookup[from_bus]
# ppc_to = bus_lookup[to_bus]
# ppc_idx = np.in1d(ppc['branch'][:, 0], ppc_from)\
# & np.in1d(ppc['branch'][:, 1], ppc_to)
# ppc["branch"][ppc_idx, BR_STATUS] = 0
#
# # drop from in service lines as well
# lines_is = lines_is.drop(sw_elem[~m])

# opened switches at in service lines
slidx = slidx\
Expand Down
28 changes: 16 additions & 12 deletions report/author_page.tex
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,28 @@
Alexander Scheidler\\[1em]

\textit{Main Contributors:} \\
Julian Dollichon\\
Florian Schäfer \\
Jan-Hendrik Menke \\
Friederike Meier\\
Steffen Meinecke\\[1em]
Julian Dollichon \\
Florian Schäfer \\
Friederike Meier \\
Jan-Hendrik Menke \\
Steffen Meinecke \\[1em]

\textit{Further Contributions by:} \\
Tobias Deß \\
Bastian Junker\\
Jannis Kupka\\
Lothar Löwer\\
Jan Ulffers\\
Nils Bornhorst\\
Jonathan Schütt\\
Elisabeth Drayer\\
Jakov Krstulović Opara\\[1em]

\textit{Coordination:}\\
Martin Braun \\
Johann-Christian Töbermann \\
Stefan Gehler \\[1em]

\textit{Thanks to:} \\
Tobias Deß \\
Bastian Junker\\
Jannis Kupka \\
Lothar Löwer \\
Jan Ulffers \\


\flushright
\textit{Contact:} \\
Expand Down
2 changes: 1 addition & 1 deletion report/latex_postprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


latex_file_path = "..\\doc\\_build\\latex\\pandapower.tex"
version = "1.2.0"
version = "1.2.2"

class AlreadyProcessedException(Exception):
pass
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

setup(
name='pandapower',
version='1.2.1',
version='1.2.2',
author='Leon Thurner, Alexander Scheidler',
author_email='[email protected], [email protected]',
description='Convenient Power System Modelling and Analysis based on PYPOWER and pandas',
Expand Down

0 comments on commit 7688357

Please sign in to comment.