ltbams 1.0.8__tar.gz → 1.0.9__tar.gz

{ltbams-1.0.8/ltbams.egg-info → ltbams-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ltbams
-Version: 1.0.8
+Version: 1.0.9
 Summary: Python software for scheduling modeling and co-simulation with dynamics.
 Home-page: https://github.com/CURENT/ams
 Author: Jinning Wang
@@ -52,9 +52,9 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
 
 <img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
 
-|               | Stable                                                                                                                                        | Latest                                                                                                                                        |
+|               | Stable                                                                                                                                        | Develop                                                                                                                                       |
 |---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| Documentation | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) | [![Latest Documentation](https://readthedocs.org/projects/ams/badge/?version=latest)](https://ams.readthedocs.io/en/latest/?badge=latest) | 
+| 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        |                                                                                                                                                                                                                                                     |                                                                                                                                                                                                            |

{ltbams-1.0.8 → ltbams-1.0.9}/README.md

@@ -24,9 +24,9 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
 
 <img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
 
-|               | Stable                                                                                                                                        | Latest                                                                                                                                        |
+|               | Stable                                                                                                                                        | Develop                                                                                                                                       |
 |---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| Documentation | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) | [![Latest Documentation](https://readthedocs.org/projects/ams/badge/?version=latest)](https://ams.readthedocs.io/en/latest/?badge=latest) | 
+| 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        |                                                                                                                                                                                                                                                     |                                                                                                                                                                                                            |

{ltbams-1.0.8 → ltbams-1.0.9}/ams/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-04-20T09:18:49-0400",
+ "date": "2025-04-23T12:23:08-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "4bda2874669399db2c37d0a4bf6ae10e324d96a7",
- "version": "1.0.8"
+ "full-revisionid": "248188b6caf31eaf1089b55a84e41aaa6115df78",
+ "version": "1.0.9"
 }
 '''  # END VERSION_JSON
 

{ltbams-1.0.8 → ltbams-1.0.9}/ams/io/matpower.py

@@ -6,8 +6,12 @@ import re
 import numpy as np
 
 from andes.io import read_file_like
+from andes.io.xlsx import confirm_overwrite
 from andes.shared import deg2rad, rad2deg
 
+from ams import __version__ as version
+from ams.shared import copyright_msg, nowarranty_msg, report_time
+
 logger = logging.getLogger(__name__)
 
 
@@ -396,14 +400,24 @@ def mpc2system(mpc: dict, system) -> bool:
                        c2=c2, c1=c1, c0=c0
                        )
 
+    # --- Area ---
+    area_id = np.unique(system.Bus.area.v).astype(int)
+    for area in area_id:
+        area_idx = f'AREA_{area}'
+        system.add('Area', idx=area_idx, name=area)
+    bus_area = system.Bus.area.v
+    bus_area = [f'AREA_{int(area)}' for area in bus_area]
+    system.Bus.area.v = bus_area
+
     # --- Zone ---
     zone_id = np.unique(system.Bus.zone.v).astype(int)
     for zone in zone_id:
         zone_idx = f'ZONE_{zone}'
-        system.add('Zone', idx=zone_idx, name=None)
+        system.add('Zone', idx=zone_idx, name=zone)
     bus_zone = system.Bus.zone.v
     bus_zone = [f'ZONE_{int(zone)}' for zone in bus_zone]
     system.Bus.zone.v = bus_zone
+
     return True
 
 
@@ -429,25 +443,29 @@ def _get_bus_id_caller(bus):
 
 def system2mpc(system) -> dict:
     """
-    Convert data from an AMS system to an mpc dict.
+    Convert a **setup** AMS system to a MATPOWER mpc dictionary.
+
+    This function is revised from ``andes.io.matpower.system2mpc``.
 
-    In the ``gen`` section, slack generators preceeds PV generators.
+    In the ``gen`` section, slack generators are listed before PV generators.
 
-    Compared to the ``andes.io.matpower.system2mpc``,
-    this function includes the generator cost data in the ``gencost``
-    section.
-    Additionally, ``c2`` and ``c1`` are scaled by ``base_mva`` to match
-    MATPOWER unit ``MW``.
+    In the converted MPC, the indices of area (bus[:, 6]) and zone (bus[:, 10])
+    may differ from the original MPC. However, the mapping relationship is preserved.
+    For example, if the original MPC numbers areas starting from 1, the converted
+    MPC may number them starting from 0.
+
+    The coefficients ``c2`` and ``c1`` in the generator cost data are scaled by
+    ``base_mva`` to match MATPOWER's unit convention (MW).
 
     Parameters
     ----------
     system : ams.core.system.System
-        AMS system
+        The AMS system to be converted.
 
     Returns
     -------
-    mpc: dict
-        MATPOWER mpc dict
+    mpc : dict
+        A dictionary in MATPOWER format representing the converted AMS system.
     """
 
     mpc = dict(version='2',
@@ -458,12 +476,16 @@ def system2mpc(system) -> dict:
                gencost=np.zeros((system.GCost.n, 7), dtype=np.float64),
                )
 
+    if not system.is_setup:
+        logger.warning("System is not setup and will be setup now.")
+        system.setup()
+
     if system.Bus.name.v is not None:
         mpc['bus_name'] = system.Bus.name.v
 
     base_mva = system.config.mva
 
-    # --- bus ---
+    # --- Bus ---
     bus = mpc['bus']
     gen = mpc['gen']
 
@@ -471,18 +493,16 @@ def system2mpc(system) -> dict:
 
     bus[:, 0] = to_busid(system.Bus.idx.v)
     bus[:, 1] = 1
+    if system.Area.n > 0:
+        bus[:, 6] = system.Area.idx2uid(system.Bus.area.v)
     bus[:, 7] = system.Bus.v0.v
     bus[:, 8] = system.Bus.a0.v * rad2deg
     bus[:, 9] = system.Bus.Vn.v
+    if system.Zone.n > 0:
+        bus[:, 10] = system.Zone.idx2uid(system.Bus.zone.v)
     bus[:, 11] = system.Bus.vmax.v
     bus[:, 12] = system.Bus.vmin.v
 
-    # --- zone ---
-    ZONE_I = system.Zone.idx.v
-    if len(ZONE_I) > 0:
-        mapping = {busi0: i for i, busi0 in enumerate(ZONE_I)}
-        bus[:, 10] = np.array([mapping[busi0] for busi0 in system.Bus.zone.v])
-
     # --- PQ ---
     if system.PQ.n > 0:
         pq_pos = system.Bus.idx2uid(system.PQ.bus.v)
@@ -568,4 +588,136 @@ def system2mpc(system) -> dict:
     else:
         mpc.pop('gencost')
 
+    # --- gentype ---
+    stg = system.StaticGen.get_all_idxes()
+    gentype = system.StaticGen.get(src='gentype', attr='v', idx=stg)
+    if any(gentype):
+        mpc['gentype'] = np.array(gentype)
+
+    # --- genfuel ---
+    genfuel = system.StaticGen.get(src='genfuel', attr='v', idx=stg)
+    if any(genfuel):
+        mpc['genfuel'] = np.array(genfuel)
+
+    # --- Bus Name ---
+    if any(system.Bus.name.v):
+        mpc['bus_name'] = np.array(system.Bus.name.v)
+
     return mpc
+
+
+def mpc2m(mpc: dict, outfile: str) -> str:
+    """
+    Write a MATPOWER mpc dict to a M-file.
+
+    Parameters
+    ----------
+    mpc : dict
+        MATPOWER mpc dictionary.
+    outfile : str
+        Path to the output M-file.
+    """
+    with open(outfile, 'w') as f:
+        # Add version info
+        f.write(f"%% Converted by AMS {version}\n")
+        f.write(f"%% {copyright_msg}\n\n")
+        f.write(f"%% {nowarranty_msg}\n")
+        f.write(f"%% Convert time: {report_time}\n\n")
+
+        f.write("function mpc = mpc_case\n")
+        f.write("mpc.version = '2';\n\n")
+
+        # Write baseMVA
+        f.write(f"%% system MVA base\nmpc.baseMVA = {mpc['baseMVA']};\n\n")
+
+        # Write bus data
+        f.write("%% bus data\n")
+        f.write("%% bus_i type Pd Qd Gs Bs area Vm Va baseKV zone Vmax Vmin\n")
+        f.write("mpc.bus = [\n")
+        for row in mpc['bus']:
+            f.write("    " + "\t".join(f"{val:.6g}" for val in row) + ";\n")
+        f.write("];\n\n")
+
+        # Write generator data
+        f.write("%% generator data\n")
+        f.write("%% bus Pg Qg Qmax Qmin Vg mBase status Pmax Pmin\n")
+        f.write("%% Pc1 Pc2 Qc1min Qc1max Qc2min Qc2max ramp_agc ramp_10 ramp_30 ramp_q apf\n")
+        f.write("mpc.gen = [\n")
+        for row in mpc['gen']:
+            f.write("    " + "\t".join(f"{val:.6g}" for val in row) + ";\n")
+        f.write("];\n\n")
+
+        # Write branch data
+        f.write("%% branch data\n")
+        f.write("%% fbus tbus r x b rateA rateB rateC ratio angle status angmin angmax PF QF PT QT\n")
+        f.write("mpc.branch = [\n")
+        for row in mpc['branch']:
+            f.write("    " + "\t".join(f"{val:.6g}" for val in row) + ";\n")
+        f.write("];\n\n")
+
+        # Write generator cost data if available
+        if 'gencost' in mpc:
+            f.write("%% generator cost data\n")
+            f.write("%% 1 startup shutdown n x1 y1 ... xn yn\n")
+            f.write("%% 2 startup shutdown n c(n-1) ... c0\n")
+            f.write("mpc.gencost = [\n")
+            for row in mpc['gencost']:
+                f.write("    " + "\t".join(f"{val:.6g}" for val in row) + ";\n")
+            f.write("];\n\n")
+
+        # Write bus names if available and not all None
+        if 'bus_name' in mpc and any(mpc['bus_name']):
+            f.write("%% bus names\n")
+            f.write("mpc.bus_name = {\n")
+            for name in mpc['bus_name']:
+                f.write(f"    '{name}';\n")
+            f.write("};\n\n")
+
+        # Write generator types if available and not all None
+        if 'gentype' in mpc and any(mpc['gentype']):
+            f.write("%% generator types\n")
+            f.write("mpc.gentype = {\n")
+            for gentype in mpc['gentype']:
+                f.write(f"    '{gentype}';\n")
+            f.write("};\n\n")
+
+        # Write generator fuels if available and not all None
+        if 'genfuel' in mpc and any(mpc['genfuel']):
+            f.write("%% generator fuels\n")
+            f.write("mpc.genfuel = {\n")
+            for genfuel in mpc['genfuel']:
+                f.write(f"    '{genfuel}';\n")
+            f.write("};\n\n")
+
+    logger.info(f"Finished writing MATPOWER case to {outfile}")
+    return outfile
+
+
+def write(system, outfile: str, overwrite: bool = None) -> bool:
+    """
+    Export an AMS system to a MATPOWER mpc file.
+
+    This function converts an AMS system object into a MATPOWER-compatible
+    mpc dictionary and writes it to a specified output file in MATPOWER format.
+
+    Parameters
+    ----------
+    system : ams.system.System
+        A loaded system.
+    outfile : str
+        Path to the output file.
+    overwrite : bool, optional
+        None to prompt for overwrite selection; True to overwrite; False to not overwrite.
+
+    Returns
+    -------
+    bool
+        True if the file was successfully written, False otherwise.
+    """
+    if not confirm_overwrite(outfile, overwrite=overwrite):
+        return False
+
+    mpc = system2mpc(system)
+    mpc2m(mpc, outfile)
+    logger.info('MATPOWER m case file written to "%s"', outfile)
+    return True

{ltbams-1.0.8 → ltbams-1.0.9}/ams/io/pypower.py

@@ -101,3 +101,17 @@ def system2ppc(system) -> dict:
     mpc['branch'][:, 0] = np.array([bus_map[busi0] for busi0 in mpc['branch'][:, 0].astype(int)])
     mpc['branch'][:, 1] = np.array([bus_map[busi0] for busi0 in mpc['branch'][:, 1].astype(int)])
     return mpc
+
+
+def ppc2py(ppc: dict, outfile: str) -> str:
+    """
+    Placeholder.
+    """
+    return NotImplemented
+
+
+def write(system, outfile: str) -> bool:
+    """
+    Placeholder.
+    """
+    return NotImplemented

{ltbams-1.0.8 → ltbams-1.0.9}/ams/models/group.py

@@ -179,75 +179,6 @@ class StaticGen(GroupBase):
 
     The generator types and fuel types are referenced from MATPOWER.
 
-    Generator Types
-    ---------------
-    The following codes represent the types of generators:
-        - BA  : Energy Storage, Battery
-        - CE  : Energy Storage, Compressed Air
-        - CP  : Energy Storage, Concentrated Solar Power
-        - FW  : Energy Storage, Flywheel
-        - PS  : Hydraulic Turbine, Reversible (pumped storage)
-        - ES  : Energy Storage, Other
-        - ST  : Steam Turbine (includes nuclear, geothermal, and solar steam)
-        - GT  : Combustion (Gas) Turbine
-        - IC  : Internal Combustion Engine (diesel, piston, reciprocating)
-        - CA  : Combined Cycle Steam Part
-        - CT  : Combined Cycle Combustion Turbine Part
-        - CS  : Combined Cycle Single Shaft
-        - CC  : Combined Cycle Total Unit
-        - HA  : Hydrokinetic, Axial Flow Turbine
-        - HB  : Hydrokinetic, Wave Buoy
-        - HK  : Hydrokinetic, Other
-        - HY  : Hydroelectric Turbine
-        - BT  : Turbines Used in a Binary Cycle
-        - PV  : Photovoltaic
-        - WT  : Wind Turbine, Onshore
-        - WS  : Wind Turbine, Offshore
-        - FC  : Fuel Cell
-        - OT  : Other
-        - UN  : Unknown
-        - JE  : Jet Engine
-        - NB  : ST - Boiling Water Nuclear Reactor
-        - NG  : ST - Graphite Nuclear Reactor
-        - NH  : ST - High Temperature Gas Nuclear Reactor
-        - NP  : ST - Pressurized Water Nuclear Reactor
-        - IT  : Internal Combustion Turbo Charged
-        - SC  : Synchronous Condenser
-        - DC  : DC ties
-        - MP  : Motor/Pump
-        - W1  : Wind Turbine, Type 1
-        - W2  : Wind Turbine, Type 2
-        - W3  : Wind Turbine, Type 3
-        - W4  : Wind Turbine, Type 4
-        - SV  : Static Var Compensator
-        - DL  : Dispatchable Load
-
-    Fuel Types
-    ----------
-    The following codes represent the fuel types:
-        - biomass     : Biomass
-        - coal        : Coal
-        - dfo         : Distillate Fuel Oil
-        - geothermal  : Geothermal
-        - hydro       : Hydro
-        - hydrops     : Hydro Pumped Storage
-        - jetfuel     : Jet Fuel
-        - lng         : Liquefied Natural Gas
-        - ng          : Natural Gas
-        - nuclear     : Nuclear
-        - oil         : Unspecified Oil
-        - refuse      : Refuse, Municipal Solid Waste
-        - rfo         : Residual Fuel Oil
-        - solar       : Solar
-        - syncgen     : Synchronous Condenser
-        - wasteheat   : Waste Heat
-        - wind        : Wind
-        - wood        : Wood or Wood Waste
-        - other       : Other
-        - unknown     : Unknown
-        - dl          : Dispatchable Load
-        - ess         : Energy Storage System
-
     Notes
     -----
     For co-simulation with ANDES, refer to the `ANDES StaticGen Documentation

{ltbams-1.0.8 → ltbams-1.0.9}/ams/report.py

@@ -3,7 +3,6 @@ Module for report generation.
 """
 import logging
 from collections import OrderedDict
-from time import strftime
 from typing import List, Dict, Optional
 
 from andes.io.txt import dump_data
@@ -11,7 +10,7 @@ from andes.shared import np
 from andes.utils.misc import elapsed
 
 from ams import __version__ as version
-from ams.shared import copyright_msg
+from ams.shared import copyright_msg, nowarranty_msg, report_time
 
 logger = logging.getLogger(__name__)
 
@@ -23,9 +22,9 @@ def report_info(system) -> list:
     info = list()
     info.append('AMS' + ' ' + version + '\n')
     info.append(f'{copyright_msg}\n\n')
-    info.append('AMS comes with ABSOLUTELY NO WARRANTY\n')
+    info.append(f"{nowarranty_msg}\n")
     info.append('Case file: ' + str(system.files.case) + '\n')
-    info.append('Report time: ' + strftime("%m/%d/%Y %I:%M:%S %p") + '\n\n')
+    info.append(f'Report time: {report_time}\n\n')
     return info
 
 

{ltbams-1.0.8 → ltbams-1.0.9}/ams/shared.py

@@ -7,6 +7,7 @@ import logging
 import unittest
 from functools import wraps
 from collections import OrderedDict
+from time import strftime
 
 import cvxpy as cp
 
@@ -35,7 +36,9 @@ _prefix = r" - --------------> | "  # NOQA
 _max_length = 80                    # NOQA
 
 # NOTE: copyright
-copyright_msg = 'Copyright (C) 2023-2025 Jinning Wang'
+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")
 
 # NOTE: copied from CVXPY documentation, last checked on 2024/10/30, v1.5
 mip_solvers = ['CBC', 'COPT', 'GLPK_MI', 'CPLEX', 'GUROBI',

{ltbams-1.0.8 → ltbams-1.0.9}/docs/source/getting_started/formats/matpower.rst

@@ -181,3 +181,138 @@ Generator Cost Data
 
 #. Not currently used by any Matpower functions.
 #. MODEL = 1, :math:`f(p)` is defined by the coordinates :math:`(p_1, f_1), (p_2, f_2), . . . , (p_N , f_N)`; MODEL = 2, :math:`f(p) = c_{n}p^{n} + ... + c_{1}p^{1} + c_{0}`.
+
+
+Generator Types
+~~~~~~~~~~~~~~~~~~~~
++------+---------------------------------------------------------------+
+| code | description                                                   |
++------+---------------------------------------------------------------+
+| BA   | Energy Storage, Battery                                       |
++------+---------------------------------------------------------------+
+| CE   | Energy Storage, Compressed Air                                |
++------+---------------------------------------------------------------+
+| CP   | Energy Storage, Concentrated Solar Power                      |
++------+---------------------------------------------------------------+
+| FW   | Energy Storage, Flywheel                                      |
++------+---------------------------------------------------------------+
+| PS   | Hydraulic Turbine, Reversible (pumped storage)                |
++------+---------------------------------------------------------------+
+| ES   | Energy Storage, Other                                         |
++------+---------------------------------------------------------------+
+| ST   | Steam Turbine (includes nuclear, geothermal, and solar steam) |
++------+---------------------------------------------------------------+
+| GT   | Combustion (Gas) Turbine                                      |
++------+---------------------------------------------------------------+
+| IC   | Internal Combustion Engine (diesel, piston, reciprocating)    |
++------+---------------------------------------------------------------+
+| CA   | Combined Cycle Steam Part                                     |
++------+---------------------------------------------------------------+
+| CT   | Combined Cycle Combustion Turbine Part                        |
++------+---------------------------------------------------------------+
+| CS   | Combined Cycle Single Shaft                                   |
++------+---------------------------------------------------------------+
+| CC   | Combined Cycle Total Unit                                     |
++------+---------------------------------------------------------------+
+| HA   | Hydrokinetic, Axial Flow Turbine                              |
++------+---------------------------------------------------------------+
+| HB   | Hydrokinetic, Wave Buoy                                       |
++------+---------------------------------------------------------------+
+| HK   | Hydrokinetic, Other                                           |
++------+---------------------------------------------------------------+
+| HY   | Hydroelectric Turbine                                         |
++------+---------------------------------------------------------------+
+| BT   | Turbines Used in a Binary Cycle                               |
++------+---------------------------------------------------------------+
+| PV   | Photovoltaic                                                  |
++------+---------------------------------------------------------------+
+| WT   | Wind Turbine, Onshore                                         |
++------+---------------------------------------------------------------+
+| WS   | Wind Turbine, Offshore                                        |
++------+---------------------------------------------------------------+
+| FC   | Fuel Cell                                                     |
++------+---------------------------------------------------------------+
+| OT   | Other                                                         |
++------+---------------------------------------------------------------+
+| UN   | Unknown                                                       |
++------+---------------------------------------------------------------+
+| JE   | Jet Engine                                                    |
++------+---------------------------------------------------------------+
+| NB   | ST - Boiling Water Nuclear Reactor                            |
++------+---------------------------------------------------------------+
+| NG   | ST - Graphite Nuclear Reactor                                 |
++------+---------------------------------------------------------------+
+| NH   | ST - High Temperature Gas Nuclear Reactor                     |
++------+---------------------------------------------------------------+
+| NP   | ST - Pressurized Water Nuclear Reactor                        |
++------+---------------------------------------------------------------+
+| IT   | Internal Combustion Turbo Charged                             |
++------+---------------------------------------------------------------+
+| SC   | Synchronous Condenser                                         |
++------+---------------------------------------------------------------+
+| DC   | DC ties                                                       |
++------+---------------------------------------------------------------+
+| MP   | Motor/Pump                                                    |
++------+---------------------------------------------------------------+
+| W1   | Wind Turbine, Type 1                                          |
++------+---------------------------------------------------------------+
+| W2   | Wind Turbine, Type 2                                          |
++------+---------------------------------------------------------------+
+| W3   | Wind Turbine, Type 3                                          |
++------+---------------------------------------------------------------+
+| W4   | Wind Turbine, Type 4                                          |
++------+---------------------------------------------------------------+
+| SV   | Static Var Compensator                                        |
++------+---------------------------------------------------------------+
+| DL   | Dispatchable Load                                             |
++------+---------------------------------------------------------------+
+
+Fuel Types
+~~~~~~~~~~~~~~~~
++-------------+---------------------------------------+
+| code        | description                           |
++-------------+---------------------------------------+
+| biomass     | Biomass                               |
++-------------+---------------------------------------+
+| coal        | Coal                                  |
++-------------+---------------------------------------+
+| dfo         | Distillate Fuel Oil                   |
++-------------+---------------------------------------+
+| geothermal  | Geothermal                            |
++-------------+---------------------------------------+
+| hydro       | Hydro                                 |
++-------------+---------------------------------------+
+| hydrops     | Hydro Pumped Storage                  |
++-------------+---------------------------------------+
+| jetfuel     | Jet Fuel                              |
++-------------+---------------------------------------+
+| lng         | Liquefied Natural Gas                 |
++-------------+---------------------------------------+
+| ng          | Natural Gas                           |
++-------------+---------------------------------------+
+| nuclear     | Nuclear                               |
++-------------+---------------------------------------+
+| oil         | Unspecified Oil                       |
++-------------+---------------------------------------+
+| refuse      | Refuse, Municipal Solid Waste         |
++-------------+---------------------------------------+
+| rfo         | Residual Fuel Oil                     |
++-------------+---------------------------------------+
+| solar       | Solar                                 |
++-------------+---------------------------------------+
+| syncgen     | Synchronous Condenser                 |
++-------------+---------------------------------------+
+| wasteheat   | Waste Heat                            |
++-------------+---------------------------------------+
+| wind        | Wind                                  |
++-------------+---------------------------------------+
+| wood        | Wood or Wood Waste                    |
++-------------+---------------------------------------+
+| other       | Other                                 |
++-------------+---------------------------------------+
+| unknown     | Unknown                               |
++-------------+---------------------------------------+
+| dl          | Dispatchable Load                     |
++-------------+---------------------------------------+
+| ess         | Energy Storage System                 |
++-------------+---------------------------------------+

{ltbams-1.0.8 → ltbams-1.0.9}/docs/source/getting_started/formats/pypower.rst

@@ -3,8 +3,7 @@
 PYPOWER
 --------
 
-AMS includes `PYPOWER cases <https://github.com/CURENT/ams/tree/develop/ams/cases/pypower>`_
-in version 2 for scheduling modeling and analysis. PYPOWER cases follow the same format as MATPOWER.
+AMS supports PYPOWER PY case file. PYPOWER cases follow a similar format as MATPOWER.
 
 The PYPOWER case is defined as a Python dictionary that includes ``bus``, ``gen``, ``branch``,
 ``areas``, and ``gencost``.

{ltbams-1.0.8 → ltbams-1.0.9}/docs/source/release-notes.rst

@@ -9,6 +9,14 @@ The APIs before v3.0.0 are in beta and may change without prior notice.
 v1.0
 ==========
 
+v1.0.9 (2024-04-23)
+--------------------
+
+Improve MATPOWER file converter:
+
+- Add a M file case writer
+- Include Area and Zone in both MATPOWER read and write
+
 v1.0.8 (2024-04-20)
 --------------------
 

{ltbams-1.0.8 → ltbams-1.0.9/ltbams.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ltbams
-Version: 1.0.8
+Version: 1.0.9
 Summary: Python software for scheduling modeling and co-simulation with dynamics.
 Home-page: https://github.com/CURENT/ams
 Author: Jinning Wang
@@ -52,9 +52,9 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
 
 <img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
 
-|               | Stable                                                                                                                                        | Latest                                                                                                                                        |
+|               | Stable                                                                                                                                        | Develop                                                                                                                                       |
 |---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| Documentation | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) | [![Latest Documentation](https://readthedocs.org/projects/ams/badge/?version=latest)](https://ams.readthedocs.io/en/latest/?badge=latest) | 
+| 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        |                                                                                                                                                                                                                                                     |                                                                                                                                                                                                            |