ltbams 1.0.2a2__py3-none-any.whl → 1.0.3a1__py3-none-any.whl

ams/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-02-01T21:17:46-0500",
+ "date": "2025-02-02T08:55:36-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "6a2dcb6840ec8d966fc7249bbfcdfe4b83722e51",
- "version": "1.0.2a2"
+ "full-revisionid": "8a697edc2d5ab9e5451fa1d4a5b2bec41d180d4c",
+ "version": "1.0.3a1"
 }
 '''  # END VERSION_JSON
 

ams/interface.py

@@ -336,7 +336,12 @@ def parse_addfile(adsys, amsys, addfile):
 
     # NOTE: Group TimedEvent needs special treatment
     # adjust Toggle and Fault models
-    toggle_df = df_models.get('Toggle') or df_models.get('Toggler')
+    keys_toggle = ['Toggle', 'Toggler']
+    toggle_df = None
+    for key in keys_toggle:
+        if key in df_models:
+            toggle_df = df_models[key]
+            break
     if toggle_df is not None:
         toggle_df['dev'] = toggle_df.apply(replace_dev, axis=1,
                                            mdl='model', dev='dev',

docs/source/release-notes.rst

@@ -9,6 +9,12 @@ The APIs before v3.0.0 are in beta and may change without prior notice.
 Pre-v1.0.0
 ==========
 
+v1.0.3 (2024-xx-xx)
+
+--------------------
+
+- Bug fix in function ``ams.interface.parse_addfile``, released in v1.0.3a1
+
 v1.0.2 (2024-02-01)
 
 --------------------

{ltbams-1.0.2a2.dist-info → ltbams-1.0.3a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ltbams
-Version: 1.0.2a2
+Version: 1.0.3a1
 Summary: Python software for scheduling modeling and co-simulation with dynamics.
 Home-page: https://github.com/CURENT/ams
 Author: Jinning Wang
@@ -143,11 +143,12 @@ pip install git+https://github.com/CURENT/ams.git
 ```
 
 ***NOTE:***
-- Version **0.9.9** has known issues and has been yanked from PyPI
-- `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries
+- `cvxpy` is distributed with the open source solvers CLARABEL, OSQP, and SCS, but MIP-capable solvers need separate installation
 - `cvxpy` versions **below 1.5** are incompatible with `numpy` versions **2.0 and above**
 - If the solver `SCIP` encounters an import error caused by a missing `libscip.9.1.dylib`, try reinstalling its Python interface by running `pip install pyscipopt --no-binary scip --force`
+- `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries
 - Versions **1.0.0** and **1.0.1** are only available on PyPI
+- Version **0.9.9** has known issues and has been yanked from PyPI
 
 # Example Usage
 

{ltbams-1.0.2a2.dist-info → ltbams-1.0.3a1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 ams/__init__.py,sha256=dKIwng8xES4NQHn6ZHy8RCKeXphN9z2wyfmbvniIEg0,351
 ams/__main__.py,sha256=EB4GfGiKgvnQ_psNr0QwPoziYvjmGvQ2yVsBwQtfrLw,170
-ams/_version.py,sha256=ohQLhssff6xOzWdf6zyISSA3SefYOFxB86wDNZeZlOI,499
+ams/_version.py,sha256=jA4hGqiTxLiBPzRLM8URDRE3F6wZ9myl6bTEt2GKIkQ,499
 ams/cli.py,sha256=EyNFXn565gFCppTxpyTZviBdPgUuKtgAPZ4WE6xewRk,6164
-ams/interface.py,sha256=PA_F5KEK7BrSvHjgz3v7vPXH2KEhOerZ7sNLrgT0IcU,44380
+ams/interface.py,sha256=PCR9geO-pvCxXxljWP4u3M-BAdVD5DjA3xvf338g9x8,44487
 ams/main.py,sha256=wzKLe_BeQAUyFh-U1cxQIOwr-rAJM8ppB3EEi6_v2tw,23607
 ams/report.py,sha256=gUscOYpPjuPuruzIXAADaifIZv2BSjmP1oKCuHdD3Vw,11004
 ams/shared.py,sha256=Zdy4-kHKc0_3CzyZKmGyCvpmrJz4Wzs9qnFlk8eyzq0,4159
@@ -126,7 +126,7 @@ docs/source/conf.py,sha256=ozLsGWVbFOZZfruXlvL6ou8i-R8kyCYZedtDzSQVRoU,6688
 docs/source/genmodelref.py,sha256=IhmF7bDw8BXPvLD8V3WjQNrfc-H07r5iS-_4DHbbp-8,1420
 docs/source/genroutineref.py,sha256=0JyMc2kV5bWrWbSoO6d7o4QgDgG8mVy3JGGQWacJypw,1064
 docs/source/index.rst,sha256=N5phQS5RIyYs-NZo_5yYB8LjvHzOKLeXzRA-M8i-g3Q,2688
-docs/source/release-notes.rst,sha256=0U7P6i5rAdL3aevH9A9mQXL0Nqn9C_zrs98ca0L-vu8,12592
+docs/source/release-notes.rst,sha256=Xna3XJePxxdJxoSAUXQJXwwfKhug0AqQH4OERU3qAxw,12712
 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
@@ -181,8 +181,8 @@ tests/test_rtn_pflow.py,sha256=aDL5Ewm6lWqpdHqIIu-DTllhXzt4bMjsLJaKbJa8sXQ,6990
 tests/test_rtn_rted.py,sha256=AyW5B4A51L_nIVLX1eYeu9ZUboOh1CH2FVj2C1XJjSc,9769
 tests/test_rtn_uc.py,sha256=vdG2ss3q91CXLZ2sUgzoUr1NU-63ue7nOxAYywMordE,8286
 tests/test_service.py,sha256=8YIa_PXurwgOzsWvUqoyqS_AzlpdrKHIMxAln5fIqCU,2438
-ltbams-1.0.2a2.dist-info/METADATA,sha256=H2CBXg-vN_Xs2Lcw_EiYAi0AaTwQFNPztNGr2fsJPU4,13287
-ltbams-1.0.2a2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ltbams-1.0.2a2.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
-ltbams-1.0.2a2.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
-ltbams-1.0.2a2.dist-info/RECORD,,
+ltbams-1.0.3a1.dist-info/METADATA,sha256=zvi17maPhlfJkiEqd-5cxzN7ussINfOaCHJ7_8CdF4o,13417
+ltbams-1.0.3a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ltbams-1.0.3a1.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
+ltbams-1.0.3a1.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
+ltbams-1.0.3a1.dist-info/RECORD,,