Skip to content

Commit 19898bd

Browse files
mzy2240mzy2240
committed
Merge branch 'develop'
2 parents 3644f50 + 625a665 commit 19898bd

20 files changed

+276
-22
lines changed

‎README.rst‎

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

80-
.. table:: ESA's testing coverage as of 2022-05-20 (Git commit: bbb3f12)
80+
.. table:: ESA's testing coverage as of 2022-08-22 (Git commit: 4b28569)
8181
:widths: auto
8282
:align: left
8383

@@ -86,7 +86,7 @@ testing coverage data for ESA, using `coverage
8686
+=================+===================+=================+=================+====================+
8787
| esa/__init__.py | 2 | 0 | 2 | 100 |
8888
+-----------------+-------------------+-----------------+-----------------+--------------------+
89-
| esa/saw.py | 848 | 0 | 848 | 100 |
89+
| esa/saw.py | 920 | 0 | 920 | 100 |
9090
+-----------------+-------------------+-----------------+-----------------+--------------------+
9191

9292
License

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.7
1+
1.2.8

‎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:a7ae401e6cd5f73ca62a62033cb5ec84c90785c20701123b343827f5aa36a7bc
3-
size 74507
2+
oid sha256:eaf6fc46551bf1b081a2f736c4f5e03bfbe577659bf6fec2bf77193995804e77
3+
size 75337

‎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:11547b690dbdb2653ad9257b99a209584ef5eeb778b5af7d83980869fc5e4db9
3-
size 399260
2+
oid sha256:d6da394dedf5a6a75c0b15139331128e705d13651e30a99df2fa2435d739220c
3+
size 408900

‎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:f41ad7eb10726f778f1b312e9043e51569b86a9365223ded88453cfcda83457d
2+
oid sha256:692841cd89f9063b19f2b12c247a55c65dc8de5c0e9d90827d00732cddfb16d9
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:37ce2aec14a4a548e21cb6a5471f2ca6946aab70249c0368620df7e40afead26
3-
size 98332
2+
oid sha256:999a9e9e885543ff76280fd6035e25917ba6c5e97d9fd179269a0256bcefb9ff
3+
size 99108

‎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: ed1a8386bdf62a50cde5a8b4689068ae
3+
config: a53f9ecfe3e60fd7052d70b826a9f37e
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.7',
3+
VERSION: '1.2.8',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
BUILDER: 'html',

‎docs/html/esa.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,6 +1478,18 @@
14781478
</dl>
14791479
</dd></dl>
14801480

1481+
<dl class="py method">
1482+
<dt class="sig sig-object py" id="esa.saw.SAW.get_lodf_matrix_fast">
1483+
<span class="sig-name descname"><span class="pre">get_lodf_matrix_fast</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_lodf_matrix_fast" title="Permalink to this definition"></a></dt>
1484+
<dd><p>Calculate the line outage distribution factor natively. This method should be much
1485+
faster than the PW script command for large cases.</p>
1486+
<dl class="field-list simple">
1487+
<dt class="field-odd">Returns</dt>
1488+
<dd class="field-odd"><p>A dense float matrix in the numpy array format.</p>
1489+
</dd>
1490+
</dl>
1491+
</dd></dl>
1492+
14811493
<dl class="py method">
14821494
<dt class="sig sig-object py" id="esa.saw.SAW.get_power_flow_results">
14831495
<span class="sig-name descname"><span class="pre">get_power_flow_results</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">ObjectType</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">str</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">additional_fields</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">Union</span><span class="p"><span class="pre">[</span></span><span class="pre">None</span><span class="p"><span class="pre">,</span> </span><span class="pre">List</span><span class="p"><span class="pre">[</span></span><span class="pre">str</span><span class="p"><span class="pre">]</span></span><span class="p"><span class="pre">]</span></span></span> <span class="o"><span class="pre">=</span></span> <span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">Union</span><span class="p"><span class="pre">[</span></span><span class="pre">None</span><span class="p"><span class="pre">,</span> </span><span class="pre">pandas.core.frame.DataFrame</span><span class="p"><span class="pre">]</span></span></span></span><a class="headerlink" href="#esa.saw.SAW.get_power_flow_results" title="Permalink to this definition"></a></dt>
@@ -1502,6 +1514,45 @@
15021514
</dl>
15031515
</dd></dl>
15041516

1517+
<dl class="py method">
1518+
<dt class="sig sig-object py" id="esa.saw.SAW.get_ptdf_matrix_fast">
1519+
<span class="sig-name descname"><span class="pre">get_ptdf_matrix_fast</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_ptdf_matrix_fast" title="Permalink to this definition"></a></dt>
1520+
<dd><p>Calculate the power transfer distribution factor natively. This method should be much
1521+
faster than the PW script command for large cases.</p>
1522+
<dl class="field-list simple">
1523+
<dt class="field-odd">Returns</dt>
1524+
<dd class="field-odd"><p>A dense float matrix in the numpy array format.</p>
1525+
</dd>
1526+
</dl>
1527+
</dd></dl>
1528+
1529+
<dl class="py method">
1530+
<dt class="sig sig-object py" id="esa.saw.SAW.get_shift_factor_matrix">
1531+
<span class="sig-name descname"><span class="pre">get_shift_factor_matrix</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">method</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">str</span></span> <span class="o"><span class="pre">=</span></span> <span class="default_value"><span class="pre">'DC'</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_shift_factor_matrix" title="Permalink to this definition"></a></dt>
1532+
<dd><p>Calculate the injection shift factor matrix using the auxiliary
1533+
script CalculateShiftFactorsMultipleElement.</p>
1534+
<dl class="field-list simple">
1535+
<dt class="field-odd">Parameters</dt>
1536+
<dd class="field-odd"><p><strong>method</strong> – The linear method to be used for the calculation. The</p>
1537+
</dd>
1538+
</dl>
1539+
<p>options are AC, DC or DCPS.
1540+
:returns: A dense float matrix in the numpy array format.</p>
1541+
</dd></dl>
1542+
1543+
<dl class="py method">
1544+
<dt class="sig sig-object py" id="esa.saw.SAW.get_shift_factor_matrix_fast">
1545+
<span class="sig-name descname"><span class="pre">get_shift_factor_matrix_fast</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_shift_factor_matrix_fast" title="Permalink to this definition"></a></dt>
1546+
<dd><p>Calculate the injection shift factor matrix directly using the incidence
1547+
matrix and the susceptance matrix. This method should be much faster than
1548+
the PW script command for large cases.</p>
1549+
<dl class="field-list simple">
1550+
<dt class="field-odd">Returns</dt>
1551+
<dd class="field-odd"><p>A dense float matrix in the numpy array format.</p>
1552+
</dd>
1553+
</dl>
1554+
</dd></dl>
1555+
15051556
<dl class="py method">
15061557
<dt class="sig sig-object py" id="esa.saw.SAW.get_shunt_admittance">
15071558
<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>

‎docs/html/genindex.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,23 @@ <h2 id="G">G</h2>
320320
<li><a href="esa.html#esa.saw.SAW.get_key_fields_for_object_type">get_key_fields_for_object_type() (esa.saw.SAW method)</a>
321321
</li>
322322
<li><a href="esa.html#esa.saw.SAW.get_lodf_matrix">get_lodf_matrix() (esa.saw.SAW method)</a>
323+
</li>
324+
<li><a href="esa.html#esa.saw.SAW.get_lodf_matrix_fast">get_lodf_matrix_fast() (esa.saw.SAW method)</a>
323325
</li>
324326
<li><a href="esa.html#esa.saw.SAW.get_power_flow_results">get_power_flow_results() (esa.saw.SAW method)</a>
325327
</li>
326-
<li><a href="esa.html#esa.saw.SAW.get_shunt_admittance">get_shunt_admittance() (esa.saw.SAW method)</a>
328+
<li><a href="esa.html#esa.saw.SAW.get_ptdf_matrix_fast">get_ptdf_matrix_fast() (esa.saw.SAW method)</a>
327329
</li>
328-
<li><a href="esa.html#esa.saw.SAW.get_version_and_builddate">get_version_and_builddate() (esa.saw.SAW method)</a>
330+
<li><a href="esa.html#esa.saw.SAW.get_shift_factor_matrix">get_shift_factor_matrix() (esa.saw.SAW method)</a>
331+
</li>
332+
<li><a href="esa.html#esa.saw.SAW.get_shift_factor_matrix_fast">get_shift_factor_matrix_fast() (esa.saw.SAW method)</a>
329333
</li>
330334
</ul></td>
331335
<td style="width: 33%; vertical-align: top;"><ul>
336+
<li><a href="esa.html#esa.saw.SAW.get_shunt_admittance">get_shunt_admittance() (esa.saw.SAW method)</a>
337+
</li>
338+
<li><a href="esa.html#esa.saw.SAW.get_version_and_builddate">get_version_and_builddate() (esa.saw.SAW method)</a>
339+
</li>
332340
<li><a href="esa.html#esa.saw.SAW.get_ybus">get_ybus() (esa.saw.SAW method)</a>
333341
</li>
334342
<li><a href="esa.html#esa.saw.SAW.GetCaseHeader">GetCaseHeader() (esa.saw.SAW method)</a>

0 commit comments

Comments
 (0)