Skip to content

Commit 5155966

Browse files
mzy2240mzy2240
committed
Merge branch 'develop'
2 parents f717745 + ffa0aa9 commit 5155966

26 files changed

+237
-34
lines changed

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The ESA team works hard to ensure ESA is well tested, and we strive for
7676
testing coverage data for ESA, using `coverage
7777
<https://pypi.org/project/coverage/>`__.
7878

79-
.. table:: ESA's testing coverage as of 2022-02-10 (Git commit: 41ad7ed)
79+
.. table:: ESA's testing coverage as of 2022-02-20 (Git commit: 2b5a8ff)
8080
:widths: auto
8181
:align: left
8282

@@ -85,7 +85,7 @@ testing coverage data for ESA, using `coverage
8585
+=================+===================+=================+=================+====================+
8686
| esa/__init__.py | 2 | 0 | 2 | 100 |
8787
+-----------------+-------------------+-----------------+-----------------+--------------------+
88-
| esa/saw.py | 752 | 0 | 752 | 100 |
88+
| esa/saw.py | 824 | 0 | 824 | 100 |
8989
+-----------------+-------------------+-----------------+-----------------+--------------------+
9090

9191
License

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.5
1+
1.2.6

‎docs/doctrees/environment.pickle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5ac4a5f1401618037c90b3292a6e401b0754ddf027b5c290113c0bf4de2ec5c1
3-
size 60341
2+
oid sha256:e702b14fd93c4623004ade2d80b28d0c20b111ba8ce8dfee491582d6d089242f
3+
size 61168

‎docs/doctrees/esa.doctree‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a7169affc51293a491383c7d600cb06d59238c5c06412c05d9827e8f570d44ca
3-
size 391032
2+
oid sha256:2d9a04549b49f3cfe86bddd889fc16a5b81352a163b5f27466f47202e5224dad
3+
size 397381

‎docs/doctrees/overview.doctree‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f1c99e9cd796c1049eb5c7e0f4bff8ada248e0b16d6c6fc62b99bf3c8b3ae447
2+
oid sha256:4c18065fefc407e5e07a9350e4a9a60b7b2b711c1edc16b4b205b43059d94fa2
33
size 30599

‎docs/doctrees/welcome.doctree‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:92f2da0e05d44bf0a4ab2adc54477498b7d7fde00aaa4330c17934e0012256d1
3-
size 95985
2+
oid sha256:eb8cbd76107b4c2e8c6b2ed7fa48b36dfb50093f625675a5df5b51671862e4b2
3+
size 97047

‎docs/html/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 77715398b7bf42f986e4d37858004ae1
3+
config: 437d8a7d4ff36783090e9c4c30038663
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/html/_static/documentation_options.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var DOCUMENTATION_OPTIONS = {
22
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: '1.2.5',
3+
VERSION: '1.2.6',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
BUILDER: 'html',

‎docs/html/common_issues.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
88

9-
<title>Common Issues &#8212; ESA 1.2.5 documentation</title>
9+
<title>Common Issues &#8212; ESA 1.2.6 documentation</title>
1010
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
1111
<link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
1212
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>

‎docs/html/esa.html‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
88

9-
<title>esa API Documentation &#8212; ESA 1.2.5 documentation</title>
9+
<title>esa API Documentation &#8212; ESA 1.2.6 documentation</title>
1010
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
1111
<link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
1212
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -1221,6 +1221,14 @@
12211221
<dd><p>Clean up for the PowerWorld COM object</p>
12221222
</dd></dl>
12231223

1224+
<dl class="py method">
1225+
<dt class="sig sig-object py" id="esa.saw.SAW.get_branch_admittance">
1226+
<span class="sig-name descname"><span class="pre">get_branch_admittance</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_branch_admittance" title="Permalink to this definition"></a></dt>
1227+
<dd><p>Helper function to get the branch admittance matrix, usually known as
1228+
Yf and Yt.
1229+
:returns: A Yf sparse matrix and a Yt sparse matrix</p>
1230+
</dd></dl>
1231+
12241232
<dl class="py method">
12251233
<dt class="sig sig-object py" id="esa.saw.SAW.get_incidence_matrix">
12261234
<span class="sig-name descname"><span class="pre">get_incidence_matrix</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_incidence_matrix" title="Permalink to this definition"></a></dt>
@@ -1314,6 +1322,13 @@
13141322
</dl>
13151323
</dd></dl>
13161324

1325+
<dl class="py method">
1326+
<dt class="sig sig-object py" id="esa.saw.SAW.get_shunt_admittance">
1327+
<span class="sig-name descname"><span class="pre">get_shunt_admittance</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_shunt_admittance" title="Permalink to this definition"></a></dt>
1328+
<dd><p>Get shunt admittance Ysh.
1329+
:return: A Ysh sparse matrix</p>
1330+
</dd></dl>
1331+
13171332
<dl class="py method">
13181333
<dt class="sig sig-object py" id="esa.saw.SAW.get_version_and_builddate">
13191334
<span class="sig-name descname"><span class="pre">get_version_and_builddate</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">tuple</span></span></span><a class="headerlink" href="#esa.saw.SAW.get_version_and_builddate" title="Permalink to this definition"></a></dt>
@@ -1532,6 +1547,21 @@
15321547
<dd><p>Given a path, p, convert it to a Windows path.</p>
15331548
</dd></dl>
15341549

1550+
<dl class="py function">
1551+
<dt class="sig sig-object py" id="esa.saw.df_to_aux">
1552+
<span class="sig-prename descclassname"><span class="pre">esa.saw.</span></span><span class="sig-name descname"><span class="pre">df_to_aux</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">fp</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">df</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">object_name</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">str</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.df_to_aux" title="Permalink to this definition"></a></dt>
1553+
<dd><p>Convert a dataframe to PW aux/axd data section.</p>
1554+
<dl class="field-list simple">
1555+
<dt class="field-odd">Parameters</dt>
1556+
<dd class="field-odd"><ul class="simple">
1557+
<li><p><strong>fp</strong> – file handler</p></li>
1558+
<li><p><strong>df</strong> – dataframe</p></li>
1559+
<li><p><strong>object_name</strong> – object type</p></li>
1560+
</ul>
1561+
</dd>
1562+
</dl>
1563+
</dd></dl>
1564+
15351565
</section>
15361566
</section>
15371567

0 commit comments

Comments
 (0)