ltbams 1.0.11__py3-none-any.whl → 1.0.12__py3-none-any.whl

ams/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-05-23T17:38:11-0400",
+ "date": "2025-05-29T20:16:06-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "6d7b555f5f48c751648594a535711b9fd21d2a85",
- "version": "1.0.11"
+ "full-revisionid": "2166f4368af3d382720af38408153a70502eb9f5",
+ "version": "1.0.12"
 }
 '''  # END VERSION_JSON
 

ams/core/matprocessor.py

@@ -3,7 +3,6 @@ Module for system matrix make.
 """
 
 import logging
-import os
 import sys
 from typing import Optional
 
@@ -14,6 +13,9 @@ from andes.shared import tqdm, tqdm_nb
 from andes.utils.misc import elapsed, is_notebook
 
 from ams.opt import Param
+
+from ams.utils.paths import get_export_path
+
 from ams.shared import pd, sps
 
 logger = logging.getLogger(__name__)
@@ -75,31 +77,28 @@ class MParam(Param):
         """
         Export the matrix to a CSV file.
 
+        In the exported CSV, columns are the bus idxes, and Line idxes are
+        used as row indexes.
+
         Parameters
         ----------
         path : str, optional
-            Path to the output CSV file.
+            Path of the csv file to export.
 
         Returns
         -------
         str
-            The path of the exported csv file
+            The exported csv file name
         """
 
-        if path is None:
-            if self.owner.system.files.fullname is None:
-                logger.info("Input file name not detacted. Using `Untitled`.")
-                file_name = f'Untitled_{self.name}'
-            else:
-                file_name = os.path.splitext(self.owner.system.files.fullname)[0]
-                file_name += f'_{self.name}'
-            path = os.path.join(os.getcwd(), file_name + '.csv')
-        else:
-            file_name = os.path.splitext(os.path.basename(path))[0]
+        path, file_name = get_export_path(self.owner.system,
+                                          self.name,
+                                          path=path,
+                                          fmt='csv')
 
         pd.DataFrame(data=self.v, columns=self.col_names, index=self.row_names).to_csv(path)
 
-        return file_name + '.csv'
+        return file_name
 
     @property
     def v(self):

ams/io/matpower.py

@@ -455,16 +455,6 @@ def system2mpc(system) -> dict:
 
     This function is revised from ``andes.io.matpower.system2mpc``.
 
-    In the ``gen`` section, slack generators are listed before PV generators.
-
-    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
@@ -474,6 +464,21 @@ def system2mpc(system) -> dict:
     -------
     mpc : dict
         A dictionary in MATPOWER format representing the converted AMS system.
+
+    Notes
+    -----
+    - In the `gen` section, slack generators are listed before PV generators.
+    - For uncontrolled generators (`ctrl.v == 0`), their max and min power
+      limits are set to their initial power (`p0.v`) in the converted MPC.
+    - 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
+      `baseMVA`.
+    - Unlike the XLSX and JSON converters, this implementation uses value providers
+      (`v`) instead of vin. As a result, any changes made through `model.set` will be
+      reflected in the generated MPC.
     """
 
     mpc = dict(version='2',
@@ -514,15 +519,31 @@ def system2mpc(system) -> dict:
     # --- PQ ---
     if system.PQ.n > 0:
         pq_pos = system.Bus.idx2uid(system.PQ.bus.v)
-        u = system.PQ.u.v
-        bus[pq_pos, 2] = u * system.PQ.p0.v * base_mva
-        bus[pq_pos, 3] = u * system.PQ.q0.v * base_mva
+
+        p0e = system.PQ.u.v * system.PQ.p0.v
+        q0e = system.PQ.u.v * system.PQ.q0.v
+
+        # NOTE: ensure multiple PQ on the same bus are summed
+        # rather than overwritten. Same for Shunt.
+        p = np.zeros(system.Bus.n)
+        q = np.zeros(system.Bus.n)
+        np.add.at(p, pq_pos, p0e)
+        np.add.at(q, pq_pos, q0e)
+        bus[:, 2] = p * base_mva
+        bus[:, 3] = q * base_mva
 
     # --- Shunt ---
     if system.Shunt.n > 0:
         shunt_pos = system.Bus.idx2uid(system.Shunt.bus.v)
-        bus[shunt_pos, 4] = system.Shunt.g.v * base_mva
-        bus[shunt_pos, 5] = system.Shunt.b.v * base_mva
+
+        ge = system.Shunt.u.v * system.Shunt.g.v
+        be = system.Shunt.u.v * system.Shunt.b.v
+        g = np.zeros(system.Bus.n)
+        b = np.zeros(system.Bus.n)
+        np.add.at(g, shunt_pos, ge)
+        np.add.at(b, shunt_pos, be)
+        bus[:, 4] = g * base_mva
+        bus[:, 5] = b * base_mva
 
     # --- PV ---
     if system.PV.n > 0:
@@ -709,11 +730,6 @@ def write(system, outfile: str, overwrite: bool = None) -> bool:
     This function converts an AMS system object into a MATPOWER-compatible
     mpc dictionary and writes it to a specified output file in MATPOWER format.
 
-    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.
-
     Parameters
     ----------
     system : ams.system.System
@@ -727,6 +743,21 @@ def write(system, outfile: str, overwrite: bool = None) -> bool:
     -------
     bool
         True if the file was successfully written, False otherwise.
+
+    Notes
+    -----
+    - In the `gen` section, slack generators are listed before PV generators.
+    - For uncontrolled generators (`ctrl.v == 0`), their max and min power
+      limits are set to their initial power (`p0.v`) in the converted MPC.
+    - 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
+      `baseMVA`.
+    - Unlike the XLSX and JSON converters, this implementation uses value providers
+      (`v`) instead of vin. As a result, any changes made through `model.set` will be
+      reflected in the generated MPC.
     """
     if not confirm_overwrite(outfile, overwrite=overwrite):
         return False

ams/io/psse.py

@@ -46,6 +46,8 @@ def write_raw(system, outfile: str, overwrite: bool = None):
     """
     Convert AMS system to PSS/E RAW file.
 
+    This method has not been fully benchmarked yet!
+
     Parameters
     ----------
     system : System

ams/routines/pypower.py

@@ -131,6 +131,15 @@ class DCPF1(RoutineBase):
                         unit='p.u.',
                         name='vBus', tex_name=r'v_{Bus}',
                         src='v', model='Bus',)
+        # --- load ---
+        self.pd = RParam(info='active demand',
+                         name='pd', tex_name=r'p_{d}',
+                         model='StaticLoad', src='p0',
+                         unit='p.u.',)
+        self.qd = RParam(info='reactive demand',
+                         name='qd', tex_name=r'q_{d}',
+                         model='StaticLoad', src='q0',
+                         unit='p.u.',)
         # --- gen ---
         self.pg = Var(info='Gen active power',
                       unit='p.u.',
@@ -267,13 +276,13 @@ class DCPF1(RoutineBase):
             return False
 
     def _get_off_constrs(self):
-        pass
+        logger.debug(f"{self.class_name} does not implement _get_off_constrs.")
 
     def _data_check(self, info=True, **kwargs):
-        pass
+        logger.debug(f"{self.class_name} does not implement _data_check.")
 
     def update(self, params=None, build_mats=False, **kwargs):
-        pass
+        logger.debug(f"{self.class_name} does not implement update.")
 
     def enable(self, name):
         raise NotImplementedError
@@ -282,7 +291,7 @@ class DCPF1(RoutineBase):
         raise NotImplementedError
 
     def _post_add_check(self):
-        pass
+        logger.debug(f"{self.class_name} does not implement _post_add_check.")
 
     def addRParam(self,
                   name: str,

ams/routines/routine.py

@@ -3,7 +3,6 @@ Module for routine data.
 """
 
 import logging
-import os
 from typing import Optional, Union, Type, Iterable, Dict
 from collections import OrderedDict
 
@@ -19,6 +18,8 @@ from ams.core.service import RBaseService, ValueService
 from ams.opt import OModel
 from ams.opt import Param, Var, Constraint, Objective, ExpressionCalc, Expression
 
+from ams.utils.paths import get_export_path
+
 from ams.shared import pd
 
 logger = logging.getLogger(__name__)
@@ -441,26 +442,20 @@ class RoutineBase:
 
         Parameters
         ----------
-        path : str
-            path of the csv file to save
+        path : str, optional
+            Path of the csv file to export.
 
         Returns
         -------
-        export_path
-            The path of the exported csv file
+        str
+            The exported csv file name
         """
         if not self.converged:
             logger.warning("Routine did not converge, aborting export.")
             return None
 
-        if not path:
-            if self.system.files.fullname is None:
-                logger.info("Input file name not detacted. Using `Untitled`.")
-                file_name = f'Untitled_{self.class_name}'
-            else:
-                file_name = os.path.splitext(self.system.files.fullname)[0]
-                file_name += f'_{self.class_name}'
-            path = os.path.join(os.getcwd(), file_name + '.csv')
+        path, file_name = get_export_path(self.system, self.class_name,
+                                          path=path, fmt='csv')
 
         data_dict = initialize_data_dict(self)
 
@@ -473,7 +468,7 @@ class RoutineBase:
 
         pd.DataFrame(data_dict).to_csv(path, index=False)
 
-        return file_name + '.csv'
+        return file_name
 
     def summary(self, **kwargs):
         """

ams/system.py

@@ -29,7 +29,7 @@ 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.matpower import write as write_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
@@ -602,6 +602,7 @@ class System(adSystem):
                  **kwargs):
         """
         Convert the AMS system to an ANDES system.
+        Wrapper method for `ams.interface.to_andes`.
 
         A preferred dynamic system file to be added has following features:
         1. The file contains both power flow and dynamic models.
@@ -718,17 +719,34 @@ class System(adSystem):
     def to_mpc(self):
         """
         Export an AMS system to a MATPOWER dict.
+        Wrapper method for `ams.io.matpower.system2mpc`.
 
         Returns
         -------
         dict
             A dictionary representing the MATPOWER case.
+
+        Notes
+        -----
+        - In the `gen` section, slack generators are listed before PV generators.
+        - For uncontrolled generators (`ctrl.v == 0`), their max and min power
+          limits are set to their initial power (`p0.v`) in the converted MPC.
+        - 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
+          `baseMVA`.
+        - Unlike the XLSX and JSON converters, this implementation uses value providers
+          (`v`) instead of vin. As a result, any changes made through `model.set` will be
+          reflected in the generated MPC.
         """
         return system2mpc(self)
 
     def to_m(self, outfile: str, overwrite: bool = None):
         """
         Export an AMS system to a MATPOWER M-file.
+        Wrapper method for `ams.io.matpower.write`.
 
         Parameters
         ----------
@@ -736,12 +754,28 @@ class System(adSystem):
             The output file name.
         overwrite : bool, optional
             If True, overwrite the existing file. Default is None.
-        """
-        return wrtite_m(self, outfile=outfile, overwrite=overwrite)
+
+        Notes
+        -----
+        - In the `gen` section, slack generators are listed before PV generators.
+        - For uncontrolled generators (`ctrl.v == 0`), their max and min power
+          limits are set to their initial power (`p0.v`) in the converted MPC.
+        - 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
+          `baseMVA`.
+        - Unlike the XLSX and JSON converters, this implementation uses value providers
+          (`v`) instead of vin. As a result, any changes made through `model.set` will be
+          reflected in the generated MPC.
+        """
+        return write_m(self, outfile=outfile, overwrite=overwrite)
 
     def to_xlsx(self, outfile: str, overwrite: bool = None):
         """
         Export an AMS system to an Excel file.
+        Wrapper method for `ams.io.xlsx.write`.
 
         Parameters
         ----------
@@ -755,6 +789,7 @@ class System(adSystem):
     def to_json(self, outfile: str, overwrite: bool = None):
         """
         Export an AMS system to a JSON file.
+        Wrapper method for `ams.io.json.write`.
 
         Parameters
         ----------
@@ -768,6 +803,9 @@ class System(adSystem):
     def to_raw(self, outfile: str, overwrite: bool = None):
         """
         Export an AMS system to a v33 PSS/E RAW file.
+        Wrapper method for `ams.io.psse.write_raw`.
+
+        This method has not been fully benchmarked yet!
 
         Parameters
         ----------

ams/utils/paths.py

@@ -255,3 +255,67 @@ def confirm_overwrite(outfile, overwrite=None):
         pass
 
     return True
+
+
+def get_export_path(system, fname, path=None, fmt='csv'):
+    """
+    Get the absolute export path and the derived file name for
+    an AMS system export.
+
+    This function is not intended to be used directly by users.
+
+    Parameters
+    ----------
+    system : ams.system.System
+        The AMS system to export. (Mocked in example)
+    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.
+    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.
+    """
+    # Determine the base name from system.files.fullname or default to "Untitled"
+    if system.files.fullname is None:
+        logger.info("Input file name not detected. Using `Untitled`.")
+        base_name_prefix = f'Untitled_{fname}'
+    else:
+        base_name_prefix = os.path.splitext(os.path.basename(system.files.fullname))[0]
+        base_name_prefix += f'_{fname}'
+
+    target_extension = fmt.lower()  # Ensure consistent extension casing
+
+    if path:
+        abs_path = os.path.abspath(path)  # Resolve to absolute path early
+
+        # Check if the provided path is likely intended as a directory
+        if not os.path.splitext(abs_path)[1]:  # No extension implies it's a directory
+            dir_path = abs_path
+            final_file_name = f"{base_name_prefix}.{target_extension}"
+            full_export_path = os.path.join(dir_path, final_file_name)
+        else:
+            # Path includes a filename. Use its directory, and its base name.
+            dir_path = os.path.dirname(abs_path)
+            # Use the provided filename's base, but enforce the target_extension
+            provided_base_filename = os.path.splitext(os.path.basename(abs_path))[0]
+            final_file_name = f"{provided_base_filename}.{target_extension}"
+            full_export_path = os.path.join(dir_path, final_file_name)
+    else:
+        # No path provided, use current working directory
+        dir_path = os.getcwd()
+        final_file_name = f"{base_name_prefix}.{target_extension}"
+        full_export_path = os.path.join(dir_path, final_file_name)
+
+    return full_export_path, final_file_name

docs/source/release-notes.rst

@@ -9,6 +9,13 @@ The APIs before v3.0.0 are in beta and may change without prior notice.
 v1.0
 ==========
 
+v1.0.12 (2025-05-29)
+----------------------
+
+- Add RParam pd and qd in ``DCPF1`` for easy access to load
+- Bug fix in ``RoutineBase.export_csv`` when path is specified
+- Fix bug in ``io.matpower.system2mpc`` with multiple PQ at one bus
+
 v1.0.11 (2025-05-23)
 ----------------------
 
@@ -18,8 +25,8 @@ v1.0.11 (2025-05-23)
 v1.0.10 (2025-05-23)
 ----------------------
 
-- Add bus type correction in ``system.System.setup()``
-- Revise ``ams.io.psse.read`` to complete model Zone when necessary
+- Add bus type correction in ``system.System.setup``
+- Revise ``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
@@ -34,7 +41,7 @@ v1.0.10 (2025-05-23)
 - 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``
+- Remove function ``shared.ppc2df``
 
 v1.0.9 (2025-04-23)
 --------------------
@@ -62,7 +69,7 @@ v1.0.7 (2025-04-14)
 - Extend common parameters in groups ``StaticGen`` and ``StaticLoad`` with ``area``
 - Set case ``pjm5bus_demo.xlsx`` as a all-inclusive case
 - Include module ``MatProcessor`` in the API documentation
-- Improve Line parameters correction in ``System.setup()``
+- Improve Line parameters correction in ``System.setup``
 - Make func ``interface._to_andes_pflow`` public
 - Discard ``sync_adsys`` step in func ``to_andes_pflow`` to fix mistake in
   parameters conversion
@@ -91,7 +98,7 @@ v1.0.4 (2025-04-05)
 v1.0.3 (2025-03-17)
 --------------------
 
-- Bug fix in function ``ams.interface.parse_addfile``, released in v1.0.3a1
+- Bug fix in function ``interface.parse_addfile``, released in v1.0.3a1
 
 v1.0.2 (2025-02-01)
 --------------------
@@ -136,10 +143,10 @@ v0.9.12 (2024-11-23)
 
 - Refactor ``OModel.initialized`` as a property method
 - Add a demo to show using ``Constraint.e`` for debugging
-- Fix ``ams.opt.omodel.Param.evaluate`` when its value is a number
-- Improve ``ams.opt.omodel.ExpressionCalc`` for better performance
-- Refactor module ``ams.opt``
-- Add class ``ams.opt.Expression``
+- Fix ``opt.omodel.Param.evaluate`` when its value is a number
+- Improve ``opt.omodel.ExpressionCalc`` for better performance
+- Refactor module ``opt``
+- Add class ``opt.Expression``
 - Switch from PYPOWER to ANDES in routine ``PFlow``
 - Switch from PYPOWER to regular formulation in routine ``DCPF``
 - Refactor routines ``DCPF`` and ``DCOPF``
@@ -382,7 +389,7 @@ v0.6.5 (2023-06-27)
 -------------------
 
 - Update documentation with auto-generated model and routine reference
-- Add interface with ANDES ``ams.interop.andes``
+- Add interface with ANDES ``interop.andes``
 - Add routine RTED and example of RTED-TDS co-simulation
 - Draft development documentation
 

{ltbams-1.0.11.dist-info → ltbams-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ltbams
-Version: 1.0.11
+Version: 1.0.12
 Summary: Python software for scheduling modeling and co-simulation with dynamics.
 Home-page: https://github.com/CURENT/ams
 Author: Jinning Wang

{ltbams-1.0.11.dist-info → ltbams-1.0.12.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=9w0v2vIzAou5TWcsacfNdhiCAr9S83BM7FAKRy_t8h0,498
+ams/_version.py,sha256=jNLhv-DaZngBxRAi3mCJd0jmQgAAbgAoAn-N8TbLgbQ,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=4sY2U0sghs_S2V6C7Z0OyQ6WZRfpCXk2_Cf_Mg24Vr4,3900
-ams/system.py,sha256=eAsaXO2O_7_PAIuPFup3edztuAhKMhODrR9l92CYx38,29765
+ams/system.py,sha256=bGbZQrN5N2tx1tnxoPz6JSGE568EGH1Oi1zQIyLFLug,31948
 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
@@ -38,7 +38,7 @@ ams/cases/wecc/wecc_uced.xlsx,sha256=R3tZgxEqz_ctKcjA1wwFecxn-QZXutvf7NzgnCg_078
 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=3eEij-ul8Rx25ZwNbv66YEOKyUXB-fYO-ZQs5BpqmIU,26610
+ams/core/matprocessor.py,sha256=gOEqg5xYpzmj4aMgTdzYeOPaL-5Bp493TrxUVmMaiTw,26453
 ams/core/model.py,sha256=LNZtzyf2A7Tz3pn9IDs35JYaHSkQRqhqZicTpZGSqsc,10926
 ams/core/param.py,sha256=LPH48xUHyqWqODD6IsiamUtkJDDSgGCEMAo6vroFoHE,11130
 ams/core/service.py,sha256=Q4aeaYFWycIEH7I8DSO8Itah2CJxc3oAW46dtKCQEyA,28041
@@ -48,8 +48,8 @@ ams/extension/__init__.py,sha256=5IFTNirDL0uDaUsg05_oociVT9VCy2rhPx1ad4LGveM,65
 ams/extension/eva.py,sha256=4_q4ME0WrQIcd205SBTjv0-rMRZZIdQ07QJuEHwLIC8,16340
 ams/io/__init__.py,sha256=GIfF7X44olHaySL8EzOBU1eXUnunr1owzzdPfPvvHZU,3802
 ams/io/json.py,sha256=IurwcZDuKczSbRTpcbQZiIi0ARCrMK6kJ0E3wS8ENy8,2585
-ams/io/matpower.py,sha256=IK6NwVUAM0FAv2rFF1hBoSTowfXD8l6YXrKiPch9hW8,26166
-ams/io/psse.py,sha256=qvKP9CP-70UejUsffPu4ibtyF1JXO0Sz0-evT4fDPXg,13631
+ams/io/matpower.py,sha256=R8ynl88bWJAzISYZKfMQi7AFRUINwqk_e-Zsh_pnVCE,27541
+ams/io/psse.py,sha256=S2JqpEFaXEiazbVtU77i93BA4ZnoKP7jDZ1rQGg24sE,13684
 ams/io/pypower.py,sha256=Fe0sxzC5DZegtYksTixadXk_LcfJ1GNetWu9EuHCkG8,2790
 ams/io/xlsx.py,sha256=7ATW1seyxsGn7d5p5IuSRFHcoCHVVjMu3E7mP1Mc74U,2460
 ams/models/__init__.py,sha256=EGkViLkVX_We9FAGuEkgfleMNmPw_vGp2Nq1OQimL7U,691
@@ -90,14 +90,14 @@ ams/routines/dopf.py,sha256=8D36-FkPORYGaMnwGTqwz8HxAXk5ywo3mk8NlGq327g,6289
 ams/routines/ed.py,sha256=9Hf_ZqD6poIxCIBfsTMC0DGoPNEja1ZtVxqhb4ijhgE,11875
 ams/routines/grbopt.py,sha256=RjrMq6XPHeBEbf-Pt9sLk2D1vnXZYYwaic4BP8lbACg,5480
 ams/routines/pflow.py,sha256=5_9n10r_PfsVXIRkaBgKxVITumImZ8mvpHnwxX_ECdw,9432
-ams/routines/pypower.py,sha256=U1UJbcNG7JawGmK9sKtjZlRrGwODVWDjJFucisMcvJs,26545
-ams/routines/routine.py,sha256=v4jzsziQPvbVh5m0AH629NBEtmKlLvitFW5m-YfFtfY,35833
+ams/routines/pypower.py,sha256=3nKm7VoVXWsiiBK0fEdHv0W2T2AsJ4a6Nqb9ts-1u1A,27214
+ams/routines/routine.py,sha256=teafNQ7DmXntwNP-RbtJJ9Ixa5xOEioO-nXFhY1psmA,35574
 ams/routines/rted.py,sha256=GOHRxo0-HS5HhwQg8lv7-2VcGr_M_TdUvvomgJ31fDQ,22070
 ams/routines/type.py,sha256=lvTWSnCYIbRJXIm3HX6jA0Hv-WWYusTOUPfoW8DITlU,3877
 ams/routines/uc.py,sha256=VcuNy2TnBjsewKEGIqeo2EFTyuhpx5QsEvgpAtscDIQ,15648
 ams/utils/__init__.py,sha256=2hAQmWRgmnE-bCGT9cJoW9FkPDMGRiGkbBcUgj-bgjI,122
 ams/utils/misc.py,sha256=Y6tPKpUKJa7bL9alroJuG2UNW9vdQjnfAmKb2EbIls8,2027
-ams/utils/paths.py,sha256=o9Ku2ETmYxsoD7VbMlS4qv_wGtXtT-SWIgDs0F7jpCQ,6693
+ams/utils/paths.py,sha256=6iTux5UaHzRi6mGHnpbYUp-MoD-IFny4IuRsV8FKDcQ,9481
 docs/Makefile,sha256=UKXBFAbKGPt1Xw9J84343v0Mh8ylAZ-tE0uCd74DrQU,725
 docs/make.bat,sha256=9UgKGb4SdP006622fJiFxeFT1BeycYAs6hDbV1xwPy8,804
 docs/source/api.rst,sha256=BRzdDFDzDwVL7Jr_Xj-O5Icgx0gt5hNNd1OjvPl7ap0,1490
@@ -105,7 +105,7 @@ 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/index.rst,sha256=N5phQS5RIyYs-NZo_5yYB8LjvHzOKLeXzRA-M8i-g3Q,2688
-docs/source/release-notes.rst,sha256=7BtbNLQ2EUvSvB9KGNELicPAFqNT8uBzQQLqlT9MpMc,13830
+docs/source/release-notes.rst,sha256=zBHZ9dALCLSKKz5lwwalCQJiNCD2l2d3iJjISWtUiPg,14031
 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
@@ -143,18 +143,18 @@ tests/test_cli.py,sha256=TtCGBy2e7Ll_2gJTFo9juZtzhaakho_MqkcqhG2w2dk,870
 tests/test_export_csv.py,sha256=NTULXfTexgI1jf5koUMOYi3RLrSQouS7zxRjXo3ng50,2921
 tests/test_group.py,sha256=Tq0s9gtenqrv4ws5YNzWxbiF4WgyhtMEAXZfJtew6M4,2699
 tests/test_interface.py,sha256=8hOZ1caRfoyoEdy1lnh8Y4rIL97FLb2oUKfX_N1lEDo,8838
-tests/test_io.py,sha256=MIale4g0jMC9Vy4jjtFKpnh12aavp9lusczff1iIVC0,6493
+tests/test_io.py,sha256=OXt1C6F_RAt0RoRj3xLKdbA3raKEAjvVyWlKD7Ju7BA,6947
 tests/test_jumper.py,sha256=bdOknplEGnO_tiJc7p3xQvgTe2b6Dz53bOgbFaXKMAI,537
 tests/test_known_good.py,sha256=NBrlAxnVMxIHXR2cWps-Kwjh36fiU4Y-eupspZkM0ks,9670
 tests/test_matp.py,sha256=LkjhqxSFr6oY_ENpduDQ77rhLLBl6RzIHZ2d0m_8i-8,17262
 tests/test_model.py,sha256=ZgghNYmEeALf8_1sPjq9lIJwuYDQ2SelivJNEYpHxJU,1621
 tests/test_omodel.py,sha256=niVdTZJEZNSVHz-ocA0nnVx84Dt3-8P5FUrwKkNiA0I,4305
-tests/test_paths.py,sha256=BU6Tjl4Q_WuHbid0ujkiibqx7yas42YJ7eV_avVMwuw,633
+tests/test_paths.py,sha256=j_D9-Cjg73mwhTS3sUHDfQ8mCebD8enCQxjyRaR2ZH4,3020
 tests/test_report.py,sha256=RR23by4G-cyleaHTy9A7SEVet0eOVS-Tm0kk1GXY5dM,8134
 tests/test_repr.py,sha256=g7MRdxLcZRI1PlREFdUG_npp0LkcQiJZfOPw1aq0EFM,570
 tests/test_routine.py,sha256=DP5CwKtzliw2gNLW2W_3kp0Ihy4rCaxeBxMpgyN5AXA,6234
 tests/test_rtn_acopf.py,sha256=Kg-RHflrrwyX2uHr16xSAze9XAdYcK7eg1LHMyr1uyA,2354
-tests/test_rtn_dcopf.py,sha256=Pl6yGfvznnjP1oGiIWEhnqFIBW2futxPZS4o_DRkbrw,3660
+tests/test_rtn_dcopf.py,sha256=qFY9mKTAIG-qDlU9-loHZddKDDszdGQwRjL-ZDnESu8,4204
 tests/test_rtn_dcopf2.py,sha256=57_62TnHW-cS6iK2zXT_eXChnh83YiYoPypJwub3VmQ,3747
 tests/test_rtn_ed.py,sha256=SeSuzqpTZZnBph41PV2Piplo9yxR3qpbhQUa6UCYnSw,10267
 tests/test_rtn_opf.py,sha256=MmMNwb9-G0KzHcrrP4uHTvs9DBU71_XPIJqNnkQQPHo,4846
@@ -163,8 +163,8 @@ tests/test_rtn_pypower.py,sha256=KO5VOZxETxVH2mY1mgNvzj1gz1Gdak1sAWxYleDU4E8,104
 tests/test_rtn_rted.py,sha256=QHDUymorCqQAJKFlDgTy40JyLTGDvNVNU3tjbjDl3-0,9850
 tests/test_rtn_uc.py,sha256=UbMeaam3dZwgq2LAJokGOl3LT5B3TWKMjCp4dRcLs40,8497
 tests/test_service.py,sha256=6IP6CAH2xHxGHZM4-R8LjZxVJ2L10LcGaPDyRIqKLmc,2438
-ltbams-1.0.11.dist-info/METADATA,sha256=HJopLlES434MQhl_hg4DDQNs90TfSJLovZKG-NChtNs,13808
-ltbams-1.0.11.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-ltbams-1.0.11.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
-ltbams-1.0.11.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
-ltbams-1.0.11.dist-info/RECORD,,
+ltbams-1.0.12.dist-info/METADATA,sha256=ZKZlrfSVEg8RkdZ-YjEWGZfY4p7kdEGppQfhHV6hgpg,13808
+ltbams-1.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ltbams-1.0.12.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
+ltbams-1.0.12.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
+ltbams-1.0.12.dist-info/RECORD,,

{ltbams-1.0.11.dist-info → ltbams-1.0.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_io.py

@@ -85,6 +85,16 @@ class TestMATPOWER(unittest.TestCase):
         self.assertEqual(np.unique(mpc5['bus'][:, 10]).shape[0],
                          np.unique(self.mpc5['bus'][:, 10]).shape[0])
 
+    def test_system2mpc_pq(self):
+        """Test AMS System to MPC conversion with multiple PQ at one bus."""
+        system = ams.load(ams.get_case('5bus/pjm5bus_demo.json'),
+                          setup=False, no_output=True)
+        system.add('PQ', dict(bus=1, p0=0.2))
+
+        mpc = system.to_mpc()
+        np.testing.assert_almost_equal(mpc['bus'][:, 2].sum(),
+                                       system.config.mva * system.PQ.p0.v.sum())
+
     def test_gencost1(self):
         """Test when gencost is type 1."""
         mpcgc1 = self.mpc14.copy()

tests/test_paths.py

@@ -1,7 +1,9 @@
 import unittest
 
+import os
+
 import ams
-from ams.utils.paths import list_cases
+from ams.utils.paths import list_cases, get_export_path
 
 
 class TestPaths(unittest.TestCase):
@@ -20,3 +22,68 @@ class TestPaths(unittest.TestCase):
                      no_output=True, default_config=True,
                      )
         self.assertNotEqual(ss, None)
+
+
+class TestExportPath(unittest.TestCase):
+
+    def setUp(self) -> None:
+        self.ss = ams.load(ams.get_case('5bus/pjm5bus_demo.json'),
+                           setup=True, no_output=True)
+
+    def test_no_fullname(self):
+        """
+        Test export path with no full name specified.
+        """
+        self.ss.files.full_name = None
+
+        path, file_name = get_export_path(self.ss,
+                                          'DCOPF',
+                                          path=None,
+                                          fmt='csv')
+
+        dir_path, only_file_name = os.path.split(path)
+        self.assertTrue(os.path.exists(dir_path))
+        self.assertIsNotNone(only_file_name)
+        self.assertEqual(only_file_name, file_name)
+
+    def test_no_path(self):
+        """
+        Test export path with no path specified.
+        """
+        path, file_name = get_export_path(self.ss,
+                                          'DCOPF',
+                                          path=None,
+                                          fmt='csv')
+
+        dir_path, only_file_name = os.path.split(path)
+        self.assertTrue(os.path.exists(dir_path))
+        self.assertIsNotNone(only_file_name)
+        self.assertEqual(only_file_name, file_name)
+
+    def test_current_path(self):
+        """
+        Test export path with current path specified.
+        """
+        path, file_name = get_export_path(self.ss,
+                                          'DCOPF',
+                                          path='.',
+                                          fmt='csv')
+
+        dir_path, only_file_name = os.path.split(path)
+        self.assertTrue(os.path.exists(dir_path))
+        self.assertIsNotNone(only_file_name)
+        self.assertEqual(only_file_name, file_name)
+
+    def test_path_with_file_name(self):
+        """
+        Test export path with path and file name specified.
+        """
+        path, file_name = get_export_path(self.ss,
+                                          'DCOPF',
+                                          path='./test_export.csv',
+                                          fmt='csv',)
+
+        dir_path, only_file_name = os.path.split(path)
+        self.assertTrue(os.path.exists(dir_path))
+        self.assertEqual(only_file_name, 'test_export.csv')
+        self.assertEqual(only_file_name, file_name)

tests/test_rtn_dcopf.py

@@ -1,3 +1,5 @@
+import os
+
 import unittest
 import numpy as np
 
@@ -99,3 +101,21 @@ class TestDCOPF(unittest.TestCase):
         a_dcopf = self.ss.DCOPF.get(src='aBus', attr='v', idx=bus_idx)
         a_acopf = self.ss.ACOPF.get(src='aBus', attr='v', idx=bus_idx)
         np.testing.assert_almost_equal(a_dcopf, a_acopf, decimal=3)
+
+    def test_export_csv(self):
+        """
+        Test `Routine.export_csv()` method.
+        """
+        self.ss.DCOPF.run(solver='CLARABEL')
+
+        # test when path is none
+        out = self.ss.DCOPF.export_csv()
+        self.assertTrue(os.path.exists(out), "CSV export failed!")
+
+        # test when path is not none
+        out2 = self.ss.DCOPF.export_csv(path='test_dcopf.csv')
+        self.assertTrue(os.path.exists(out2), "CSV export with path failed!")
+
+        # Clean up
+        os.remove(out)
+        os.remove(out2)