Merge branch 'develop'

mzy2240 · mzy2240 · commit 845b6f33853c · 2022-09-26T22:44:25.000-05:00
diff --git a/README.rst b/README.rst
@@ -80,7 +80,7 @@ The ESA team works hard to ensure ESA is well tested, and we strive for
 testing coverage data for ESA, using `coverage
 <https://pypi.org/project/coverage/>`__.
 
-.. table:: ESA's testing coverage as of 2022-09-15 (Git commit: 09a0fb7)
+.. table:: ESA's testing coverage as of 2022-09-26 (Git commit: 9fe1d36)
     :widths: auto
     :align: left
 
@@ -89,7 +89,7 @@ testing coverage data for ESA, using `coverage
     +=================+===================+=================+=================+====================+
     | esa/__init__.py |                 2 |               0 |               2 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
-    | esa/saw.py      |              1124 |               0 |            1124 |                100 |
+    | esa/saw.py      |              1140 |               0 |            1140 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
 
 License
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.9
+1.3.0
diff --git a/docs/doctrees/environment.pickle b/docs/doctrees/environment.pickle
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e29ac7436c46c295f280ef7e85d84bddc94cc4441de249647e8cf5f8d4749a2
-size 76583
+oid sha256:6f26d65d8c814f35cca58a1ccef50e9a78c88eb6cd78e607b29c45250f12e3ca
+size 77505
diff --git a/docs/doctrees/esa.doctree b/docs/doctrees/esa.doctree
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bb4928057a36445e0c3b517b5224764ac582d263eeb20a2d1b7d44c6f4e6f02
-size 422281
+oid sha256:6192770b6d60e67bfc33d0345587a708f32df512825d3c5139ad441b2a0c65de
+size 428140
diff --git a/docs/doctrees/overview.doctree b/docs/doctrees/overview.doctree
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b60c51408adf626a0a2f7c50a57334ec166d7f99057fb7fa17fd8b578108af2
+oid sha256:8b886f319941a482f1d2bb78ce717dd8ef51654b501461a76ada5e4b263c03fd
 size 30603
diff --git a/docs/doctrees/snippets.doctree b/docs/doctrees/snippets.doctree
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be1c0878bd1b910949f20228f4f58fcab4081add4682b793e17a96aef596b61a
-size 93956
+oid sha256:c262b3b051efba0fa27af37c58c5dcef829f2219c0a44154b2339c52e6f046a2
+size 98508
diff --git a/docs/doctrees/welcome.doctree b/docs/doctrees/welcome.doctree
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:326f14e6606ad732909f25abcfd851cac003341a1f3ee7a792c39f12d1116707
-size 100937
+oid sha256:24dc206456b62c8eb57655dc3358d0afb912e7ceac1d6d512cdc00e9967bbbea
+size 102423
diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: e0464f6a5f354efa64833053541a243d
+config: b7c62c6de69d4bab05d2a187be4395f4
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/html/_sources/snippets.rst.txt b/docs/html/_sources/snippets.rst.txt
@@ -38,10 +38,15 @@ Transient Stability Analysis
 
 .. include:: snippets/ts_mycontingency_200.rst
 
-Contingency Analysis
---------------------
+Fast Contingency Analysis
+-------------------------
+
+.. include:: snippets/fast_contingency_analysis_2000.rst
 
-.. include:: snippets/contingency_analysis_2000.rst
+Contingency Analysis using PW Built-in capability
+-------------------------------------------------
+
+.. include:: snippets/pw_contingency_analysis_2000.rst
 
 Create Simple Graph Model
 -------------------------
@@ -57,3 +62,4 @@ Plot Histogram of Line Flows with Matplotlib
 --------------------------------------------
 
 .. include:: snippets/line_loading_matplotlib_2000.rst
+
diff --git a/docs/html/_static/documentation_options.js b/docs/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '1.2.9',
+    VERSION: '1.3.0',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',
diff --git a/docs/html/esa.html b/docs/html/esa.html
@@ -1481,19 +1481,34 @@
 
 <dl class="py method">
 <dt class="sig sig-object py" id="esa.saw.SAW.get_lodf_matrix">
-<span class="sig-name descname"><span class="pre">get_lodf_matrix</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">precision</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">int</span></span> <span class="o"><span class="pre">=</span></span> <span class="default_value"><span class="pre">3</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_lodf_matrix" title="Permalink to this definition">¶</a></dt>
+<span class="sig-name descname"><span class="pre">get_lodf_matrix</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">precision</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">int</span></span> <span class="o"><span class="pre">=</span></span> <span class="default_value"><span class="pre">3</span></span></em>, <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>, <em class="sig-param"><span class="n"><span class="pre">post</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">bool</span></span> <span class="o"><span class="pre">=</span></span> <span class="default_value"><span class="pre">True</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">raw</span></span><span class="p"><span class="pre">:</span></span> <span class="n"><span class="pre">bool</span></span> <span class="o"><span class="pre">=</span></span> <span class="default_value"><span class="pre">False</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#esa.saw.SAW.get_lodf_matrix" title="Permalink to this definition">¶</a></dt>
 <dd><p>Obtain LODF matrix in numpy array or scipy sparse matrix.
 By default, it obtains the lodf matrix directly from PW. If size
 is larger than 1000, then precision will be applied to filter out
 small values and the result will be returned in scipy sparse matrix.</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
-<dd class="field-odd"><p><strong>precision</strong> – number of decimal to keep.</p>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>precision</strong> – number of decimal to keep.</p></li>
+<li><p><strong>method</strong> – The linear method to be used for the LODF calculation. Default is DC.</p></li>
+</ul>
 </dd>
-<dt class="field-even">Returns</dt>
-<dd class="field-even"><p>LODF matrix</p>
+</dl>
+<p>Change to DCPS would take phase shifter into account. Note: AC is NOT an option for the
+LODF calculation.
+:param post: Set to True to calculate any line closure sensitivies relative to
+post-closure flow on the line being closed. This is known as the LCDF value.
+Set to False to calculate any line closure sensitivities based on calculating the flow on
+the line being closed from pre-closure voltages and angles. This is known as the MLCDF
+value.
+:param raw: Set to True if you want to get the raw LODF matrix (dataframe), which suppose to
+be exactly the same as the table shown in the PW GUI. Default is False.</p>
+<dl class="field-list simple">
+<dt class="field-odd">Returns</dt>
+<dd class="field-odd"><p>The LODF matrix and a boolean vector to indicate which lines would cause</p>
 </dd>
 </dl>
+<p>islanding.</p>
 </dd></dl>
 
 <dl class="py method">
diff --git a/docs/html/index.html b/docs/html/index.html
@@ -247,7 +247,8 @@ <h1>Easy SimAuto (ESA) Documentation<a class="headerlink" href="#easy-simauto-es
 <li class="toctree-l2"><a class="reference internal" href="snippets.html#increase-loading-in-case">Increase Loading in Case</a></li>
 <li class="toctree-l2"><a class="reference internal" href="snippets.html#add-lines-to-case">Add Lines to Case</a></li>
 <li class="toctree-l2"><a class="reference internal" href="snippets.html#transient-stability-analysis">Transient Stability Analysis</a></li>
-<li class="toctree-l2"><a class="reference internal" href="snippets.html#contingency-analysis">Contingency Analysis</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snippets.html#fast-contingency-analysis">Fast Contingency Analysis</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snippets.html#contingency-analysis-using-pw-built-in-capability">Contingency Analysis using PW Built-in capability</a></li>
 <li class="toctree-l2"><a class="reference internal" href="snippets.html#create-simple-graph-model">Create Simple Graph Model</a></li>
 <li class="toctree-l2"><a class="reference internal" href="snippets.html#created-graph-model-with-edges-weighted-by-branch-impedance">Created Graph Model with Edges Weighted by Branch Impedance</a></li>
 <li class="toctree-l2"><a class="reference internal" href="snippets.html#plot-histogram-of-line-flows-with-matplotlib">Plot Histogram of Line Flows with Matplotlib</a></li>
diff --git a/docs/html/objects.inv b/docs/html/objects.inv
diff --git a/docs/html/overview.html b/docs/html/overview.html
@@ -316,7 +316,7 @@ <h2>Testing Coverage<a class="headerlink" href="#testing-coverage" title="Permal
 <p>The ESA team strives to write good tests with 100% coverage. The table
 below provides the latest test coverage data for ESA.</p>
 <table class="colwidths-auto docutils align-left" id="id3">
-<caption><span class="caption-text">ESA’s testing coverage as of 2022-09-15 (Git commit: 09a0fb7)</span><a class="headerlink" href="#id3" title="Permalink to this table">¶</a></caption>
+<caption><span class="caption-text">ESA’s testing coverage as of 2022-09-26 (Git commit: 9fe1d36)</span><a class="headerlink" href="#id3" title="Permalink to this table">¶</a></caption>
 <thead>
 <tr class="row-odd"><th class="head"><p>Name</p></th>
 <th class="head"><p>Num. Statements</p></th>
@@ -333,9 +333,9 @@ <h2>Testing Coverage<a class="headerlink" href="#testing-coverage" title="Permal
 <td><p>100</p></td>
 </tr>
 <tr class="row-odd"><td><p>esa/saw.py</p></td>
-<td><p>1124</p></td>
+<td><p>1140</p></td>
 <td><p>0</p></td>
-<td><p>1124</p></td>
+<td><p>1140</p></td>
 <td><p>100</p></td>
 </tr>
 </tbody>
diff --git a/docs/html/searchindex.js b/docs/html/searchindex.js
diff --git a/docs/html/snippets.html b/docs/html/snippets.html
@@ -167,7 +167,9 @@
                 
                   <li class="toctree-l2"><a href="#transient-stability-analysis" class="reference internal">Transient Stability Analysis</a></li>
                 
-                  <li class="toctree-l2"><a href="#contingency-analysis" class="reference internal">Contingency Analysis</a></li>
+                  <li class="toctree-l2"><a href="#fast-contingency-analysis" class="reference internal">Fast Contingency Analysis</a></li>
+                
+                  <li class="toctree-l2"><a href="#contingency-analysis-using-pw-built-in-capability" class="reference internal">Contingency Analysis using PW Built-in capability</a></li>
                 
                   <li class="toctree-l2"><a href="#create-simple-graph-model" class="reference internal">Create Simple Graph Model</a></li>
                 
@@ -663,8 +665,8 @@ <h2>Transient Stability Analysis<a class="headerlink" href="#transient-stability
 in the case and then load the case using ESA. GetParametersMultipleElement cannot be used
 here to retrieve the TS datapoints (which is a very rare situation).</p>
 </section>
-<section id="contingency-analysis">
-<h2>Contingency Analysis<a class="headerlink" href="#contingency-analysis" title="Permalink to this headline">¶</a></h2>
+<section id="fast-contingency-analysis">
+<h2>Fast Contingency Analysis<a class="headerlink" href="#fast-contingency-analysis" title="Permalink to this headline">¶</a></h2>
 <p>This example shows how to do fast contingency analysis (N-1 &amp; N-2) using
 ESA. The fast contingency analysis is a slightly improved implementation
 of <a class="reference external" href="https://ieeexplore.ieee.org/document/7390321">this paper</a>. It is generally
@@ -698,6 +700,38 @@ <h2>Contingency Analysis<a class="headerlink" href="#contingency-analysis" title
 <p>You could also validate the fast CA result with the built-in CA result by
 simply set the argument <cite>validate=True</cite> when calling <cite>run_contingency_analysis</cite> function.</p>
 </section>
+<section id="contingency-analysis-using-pw-built-in-capability">
+<h2>Contingency Analysis using PW Built-in capability<a class="headerlink" href="#contingency-analysis-using-pw-built-in-capability" title="Permalink to this headline">¶</a></h2>
+<p>This example shows how to perform the contingency analysis via PW’s built-in capability. We assume
+you already have the aux file that contains all the contingencies.</p>
+<p>The initialization procedure is the same as others.</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">CASE_PATH</span> <span class="o">=</span> <span class="sa">r</span><span class="s2">&quot;C:\Users\myuser\git\ESA\tests\cases\tx2000\tx2000_base_pws_version_21.pwb&quot;</span>
+<span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">esa</span> <span class="kn">import</span> <span class="n">SAW</span>
+<span class="gp">&gt;&gt;&gt; </span><span class="n">saw</span> <span class="o">=</span> <span class="n">SAW</span><span class="p">(</span><span class="n">CASE_PATH</span><span class="p">,</span> <span class="n">CreateIfNotFound</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+<span class="gp">&gt;&gt;&gt; </span><span class="n">saw</span><span class="o">.</span><span class="n">pw_order</span> <span class="o">=</span> <span class="kc">True</span>
+</pre></div>
+</div>
+<p>Make sure your case already has a valid operating states. If not, run power flow first:</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">saw</span><span class="o">.</span><span class="n">SolvePowerFlow</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>Then load the auxiliary file into Powerworld.</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">filepath_aux</span> <span class="o">=</span> <span class="sa">r</span><span class="s2">&quot;C:\Users\myuser\git\ESA\tests\cases\tx2000\tx2000_contingency_auxfile.aux&quot;</span>
+<span class="gp">&gt;&gt;&gt; </span><span class="n">saw</span><span class="o">.</span><span class="n">ProcessAuxFile</span><span class="p">(</span><span class="n">filepath_aux</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>Run the powerworld script command to solve all the contingencies that are not set to skip in the
+loaded auxiliary file.</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">cmd_solve</span> <span class="o">=</span> <span class="s1">&#39;CTGSolveAll(</span><span class="si">{}</span><span class="s1">,</span><span class="si">{}</span><span class="s1">)&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="s1">&#39;NO&#39;</span><span class="p">,</span><span class="s1">&#39;YES&#39;</span><span class="p">)</span>
+<span class="gp">&gt;&gt;&gt; </span><span class="n">saw</span><span class="o">.</span><span class="n">RunScriptCommand</span><span class="p">(</span><span class="n">cmd_solve</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>Use ESA to obtain the CA result</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">result</span> <span class="o">=</span> <span class="n">saw</span><span class="o">.</span><span class="n">GetParametersMultipleElement</span><span class="p">(</span><span class="s1">&#39;Contingency&#39;</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;CTGLabel&#39;</span><span class="p">,</span> <span class="s1">&#39;CTGSolved&#39;</span><span class="p">,</span> <span class="s1">&#39;CTGProc&#39;</span><span class="p">,</span> <span class="s1">&#39;CTGCustMonViol&#39;</span><span class="p">,</span> <span class="s1">&#39;CTGViol&#39;</span><span class="p">])</span>
+</pre></div>
+</div>
+<p>The result is stored as a dataframe.</p>
+</section>
 <section id="create-simple-graph-model">
 <h2>Create Simple Graph Model<a class="headerlink" href="#create-simple-graph-model" title="Permalink to this headline">¶</a></h2>
 <p>This example shows how to easily transform a grid model into a graph
diff --git a/docs/html/welcome.html b/docs/html/welcome.html
@@ -544,6 +544,14 @@ <h3>Credits and Thanks<a class="headerlink" href="#credits-and-thanks" title="Pe
 <p>Changes made with each ESA release are listed here. Please note that
 versions prior to 1.0.0 are not listed here, but are still available on
 <a class="reference external" href="https://pypi.org/project/esa/#history">PyPi</a>.</p>
+<section id="version-1-3-0">
+<h3>Version 1.3.0<a class="headerlink" href="#version-1-3-0" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><p>Improve the <cite>get_lodf_matrix</cite> function to support DCPS (DC with phase shifter) and MLCDF</p></li>
+<li><p>Add a new example for the built-in contingency analysis</p></li>
+<li><p>Fix typos and bugs</p></li>
+</ul>
+</section>
 <section id="version-1-2-9">
 <h3>Version 1.2.9<a class="headerlink" href="#version-1-2-9" title="Permalink to this headline">¶</a></h3>
 <ul class="simple">
diff --git a/docs/rst/coverage.rst b/docs/rst/coverage.rst
@@ -1,4 +1,4 @@
-.. table:: ESA's testing coverage as of 2022-09-15 (Git commit: 09a0fb7)
+.. table:: ESA's testing coverage as of 2022-09-26 (Git commit: 9fe1d36)
     :widths: auto
     :align: left
 
@@ -7,5 +7,5 @@
     +=================+===================+=================+=================+====================+
     | esa/__init__.py |                 2 |               0 |               2 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
-    | esa/saw.py      |              1124 |               0 |            1124 |                100 |
+    | esa/saw.py      |              1140 |               0 |            1140 |                100 |
     +-----------------+-------------------+-----------------+-----------------+--------------------+
diff --git a/docs/rst/snippets.rst b/docs/rst/snippets.rst
@@ -38,10 +38,15 @@ Transient Stability Analysis
 
 .. include:: snippets/ts_mycontingency_200.rst
 
-Contingency Analysis
---------------------
+Fast Contingency Analysis
+-------------------------
+
+.. include:: snippets/fast_contingency_analysis_2000.rst
 
-.. include:: snippets/contingency_analysis_2000.rst
+Contingency Analysis using PW Built-in capability
+-------------------------------------------------
+
+.. include:: snippets/pw_contingency_analysis_2000.rst
 
 Create Simple Graph Model
 -------------------------
@@ -57,3 +62,4 @@ Plot Histogram of Line Flows with Matplotlib
 --------------------------------------------
 
 .. include:: snippets/line_loading_matplotlib_2000.rst
+
diff --git a/docs/rst/snippets/fast_contingency_analysis_2000.rst b/docs/rst/snippets/fast_contingency_analysis_2000.rst
diff --git a/docs/rst/snippets/pw_contingency_analysis_2000.rst b/docs/rst/snippets/pw_contingency_analysis_2000.rst
@@ -0,0 +1,39 @@
+This example shows how to perform the contingency analysis via PW's built-in capability. We assume
+you already have the aux file that contains all the contingencies.
+
+The initialization procedure is the same as others.
+
+.. code:: python
+
+    >>> CASE_PATH = r"C:\Users\myuser\git\ESA\tests\cases\tx2000\tx2000_base_pws_version_21.pwb"
+    >>> from esa import SAW
+    >>> saw = SAW(CASE_PATH, CreateIfNotFound=True)
+    >>> saw.pw_order = True
+
+Make sure your case already has a valid operating states. If not, run power flow first:
+
+.. code:: python
+
+    >>> saw.SolvePowerFlow()
+
+Then load the auxiliary file into Powerworld.
+
+.. code:: python
+
+    >>> filepath_aux = r"C:\Users\myuser\git\ESA\tests\cases\tx2000\tx2000_contingency_auxfile.aux"
+    >>> saw.ProcessAuxFile(filepath_aux)
+    
+Run the powerworld script command to solve all the contingencies that are not set to skip in the
+loaded auxiliary file.
+
+.. code:: python
+
+    >>> cmd_solve = 'CTGSolveAll({},{})'.format('NO','YES')
+    >>> saw.RunScriptCommand(cmd_solve)
+
+Use ESA to obtain the CA result
+
+.. code:: python
+
+    >>> result = saw.GetParametersMultipleElement('Contingency', ['CTGLabel', 'CTGSolved', 'CTGProc', 'CTGCustMonViol', 'CTGViol'])
+The result is stored as a dataframe.
diff --git a/docs/rst/welcome/changelog.rst b/docs/rst/welcome/changelog.rst
diff --git a/esa/__init__.py b/esa/__init__.py
diff --git a/esa/saw.py b/esa/saw.py
diff --git a/tests/test_saw.py b/tests/test_saw.py
