ltbams 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

ams/shared.py

@@ -6,7 +6,6 @@ This module is supplementary to the ``andes.shared`` module.
 import logging
 import unittest
 from functools import wraps
-from collections import OrderedDict
 from time import strftime
 
 import cvxpy as cp
@@ -21,10 +20,16 @@ logger = logging.getLogger(__name__)
 sps = LazyImport('import scipy.sparse as sps')
 np = LazyImport('import numpy as np')
 pd = LazyImport('import pandas as pd')
+ppoption = LazyImport('from pypower.ppoption import ppoption')
+runpf = LazyImport('from pypower.runpf import runpf')
+runopf = LazyImport('from pypower.runopf import runopf')
+opf = LazyImport('from gurobi_optimods import opf')
 
 # --- an empty ANDES system ---
 empty_adsys = adSystem(autogen_stale=False)
 ad_models = list(empty_adsys.models.keys())
+ad_pf_models = [mname for mname, model in empty_adsys.models.items() if model.flags.pflow]
+ad_dyn_models = [mname for mname, model in empty_adsys.models.items() if model.flags.tds and not model.flags.pflow]
 
 # --- NumPy constants ---
 # NOTE: In NumPy 2.0, np.Inf and np.NaN are deprecated.
@@ -105,49 +110,27 @@ def skip_unittest_without_MISOCP(f):
     return wrapper
 
 
-ppc_cols = OrderedDict([
-    ('bus', ['bus_i', 'type', 'pd', 'qd', 'gs', 'bs', 'area', 'vm', 'va',
-             'baseKV', 'zone', 'vmax', 'vmin', 'lam_p', 'lam_q',
-             'mu_vmax', 'mu_vmin']),
-    ('branch', ['fbus', 'tbus', 'r', 'x', 'b', 'rate_a', 'rateB_b', 'rate_c',
-                'tap', 'shift', 'status', 'angmin',
-                'angmax', 'pf', 'qf', 'pt', 'qt', 'mu_sf', 'mu_st',
-                'mu_angmin', 'mu_angmax']),
-    ('gen', ['bus', 'pg', 'qg', 'qmax', 'qmin', 'vg', 'mbase', 'status',
-             'pmax', 'pmin', 'pc1', 'pc2', 'qc1min', 'qc1max', 'qc2min',
-             'qc2max', 'ramp_agc', 'ramp_10', 'ramp_30', 'ramp_q',
-             'apf', 'mu_pmax', 'mu_pmin', 'mu_qmax', 'mu_qmin']),
-    ('gencost', ['model', 'startup', 'shutdown', 'n', 'c2', 'c1', 'c0']),
-])
+def skip_unittest_without_PYPOWER(f):
+    """
+    Decorator for skipping tests that require PYPOWER.
+    """
+    def wrapper(*args, **kwargs):
+        try:
+            import pypower  # NOQA
+        except ImportError:
+            raise unittest.SkipTest("PYPOWER is not installed.")
+        return f(*args, **kwargs)
+    return wrapper
 
 
-def ppc2df(ppc, model='bus', ppc_cols=ppc_cols):
+def skip_unittest_without_gurobi_optimods(f):
     """
-    Convert PYPOWER dict to pandas DataFrame.
-
-    Parameters
-    ----------
-    ppc : dict
-        PYPOWER case dict.
-    model : str
-        Model name.
-    ppc_cols : dict
-        Column names.
-
-    Returns
-    -------
-    pandas.DataFrame
-        DataFrame.
-
-    Examples
-    --------
-    >>> import ams
-    >>> sp = ams.system.example()
-    >>> ppc = ams.io.pypower.system2ppc(sp)
-    >>> ppc_bus = ams.shared.ppc2df(ppc, 'bus')
+    Decorator for skipping tests that require gurobi_optimods.
     """
-    if model not in ppc_cols.keys():
-        raise ValueError(f"Invalid model {model}")
-
-    df = pd.DataFrame(ppc[model], columns=ppc_cols[model][0:ppc[model].shape[1]])
-    return df
+    def wrapper(*args, **kwargs):
+        try:
+            import gurobi_optimods  # NOQA
+        except ImportError:
+            raise unittest.SkipTest("Gurobi is not installed.")
+        return f(*args, **kwargs)
+    return wrapper

