ltbams 1.0.13__py3-none-any.whl → 1.0.15__py3-none-any.whl

ams/shared.py

@@ -15,6 +15,7 @@ from andes.utils.lazyimport import LazyImport
 
 from andes.system import System as adSystem
 
+from ._version import get_versions
 
 logger = logging.getLogger(__name__)
 
@@ -46,6 +47,15 @@ _max_length = 80                    # NOQA
 copyright_msg = "Copyright (C) 2023-2025 Jinning Wang"
 nowarranty_msg = "AMS comes with ABSOLUTELY NO WARRANTY"
 report_time = strftime("%m/%d/%Y %I:%M:%S %p")
+version_msg = f"AMS {get_versions()['version']}"
+
+summary_row = {'field': 'Info',
+               'comment': version_msg,
+               'comment2': report_time,
+               'comment3': nowarranty_msg,
+               'comment4': copyright_msg}
+
+summary_name = "Summary"  # ensure model Summary's name is consistent
 
 # NOTE: copied from CVXPY documentation, last checked on 2024/10/30, v1.5
 mip_solvers = ['CBC', 'COPT', 'GLPK_MI', 'CPLEX', 'GUROBI',
@@ -162,3 +172,62 @@ def _update_pbar(pbar, current, total):
     if pbar.n < pbar.total:  # Check if it's not already at total
         pbar.update(pbar.total - pbar.n)  # Update remaining
     pbar.close()
+
+
+def ams_params_not_in_andes(mdl_name, am_params):
+    """
+    Helper function to return parameters not in the ANDES model.
+    If the model is not in the ANDES system, it returns an empty list.
+
+    Parameters
+    ----------
+    mdl_name : str
+        The name of the model.
+    am_params : list
+        A list of parameters from the AMS model.
+
+    Returns
+    -------
+    list
+        A list of parameters that are not in the ANDES model.
+    """
+    if mdl_name not in ad_models:
+        return []
+    ad_params = list(empty_adsys.models[mdl_name].params.keys())
+    return list(set(am_params) - set(ad_params))
+
+
+def model2df(instance, skip_empty, to_andes):
+    """
+    Prepare a DataFrame from the model instance for output.
+
+    Parameters
+    ----------
+    instance : ams.model.Model
+        The model instance to prepare.
+    skip_empty : bool
+        Whether to skip empty models.
+    to_andes : bool
+        Whether to prepare the DataFrame for ANDES.
+
+    Returns
+    -------
+    pd.DataFrame
+        The prepared DataFrame.
+    """
+    name = instance.class_name
+
+    if skip_empty and instance.n == 0:
+        return None
+
+    if name not in ad_models and to_andes:
+        return None
+
+    instance.cache.refresh("df_in")
+    df = instance.cache.df_in
+
+    if to_andes:
+        skipped_params = ams_params_not_in_andes(name, df.columns.tolist())
+        df = df.drop(skipped_params, axis=1, errors='ignore')
+
+    return df

ams/system.py

@@ -51,9 +51,9 @@ def disable_methods(methods):
 
 class System(adSystem):
     """
-    A subclass of ``andes.system.System``, this class encapsulates data, models,
-    and routines for scheduling modeling and analysis in power systems.
-    Some methods  inherited from the parent class are intentionally disabled.
+    Base system class, revised from `andes.system.System`.
+    This class encapsulates data, models, and routines for scheduling
+    modeling and analysis in power systems.
 
     Parameters
     ----------
@@ -400,7 +400,7 @@ class System(adSystem):
         """
         Add a device instance for an existing model.
 
-        Revised from ``andes.system.System.add()``.
+        Revised from ``andes.system.System.add``.
         """
         if model not in self.models and (model not in self.model_aliases):
             if model in ad_dyn_models:
@@ -652,9 +652,10 @@ class System(adSystem):
 
         Notes
         -----
-        1. Power flow models in the addfile will be skipped and only dynamic models will be used.
-        2. The addfile format is guessed based on the file extension. Currently only ``xlsx`` is supported.
-        3. Index in the addfile is automatically adjusted when necessary.
+        - Power flow models in the addfile will be skipped and only dynamic models
+          will be used.
+        - The addfile format is guessed based on the file extension.
+        - Index in the addfile is automatically adjusted when necessary.
         """
         return to_andes(system=self, addfile=addfile,
                         setup=setup, no_output=no_output,
@@ -745,7 +746,13 @@ class System(adSystem):
         """
         return system2mpc(self)
 
-    def to_m(self, outfile: str, overwrite: bool = None):
+    def to_m(
+        self,
+        outfile: str,
+        overwrite: Optional[bool] = None,
+        skip_empty: bool = True,
+        to_andes: bool = False
+    ) -> bool:
         """
         Export an AMS system to a MATPOWER M-file.
         Wrapper method for `ams.io.matpower.write`.
@@ -776,9 +783,16 @@ class System(adSystem):
         """
         return write_m(self, outfile=outfile, overwrite=overwrite)
 
-    def to_xlsx(self, outfile: str, overwrite: bool = None):
+    def to_xlsx(
+        self,
+        outfile: str,
+        overwrite: Optional[bool] = None,
+        skip_empty: bool = True,
+        add_book: Optional[str] = None,
+        to_andes: bool = False
+    ) -> bool:
         """
-        Export an AMS system to an Excel file.
+        Export the AMS system to an Excel (XLSX) file.
         Wrapper method for `ams.io.xlsx.write`.
 
         Parameters
@@ -787,14 +801,40 @@ class System(adSystem):
             The output file name.
         overwrite : bool, optional
             If True, overwrite the existing file. Default is None.
+        skip_empty : bool, optional
+            If True, skip output of empty models (n = 0). Default is True.
+        add_book : str, optional
+            An optional workbook to be added to the output spreadsheet.
+            If None, no additional workbook is added. Default is None.
+        to_andes : bool, optional
+            If True, write to an ANDES system, where non-ANDES models are skipped.
+
+        Returns
+        -------
+        bool
+            True if the file is written successfully, False otherwise.
+
+        Notes
+        -----
+        - Only models with n > 0 are exported if `skip_empty` is True.
+        - If `to_andes` is True, only ANDES-compatible models are exported.
+        - The `add_book` parameter allows merging another workbook into the output.
 
         .. versionadded:: 1.0.10
         """
-        return write_xlsx(self, outfile=outfile, overwrite=overwrite)
+        return write_xlsx(self, outfile=outfile,
+                          skip_empty=skip_empty, overwrite=overwrite,
+                          add_book=add_book, to_andes=to_andes)
 
-    def to_json(self, outfile: str, overwrite: bool = None):
+    def to_json(
+        self,
+        outfile: str,
+        overwrite: Optional[bool] = None,
+        skip_empty: bool = True,
+        to_andes: bool = False
+    ) -> bool:
         """
-        Export an AMS system to a JSON file.
+        Export the AMS system to a JSON file.
         Wrapper method for `ams.io.json.write`.
 
         Parameters
@@ -803,24 +843,59 @@ class System(adSystem):
             The output file name.
         overwrite : bool, optional
             If True, overwrite the existing file. Default is None.
+        skip_empty : bool, optional
+            If True, skip output of empty models (n = 0). Default is True.
+        to_andes : bool, optional
+            If True, write to an ANDES system, where non-ANDES models are skipped.
+
+        Returns
+        -------
+        bool
+            True if the file is written successfully, False otherwise.
+
+        Notes
+        -----
+        - Only models with n > 0 are exported if `skip_empty` is True.
+        - If `to_andes` is True, only ANDES-compatible models are exported.
 
         .. versionadded:: 1.0.10
         """
-        return write_json(self, outfile=outfile, overwrite=overwrite)
+        return write_json(self, outfile=outfile,
+                          skip_empty=skip_empty, overwrite=overwrite,
+                          to_andes=to_andes)
 
-    def to_raw(self, outfile: str, overwrite: bool = None):
+    def to_raw(
+        self,
+        outfile: str,
+        overwrite: Optional[bool] = None,
+        skip_empty: bool = True,
+        to_andes: bool = False
+    ) -> bool:
         """
-        Export an AMS system to a v33 PSS/E RAW file.
+        Export the AMS system to a PSS/E RAW v33 file.
         Wrapper method for `ams.io.psse.write_raw`.
 
-        This method has not been fully benchmarked yet!
-
         Parameters
         ----------
         outfile : str
             The output file name.
         overwrite : bool, optional
             If True, overwrite the existing file. Default is None.
+        skip_empty : bool, optional
+            If True, skip output of empty models (n = 0). Default is True.
+        to_andes : bool, optional
+            If True, write only ANDES-compatible models.
+
+        Returns
+        -------
+        bool
+            True if the file is written successfully, False otherwise.
+
+        Notes
+        -----
+        - Only models with n > 0 are exported if `skip_empty` is True.
+        - If `to_andes` is True, only ANDES-compatible models are exported.
+        - This method has not been fully benchmarked yet.
 
         .. versionadded:: 1.0.10
         """

ams/utils/paths.py

@@ -271,21 +271,17 @@ def get_export_path(system, fname, path=None, fmt='csv'):
     fname : str
         The descriptive file name, e.g., 'PTDF', or 'DCOPF'.
     path : str, optional
-        The desired output path.
-        - If it's a directory, the file name will be generated.
-        - If it's a full file path (with extension), the filename part will be used
-          as the base, and the `fmt` argument will determine the final extension.
-        - If None, the current working directory will be used, and the filename will
-          be generated.
+        The desired output path. For a directory, the file name will be generated;
+        For a full file path, the base name will be used with the specified format;
+        For None, the current working directory will be used.
     fmt : str, optional
         The file format to export, e.g., 'csv', 'json'. Default is 'csv'.
 
     Returns
     -------
-    tuple
-        (str, str): A tuple containing:
-            - The **absolute export path** (e.g., '/home/user/project/data_Routine.csv').
-            - The **export file name** (e.g., 'data_Routine.csv'), including the format extension.
+    tuple : (str, str)
+        - The absolute export path (e.g., '/home/user/project/data_Routine.csv').
+        - The export file name (e.g., 'data_Routine.csv'), including the format extension.
     """
     # Determine the base name from system.files.fullname or default to "Untitled"
     if system.files.fullname is None:

docs/source/examples/index.rst

@@ -30,3 +30,4 @@ folder of the repository
    ../_examples/demo/demo_debug.ipynb
    ../_examples/demo/demo_mat.ipynb
    ../_examples/demo/demo_wrapper_routines.ipynb
+   ../_examples/demo/demo_dcopf.ipynb

docs/source/genroutineref.py

@@ -20,6 +20,30 @@ Routine reference
 Use the left navigation pane to locate the group and model
 and view details.
 
+Typical acronyms used in AMS include:
+
++------------+---------------------------+
+| Acronym    | Meaning                   |
++============+===========================+
+| AC-        | Alternating Current       |
++------------+---------------------------+
+| DC-        | Direct Current            |
++------------+---------------------------+
+| RT-        | Real-Time                 |
++------------+---------------------------+
+| -DG       | Distributed Generation     |
++------------+---------------------------+
+| -ES        | Energy Storage            |
++------------+---------------------------+
+| -OPF       | Optimal Power Flow        |
++------------+---------------------------+
+| -ED        | Economic Dispatch         |
++------------+---------------------------+
+| -UC        | Unit Commitment           |
++------------+---------------------------+
+| LMP        | Locational Marginal Price |
++------------+---------------------------+
+
 """
 
     out += ss.supported_routines(export='rest')

docs/source/release-notes.rst

@@ -9,6 +9,21 @@ The APIs before v3.0.0 are in beta and may change without prior notice.
 v1.0
 ==========
 
+v1.0.15 (2025-09-28)
+----------------------
+
+- Fix ``DCOPF2.pb`` to use PTDF-based formulation
+- Add a demo to compare ``DCOPF2`` and ``DCOPF``, see
+  ``examples/demonstration/demo_dcopf.ipynb``
+- In DC type routines, set `vBus` value as 1 for placeholder
+- Include Summary and Objective value in exported JSON
+
+v1.0.14 (2025-08-29)
+----------------------
+
+- Add supported Python versions in README
+
+
 v1.0.13 (2025-08-18)
 ----------------------
 

{ltbams-1.0.13.dist-info → ltbams-1.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ltbams
-Version: 1.0.13
+Version: 1.0.15
 Summary: Python software for scheduling modeling and co-simulation with dynamics.
 Home-page: https://github.com/CURENT/ams
 Author: Jinning Wang
@@ -51,12 +51,13 @@ Dynamic: home-page
 
 # LTB AMS
 
+<img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
+
 Python Software for Power System Scheduling Modeling and Co-Simulation with Dynamics, serving as the market simulator for the [CURENT Largescale Testbed][LTB Repository].
 
 ![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)
 [![DOI:10.1109/TSTE.2025.3528027](https://zenodo.org/badge/DOI/10.1109/TSTE.2025.3528027.svg)](https://ieeexplore.ieee.org/document/10836855)
-
-<img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
+[![pyOpenSci Peer-Reviewed](https://pyopensci.org/badges/peer-reviewed.svg)](https://github.com/pyOpenSci/software-review/issues/174)
 
 | Badges |  |  |
 |---|---|---|
@@ -66,16 +67,16 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
 | Tag | [![GitHub Tag](https://img.shields.io/github/v/tag/CURENT/ams)](https://github.com/CURENT/ams/tags) | ![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/curent/ams/latest/develop) |
 | Documentation | [![Read the Docs](https://img.shields.io/readthedocs/ams?label=stable)](https://ltb.readthedocs.io/projects/ams/en/stable/?badge=stable) | [![Read the Docs](https://img.shields.io/readthedocs/ams?label=develop)](https://ltb.readthedocs.io/projects/ams/en/develop/?badge=develop) |
 | Download | [![PyPI - Downloads](https://img.shields.io/pypi/dm/ltbams)](https://pypi.org/project/ltbams/) | [![Anaconda-Server Badge](https://anaconda.org/conda-forge/ltbams/badges/downloads.svg)](https://anaconda.org/conda-forge/ltbams) |
-| Code Quality | ![Codacy Badge](https://app.codacy.com/project/badge/Grade/69456da1b8634f2f984bd769e35f0050) | ![Codacy Badge](https://app.codacy.com/project/badge/Coverage/69456da1b8634f2f984bd769e35f0050) |
-| Code Cov | ![codecov](https://codecov.io/gh/CURENT/ams/graph/badge.svg?token=RZI5GLLBQH) |  |
+| Quality | ![Codacy Badge](https://app.codacy.com/project/badge/Grade/69456da1b8634f2f984bd769e35f0050) | [![codebeat badge](https://codebeat.co/badges/6c8a53d2-cffd-4787-8c49-d59742a95205)](https://codebeat.co/projects/github-com-curent-ams-master) |
+| Coverage | ![Codacy Badge](https://app.codacy.com/project/badge/Coverage/69456da1b8634f2f984bd769e35f0050) | ![codecov](https://codecov.io/gh/CURENT/ams/graph/badge.svg?token=RZI5GLLBQH) |
 | Last Commit | ![GitHub last commit (master)](https://img.shields.io/github/last-commit/CURENT/ams/master?label=last%20commit%20to%20master) | ![GitHub last commit (develop)](https://img.shields.io/github/last-commit/CURENT/ams/develop?label=last%20commit%20to%20develop) |
-| CI | [![Compatibility](https://github.com/CURENT/ams/actions/workflows/compatibility.yml/badge.svg)](https://github.com/CURENT/ams/actions/workflows/compatibility.yml) | [![Build Status](https://dev.azure.com/curentltb/ams/_apis/build/status%2FCURENT.ams?branchName=scuc)](https://dev.azure.com/curentltb/ams/_build/latest?definitionId=2&branchName=scuc) |
-| CD | [![Publish](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml) |  |
+| CI | [![Compatibility](https://github.com/CURENT/ams/actions/workflows/compatibility.yml/badge.svg)](https://github.com/CURENT/ams/actions/workflows/compatibility.yml) | [![Build Status](https://dev.azure.com/curentltb/ams/_apis/build/status%2FCURENT.ams?branchName=master)](https://dev.azure.com/curentltb/ams/_build/latest?definitionId=2&branchName=master) |
+| CD | [![Publish](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml) | [![Build Status](https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/ltbams-feedstock?branchName=main)](https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=21708&branchName=main) |
 | Structure | [![Structure](https://img.shields.io/badge/code_base-visualize-blue)](https://mango-dune-07a8b7110.1.azurestaticapps.net/?repo=CURENT%2Fams) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/CURENT/ams) |
 | Dependency | [![libraries](https://img.shields.io/librariesio/release/pypi/ltbams)](https://libraries.io/pypi/ltbams) |  |
 | Try on Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/curent/ams/master) |  |
 
-# Why AMS
+## Why AMS
 
 AMS facilitates **Dynamics Incorporated Scheduling** and **Scheduling-Dynamics Co-Simulation**
 through an integrated interface with ANDES.
@@ -150,9 +151,9 @@ Use the following resources to get involved.
 -  Read release notes highlighted [here][release notes]
 -  Try in Jupyter Notebook on [Binder][Binder]
 -  Check out the source code used for [benchmark][benchmark]
--  Check out and and cite our [paper][paper]
+-  Check out and cite our [paper][paper]
 
-# Installation
+## Installation
 
 AMS is released as ``ltbams`` on PyPI and conda-forge.
 Install from PyPI using pip:
@@ -191,11 +192,11 @@ pip install git+https://github.com/CURENT/ams.git
 - `cvxpy` is distributed with the open source solvers CLARABEL, OSQP, and SCS, but MIP-capable solvers need separate installation
 - `cvxpy` versions **below 1.5** are incompatible with `numpy` versions **2.0 and above**
 - If the solver `SCIP` encounters an import error caused by a missing `libscip.9.1.dylib`, try reinstalling its Python interface by running `pip install pyscipopt --no-binary scip --force`
-- `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries, more detailes can be found in this closed issue [Bug with dependency kvxopt 1.3.2.0](https://github.com/CURENT/andes/issues/508)
+- For the ImportError related to `kvxopt`, it is recommended to reinstall it via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries. More details can be found in this closed issue [Bug with dependency kvxopt 1.3.2.0](https://github.com/CURENT/andes/issues/508)
 - Versions **1.0.0** and **1.0.1** are only available on PyPI
 - Version **0.9.9** has known issues and has been yanked from PyPI
 
-# Example Usage
+## Example Usage
 
 ```python
 import ams
@@ -216,12 +217,15 @@ sa
 >>> <andes.system.System at 0x14bd98190>
 ```
 
-# Citing AMS
+Here, RTED stands for Real-Time Economic Dispatch.
+For a full list of acronyms used in the library, please consult the [Documentation - Routine Reference](https://ltb.readthedocs.io/projects/ams/en/stable/routineref.html#routine-reference).
+
+## Citing AMS
 If you use AMS for research or consulting, please cite the following paper in your publication that uses AMS:
 
 > J. Wang et al., "Dynamics-Incorporated Modeling Framework for Stability Constrained Scheduling Under High-Penetration of Renewable Energy," in IEEE Transactions on Sustainable Energy, vol. 16, no. 3, pp. 1673-1685, July 2025, doi: 10.1109/TSTE.2025.3528027.
 
-# Sponsors and Contributors
+## Sponsors and Contributors
 AMS is the scheduling simulation engine for the CURENT Largescale Testbed (LTB).
 More information about CURENT LTB can be found at the [LTB Repository][LTB Repository].
 
@@ -232,16 +236,9 @@ This work was supported in part by the Advanced Grid Research and Development Pr
 
 See [GitHub contributors][GitHub contributors] for the contributor list.
 
-# License
+## License
 AMS is licensed under the [GPL v3 License](./LICENSE).
 
-# Related Projects
-- [Popular Open Source Libraries for Power System Analysis](https://github.com/ps-wiki/best-of-ps)
-- [G-PST Tools Portal](https://g-pst.github.io/tools/): An open tools portal with a classification approach
-- [Open Source Software (OSS) for Electricity Market Research, Teaching, and Training](https://www2.econ.iastate.edu/tesfatsi/ElectricOSS.htm)
-
-Some commercial solvers provide academic licenses, such as COPT, GUROBI, CPLEX, and MOSEK.
-
 * * *
 
 [GitHub releases]:       https://github.com/CURENT/ams/releases

{ltbams-1.0.13.dist-info → ltbams-1.0.15.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ams/__init__.py,sha256=q-9-f0YCg6aaTW19VCkY6VosfvRA2ObI9mF1f_3016Y,313
 ams/__main__.py,sha256=EB4GfGiKgvnQ_psNr0QwPoziYvjmGvQ2yVsBwQtfrLw,170
-ams/_version.py,sha256=cx7xVAwESB33WAGN1aq_ze2Enb6iFPvXPOw8AEV7mrg,498
-ams/cli.py,sha256=EyNFXn565gFCppTxpyTZviBdPgUuKtgAPZ4WE6xewRk,6164
-ams/interface.py,sha256=-UN7-TiSt7mOS0W7526LuOk4KCIGDZSguRaVmh_KMRM,45240
-ams/main.py,sha256=lIqC16TO0pye75Wv8l_6EemNtm15iyMdvu8YQFkdd_4,23599
-ams/report.py,sha256=ewcffopOzT5o45eJNmcV8pxeQqPIjKbarGN33-yHGA8,10961
-ams/shared.py,sha256=HNkW-fa7l1PSubHPUvG5iaJTKeKXEt-IUCEv1MyrX3Q,4820
-ams/system.py,sha256=rKd9xeb6NKTcb74iqMh5zHS4ZrvQXI88zx56ChIoKkc,32118
+ams/_version.py,sha256=Y9hMQAuHXt_45lOoYtSA44yQCwKbKuDs8CYDfeESO-k,498
+ams/cli.py,sha256=OuQc4xotv0dCgEIEaw-ZFEfDZvt1w9QQ9yjeaJiDe_s,6067
+ams/interface.py,sha256=wYqoh_rK4vHidJjWnE5VZHzonm4D-uCzZt0Z9oFBKVo,45233
+ams/main.py,sha256=OFbEtXEIuv-zSFccyN_1Mrg8XEn4TZTHXa3Ly-zbxmo,23559
+ams/report.py,sha256=iqa--JZwDldjmOaMhDdg8yYkuNL5ITeMxQak0OTPtos,10860
+ams/shared.py,sha256=sr5xMTP-7FWHsSCRz_dLMUN2OsmszlPcdYzR3orol0c,6613
+ams/system.py,sha256=hGokwNl5pgzVs07jnONteD5ipqoKukZetHi4dq2pIO0,34534
 ams/cases/5bus/pjm5bus_demo.json,sha256=IpxO2vzB9-9Kg9xjOXREKeXEz9wjFE7cuQbcUu8VORA,23152
 ams/cases/5bus/pjm5bus_demo.xlsx,sha256=OWIUprkg8_aQ_bTCaEFMl7Bhfa1R20zxAHXRQtXBix0,32607
 ams/cases/5bus/pjm5bus_ev.xlsx,sha256=vR8dJv5jIxib1pgcMonhzvraoqZVJWhBSJdVXDL0qsI,19498
@@ -36,81 +36,81 @@ ams/cases/pglib/pglib_opf_case39_epri__api.m,sha256=DKUNon8FgIYKJWOK5ZyQ0fLP0zow
 ams/cases/wecc/wecc.m,sha256=8Wqal6H5r1wNxLLQBCXo2V3v3JZY5IJDEkyrEGCrCWE,30498
 ams/cases/wecc/wecc_uced.xlsx,sha256=R3tZgxEqz_ctKcjA1wwFecxn-QZXutvf7NzgnCg_078,94767
 ams/core/__init__.py,sha256=lIvrAvYf2yrHWqYi0rVuJgJt8KNA8nTmN2iuZ125z9Q,123
-ams/core/common.py,sha256=934J7xq5JvC14yKp2Z4hWKUFJFhxzAnxB_8_99CChY0,704
-ams/core/documenter.py,sha256=3-jUYrtN8zDZXd8tQZlmZouJluJPH9_xIDbK9ZEEnRU,25762
-ams/core/matprocessor.py,sha256=T_WcfTS2qoXa8IxiaYBgSjt56yQm_qUKSsh3Gfq-yIc,27923
-ams/core/model.py,sha256=LNZtzyf2A7Tz3pn9IDs35JYaHSkQRqhqZicTpZGSqsc,10926
-ams/core/param.py,sha256=LPH48xUHyqWqODD6IsiamUtkJDDSgGCEMAo6vroFoHE,11130
+ams/core/common.py,sha256=UrgM3W2zjzGKZsI0vA7ozqA2RwjTu1idQAo_nzqQgjk,840
+ams/core/documenter.py,sha256=Q8u_AN1ljyQIKdbPsmcscCc8iUwpz4fTRVXZieJZByI,25814
+ams/core/matprocessor.py,sha256=ooYQEq6YCfLb2bpVdK8cjBOG1wmDgSEeUkkG1xOA9Qo,27952
+ams/core/model.py,sha256=wS8LN3F6wCy3aATnxrbvN6RwvG3mKfAlfBwvOuBdEx0,10990
+ams/core/param.py,sha256=uNNjlBkaC8HXiLPsceDS5AIc9U2gNo7pHKquni0LRfE,11183
 ams/core/service.py,sha256=Q4aeaYFWycIEH7I8DSO8Itah2CJxc3oAW46dtKCQEyA,28041
-ams/core/symprocessor.py,sha256=qGzztGqe15-nrq1ZdrjslEH-375vjvB3O8fi7nau5Hw,8419
-ams/core/var.py,sha256=f48pzir4miBsB5sh6PwUsFe0LdNNEM-d3VufcjbUU0w,1591
+ams/core/symprocessor.py,sha256=QlVfKdFYsXwcNChltfmosXW2HRCqsOpgi0rZhbtdYYI,8547
+ams/core/var.py,sha256=cwvFKz3LmjGH--nkaGo2lron8q7UViyBd3YrAkhuR7s,1575
 ams/extension/__init__.py,sha256=5IFTNirDL0uDaUsg05_oociVT9VCy2rhPx1ad4LGveM,65
-ams/extension/eva.py,sha256=4_q4ME0WrQIcd205SBTjv0-rMRZZIdQ07QJuEHwLIC8,16340
+ams/extension/eva.py,sha256=CoijRlJ7-4hyCdT8028aoI5BOZQi3HaSYoXlOatboVY,16449
 ams/io/__init__.py,sha256=GIfF7X44olHaySL8EzOBU1eXUnunr1owzzdPfPvvHZU,3802
-ams/io/json.py,sha256=IurwcZDuKczSbRTpcbQZiIi0ARCrMK6kJ0E3wS8ENy8,2585
-ams/io/matpower.py,sha256=qxZ6qqFDm1F9mWotLT6walWD-rZaFKyh0-DVtRcjhgY,27601
-ams/io/psse.py,sha256=qLKM9pRsNuSVNRHrgy4i6beSLuxu4fcBEU_SIV8owRA,13714
+ams/io/json.py,sha256=PhbF1kUhl7UXR2OtTAx-fdb3mZ2ujyYpn-vJqUe5Gdg,2508
+ams/io/matpower.py,sha256=g-qOtKGvnJJuHDqcyiGGGCY_BeuSbnQpmflolMV_wo8,27575
+ams/io/psse.py,sha256=IqE8EDAZrm2FrjYmLpcV7231Dw-1gD-4f1Xndx0nmGo,13724
 ams/io/pypower.py,sha256=Fe0sxzC5DZegtYksTixadXk_LcfJ1GNetWu9EuHCkG8,2790
-ams/io/xlsx.py,sha256=7ATW1seyxsGn7d5p5IuSRFHcoCHVVjMu3E7mP1Mc74U,2460
+ams/io/xlsx.py,sha256=xvo3eMwavFRWzppVI1HR0za9vI0w05WJaVctA8erEr4,2443
 ams/models/__init__.py,sha256=EGkViLkVX_We9FAGuEkgfleMNmPw_vGp2Nq1OQimL7U,691
 ams/models/area.py,sha256=AKYU6aJQKsVWRZdvMO7yic-8wZ1GumSTQXgDg5L0THw,899
 ams/models/bus.py,sha256=U0vSegkm-9fqPQS9KMJQU6gpIMX_1GK5O_dvRc8-0P0,1585
 ams/models/cost.py,sha256=rmGNj9ztMbqA-OIJj8fNNBh8bdYJSY9hk10vffgxc6k,5916
-ams/models/group.py,sha256=qVYhyMJQHIDikcxxY-mAOOVZOE1_Bp9Av4dP6AtQ4hs,5780
+ams/models/group.py,sha256=3jzytOxnb9kqYqKfVD02ZhgaswbJ0lih_0_WMl2DGfw,5897
 ams/models/info.py,sha256=Oh0Xo5J4ZHBsNIkMOzIwv_DegsX1inyuv3Q5CpCfyQw,788
 ams/models/line.py,sha256=ju5h1BcW4kgVWm_lgl8zWhSYqlsUjbdoUwzz2t0Vx1s,2770
 ams/models/reserve.py,sha256=3BjWCyKrPL4CwTvmzRxk25H8Nkxh-Rz0Ne17I9Y2TUA,2816
 ams/models/shunt.py,sha256=h5QV33EcCd86XRR0sMIzcO0PTeTirkWaxi8imPKzOi0,337
-ams/models/timeslot.py,sha256=XfXJukbQXTUawbsYI6BMLbytXNIe5VE2SQ5_t1Lc8_8,2001
-ams/models/zone.py,sha256=b9DsXOsD9Dny-lCMAWwRpRpl7rYVa0ev180YwqFTaiA,1076
+ams/models/timeslot.py,sha256=z_LDZZOjYFG_R_1jwBWSsLKsD-OoauWo027Z2J_JIMQ,3639
+ams/models/zone.py,sha256=-oOmPiMa8I7TzgheKEZOImXWv273ri6TURhmzy_ygkE,1089
 ams/models/distributed/__init__.py,sha256=3uiMHT2YRq79DXIB1jni6wP7dNoQMjU1bMTUpr4P6Rc,161
-ams/models/distributed/esd1.py,sha256=A1qCLzaDtJVI-YoXJd6IRYtP_wp_Ajz2lfjFHvzqHkk,2130
-ams/models/distributed/ev.py,sha256=mpEIGyG9jV1bXkRIXOkCck4hl5np3bfBKvs4ysxukdM,1978
-ams/models/distributed/pvd1.py,sha256=KAOlXpZgT_w58xaGWjm5ht6ksac6eRhaqBFHK4EPRH8,1960
+ams/models/distributed/esd1.py,sha256=Ojqp_dJOJqa65u8kZ-oreA5cxruX2kXZ5AeNAAeYV7g,2136
+ams/models/distributed/ev.py,sha256=DO5cIqAX09lMKfrlsK-W_6gypI6hWpXHObQ0JZ6g9OE,2096
+ams/models/distributed/pvd1.py,sha256=RGxpkb5lWfoxafSyc_Tc8GcxBf0lF9Zl1RbN3WSE7MQ,1966
 ams/models/renewable/__init__.py,sha256=7dZyRXbvBAHbLJeJssJ1hsOHj9Bgeg77kB5gcX_mBtg,118
-ams/models/renewable/regc.py,sha256=3J9alIGUn_GkibQ3-dKTylAOpNPzd5zpancPc79q9T4,3448
+ams/models/renewable/regc.py,sha256=A4CYMVeKPZsqD6tTMz0GmPYiuZjfKGYx8f2eCX_D0lg,3483
 ams/models/static/__init__.py,sha256=lh5yR5Xb2unS4ndng-cLU1TAeoidu2s6VAVFLc3HUDU,96
 ams/models/static/gen.py,sha256=QXklOYlnU7QHWy-WFJwhxuNItUPqFsLJIjAO4sGMUbg,7087
 ams/models/static/pq.py,sha256=SCwAqhqvKy_PFHp6VYO_zgv3v6gI5pK3KvT3RNX-nvA,2782
 ams/opt/__init__.py,sha256=INsl8yxtOzTKqV9pzVxlL6RSGDRaUDwxpZMY1QROrF4,459
 ams/opt/constraint.py,sha256=ERT9zwjQyGkvDo465Yd0wBexlIhjVmw0MyWq4BWnWoI,5534
-ams/opt/exprcalc.py,sha256=7io0vEZu5zqsEnetocasRT1tu7o7g0TXw7iJf2YFIxI,4317
+ams/opt/exprcalc.py,sha256=Dkopx7U5VnfeqN6VDAx1iqaF60dRxvHpNErnhZN1rm4,4422
 ams/opt/expression.py,sha256=WrWnYliB61uHA_wQjtYgtAXdpgSN1pNqQmWvzHWSsdE,5569
 ams/opt/objective.py,sha256=W0dQfW5dHNdWEc2DQtWYNGMuhMY6Pu-HTD0n7-izDZA,5519
 ams/opt/omodel.py,sha256=hEtfKoSNssSxHgUDdep79pifNTsywytDTjgGgne7nKM,12750
-ams/opt/optzbase.py,sha256=KEYRPhfTCw1E5EUmjpDXSF1kdyqzdR9Yg10Z2VNJahw,5615
+ams/opt/optzbase.py,sha256=wp5Logvti1psRnuzRKDV36HN_EQw-cEbk3BsORDx1_0,5623
 ams/opt/param.py,sha256=G0KkWo1SqLiecZ7gLPzsbG5_WBORSVZ2GJ20ekdYJoQ,5121
 ams/opt/var.py,sha256=cpDiELo37E7IoTDlVn_NbkuFNQ88oey23YOF6Gpg6zM,7707
 ams/routines/__init__.py,sha256=V_IyEb5qLBrZ4zc_eVe-Rc0G_j-u881tvEzcEejhNv8,647
 ams/routines/acopf.py,sha256=dLVTh84KiBvLyG2auNsIfcufsl6N-9FcXWjpdYrQfYQ,208
-ams/routines/dcopf.py,sha256=40I5pYUsUiear_DT9iHwRtFPs_yy-wlxQVDnFrlMtg4,11619
-ams/routines/dcopf2.py,sha256=sDCP8zqYHDh7s7p9SX6G8QhMfIxCg3VPYJn6r3pRKyo,3620
-ams/routines/dcpf.py,sha256=lGZ9LmCL1DsFB-sNxI7NGrq0qd_iBRMDPJmU5022t20,8242
-ams/routines/dopf.py,sha256=8D36-FkPORYGaMnwGTqwz8HxAXk5ywo3mk8NlGq327g,6289
-ams/routines/ed.py,sha256=9Hf_ZqD6poIxCIBfsTMC0DGoPNEja1ZtVxqhb4ijhgE,11875
+ams/routines/dcopf.py,sha256=QagOUPWgBIh9zhh2LQp7aZw0kx3n-JKtClVh7X3M-yI,11874
+ams/routines/dcopf2.py,sha256=GNXyydfVKRYx4gW_5mdWhnA2eDDYFSUGK-AuJnEC-fI,4899
+ams/routines/dcpf.py,sha256=qZ2MSOmn53lz2Q54Cy_tIZ3TSKYJuN1YQsQez1XRukQ,8384
+ams/routines/dopf.py,sha256=IRvkwYF80sYAPI0iUS5L6c2jChFT3vl8tELf7LA6V7Q,6275
+ams/routines/ed.py,sha256=-OpoWiTEMDC5dHcumJikKPsp7DoyfxQ0sRXjKhWQ6vE,11870
 ams/routines/grbopt.py,sha256=hEDy7L-lSd7QxSN_GAyDLaLkhIpxl6csXz6ntdKT_fw,5510
-ams/routines/pflow.py,sha256=5_9n10r_PfsVXIRkaBgKxVITumImZ8mvpHnwxX_ECdw,9432
+ams/routines/pflow.py,sha256=vFnf61cYv7gWJSGqcQrMOaw-aOODd2eJMLpQ4aM1PQM,9438
 ams/routines/pypower.py,sha256=VnqMQZkBIvDe3tDbTJcxYz04idon5XvmGlf7OSs8kOI,27334
-ams/routines/routine.py,sha256=PB-97CkdNAiAGMlagihvFTklt2w7ce4FG2NcjW1InoA,39445
-ams/routines/rted.py,sha256=GOHRxo0-HS5HhwQg8lv7-2VcGr_M_TdUvvomgJ31fDQ,22070
+ams/routines/routine.py,sha256=eDscTniBpFh9SZ8pTV1pmi-b_6JwL5OYOgiXmPUUNxE,39981
+ams/routines/rted.py,sha256=-5UOeEGx3ZOrF0FG0M0OUPP2tIfajQmKyZHTQ3c6kaE,22058
 ams/routines/type.py,sha256=lvTWSnCYIbRJXIm3HX6jA0Hv-WWYusTOUPfoW8DITlU,3877
-ams/routines/uc.py,sha256=VcuNy2TnBjsewKEGIqeo2EFTyuhpx5QsEvgpAtscDIQ,15648
+ams/routines/uc.py,sha256=L9LpwjoqKoUzIwYq-G-r1zRTMGfbaSWSwT8GZuf_nB0,15650
 ams/utils/__init__.py,sha256=2hAQmWRgmnE-bCGT9cJoW9FkPDMGRiGkbBcUgj-bgjI,122
 ams/utils/misc.py,sha256=Y6tPKpUKJa7bL9alroJuG2UNW9vdQjnfAmKb2EbIls8,2027
-ams/utils/paths.py,sha256=6iTux5UaHzRi6mGHnpbYUp-MoD-IFny4IuRsV8FKDcQ,9481
+ams/utils/paths.py,sha256=Zx0PMqHjd_uuZI2pPu-Jec98FMNE2rCaaXJCHlZ22qs,9295
 docs/Makefile,sha256=UKXBFAbKGPt1Xw9J84343v0Mh8ylAZ-tE0uCd74DrQU,725
 docs/make.bat,sha256=9UgKGb4SdP006622fJiFxeFT1BeycYAs6hDbV1xwPy8,804
 docs/source/api.rst,sha256=BRzdDFDzDwVL7Jr_Xj-O5Icgx0gt5hNNd1OjvPl7ap0,1490
 docs/source/conf.py,sha256=UyoWogZTUNSJU7pQS_JaR28nKddW94zr01LYoIciZZw,6688
 docs/source/genmodelref.py,sha256=IhmF7bDw8BXPvLD8V3WjQNrfc-H07r5iS-_4DHbbp-8,1420
-docs/source/genroutineref.py,sha256=glHhbWUXfZzMDrkque9CBZu8QtdxlxPojInERzAAOwA,1063
+docs/source/genroutineref.py,sha256=0Fac6ZPY0TVfRvunq-FY6iax-_N6EEcoeVXVZmkfV4k,2006
 docs/source/index.rst,sha256=oAdRBWTLCX8nEMVatfDFkn0dtvinOK7vg4QUekT4jns,2738
-docs/source/release-notes.rst,sha256=bzZC_X3PP392jjG0j3hSbBtPUFceMcea0FjTIPljyl8,14308
+docs/source/release-notes.rst,sha256=tsSEDXGQGi9kH8-gnGb-SslytqfRFRto6iEJDgWyrXI,14709
 docs/source/_templates/autosummary/base.rst,sha256=zl3U4baR4a6YjsHyT-x9zCOrHwKZOVUdWn1NPX2u3bc,106
 docs/source/_templates/autosummary/class.rst,sha256=Hv_igCsLsUpM62_zN0nqj6FSfKnS5xLyu8ZldMbfOAk,668
 docs/source/_templates/autosummary/module.rst,sha256=YdbpCudOrEU-JbuSlzGvcOI2hn_KrCM6FW5HcGqkaEE,1113
 docs/source/_templates/autosummary/module_toctree.rst,sha256=sg30OdqFDLyo8Y3hl9V-s2BXb1bzcjjqqWaWi-C3qFM,1126
-docs/source/examples/index.rst,sha256=yXR54WHHcBY38-h9LkdTBcNq3HDeT6eSNyrMmafq12E,792
+docs/source/examples/index.rst,sha256=8nnW6jISleIz3IBWmqWtQcaOEdgMonY1UfWYs3NjTnM,830
 docs/source/getting_started/copyright.rst,sha256=d3S7FjrbysVqQd3pEBadrrkcQOZ7sYYeDTCOS4goPC8,715
 docs/source/getting_started/index.rst,sha256=mcp1NdUwbPoNzpn7Owf5Qzfd6J_--ToU52PjmrbwjBY,1512
 docs/source/getting_started/install.rst,sha256=pCL5GDNxwkWnrPaO48i9c0bBPT_dYAWvD2CQ7Oi2P_0,7400
@@ -135,8 +135,8 @@ docs/source/modeling/index.rst,sha256=TasRAJSglc5KAZaGAj9TLMktOO2TtzZsqG5WvvZXB_
 docs/source/modeling/model.rst,sha256=j7OSvoXnDht6rGpgwPiJklsCWrebfx4DxIN-G8r6iFo,7086
 docs/source/modeling/routine.rst,sha256=BkUE3y5L1lA7LP9Nyzc4zzY-tF3t4k7egBE188kybHY,4286
 docs/source/modeling/system.rst,sha256=NMOPNMOKG1_dRyNPPx-MiCKbbpadxWJxGyU6geRUsvQ,1374
-ltbams-1.0.13.dist-info/METADATA,sha256=Zlsv1ahEhFMTEJDWhCLAaek_J_nwX7v0i6HTKmZEY0w,14014
-ltbams-1.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ltbams-1.0.13.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
-ltbams-1.0.13.dist-info/top_level.txt,sha256=5QQ_oDY9sa52MVmqCjqjUq07BssHOKmDSaQ8EZi6DOw,9
-ltbams-1.0.13.dist-info/RECORD,,
+ltbams-1.0.15.dist-info/METADATA,sha256=K6aLQwj_aKgX8n92MvowKSeKLlI72bAjR8rX-QOES0E,14333
+ltbams-1.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ltbams-1.0.15.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
+ltbams-1.0.15.dist-info/top_level.txt,sha256=5QQ_oDY9sa52MVmqCjqjUq07BssHOKmDSaQ8EZi6DOw,9
+ltbams-1.0.15.dist-info/RECORD,,