ams/system.py

@@ -9,7 +9,6 @@ from typing import Dict, Optional
 
 import numpy as np
 
-from andes.core import Config
 from andes.system import System as andes_System
 from andes.system import (_config_numpy, load_config_rc)
 from andes.variables import FileMan
@@ -23,9 +22,17 @@ from ams.routines.type import TypeBase
 from ams.models import file_classes
 from ams.routines import all_routines
 from ams.utils.paths import get_config_path
+from ams.core import Config
 from ams.core.matprocessor import MatProcessor
 from ams.interface import to_andes
 from ams.report import Report
+from ams.shared import ad_dyn_models
+
+from ams.io.matpower import system2mpc
+from ams.io.matpower import write as wrtite_m
+from ams.io.xlsx import write as write_xlsx
+from ams.io.json import write as write_json
+from ams.io.psse import write_raw
 
 logger = logging.getLogger(__name__)
 
@@ -389,6 +396,43 @@ class System(andes_System):
         self.is_setup = False
         self.setup()
 
+    def add(self, model, param_dict=None, **kwargs):
+        """
+        Add a device instance for an existing model.
+
+        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:
+                logger.debug("ANDES dynamic model <%s> is skipped.", model)
+            else:
+                logger.warning("<%s> is not an existing model.", model)
+            return
+
+        if self.is_setup:
+            raise NotImplementedError("Adding devices are not allowed after setup.")
+
+        group_name = self.__dict__[model].group
+        group = self.groups[group_name]
+
+        if param_dict is None:
+            param_dict = {}
+        if kwargs is not None:
+            param_dict.update(kwargs)
+
+        # remove `uid` field
+        param_dict.pop('uid', None)
+
+        idx = param_dict.pop('idx', None)
+        if idx is not None and (not isinstance(idx, str) and np.isnan(idx)):
+            idx = None
+
+        idx = group.get_next_idx(idx=idx, model_name=model)
+        self.__dict__[model].add(idx=idx, **param_dict)
+        group.add(idx=idx, model=self.__dict__[model])
+
+        return idx
+
     def setup(self):
         """
         Set up system for studies.
@@ -421,7 +465,16 @@ class System(andes_System):
             adjusted_params_str = ', '.join(adjusted_params)
             msg = f"Zero Line parameters detected, adjusted to default values: {adjusted_params_str}."
             logger.info(msg)
-
+        # --- bus type correction ---
+        pq_bus = self.PQ.bus.v
+        pv_bus = self.PV.bus.v
+        slack_bus = self.Slack.bus.v
+        # TODO: how to include islanded buses?
+        if self.Bus.n > 0 and np.all(self.Bus.type.v == 1):
+            self.Bus.alter(src='type', idx=pq_bus, value=1)
+            self.Bus.alter(src='type', idx=pv_bus, value=2)
+            self.Bus.alter(src='type', idx=slack_bus, value=3)
+            logger.info("All bus type are PQ, adjusted given load and generator connection status.")
         # === no device addition or removal after this point ===
         self.calc_pu_coeff()   # calculate parameters in system per units
 
@@ -662,10 +715,73 @@ class System(andes_System):
 
         return False
 
+    def to_mpc(self):
+        """
+        Export an AMS system to a MATPOWER dict.
+
+        Returns
+        -------
+        dict
+            A dictionary representing the MATPOWER case.
+        """
+        return system2mpc(self)
+
+    def to_m(self, outfile: str, overwrite: bool = None):
+        """
+        Export an AMS system to a MATPOWER M-file.
+
+        Parameters
+        ----------
+        outfile : str
+            The output file name.
+        overwrite : bool, optional
+            If True, overwrite the existing file. Default is None.
+        """
+        return wrtite_m(self, outfile=outfile, overwrite=overwrite)
+
+    def to_xlsx(self, outfile: str, overwrite: bool = None):
+        """
+        Export an AMS system to an Excel file.
+
+        Parameters
+        ----------
+        outfile : str
+            The output file name.
+        overwrite : bool, optional
+            If True, overwrite the existing file. Default is None.
+        """
+        return write_xlsx(self, outfile=outfile, overwrite=overwrite)
+
+    def to_json(self, outfile: str, overwrite: bool = None):
+        """
+        Export an AMS system to a JSON file.
+
+        Parameters
+        ----------
+        outfile : str
+            The output file name.
+        overwrite : bool, optional
+            If True, overwrite the existing file. Default is None.
+        """
+        return write_json(self, outfile=outfile, overwrite=overwrite)
+
+    def to_raw(self, outfile: str, overwrite: bool = None):
+        """
+        Export an AMS system to a v33 PSS/E RAW file.
+
+        Parameters
+        ----------
+        outfile : str
+            The output file name.
+        overwrite : bool, optional
+            If True, overwrite the existing file. Default is None.
+        """
+        return write_raw(self, outfile=outfile, overwrite=overwrite)
 
 # --------------- Helper Functions ---------------
 # NOTE: _config_numpy, load_config_rc are imported from andes.system
 
+
 def example(setup=True, no_output=True, **kwargs):
     """
     Return an :py:class:`ams.system.System` object for the

docs/source/api.rst

@@ -48,6 +48,8 @@ Routines
    ams.routines.routine
    ams.routines.dcopf
    ams.routines.pflow
+   ams.routines.pypower
+   ams.routines.grbopt
 
 
 Optimization

docs/source/getting_started/install.rst

@@ -43,7 +43,7 @@ Create an environment for AMS (recommended)
 
 .. code:: bash
 
-     mamba create --name ams python=3.8
+     mamba create --name ams python=3.10
 
 Activate the new environment with
 
@@ -83,10 +83,7 @@ To install packages in the ``dev`` when installing AMS, do:
 
 .. code:: bash
 
-    pip install -r requirements-dev.txt
-
-One can also inspect the ``requirements-dev.txt`` to identify the packages
-for manual installation.
+    pip install .[dev]
 
 .. _Develop Install:
 
@@ -131,6 +128,7 @@ Install dependencies with
     mamba install --file requirements.txt
     mamba install --file requirements-dev.txt
     mamba install --file requirements-doc.txt
+    mamba install --file requirements-nlp.txt
 
 Alternatively, you can install them with ``pip``:
 
@@ -139,12 +137,17 @@ Alternatively, you can install them with ``pip``:
     pip install -r requirements.txt
     pip install -r requirements-dev.txt
     pip install -r requirements-doc.txt
+    pip install -r requirements-nlp.txt
+
+Alternatively, if you have a modern version of pip (>=23.1), you can install all dependencies specified in ``pyproject.toml`` with:
+
+    pip install .[dev,doc,nlp]
 
 Step 3: Install AMS in the development mode using
 
 .. code:: bash
 
-      python3 -m pip install -e .
+    python3 -m pip install -e .
 
 Note the dot at the end. Pip will take care of the rest.
 

docs/source/release-notes.rst

@@ -9,6 +9,27 @@ The APIs before v3.0.0 are in beta and may change without prior notice.
 v1.0
 ==========
 
+v1.0.10 (2024-xx-xx)
+--------------------
+
+- Add bus type correction in ``system.System.setup()``
+- Revise ``ams.io.psse.read`` to complete model Zone when necessary
+- Use numerical Area and Zone idx in MATPOWER and PSSE RAW file conversion
+- Support JSON format addfile when converting to ANDES case
+- Add PSS/E v33 RAW file writer
+- In class ``System``, add wrapper methods ``to_mpc``, ``to_m``, ``to_xlsx``,
+  ``to_json``, and ``to_raw`` for easier case file export
+- Add wrapper routines for PYPOWER: ``DCPF1``, ``PFlow1``, ``DCOPF1``, and ``ACOPF1``
+- In routine ``DCOPF`` and its derivatives, add ExpressionCalc ``mu1`` ``mu2`` to
+  calculate Lagrange multipliers of line flow limits constraints
+- Add wrapper routine ``OPF`` for gurobi_optimods
+- Add a demo to show newly added wrapper routines, see
+  ``examples/demonstration/demo_wrapper_routines.ipynb``
+- Revise ``andes.common.config.Config.update`` to ensure configuration parameters
+  are consistently updated in both the object and its internal ``_dict``
+- Remove legacy revised PYPOWER module
+- Remove function ``ams.shared.ppc2df``
+
 v1.0.9 (2024-04-23)
 --------------------
 
@@ -408,50 +429,3 @@ v0.4 (2023-01)
 -------------------
 
 This release outlines the package.
-
-Known Limitations
-=================
-
-- For builit-in PYPOWER-based ACOPF, the known largest solvable case is "pglib_opf_case1354_pegase.m"
-- Batch processing is not supported yet
-- Routine ``DCOPF`` has been extensively benchmarked with pandapower and MATPOWER.
-- Routines besides above mentioned are not fully benchmarked yet.
-
-Roadmap
-=======
-
-This section lists out some potential features that may be added in the future.
-Note that the proposed features are not guaranteed to be implemented and subject to change.
-
-Electric Vehicle for Grid Service
-------------------------------------------
-
-A charging-time-constrained EV aggregation based on the state-space model
-
-References:
-
-[1] J. Wang et al., "Electric Vehicles Charging Time Constrained Deliverable Provision of Secondary
-Frequency Regulation," in IEEE Transactions on Smart Grid, doi: 10.1109/TSG.2024.3356948.
-
-[2] M. Wang et al., "State Space Model of Aggregated Electric Vehicles for Frequency Regulation," in
-IEEE Transactions on Smart Grid, vol. 11, no. 2, pp. 981-994, March 2020, doi: 10.1109/TSG.2019.2929052.
-
-Distribution OPF
---------------------------
-
-- Distribution networks OPF and its LMP
-- DG siting and sizing considering energy equity
-
-References:
-
-[1] H. Yuan, F. Li, Y. Wei and J. Zhu, "Novel Linearized Power Flow and Linearized OPF Models for
-Active Distribution Networks With Application in Distribution LMP," in IEEE Transactions on Smart Grid,
-vol. 9, no. 1, pp. 438-448, Jan. 2018, doi: 10.1109/TSG.2016.2594814.
-
-[2] C. Li, F. Li, S. Jiang, X. Wang and J. Wang, "Siting and Sizing of DG Units Considering Energy
-Equity: Model, Solution, and Guidelines," in IEEE Transactions on Smart Grid, doi: 10.1109/TSG.2024.3350914.
-
-Planning
---------------------------
-
-- Transmission expansion planning

{ltbams-1.0.9.dist-info → ltbams-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ltbams
-Version: 1.0.9
+Version: 1.0.10
 Summary: Python software for scheduling modeling and co-simulation with dynamics.
 Home-page: https://github.com/CURENT/ams
 Author: Jinning Wang
@@ -23,6 +23,28 @@ Requires-Dist: openpyxl
 Requires-Dist: andes>=1.9.3
 Requires-Dist: pybind11
 Requires-Dist: cvxpy
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: numpydoc; extra == "dev"
+Requires-Dist: toml; extra == "dev"
+Provides-Extra: nlp
+Requires-Dist: PYPOWER; extra == "nlp"
+Requires-Dist: pyoptinterface; extra == "nlp"
+Requires-Dist: gurobipy; extra == "nlp"
+Requires-Dist: gurobi-optimods; extra == "nlp"
+Provides-Extra: doc
+Requires-Dist: pandoc; extra == "doc"
+Requires-Dist: ipython; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: pydata-sphinx-theme; extra == "doc"
+Requires-Dist: numpydoc; extra == "doc"
+Requires-Dist: sphinx-copybutton; extra == "doc"
+Requires-Dist: sphinx-panels; extra == "doc"
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: nbsphinx; extra == "doc"
 Dynamic: author
 Dynamic: home-page
 
@@ -30,40 +52,29 @@ Dynamic: home-page
 
 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)](https://github.com/CURENT/ams/blob/master/LICENSE)
-![platforms](https://anaconda.org/conda-forge/ltbams/badges/platforms.svg)
-[![Python Versions](https://img.shields.io/badge/Python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)](https://www.python.org/)
+![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)
-[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
-[![codecov](https://codecov.io/gh/CURENT/ams/graph/badge.svg?token=RZI5GLLBQH)](https://codecov.io/gh/CURENT/ams)
-
-[![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)
-[![GitHub last commit (master)](https://img.shields.io/github/last-commit/CURENT/ams/master?label=last%20commit%20to%20master)](https://github.com/CURENT/ams/commits/master/)
-[![GitHub last commit (develop)](https://img.shields.io/github/last-commit/CURENT/ams/develop?label=last%20commit%20to%20develop)](https://github.com/CURENT/ams/commits/develop/)
-
-[![libraries](https://img.shields.io/librariesio/release/pypi/ltbams)](https://libraries.io/pypi/ltbams)
-![Repo Size](https://img.shields.io/github/repo-size/CURENT/ams)
-[![Structure](https://img.shields.io/badge/code_base-visualize-blue)](https://mango-dune-07a8b7110.1.azurestaticapps.net/?repo=CURENT%2Fams)
-
-[![Compatibility Tests](https://github.com/CURENT/ams/actions/workflows/compatibility.yml/badge.svg)](https://github.com/CURENT/ams/actions/workflows/compatibility.yml)
-[![Publish to TestPyPI and PyPI](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml/badge.svg?branch=master)](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml)
-[![Azure Pipline](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)
 
 <img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
 
-|               | Stable                                                                                                                                        | Develop                                                                                                                                       |
-|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| Documentation | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) | [![Develop Documentation](https://readthedocs.org/projects/ams/badge/?version=develop)](https://ams.readthedocs.io/en/develop/?badge=develop) | 
-
-
-| Badges        |                                                                                                                                                                                                                                                     |                                                                                                                                                                                                            |
-|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Downloads     | [![PyPI Version](https://img.shields.io/pypi/v/ltbams.svg)](https://pypi.python.org/pypi/ltbams)         | [![Conda Version](https://anaconda.org/conda-forge/ltbams/badges/version.svg)](https://anaconda.org/conda-forge/ltbams) |
-| Try on Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/curent/ams/master)                                                                                                                                                 |                                                                                                                                                                                                            |
-| Code Quality  |[![Codacy Badge](https://app.codacy.com/project/badge/Grade/69456da1b8634f2f984bd769e35f0050)](https://app.codacy.com/gh/CURENT/ams/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)| [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/69456da1b8634f2f984bd769e35f0050)](https://app.codacy.com/gh/CURENT/ams/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage) |
-
-
+|  | Stable | Develop |
+|---|---|---|
+| Documentation | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) | [![Develop Documentation](https://readthedocs.org/projects/ams/badge/?version=develop)](https://ams.readthedocs.io/en/develop/?badge=develop) |
+
+| Badges |  |  |
+|---|---|---|
+| Repo | ![Project Status: Active](https://www.repostatus.org/badges/latest/active.svg) | ![Repo Size](https://img.shields.io/github/repo-size/CURENT/ams) |
+| Version | ![PyPI Version](https://img.shields.io/pypi/v/ltbams.svg) | ![Conda Version](https://anaconda.org/conda-forge/ltbams/badges/version.svg) |
+| 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) |
+| Download | ![PyPI - Downloads](https://img.shields.io/pypi/dm/ltbams) | ![Anaconda-Server Badge](https://anaconda.org/conda-forge/ltbams/badges/downloads.svg) |
+| 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) |  |
+| 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 Tests](https://github.com/CURENT/ams/actions/workflows/compatibility.yml/badge.svg) | ![Azure Pipline](https://dev.azure.com/curentltb/ams/_apis/build/status%2FCURENT.ams?branchName=master) |
+| CD | ![Publish to TestPyPI and PyPI](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml/badge.svg?branch=master) |  |
+| 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
 
@@ -82,25 +93,27 @@ and solved with third-party solvers.
 
 AMS produces credible scheduling results and competitive performance.
 The following results show the comparison of DCOPF between AMS and other tools.
-
-| Cost [\$]             | AMS          | pandapower   | MATPOWER     |
-|-----------------------|--------------|--------------|--------------|
-| IEEE 14-Bus           | 7,642.59     | 7,642.59     | 7,642.59     |
-| IEEE 39-Bus           | 41,263.94    | 41,263.94    | 41,263.94    |
-| PEGASE 89-Bus         | 5,733.37     | 5,733.37     | 5,733.37     |
-| IEEE 118-Bus          | 125,947.88   | 125,947.88   | 125,947.88   |
-| NPCC 140-Bus          | 810,033.37   | 810,016.06   | 810,033.37   |
-| WECC 179-Bus          | 411,706.13   | 411,706.13   | 411,706.13   |
-| IEEE 300-Bus          | 706,292.32   | 706,292.32   | 706,292.32   |
-| PEGASE 1354-Bus       | 1,218,096.86 | 1,218,096.86 | 1,218,096.86 |
-| PEGASE 2869-Bus       | 2,386,235.33 | 2,386,235.33 | 2,386,235.33 |
-| GOC 4020-Bus          | 793,634.11   | 793,634.11   | 793,634.11   |
-| EPIGRIDS 5658-Bus     | 1,195,466.12 | 1,195,466.12 | 1,195,466.12 |
-| EPIGRIDS 7336-Bus     | 1,855,870.94 | 1,855,870.94 | 1,855,870.94 |
+In the table, **AMS Gap** is the difference between the AMS and MATPOWER results,
+and **pandapower Gap** is the difference between the pandapower and MATPOWER results.
+
+| Case             | MATPOWER [\$] | AMS Gap [\$] | pandapower Gap [\$] |
+|------------------|--------------|--------------|---------------------|
+| IEEE 14-Bus      | 7,642.59     | 0.00         | 0.00                |
+| IEEE 39-Bus      | 41,263.94    | 0.00         | 0.00                |
+| PEGASE 89-Bus    | 5,733.37     | 0.00         | 0.00                |
+| IEEE 118-Bus     | 125,947.88   | 0.00         | 0.00                |
+| NPCC 140-Bus     | 810,033.37   | 0.00         | **-17.31**          |
+| WECC 179-Bus     | 411,706.13   | 0.00         | 0.00                |
+| IEEE 300-Bus     | 706,292.32   | 0.00         | 0.00                |
+| PEGASE 1354-Bus  | 1,218,096.86 | 0.00         | 0.00                |
+| PEGASE 2869-Bus  | 2,386,235.33 | 0.00         | 0.00                |
+| GOC 4020-Bus     | 793,634.11   | 0.00         | 0.00                |
+| EPIGRIDS 5658-Bus| 1,195,466.12 | 0.00         | 0.00                |
+| EPIGRIDS 7336-Bus| 1,855,870.94 | 0.00         | 0.00                |
 
 <div style="text-align: left;">
   <img src="docs/source/images/dcopf_time.png" alt="DCOPF Time" width="480" height="auto">
-  <p><strong>Figure:</strong> Computation time of OPF on small-scale cases.</p>
+  <p><strong>Figure:</strong> Computation time of OPF on medium to large cases.</p>
 </div>
 
 In the bar chart, the gray bar labeled "AMS Symbolic Processing" represents the time spent
@@ -113,6 +126,19 @@ Regarding the baselines, the blue and green bars represent the running time of M
 solver MIPS and pandapower using solver PIPS, respectively.
 The results for AMS, pandapower, and matpower are the average time consumed over ten repeat tests.
 
+<div style="text-align: left;">
+  <img src="docs/source/images/educ_pie.png" alt="DCOPF Time" width="480" height="auto">
+  <p><strong>Figure:</strong> Computation time distribution for multi-period economic dispatch and
+unit commitment using a 31,777-bus case.</p>
+</div>
+
+To further demonstrate AMS's scalability, we validated multi-period economic dispatch and unit commitment
+on an ultra-large power system case with 31,777 buses, 4,664 generators, 41,573 transmission lines,
+and 5 time intervals.
+The computation time distribution for this case is shown in the figure below. Notably, the time spent
+on symbolic processing remains negligible even at this scale, highlighting AMS's efficiency for
+large-scale studies.
+
 AMS is currently under active development.
 Use the following resources to get involved.
 
@@ -136,6 +162,20 @@ Install from PyPI using pip:
 pip install ltbams
 ```
 
+You can also install with optional dependencies, such as ``dev``, ``docs``, and ``nlp``:
+
+```bash
+pip install ltbams[dev]
+pip install ltbams[docs]
+pip install ltbams[nlp]
+```
+
+Or install with all optional dependencies:
+
+```bash
+pip install ltbams[all]
+```
+
 Install from conda-forge using conda:
 
 ```bash