ltbams 1.0.7__py3-none-any.whl → 1.0.8__py3-none-any.whl

ams/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-04-14T02:15:15-0400",
+ "date": "2025-04-20T09:18:49-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "ba5d62c3b3d080ab5ffe03e04883a3492dc121eb",
- "version": "1.0.7"
+ "full-revisionid": "4bda2874669399db2c37d0a4bf6ae10e324d96a7",
+ "version": "1.0.8"
 }
 '''  # END VERSION_JSON
 

ams/cases/hawaii40/Hawaii40.m

@@ -0,0 +1,375 @@
+% Case saved by PowerWorld Simulator, version 23, build date August 27, 2023
+function mpc = Hawaii40_20231026
+mpc.version = '2';
+mpc.baseMVA =  100.00;
+
+%% bus data 
+mpc.bus = [
+1	1	0.00	0.00	0.00	0.00	1	0.9935453	-1.119907	138.00	1	1.100	0.900	5.22	0.00	0	0
+2	2	60.70	0.00	0.00	0.00	1	0.9912250	-3.927372	69.00	1	1.100	0.900	5.25	0.00	0	0
+3	1	59.39	0.00	0.00	0.00	1	0.9845477	-4.731145	69.00	1	1.100	0.900	5.71	-0.03	0	0
+4	1	22.47	0.00	0.00	0.00	1	0.9787999	-5.745870	69.00	1	1.100	0.900	5.42	-0.01	0	0
+5	1	0.00	0.00	0.00	0.00	1	0.9889847	-2.069792	138.00	1	1.100	0.900	5.28	0.00	0	0
+6	1	27.46	0.00	0.00	0.00	1	0.9812064	-5.528160	69.00	1	1.100	0.900	5.49	-0.00	0	0
+7	1	37.01	0.00	0.00	0.00	1	0.9805826	-5.671337	69.00	1	1.100	0.900	5.48	-0.00	0	0
+8	1	65.10	0.00	0.00	0.00	1	0.9786187	-5.702381	69.00	1	1.100	0.900	5.75	-0.03	0	0
+9	1	0.00	0.00	0.00	0.00	1	0.9867678	-2.548359	138.00	1	1.100	0.900	5.31	-0.00	0	0
+10	1	37.76	0.00	0.00	0.00	1	0.9809410	-5.651960	69.00	1	1.100	0.900	5.47	0.00	0	0
+11	1	65.55	0.00	0.00	0.00	1	0.9749115	-6.522955	69.00	1	1.100	0.900	5.50	0.00	0	0
+12	1	54.01	0.00	0.00	0.00	1	0.9773269	-6.198354	69.00	1	1.100	0.900	5.51	-0.00	0	0
+13	1	59.24	0.00	0.00	0.00	1	0.9789530	-6.094816	69.00	1	1.100	0.900	5.49	-0.00	0	0
+14	1	0.00	0.00	0.00	0.00	1	0.9837641	-3.136205	138.00	1	1.100	0.900	5.35	-0.00	0	0
+15	1	60.90	0.00	0.00	0.00	1	0.9786311	-6.029763	69.00	1	1.100	0.900	5.51	0.01	0	0
+16	1	23.83	0.00	0.00	32.00	1	0.9821866	-6.456032	69.00	1	1.100	0.900	5.56	-0.01	0	0
+17	1	12.04	0.00	0.00	0.00	1	0.9754957	-6.981904	69.00	1	1.100	0.900	5.53	-0.01	0	0
+18	1	36.32	0.00	0.00	0.00	1	0.9759604	-7.121150	69.00	1	1.100	0.900	5.55	-0.01	0	0
+19	1	48.60	0.00	0.00	0.00	1	0.9913040	-3.514221	69.00	1	1.100	0.900	5.89	-0.04	0	0
+20	1	64.95	0.00	0.00	0.00	1	0.9896603	-1.963951	69.00	1	1.100	0.900	7.07	-0.18	0	0
+21	1	48.34	0.00	0.00	0.00	1	0.9799422	-5.268157	69.00	1	1.100	0.900	5.54	-0.01	0	0
+22	1	0.00	0.00	0.00	0.00	1	0.9963974	-0.844548	138.00	1	1.100	0.900	5.19	0.00	0	0
+23	3	86.75	0.00	0.00	0.00	1	1.0000000	-2.106015	69.00	1	1.100	0.900	5.10	0.00	0	0
+24	1	46.58	0.00	0.00	0.00	1	0.9934020	-3.706851	69.00	1	1.100	0.900	4.59	-0.05	0	0
+25	1	0.00	0.00	0.00	0.00	1	0.9966141	-0.528763	138.00	1	1.100	0.900	5.20	0.00	0	0
+26	2	75.28	0.00	0.00	0.00	1	0.9951046	-3.596866	69.00	1	1.100	0.900	4.93	-0.02	0	0
+27	2	3.95	0.00	0.00	0.00	1	1.0034164	1.362694	69.00	1	1.100	0.900	7.78	-0.10	0	0
+28	2	8.82	0.00	0.00	0.00	1	1.0000000	0.234055	69.00	1	1.100	0.900	0.00	0.00	0	0
+29	1	7.70	0.00	0.00	0.00	1	0.9953834	-0.097274	69.00	1	1.100	0.900	7.84	-0.12	0	0
+30	1	49.03	0.00	0.00	0.00	1	0.9957983	-0.422344	69.00	1	1.100	0.900	8.14	-0.10	0	0
+31	1	9.62	0.00	0.00	0.00	1	0.9952150	-2.101776	69.00	1	1.100	0.900	2.58	0.08	0	0
+32	1	6.67	0.00	0.00	0.00	1	0.9912167	-1.321157	69.00	1	1.100	0.900	7.37	-0.16	0	0
+33	2	58.22	0.00	0.00	0.00	1	0.9956520	-3.050368	69.00	1	1.100	0.900	4.14	-0.01	0	0
+34	2	0.00	0.00	0.00	0.00	1	1.0000000	-2.084231	69.00	1	1.100	0.900	4.62	0.00	0	0
+35	2	0.00	0.00	0.00	0.00	1	1.0000000	0.376390	138.00	1	1.100	0.900	5.20	0.00	0	0
+36	2	0.00	0.00	0.00	0.00	1	0.9965724	-3.565242	69.00	1	1.100	0.900	4.59	-0.05	0	0
+37	2	0.00	0.00	0.00	0.00	1	1.0000000	0.251430	138.00	1	1.100	0.900	5.20	0.00	0	0
+];
+
+%% generator data 
+mpc.gen = [
+2	2.50	0.80	0.80	-0.50	1.0000	2.80	1	2.50	1.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+2	2.50	0.80	0.80	-0.50	1.0000	2.80	1	2.50	1.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+2	2.50	0.80	0.80	-0.50	1.0000	2.80	1	2.50	1.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+2	2.50	0.80	0.80	-0.50	1.0000	2.80	1	2.50	1.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	69.27	0.04	23.30	-14.00	1.0000	85.60	1	77.80	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	39.13	0.04	13.80	-8.30	1.0000	50.50	1	45.90	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	69.27	0.04	23.30	-14.00	1.0000	85.60	1	77.80	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	47.64	0.04	15.60	-9.40	1.0000	57.10	1	51.90	23.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	47.11	0.04	15.50	-9.30	1.0000	57.00	1	51.80	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	44.53	0.04	15.40	-9.20	1.0000	56.30	1	51.20	6.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	44.53	0.04	15.40	-9.20	1.0000	56.30	1	51.20	6.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	43.61	0.04	14.30	-8.60	1.0000	52.50	1	47.70	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	43.19	0.04	14.20	-8.50	1.0000	51.90	1	47.20	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+23	12.53	0.04	4.40	-2.60	1.0000	16.20	1	14.70	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+26	20.00	6.00	6.00	-3.60	1.0000	22.00	1	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+26	10.20	3.10	3.10	-1.90	1.0000	11.20	1	10.20	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+27	30.00	-5.40	9.00	-5.40	1.0000	33.00	1	30.00	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+27	27.60	-5.00	8.30	-5.00	1.0000	30.40	1	27.60	1.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+28	46.30	-5.49	14.70	-8.80	1.0000	53.90	1	49.00	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+28	69.00	-5.49	20.70	-12.40	1.0000	75.90	1	69.00	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+33	27.60	8.30	8.30	-5.00	1.0000	30.40	1	27.60	0.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+34	7.22	-0.98	2.50	-1.50	1.0000	9.20	1	8.40	2.50	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+34	6.04	-0.98	2.50	-1.50	1.0000	9.20	1	8.40	2.50	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+34	6.04	-0.98	2.50	-1.50	1.0000	9.20	1	8.40	2.50	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+34	6.04	-0.98	2.50	-1.50	1.0000	9.20	1	8.40	2.50	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+34	6.01	-0.98	2.50	-1.50	1.0000	9.20	1	8.40	2.50	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+34	7.22	-0.98	2.50	-1.50	1.0000	9.20	1	8.40	2.50	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	58.00	0.05	17.40	-10.40	1.0000	63.80	1	58.00	5.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	28.00	0.05	8.40	-5.00	1.0000	30.80	1	28.00	5.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	0.00	0.00	54.00	-32.40	1.0000	198.00	0	180.00	63.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	20.00	0.05	6.00	-3.60	1.0000	22.00	1	20.00	5.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	67.00	0.05	25.50	-15.30	1.0000	93.50	1	85.00	40.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	0.00	0.00	25.50	-15.30	1.0000	93.50	0	85.00	40.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	50.00	0.05	15.00	-9.00	1.0000	55.00	1	50.00	10.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+35	56.20	0.05	33.90	-20.30	1.0000	124.30	1	113.00	42.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+36	2.00	1.00	1.00	-0.60	1.0000	3.50	1	3.20	2.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+36	2.10	1.00	1.00	-0.60	1.0000	3.50	1	3.20	2.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+36	2.00	1.00	1.00	-0.60	1.0000	3.50	1	3.20	2.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+36	2.48	1.00	1.00	-0.60	1.0000	3.50	1	3.20	2.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+37	0.00	0.00	38.60	-23.20	1.0000	141.60	0	128.70	45.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+37	0.00	0.00	38.40	-23.00	1.0000	140.90	0	128.10	55.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+37	58.32	5.63	26.20	-15.70	1.0000	95.90	1	87.20	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+37	0.00	0.00	24.60	-14.80	1.0000	90.30	0	82.10	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+37	68.48	5.63	23.40	-14.00	1.0000	85.90	1	78.10	30.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+37	0.00	0.00	23.40	-14.00	1.0000	85.70	0	77.90	20.00	0.00	0.00	0.00	0.00	0.00	0.00	0	0	0	0	0.0000	0	0	0	0
+];
+
+%% generator cost data
+mpc.gencost = [
+2	0	0	4	0.0000	0.003	4.570	0.00
+2	0	0	4	0.0000	0.002	4.570	0.00
+2	0	0	4	0.0000	0.002	4.570	0.00
+2	0	0	4	0.0000	0.002	4.570	0.00
+2	0	0	4	0.0000	0.004	4.680	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.005	4.680	0.00
+2	0	0	4	0.0000	0.004	4.640	0.00
+2	0	0	4	0.0000	0.004	4.640	0.00
+2	0	0	4	0.0000	0.003	4.640	0.00
+2	0	0	4	0.0000	0.003	4.640	0.00
+2	0	0	4	0.0000	0.003	4.640	0.00
+2	0	0	4	0.0000	0.005	4.630	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.000	0.000	0.00
+2	0	0	4	0.0000	0.003	4.580	0.00
+2	0	0	4	0.0000	0.003	4.580	0.00
+2	0	0	4	0.0000	0.004	4.580	0.00
+2	0	0	4	0.0000	0.003	4.580	0.00
+2	0	0	4	0.0000	0.004	4.580	0.00
+2	0	0	4	0.0000	0.003	4.580	0.00
+2	0	0	4	0.0000	0.004	4.650	0.00
+2	0	0	4	0.0000	0.004	4.610	0.00
+2	0	0	4	0.0000	0.007	4.810	0.00
+2	0	0	4	0.0000	0.003	4.600	0.00
+2	0	0	4	0.0000	0.004	4.690	0.00
+2	0	0	4	0.0000	0.005	4.690	0.00
+2	0	0	4	0.0000	0.004	4.640	0.00
+2	0	0	4	0.0000	0.004	4.720	0.00
+2	0	0	4	0.0000	0.003	4.580	0.00
+2	0	0	4	0.0000	0.002	4.580	0.00
+2	0	0	4	0.0000	0.003	4.580	0.00
+2	0	0	4	0.0000	0.002	4.580	0.00
+2	0	0	4	0.0000	0.006	4.740	0.00
+2	0	0	4	0.0000	0.006	4.740	0.00
+2	0	0	4	0.0000	0.005	4.690	0.00
+2	0	0	4	0.0000	0.005	4.680	0.00
+2	0	0	4	0.0000	0.004	4.680	0.00
+2	0	0	4	0.0000	0.005	4.680	0.00
+];
+
+%% branch data
+mpc.branch = [
+1	2	0.004840	0.123766	0.00000	123.20	123.20	123.20	1.00000	0.000	1	0.00	0.00	39.02	1.29	-38.95	0.62	0	0	0	0
+1	2	0.004840	0.123766	0.00000	123.20	123.20	123.20	1.00000	0.000	1	0.00	0.00	39.02	1.29	-38.95	0.62	0	0	0	0
+1	2	0.004840	0.123766	0.00000	123.20	123.20	123.20	1.00000	0.000	1	0.00	0.00	39.02	1.29	-38.95	0.62	0	0	0	0
+1	5	0.003400	0.020913	0.00846	232.80	232.80	232.80	0.00000	0.000	1	0.00	0.00	79.42	8.98	-79.20	-8.46	0	0	0	0
+1	5	0.003400	0.020913	0.00846	232.80	232.80	232.80	0.00000	0.000	1	0.00	0.00	79.42	8.98	-79.20	-8.46	0	0	0	0
+1	22	0.003740	0.024173	0.00605	177.80	177.80	177.80	0.00000	0.000	1	0.00	0.00	-20.99	-8.73	21.01	8.25	0	0	0	0
+1	25	0.002890	0.015798	0.00771	217.00	217.00	217.00	0.00000	0.000	1	0.00	0.00	-65.93	-7.29	66.06	7.23	0	0	0	0
+1	25	0.002890	0.015798	0.00771	217.00	217.00	217.00	0.00000	0.000	1	0.00	0.00	-65.93	-7.29	66.06	7.23	0	0	0	0
+1	35	0.010800	0.041922	0.01284	281.60	281.60	281.60	0.00000	0.000	1	0.00	0.00	-61.53	0.73	61.95	-0.40	0	0	0	0
+1	35	0.010800	0.041922	0.01284	281.60	281.60	281.60	0.00000	0.000	1	0.00	0.00	-61.53	0.73	61.95	-0.40	0	0	0	0
+2	4	0.042960	0.079357	0.00257	66.80	66.80	66.80	0.00000	0.000	1	0.00	0.00	36.76	-3.89	-36.16	4.74	0	0	0	0
+2	6	0.026890	0.058600	0.00312	82.00	82.00	82.00	0.00000	0.000	1	0.00	0.00	44.97	-3.19	-44.41	4.10	0	0	0	0
+2	6	0.026890	0.058600	0.00312	82.00	82.00	82.00	0.00000	0.000	1	0.00	0.00	44.97	-3.19	-44.41	4.10	0	0	0	0
+2	7	0.027540	0.075691	0.00377	77.80	77.80	77.80	0.00000	0.000	1	0.00	0.00	39.18	0.09	-38.75	0.73	0	0	0	0
+2	21	0.036460	0.077337	0.00173	94.80	94.80	94.80	0.00000	0.000	1	0.00	0.00	29.76	0.69	-29.43	-0.16	0	0	0	0
+2	23	0.032620	0.081030	0.00180	101.30	101.30	101.30	0.00000	0.000	1	0.00	0.00	-36.96	4.68	37.42	-3.71	0	0	0	0
+2	23	0.032620	0.081030	0.00180	101.30	101.30	101.30	0.00000	0.000	1	0.00	0.00	-36.96	4.68	37.42	-3.71	0	0	0	0
+2	23	0.032620	0.081030	0.00180	101.30	101.30	101.30	0.00000	0.000	1	0.00	0.00	-36.96	4.68	37.42	-3.71	0	0	0	0
+2	26	0.030490	0.066116	0.00186	61.70	61.70	61.70	0.00000	0.000	1	0.00	0.00	-9.30	-1.59	9.33	1.47	0	0	0	0
+2	26	0.030490	0.066116	0.00186	61.70	61.70	61.70	0.00000	0.000	1	0.00	0.00	-9.30	-1.59	9.33	1.47	0	0	0	0
+3	6	0.014780	0.036690	0.00104	85.00	85.00	85.00	0.00000	0.000	1	0.00	0.00	34.71	-4.81	-34.52	5.18	0	0	0	0
+3	6	0.014780	0.036690	0.00104	85.00	85.00	85.00	0.00000	0.000	1	0.00	0.00	34.71	-4.81	-34.52	5.18	0	0	0	0
+3	16	0.023830	0.063585	0.00504	82.80	82.80	82.80	0.00000	0.000	1	0.00	0.00	41.57	-11.48	-41.11	12.21	0	0	0	0
+3	19	0.013820	0.031229	0.00541	91.60	91.60	91.60	0.00000	0.000	1	0.00	0.00	-63.13	7.08	63.70	-6.30	0	0	0	0
+3	19	0.013820	0.031229	0.00541	91.60	91.60	91.60	0.00000	0.000	1	0.00	0.00	-63.13	7.08	63.70	-6.30	0	0	0	0
+3	19	0.013820	0.031229	0.00541	91.60	91.60	91.60	0.00000	0.000	1	0.00	0.00	-63.13	7.08	63.70	-6.30	0	0	0	0
+3	21	0.024230	0.047508	0.00152	49.00	49.00	49.00	0.00000	0.000	1	0.00	0.00	19.00	-0.13	-18.91	0.16	0	0	0	0
+4	13	0.012140	0.038486	0.00170	53.20	53.20	53.20	0.00000	0.000	1	0.00	0.00	13.69	-4.74	-13.67	4.66	0	0	0	0
+5	6	0.004790	0.139559	0.00000	198.00	198.00	198.00	1.00000	0.000	1	0.00	0.00	42.13	5.33	-42.04	-2.76	0	0	0	0
+5	9	0.002290	0.012058	0.00409	170.70	170.70	170.70	0.00000	0.000	1	0.00	0.00	68.63	5.23	-68.52	-5.05	0	0	0	0
+5	14	0.005740	0.038815	0.00687	162.50	162.50	162.50	0.00000	0.000	1	0.00	0.00	47.64	6.35	-47.50	-6.10	0	0	0	0
+7	6	0.004000	0.010000	0.00096	40.20	40.20	40.20	0.00000	0.000	1	0.00	0.00	-22.83	3.00	22.85	-3.03	0	0	0	0
+7	6	0.004000	0.010000	0.00096	40.20	40.20	40.20	0.00000	0.000	1	0.00	0.00	-22.83	3.00	22.85	-3.03	0	0	0	0
+7	6	0.004000	0.010000	0.00096	40.20	40.20	40.20	0.00000	0.000	1	0.00	0.00	-22.83	3.00	22.85	-3.03	0	0	0	0
+6	11	0.019800	0.042395	0.00097	89.00	89.00	89.00	0.00000	0.000	1	0.00	0.00	37.88	-2.83	-37.58	3.37	0	0	0	0
+6	12	0.013640	0.033191	0.00066	58.80	58.80	58.80	0.00000	0.000	1	0.00	0.00	33.01	-1.93	-32.86	2.25	0	0	0	0
+6	12	0.013640	0.033191	0.00066	58.80	58.80	58.80	0.00000	0.000	1	0.00	0.00	33.01	-1.93	-32.86	2.25	0	0	0	0
+7	10	0.004000	0.010000	0.00096	50.00	50.00	50.00	0.00000	0.000	1	0.00	0.00	-4.02	-1.95	4.02	1.86	0	0	0	0
+7	13	0.009410	0.027706	0.00096	40.20	40.20	40.20	0.00000	0.000	1	0.00	0.00	24.74	-2.59	-24.68	2.67	0	0	0	0
+7	13	0.009410	0.027706	0.00096	40.20	40.20	40.20	0.00000	0.000	1	0.00	0.00	24.74	-2.59	-24.68	2.67	0	0	0	0
+7	13	0.009410	0.027706	0.00096	40.20	40.20	40.20	0.00000	0.000	1	0.00	0.00	24.74	-2.59	-24.68	2.67	0	0	0	0
+8	15	0.031390	0.075848	0.00197	84.90	84.90	84.90	0.00000	0.000	1	0.00	0.00	6.16	-2.64	-6.15	2.49	0	0	0	0
+8	19	0.036990	0.102463	0.00246	90.00	90.00	90.00	0.00000	0.000	1	0.00	0.00	-35.63	1.32	36.12	-0.20	0	0	0	0
+8	19	0.036990	0.102463	0.00246	90.00	90.00	90.00	0.00000	0.000	1	0.00	0.00	-35.63	1.32	36.12	-0.20	0	0	0	0
+9	10	0.004680	0.125654	0.00000	56.20	56.20	56.20	1.00000	0.000	1	0.00	0.00	41.86	4.15	-41.78	-1.86	0	0	0	0
+9	14	0.009330	0.037848	0.01017	169.30	169.30	169.30	0.00000	0.000	1	0.00	0.00	26.66	0.90	-26.59	-1.61	0	0	0	0
+11	13	0.018440	0.047771	0.00224	45.30	45.30	45.30	0.00000	0.000	1	0.00	0.00	-15.74	-2.22	15.79	2.13	0	0	0	0
+11	15	0.023280	0.069221	0.00152	48.60	48.60	48.60	0.00000	0.000	1	0.00	0.00	-12.23	-1.15	12.26	1.11	0	0	0	0
+12	15	0.015110	0.041464	0.00414	77.00	77.00	77.00	0.00000	0.000	1	0.00	0.00	-6.98	-0.72	6.99	0.34	0	0	0	0
+12	17	0.022780	0.065341	0.00282	49.90	49.90	49.90	0.00000	0.000	1	0.00	0.00	18.68	-3.77	-18.60	3.75	0	0	0	0
+13	16	0.013090	0.032547	0.00110	52.00	52.00	52.00	0.00000	0.000	1	0.00	0.00	12.68	-14.82	-12.63	14.84	0	0	0	0
+14	15	0.003250	0.131522	0.00000	85.90	85.90	85.90	1.00000	0.000	1	0.00	0.00	37.05	3.86	-37.00	-1.97	0	0	0	0
+14	15	0.003250	0.131522	0.00000	85.90	85.90	85.90	1.00000	0.000	1	0.00	0.00	37.05	3.86	-37.00	-1.97	0	0	0	0
+16	18	0.015530	0.039228	0.00191	51.70	51.70	51.70	0.00000	0.000	1	0.00	0.00	29.91	3.82	-29.77	-3.63	0	0	0	0
+17	18	0.009840	0.029754	0.00145	47.90	47.90	47.90	0.00000	0.000	1	0.00	0.00	6.56	-3.75	-6.55	3.63	0	0	0	0
+19	23	0.012580	0.030449	0.00133	100.30	100.30	100.30	0.00000	0.000	1	0.00	0.00	-77.99	4.83	78.77	-3.07	0	0	0	0
+19	23	0.012580	0.030449	0.00133	100.30	100.30	100.30	0.00000	0.000	1	0.00	0.00	-77.99	4.83	78.77	-3.07	0	0	0	0
+19	23	0.012580	0.030449	0.00133	100.30	100.30	100.30	0.00000	0.000	1	0.00	0.00	-77.99	4.83	78.77	-3.07	0	0	0	0
+19	23	0.012580	0.030449	0.00133	100.30	100.30	100.30	0.00000	0.000	1	0.00	0.00	-77.99	4.83	78.77	-3.07	0	0	0	0
+20	23	0.042660	0.074844	0.00179	85.80	85.80	85.80	0.00000	0.000	1	0.00	0.00	-3.41	-11.81	3.47	11.75	0	0	0	0
+20	30	0.027800	0.068487	0.00300	64.40	64.40	64.40	0.00000	0.000	1	0.00	0.00	-36.15	6.18	36.53	-5.53	0	0	0	0
+20	32	0.014940	0.039916	0.00335	52.00	52.00	52.00	0.00000	0.000	1	0.00	0.00	-25.40	5.64	25.50	-5.69	0	0	0	0
+22	23	0.004450	0.116580	0.00000	149.60	149.60	149.60	1.00000	0.000	1	0.00	0.00	18.68	-3.58	-18.66	4.01	0	0	0	0
+22	23	0.004450	0.116580	0.00000	149.60	149.60	149.60	1.00000	0.000	1	0.00	0.00	18.68	-3.58	-18.66	4.01	0	0	0	0
+22	23	0.004450	0.116580	0.00000	149.60	149.60	149.60	1.00000	0.000	1	0.00	0.00	18.68	-3.58	-18.66	4.01	0	0	0	0
+22	25	0.002980	0.017679	0.00775	277.00	277.00	277.00	0.00000	0.000	1	0.00	0.00	-30.29	3.58	30.32	-4.19	0	0	0	0
+22	37	0.006820	0.040841	0.01104	292.90	292.90	292.90	0.00000	0.000	1	0.00	0.00	-46.75	-1.08	46.90	0.88	0	0	0	0
+23	34	0.030140	0.091720	0.00193	74.40	74.40	74.40	0.00000	0.000	1	0.00	0.00	-0.37	0.03	0.37	-0.22	0	0	0	0
+23	34	0.030140	0.091720	0.00193	74.40	74.40	74.40	0.00000	0.000	1	0.00	0.00	-0.37	0.03	0.37	-0.22	0	0	0	0
+24	26	0.016450	0.053480	0.00135	65.60	65.60	65.60	0.00000	0.000	1	0.00	0.00	-4.13	-1.96	4.13	1.83	0	0	0	0
+24	26	0.016450	0.053480	0.00135	65.60	65.60	65.60	0.00000	0.000	1	0.00	0.00	-4.13	-1.96	4.13	1.83	0	0	0	0
+24	33	0.016900	0.033191	0.01102	69.50	69.50	69.50	0.00000	0.000	1	0.00	0.00	-29.76	8.07	29.92	-8.84	0	0	0	0
+24	36	0.018930	0.037551	0.00194	48.70	48.70	48.70	0.00000	0.000	1	0.00	0.00	-8.56	-4.16	8.58	4.00	0	0	0	0
+25	26	0.005320	0.147265	0.00000	131.70	131.70	131.70	1.00000	0.000	1	0.00	0.00	36.07	0.68	-36.00	1.25	0	0	0	0
+25	26	0.005320	0.147265	0.00000	131.70	131.70	131.70	1.00000	0.000	1	0.00	0.00	36.07	0.68	-36.00	1.25	0	0	0	0
+25	35	0.004130	0.024420	0.00685	201.40	201.40	201.40	0.00000	0.000	1	0.00	0.00	-64.87	-2.68	65.04	3.03	0	0	0	0
+25	35	0.004130	0.024420	0.00685	201.40	201.40	201.40	0.00000	0.000	1	0.00	0.00	-64.87	-2.68	65.04	3.03	0	0	0	0
+25	37	0.004890	0.026145	0.00780	224.00	224.00	224.00	0.00000	0.000	1	0.00	0.00	-52.42	-3.14	52.55	3.08	0	0	0	0
+25	37	0.004890	0.026145	0.00780	224.00	224.00	224.00	0.00000	0.000	1	0.00	0.00	-52.42	-3.14	52.55	3.08	0	0	0	0
+27	29	0.023880	0.042832	0.00128	67.50	67.50	67.50	0.00000	0.000	1	0.00	0.00	53.65	-10.40	-52.94	11.54	0	0	0	0
+28	30	0.011200	0.031396	0.00433	70.00	70.00	70.00	0.00000	0.000	1	0.00	0.00	36.53	0.34	-36.39	-0.35	0	0	0	0
+28	30	0.011200	0.031396	0.00433	70.00	70.00	70.00	0.00000	0.000	1	0.00	0.00	36.53	0.34	-36.39	-0.35	0	0	0	0
+28	31	0.051070	0.104683	0.01435	58.30	58.30	58.30	0.00000	0.000	1	0.00	0.00	33.41	-11.66	-32.78	11.52	0	0	0	0
+29	30	0.014790	0.036656	0.00188	49.30	49.30	49.30	0.00000	0.000	1	0.00	0.00	12.82	-6.35	-12.79	6.24	0	0	0	0
+29	32	0.023150	0.061347	0.00173	60.00	60.00	60.00	0.00000	0.000	1	0.00	0.00	32.42	-5.19	-32.17	5.69	0	0	0	0
+31	33	0.026960	0.057612	0.00333	38.00	38.00	38.00	0.00000	0.000	1	0.00	0.00	23.16	-11.52	-22.98	11.58	0	0	0	0
+33	34	0.035280	0.083927	0.00256	84.30	84.30	84.30	0.00000	0.000	1	0.00	0.00	-18.78	2.78	18.91	-2.73	0	0	0	0
+33	34	0.035280	0.083927	0.00256	84.30	84.30	84.30	0.00000	0.000	1	0.00	0.00	-18.78	2.78	18.91	-2.73	0	0	0	0
+35	37	0.001520	0.008374	0.00809	297.60	297.60	297.60	0.00000	0.000	1	0.00	0.00	25.22	-4.95	-25.21	4.20	0	0	0	0
+];
+
+%% bus names
+mpc.bus_name = {
+'ALOHA138';
+'ALOHA69';
+'FLOWER69';
+'WAVE69';
+'HONOLULU138';
+'HONOLULU69';
+'SURF69';
+'KANEOHE69';
+'TURTLE138';
+'TURTLE69';
+'MAHALO69';
+'LYCHEE69';
+'COCONUT69';
+'KAILUA138';
+'KAILUA69';
+'PALM69';
+'WAIMANALO69';
+'VOLCANO69';
+'PEARL CITY69';
+'MILILANI69';
+'AIEA69';
+'WAIPAHU138';
+'WAIPAHU69';
+'KAPOLEI69';
+'EWA BEACH138';
+'EWA BEACH69';
+'KAHUKU69';
+'HALEIWA69';
+'LAIE69';
+'WAHIAWA69';
+'WAIALUA69';
+'HAUULA69';
+'WAIANAE69';
+'SCHOFIELD69';
+'KALAELOA138';
+'COGEN69';
+'KAHE138';
+};
+
+%% Generator Unit Types
+mpc.gentype = {
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+'UN';
+};
+
+%% Generator Fuel Types
+mpc.genfuel = {
+'wood';
+'wood';
+'wood';
+'wood';
+'dfo';
+'solar';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'solar';
+'solar';
+'solar';
+'wind';
+'wind';
+'solar';
+'wind';
+'solar';
+'wood';
+'wood';
+'wood';
+'wood';
+'wood';
+'wood';
+'wood';
+'wood';
+'coal';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+'dfo';
+};

ams/cases/matpower/case5.m

@@ -8,6 +8,7 @@ function mpc = case5
 
 %   Created by Rui Bo in 2006, modified in 2010, 2014.
 %   Distributed with permission.
+%   Make up two sections gentype, genfuel, and bus_name for testing purposes.
 
 %   MATPOWER
 
@@ -60,3 +61,27 @@ mpc.gencost = [
 	2	0	0	2	40	0;
 	2	0	0	2	10	0;
 ];
+
+mpc.gentype = {
+	'ST';
+	'ST';
+	'ST';
+	'ST';
+	'ST';
+};
+
+mpc.genfuel = {
+	'coal';
+	'coal';
+	'coal';
+	'coal';
+	'coal';
+};
+
+mpc.bus_name = {
+	'A';
+	'B';
+	'C';
+	'D';
+	'E';
+};

ams/io/__init__.py

@@ -25,6 +25,7 @@ input_formats = {
     'matpower': ('m', ),
     'psse': ('raw', 'dyr'),
     'pypower': ('py',),
+    'powerworld': ('aux',),
 }
 
 # Output formats is a dictionary of supported output formats and their extensions

ams/io/matpower.py

@@ -2,9 +2,10 @@
 MATPOWER parser.
 """
 import logging
+import re
 import numpy as np
 
-from andes.io.matpower import m2mpc
+from andes.io import read_file_like
 from andes.shared import deg2rad, rad2deg
 
 logger = logging.getLogger(__name__)
@@ -29,6 +30,151 @@ def read(system, file):
     return mpc2system(mpc, system)
 
 
+def m2mpc(infile: str) -> dict:
+    """
+    Parse a MATPOWER file and return a dictionary containing the parsed data.
+
+    This function processes MATPOWER case files and extracts relevant fields
+    into a structured dictionary. It is revised from ``andes.io.matpower.m2mpc``.
+
+    Supported fields include:
+    - `baseMVA`: The system base power in MVA.
+    - `bus`: Bus data, including voltage, load, and generation information.
+    - `bus_name`: Names of the buses (if available).
+    - `gen`: Generator data, including power limits and voltage setpoints.
+    - `branch`: Branch data, including line impedances and ratings.
+    - `gencost`: Generator cost data (parsed but not used in this implementation).
+    - `areas`: Area data (parsed but not used in this implementation).
+    - `gentype`: Generator type information (if available).
+    - `genfuel`: Generator fuel type information (if available).
+
+    Parameters
+    ----------
+    infile : str
+        Path to the MATPOWER file to be parsed.
+
+    Returns
+    -------
+    dict
+        A dictionary containing the parsed MATPOWER data, where keys correspond
+        to MATPOWER struct names and values are numpy arrays or lists.
+    """
+
+    func = re.compile(r'function\s')
+    mva = re.compile(r'\s*mpc.baseMVA\s*=\s*')
+    bus = re.compile(r'\s*mpc.bus\s*=\s*\[?')
+    gen = re.compile(r'\s*mpc.gen\s*=\s*\[')
+    branch = re.compile(r'\s*mpc.branch\s*=\s*\[')
+    area = re.compile(r'\s*mpc.areas\s*=\s*\[')
+    gencost = re.compile(r'\s*mpc.gencost\s*=\s*\[')
+    bus_name = re.compile(r'\s*mpc.bus_name\s*=\s*{')
+    gentype = re.compile(r'\s*mpc.gentype\s*=\s*{')
+    genfuel = re.compile(r'\s*mpc.genfuel\s*=\s*{')
+    end = re.compile(r'\s*[\];}]')
+    has_digit = re.compile(r'.*\d+\s*]?;?')
+
+    field = None
+    info = True
+
+    mpc = {
+        'version': 2,  # not in use
+        'baseMVA': 100,
+        'bus': [],
+        'gen': [],
+        'branch': [],
+        'area': [],
+        'gencost': [],
+        'bus_name': [],
+        'gentype': [],
+        'genfuel': [],
+    }
+
+    input_list = read_file_like(infile)
+
+    for line in input_list:
+        line = line.strip().rstrip(';')
+        if not line:
+            continue
+        elif func.search(line):  # skip function declaration
+            continue
+        elif len(line.split('%')[0]) == 0:
+            if info is True:
+                logger.info(line[1:])
+                info = False
+            else:
+                continue
+        elif mva.search(line):
+            mpc["baseMVA"] = float(line.split('=')[1])
+
+        if not field:
+            if bus.search(line):
+                field = 'bus'
+            elif gen.search(line):
+                field = 'gen'
+            elif branch.search(line):
+                field = 'branch'
+            elif area.search(line):
+                field = 'area'
+            elif gencost.search(line):
+                field = 'gencost'
+            elif bus_name.search(line):
+                field = 'bus_name'
+            elif gentype.search(line):
+                field = 'gentype'
+            elif genfuel.search(line):
+                field = 'genfuel'
+            else:
+                continue
+        elif end.search(line):
+            field = None
+            continue
+
+        # parse mpc sections
+        if field:
+            if line.find('=') >= 0:
+                line = line.split('=')[1]
+            if line.find('[') >= 0:
+                line = re.sub(r'\[', '', line)
+            elif line.find('{') >= 0:
+                line = re.sub(r'{', '', line)
+
+            if field in ['bus_name', 'gentype', 'genfuel']:
+                # Handle string-based fields
+                line = line.split(';')
+                data = [i.strip('\'').strip() for i in line if i.strip()]
+                mpc[field].extend(data)
+            else:
+                if not has_digit.search(line):
+                    continue
+                line = line.split('%')[0].strip()
+                line = line.split(';')
+                for item in line:
+                    if not has_digit.search(item):
+                        continue
+                    try:
+                        data = np.array([float(val) for val in item.split()])
+                    except Exception as e:
+                        logger.error('Error parsing "%s"', infile)
+                        raise e
+                    mpc[field].append(data)
+
+    # convert mpc to np array
+    mpc_array = dict()
+    for key, val in mpc.items():
+        if isinstance(val, (float, int)):
+            mpc_array[key] = val
+        elif isinstance(val, list):
+            if len(val) == 0:
+                continue
+            if key in ['bus_name', 'gentype', 'genfuel']:
+                mpc_array[key] = np.array(val, dtype=object)
+            else:
+                mpc_array[key] = np.array(val)
+        else:
+            raise NotImplementedError("Unknown type for mpc, ", type(val))
+    return mpc_array
+
+
 def mpc2system(mpc: dict, system) -> bool:
     """
     Load an mpc dict into an empty AMS system.
@@ -97,7 +243,20 @@ def mpc2system(mpc: dict, system) -> bool:
         mpc_gen[:, 19] = system.PV.Rq.default * base_mva / 60
     else:
         mpc_gen = mpc['gen']
-    for data in mpc_gen:
+
+    # Ensure 'gentype' and 'genfuel' keys exist in mpc, with default values if missing
+    gentype = mpc.get('gentype', [''] * mpc_gen.shape[0])
+    genfuel = mpc.get('genfuel', [''] * mpc_gen.shape[0])
+
+    # Validate lengths of 'gentype' and 'genfuel' against the number of generators
+    if len(gentype) != mpc_gen.shape[0]:
+        raise ValueError(
+            f"'gentype' length ({len(gentype)}) does not match the number of generators ({mpc_gen.shape[0]})")
+    if len(genfuel) != mpc_gen.shape[0]:
+        raise ValueError(
+            f"'genfuel' length ({len(genfuel)}) does not match the number of generators ({mpc_gen.shape[0]})")
+
+    for data, gt, gf in zip(mpc_gen, gentype, genfuel):
         # bus  pg  qg  qmax  qmin  vg  mbase  status  pmax  pmin
         # 0    1   2   3     4     5   6      7       8     9
         # pc1  pc2  qc1min  qc1max  qc2min  qc2max  ramp_agc  ramp_10
@@ -142,7 +301,7 @@ def mpc2system(mpc: dict, system) -> bool:
                        Qc2min=qc2min, Qc2max=qc2max,
                        Ragc=ramp_agc, R10=ramp_10,
                        R30=ramp_30, Rq=ramp_q,
-                       apf=apf)
+                       apf=apf, gentype=gt, genfuel=gf)
         else:
             system.add('PV', idx=gen_idx, bus=bus_idx, busr=bus_idx,
                        name=None,
@@ -155,7 +314,7 @@ def mpc2system(mpc: dict, system) -> bool:
                        Qc2min=qc2min, Qc2max=qc2max,
                        Ragc=ramp_agc, R10=ramp_10,
                        R30=ramp_30, Rq=ramp_q,
-                       apf=apf)
+                       apf=apf, gentype=gt, genfuel=gf)
 
     for data in mpc['branch']:
         # fbus	tbus	r	x	b	rateA	rateB	rateC	ratio	angle
@@ -204,9 +363,8 @@ def mpc2system(mpc: dict, system) -> bool:
         gen_idx = np.arange(mpc['gen'].shape[0]) + 1
         mpc_cost = mpc['gencost']
         if mpc_cost[0, 0] == 1:
-            logger.warning("Type 1 gencost detected. "
-                           "This is not supported in AMS. "
-                           "Default type 2 cost parameters will be used as a fallback."
+            logger.warning("Type 1 gencost detected, which is not supported in AMS.\n"
+                           "Default type 2 cost parameters will be used as a fallback.\n"
                            "It is recommended to manually convert the gencost data to type 2.")
             mpc_cost = np.repeat(np.array([[2, 0, 0, 3, 0, 0, 0]]),
                                  mpc_cost.shape[0], axis=0)

ams/io/psse.py

@@ -1,5 +1,5 @@
 """
-Excel reader and writer for AMS.
+PSS/E .raw reader for AMS.
 This module is the existing module in ``andes.io.psse``.
 """
 

ams/models/group.py

@@ -175,20 +175,91 @@ class Reserve(GroupBase):
 
 class StaticGen(GroupBase):
     """
-    Generator group.
+    Static Generator Group.
+
+    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, check
-    `ANDES StaticGen <https://docs.andes.app/en/latest/groupdoc/StaticGen.html#staticgen>`_
-    for replacing static generators with dynamic generators.
+    For co-simulation with ANDES, refer to the `ANDES StaticGen Documentation
+    <https://docs.andes.app/en/latest/groupdoc/StaticGen.html#staticgen>`_ for
+    replacing static generators with dynamic generators.
     """
 
     def __init__(self):
         super().__init__()
         self.common_params.extend(('bus', 'Sn', 'Vn', 'p0', 'q0', 'ra', 'xs', 'subidx',
                                    'pmax', 'pmin', 'pg0', 'ctrl', 'R10', 'td1', 'td2',
-                                   'area', 'zone'))
+                                   'area', 'zone', 'gentype', 'genfuel'))
         self.common_vars.extend(('p', 'q'))
 
 

ams/models/line.py

@@ -1,7 +1,7 @@
 from andes.models.line.line import LineData
 from andes.models.line.jumper import JumperData
 from andes.core.param import NumParam
-from andes.shared import deg2rad, np, spmatrix
+from andes.shared import deg2rad
 
 from ams.core.model import Model
 
@@ -49,167 +49,6 @@ class Line(LineData, Model):
         self.a1a = None
         self.a2a = None
 
-    # NOTE: following code are minly copied from `andes.models.line.Line`
-    # and they are not fully verified
-    # potential issues:
-    # `build_Bp` contains 'fdxb', which is not included in the input parameters,
-    # and the results are the negative of `Bbus` from `makeBdc` in PYPOWER
-    # `build_Bpp` ignores the line resistance for all three methods
-    # `build_Bdc` results are the negative of `Bbus` from `makeBdc` in PYPOWER
-    # `build_y` results have inignorable differences at diagonal elements with `makeYbus` in PYPOWER
-
-    def build_y(self):
-        """
-        Build bus admittance matrix. Copied from ``andes.models.line.line.Line``.
-
-        Returns
-        -------
-        Y : spmatrix
-            Bus admittance matrix.
-        """
-
-        nb = self.system.Bus.n
-
-        y1 = self.u.v * (self.g1.v + self.b1.v * 1j)
-        y2 = self.u.v * (self.g2.v + self.b2.v * 1j)
-        y12 = self.u.v / (self.r.v + self.x.v * 1j)
-        m = self.tap.v * np.exp(1j * self.phi.v)
-        m2 = self.tap.v**2
-        mconj = np.conj(m)
-
-        # build self and mutual admittances into Y
-        Y = spmatrix((y12 + y1 / m2), self.a1a, self.a1a, (nb, nb), 'z')
-        Y -= spmatrix(y12 / mconj, self.a1a, self.a2a, (nb, nb), 'z')
-        Y -= spmatrix(y12 / m, self.a2a, self.a1a, (nb, nb), 'z')
-        Y += spmatrix(y12 + y2, self.a2a, self.a2a, (nb, nb), 'z')
-
-        return Y
-
-    def build_Bp(self, method='fdpf'):
-        """
-        Function for building B' matrix.
-
-        Parameters
-        ----------
-        method : str
-            Method for building B' matrix. Choose from 'fdpf', 'fdbx', 'dcpf'.
-
-        Returns
-        -------
-        Bp : spmatrix
-            B' matrix.
-        """
-        nb = self.system.Bus.n
-
-        if method not in ("fdpf", "fdbx", "dcpf"):
-            raise ValueError(f"Invalid method {method}; choose from 'fdpf', 'fdbx', 'dcpf'")
-
-        # Build B prime matrix -- FDPF
-        # `y1`` neglects line charging shunt, and g1 is usually 0 in HV lines
-        # `y2`` neglects line charging shunt, and g2 is usually 0 in HV lines
-        y1 = self.u.v * self.g1.v
-        y2 = self.u.v * self.g2.v
-
-        # `m` neglected tap ratio
-        m = np.exp(self.phi.v * 1j)
-        mconj = np.conj(m)
-        m2 = np.ones(self.n)
-
-        if method in ('fdxb', 'dcpf'):
-            # neglect line resistance in Bp in XB method
-            y12 = self.u.v / (self.x.v * 1j)
-        else:
-            y12 = self.u.v / (self.r.v + self.x.v * 1j)
-
-        Bdc = spmatrix((y12 + y1) / m2, self.a1a, self.a1a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12 / mconj, self.a1a, self.a2a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12 / m, self.a2a, self.a1a, (nb, nb), 'z')
-        Bdc += spmatrix(y12 + y2, self.a2a, self.a2a, (nb, nb), 'z')
-        Bdc = Bdc.imag()
-
-        for item in range(nb):
-            if abs(Bdc[item, item]) == 0:
-                Bdc[item, item] = 1e-6 + 0j
-
-        return Bdc
-
-    def build_Bpp(self, method='fdpf'):
-        """
-        Function for building B'' matrix.
-
-        Parameters
-        ----------
-        method : str
-            Method for building B'' matrix. Choose from 'fdpf', 'fdbx', 'dcpf'.
-
-        Returns
-        -------
-        Bpp : spmatrix
-            B'' matrix.
-        """
-
-        nb = self.system.Bus.n
-
-        if method not in ("fdpf", "fdbx", "dcpf"):
-            raise ValueError(f"Invalid method {method}; choose from 'fdpf', 'fdbx', 'dcpf'")
-
-        # Build B double prime matrix
-        # y1 neglected line charging shunt, and g1 is usually 0 in HV lines
-        # y2 neglected line charging shunt, and g2 is usually 0 in HV lines
-        # m neglected phase shifter
-        y1 = self.u.v * (self.g1.v + self.b1.v * 1j)
-        y2 = self.u.v * (self.g2.v + self.b2.v * 1j)
-
-        m = self.tap.v
-        m2 = abs(m)**2
-
-        if method in ('fdbx', 'fdpf', 'dcpf'):
-            # neglect line resistance in Bpp in BX method
-            y12 = self.u.v / (self.x.v * 1j)
-        else:
-            y12 = self.u.v / (self.r.v + self.x.v * 1j)
-
-        Bpp = spmatrix((y12 + y1) / m2, self.a1a, self.a1a, (nb, nb), 'z')
-        Bpp -= spmatrix(y12 / np.conj(m), self.a1a, self.a2a, (nb, nb), 'z')
-        Bpp -= spmatrix(y12 / m, self.a2a, self.a1a, (nb, nb), 'z')
-        Bpp += spmatrix(y12 + y2, self.a2a, self.a2a, (nb, nb), 'z')
-        Bpp = Bpp.imag()
-
-        for item in range(nb):
-            if abs(Bpp[item, item]) == 0:
-                Bpp[item, item] = 1e-6 + 0j
-
-        return Bpp
-
-    def build_Bdc(self):
-        """
-        The MATPOWER-flavor Bdc matrix for DC power flow.
-
-        The method neglects line charging and line resistance. It retains tap ratio.
-
-        Returns
-        -------
-        Bdc : spmatrix
-            Bdc matrix.
-        """
-
-        nb = self.system.Bus.n
-
-        y12 = self.u.v / (self.x.v * 1j)
-        y12 = y12 / self.tap.v
-
-        Bdc = spmatrix(y12, self.a1a, self.a1a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12, self.a1a, self.a2a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12, self.a2a, self.a1a, (nb, nb), 'z')
-        Bdc += spmatrix(y12, self.a2a, self.a2a, (nb, nb), 'z')
-        Bdc = Bdc.imag()
-
-        for item in range(nb):
-            if abs(Bdc[item, item]) == 0:
-                Bdc[item, item] = 1e-6
-
-        return Bdc
-
 
 class Jumper(JumperData, Model):
     """

ams/models/static/gen.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 
-from andes.core.param import NumParam, ExtParam
+from andes.core.param import NumParam, ExtParam, DataParam
 from andes.models.static.pv import PVData
 from andes.models.static.slack import SlackData
 
@@ -81,6 +81,14 @@ class GenParam:
                             tex_name=r't_{d2}',
                             unit='h',
                             )
+        self.gentype = DataParam(default=None,
+                                 info='generator type',
+                                 tex_name=r'g_{type}',
+                                 )
+        self.genfuel = DataParam(default=None,
+                                 info='generator fuel type',
+                                 tex_name=r'g_{fuel}',
+                                 )
 
 
 class PVModel(Model):

ams/routines/dcpf0.py

@@ -168,7 +168,7 @@ class DCPF0(RoutineBase):
         if self.exit_code == 0:
             msg = f"<{self.class_name}> solved in {s}, converged in "
             msg += n_iter_str + f"with {sstats['solver_name']}."
-            logger.info(msg)
+            logger.warning(msg)
             try:
                 self.unpack(res)
             except Exception as e:

docs/source/getting_started/copyright.rst

@@ -7,7 +7,7 @@ License
 
 GNU Public License v3
 *********************
-| Copyright :raw-html:`©` 2023-2024 Jinning Wang.
+| Copyright :raw-html:`©` 2023-2025 Jinning Wang.
 
 AMS is free software; you can redistribute it and/or modify it under the terms
 of the `GNU General Public License <http://www.gnu.org/licenses/gpl-3.0.html>`_

docs/source/release-notes.rst

@@ -9,6 +9,16 @@ The APIs before v3.0.0 are in beta and may change without prior notice.
 v1.0
 ==========
 
+v1.0.8 (2024-04-20)
+--------------------
+
+- Run workflow "Publish" only on push tag event
+- Include Hawaii synthetic case from
+  `Hawaii Synthetic Grid <https://electricgrids.engr.tamu.edu/hawaii40/>`_
+- Remove matrices calculation functions in model ``Line``
+- Include ``gentype`` and ``genfuel`` when parsing MATPOWER cases
+- Fix logging level in ``ACOPF.run``
+
 v1.0.7 (2024-04-14)
 --------------------
 
@@ -19,6 +29,8 @@ v1.0.7 (2024-04-14)
 - Include module ``MatProcessor`` in the API documentation
 - 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
 - Update case files
 
 v1.0.6 (2024-04-10)

{ltbams-1.0.7.dist-info → ltbams-1.0.8.dist-info}/METADATA

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

{ltbams-1.0.7.dist-info → ltbams-1.0.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ams/__init__.py,sha256=dKIwng8xES4NQHn6ZHy8RCKeXphN9z2wyfmbvniIEg0,351
 ams/__main__.py,sha256=EB4GfGiKgvnQ_psNr0QwPoziYvjmGvQ2yVsBwQtfrLw,170
-ams/_version.py,sha256=OAPUdjEgjrXQonMYZMpBIDd9aovta238shZS3_AbAQ8,497
+ams/_version.py,sha256=l75Msd6bSTQ0CAX_Sc-wAbTvXkpOZ2xKEDedkXIFFlY,497
 ams/cli.py,sha256=EyNFXn565gFCppTxpyTZviBdPgUuKtgAPZ4WE6xewRk,6164
 ams/interface.py,sha256=_aF2VrO_hmVrW56H_q4CYWJps63nWUswCd3AWUbPbE8,44880
 ams/main.py,sha256=wzKLe_BeQAUyFh-U1cxQIOwr-rAJM8ppB3EEi6_v2tw,23607
@@ -10,6 +10,7 @@ ams/system.py,sha256=AW2_rMH0wjTuxhha87hQuyUCAllzWTfEsVBaTIiSAOg,25956
 ams/cases/5bus/pjm5bus_demo.xlsx,sha256=OWIUprkg8_aQ_bTCaEFMl7Bhfa1R20zxAHXRQtXBix0,32607
 ams/cases/5bus/pjm5bus_ev.xlsx,sha256=vR8dJv5jIxib1pgcMonhzvraoqZVJWhBSJdVXDL0qsI,19498
 ams/cases/5bus/pjm5bus_jumper.xlsx,sha256=47QAol1RGz_aGvhV2emq9XCy_Db9Zca15_OMVAdFVR0,19332
+ams/cases/hawaii40/Hawaii40.m,sha256=t6YZwncQrMhZg3yDXh38oqDMY3akrdvCPf97nNm1otw,20683
 ams/cases/ieee123/ieee123.xlsx,sha256=yWsEFN1BvcoBYX9hWdrenPC_qKQfXtZ4xhpwoIc2OSE,39223
 ams/cases/ieee123/ieee123_regcv1.xlsx,sha256=dIygkiNGzo_RE0moMPFu-9Bt0uPDuAL9zYWAs6e8VSk,41678
 ams/cases/ieee14/ieee14.json,sha256=bBy3i2jKqFNmnc_rmNOYvGm-SAW2T6wwvEQ-Hkj5Hkw,21400
@@ -26,7 +27,7 @@ ams/cases/matpower/case118.m,sha256=vC5vIrS553ZXKIXuS1Dk9Ksu4MVXfpEm6G2QbxTEtfc,
 ams/cases/matpower/case14.m,sha256=L_xOG3NK5sXpLb5otONgEO1pWku8xNBlx0xPvDn888E,4597
 ams/cases/matpower/case300.m,sha256=L3mWBAncy5pHy53nycEXPmmRh1Rl-ZtlsELXwQGX4S8,65678
 ams/cases/matpower/case39.m,sha256=RAgz-ZjR2HaMYgR32stq_U4D8l85S7DSAFJFE60_3Dw,9628
-ams/cases/matpower/case5.m,sha256=7ZByCJ0IDeveKqAp7YqVSRwxGwj_T0Wte_Bogthv4nk,1921
+ams/cases/matpower/case5.m,sha256=5KbGGXoS5Abx2mHZqX-vmmNEQ5AhhG4qo6Q6YZz9Qxs,2169
 ams/cases/matpower/case_ACTIVSg2000.m,sha256=jQBhjej9EL81pZn1nS3uv-zQ2G4o_P9zIZrXxOurhgs,659546
 ams/cases/npcc/npcc.m,sha256=QrYcufKlHrXr5nFC2Z92X05_Q1Rn3Nf11HCCYenAaC0,26342
 ams/cases/npcc/npcc_uced.xlsx,sha256=zuaZEOBwdOHwK5hFgQSXownyH-MfKDZQ-iVFeaFVSyg,86557
@@ -43,19 +44,19 @@ ams/core/symprocessor.py,sha256=HegjU_UnvWEny9kitI1su9J0WeFDjQnM4gNoeUGJ7qU,8428
 ams/core/var.py,sha256=f48pzir4miBsB5sh6PwUsFe0LdNNEM-d3VufcjbUU0w,1591
 ams/extension/__init__.py,sha256=5IFTNirDL0uDaUsg05_oociVT9VCy2rhPx1ad4LGveM,65
 ams/extension/eva.py,sha256=wUF8RNxzwas2Q6_xD0k3EVWjmX4kxHmTSkv2inJzaUY,16342
-ams/io/__init__.py,sha256=HLE3aozzXEx-6IBy8WTQVdSCpAZrrR9nX6UqaZ7okTw,3774
+ams/io/__init__.py,sha256=GIfF7X44olHaySL8EzOBU1eXUnunr1owzzdPfPvvHZU,3802
 ams/io/json.py,sha256=IurwcZDuKczSbRTpcbQZiIi0ARCrMK6kJ0E3wS8ENy8,2585
-ams/io/matpower.py,sha256=Oj3FW-eqcl3H5mnB0U5XG1mtCK0SaxVOkgRXaC6MIKA,14523
-ams/io/psse.py,sha256=w5VKNE6enX0lfKwPI857PRtdpwN39R6IFRIcdbPSpOg,151
+ams/io/matpower.py,sha256=SNYvCO0Be9rdM4PPPFuK6H2JuOLflFpWQloFtG59uIM,20174
+ams/io/psse.py,sha256=TOLsGuoFWpgLRK_zZqjCLIjd9fHAlfgjbDm84okw3p0,145
 ams/io/pypower.py,sha256=E6_kSNfv1Yyv9oYfFebeNeKaQPlHyRZQpE8F6Y67g8Q,2583
 ams/io/xlsx.py,sha256=7ATW1seyxsGn7d5p5IuSRFHcoCHVVjMu3E7mP1Mc74U,2460
 ams/models/__init__.py,sha256=EGkViLkVX_We9FAGuEkgfleMNmPw_vGp2Nq1OQimL7U,691
 ams/models/area.py,sha256=AKYU6aJQKsVWRZdvMO7yic-8wZ1GumSTQXgDg5L0THw,899
 ams/models/bus.py,sha256=U0vSegkm-9fqPQS9KMJQU6gpIMX_1GK5O_dvRc8-0P0,1585
 ams/models/cost.py,sha256=rmGNj9ztMbqA-OIJj8fNNBh8bdYJSY9hk10vffgxc6k,5916
-ams/models/group.py,sha256=EEB66FwLq6liC6lGHax3oXIFxlwdYb4JMeDLnbLg6j4,5618
+ams/models/group.py,sha256=AS3kAK7vsRAKpqd-_tS953PFDttnV45ujg6i4QKk_xQ,8399
 ams/models/info.py,sha256=Oh0Xo5J4ZHBsNIkMOzIwv_DegsX1inyuv3Q5CpCfyQw,788
-ams/models/line.py,sha256=dltKgVZdXj_kchA9QhHeyorYQKm_7PQW9B2qC_PTsKs,8084
+ams/models/line.py,sha256=ju5h1BcW4kgVWm_lgl8zWhSYqlsUjbdoUwzz2t0Vx1s,2770
 ams/models/reserve.py,sha256=3BjWCyKrPL4CwTvmzRxk25H8Nkxh-Rz0Ne17I9Y2TUA,2816
 ams/models/shunt.py,sha256=h5QV33EcCd86XRR0sMIzcO0PTeTirkWaxi8imPKzOi0,337
 ams/models/timeslot.py,sha256=XfXJukbQXTUawbsYI6BMLbytXNIe5VE2SQ5_t1Lc8_8,2001
@@ -67,7 +68,7 @@ ams/models/distributed/pvd1.py,sha256=KAOlXpZgT_w58xaGWjm5ht6ksac6eRhaqBFHK4EPRH
 ams/models/renewable/__init__.py,sha256=7dZyRXbvBAHbLJeJssJ1hsOHj9Bgeg77kB5gcX_mBtg,118
 ams/models/renewable/regc.py,sha256=3J9alIGUn_GkibQ3-dKTylAOpNPzd5zpancPc79q9T4,3448
 ams/models/static/__init__.py,sha256=lh5yR5Xb2unS4ndng-cLU1TAeoidu2s6VAVFLc3HUDU,96
-ams/models/static/gen.py,sha256=SAaQD5_oOGFWa8NY8hbhsNqMQGHlToHdngEt_Xy5S3E,6685
+ams/models/static/gen.py,sha256=QXklOYlnU7QHWy-WFJwhxuNItUPqFsLJIjAO4sGMUbg,7087
 ams/models/static/pq.py,sha256=a-z7-1Vegr3mPguRAdLqfJlwk5OG_Zpp8usfOzRAR30,2583
 ams/opt/__init__.py,sha256=INsl8yxtOzTKqV9pzVxlL6RSGDRaUDwxpZMY1QROrF4,459
 ams/opt/constraint.py,sha256=ERT9zwjQyGkvDo465Yd0wBexlIhjVmw0MyWq4BWnWoI,5534
@@ -105,7 +106,7 @@ ams/routines/cpf.py,sha256=xsrUVjtGQ1b7UCXpwwYihqzTeEGJJKnO9LlX1Tz9Tks,1552
 ams/routines/dcopf.py,sha256=6ETgopvX9tSFF3kssHsBchAttcyo2DTG-eIqjvlk0WY,11087
 ams/routines/dcopf2.py,sha256=sDCP8zqYHDh7s7p9SX6G8QhMfIxCg3VPYJn6r3pRKyo,3620
 ams/routines/dcpf.py,sha256=SswIb7t37ulxe1rjroA7oSa6z01kYjO-x8P1WWOUutM,8237
-ams/routines/dcpf0.py,sha256=gPPfSUzzJbHz_gAEFVyZ3iriEHvLJ-OGpTzhza8FOkA,6811
+ams/routines/dcpf0.py,sha256=V9zfBoV0cRMFLJdLrpvieyvwTybLTZADPoaKMJLKSkY,6814
 ams/routines/dopf.py,sha256=8D36-FkPORYGaMnwGTqwz8HxAXk5ywo3mk8NlGq327g,6289
 ams/routines/ed.py,sha256=i0Y3COlz4oAf8u8JxqfuQWn6WxjJzb59weLedow0Y_g,11777
 ams/routines/pflow.py,sha256=CZAiwnZYhEmSU7Exn9CK6rFxWvjpvv1Py-pLegWJ71s,9419
@@ -124,13 +125,13 @@ docs/source/conf.py,sha256=UyoWogZTUNSJU7pQS_JaR28nKddW94zr01LYoIciZZw,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=KHsxEcYBAKMF19k9sl6FyO5Et4ecRutohZvkC6vr1PA,13787
+docs/source/release-notes.rst,sha256=8655hUeA11Fxd-fTIUUtTrsfhwi9nnEbwCduTTiIzmc,14250
 docs/source/_templates/autosummary/base.rst,sha256=zl3U4baR4a6YjsHyT-x9zCOrHwKZOVUdWn1NPX2u3bc,106
 docs/source/_templates/autosummary/class.rst,sha256=Hv_igCsLsUpM62_zN0nqj6FSfKnS5xLyu8ZldMbfOAk,668
 docs/source/_templates/autosummary/module.rst,sha256=YdbpCudOrEU-JbuSlzGvcOI2hn_KrCM6FW5HcGqkaEE,1113
 docs/source/_templates/autosummary/module_toctree.rst,sha256=sg30OdqFDLyo8Y3hl9V-s2BXb1bzcjjqqWaWi-C3qFM,1126
 docs/source/examples/index.rst,sha256=6VT3wVeKk8BWf6pJQtZrmcumW_3jI8esdlzja8scUCA,742
-docs/source/getting_started/copyright.rst,sha256=XBfWvLm7T8p-zh1jkDy1kODvTDcH73AEV_vkiN32A2o,715
+docs/source/getting_started/copyright.rst,sha256=d3S7FjrbysVqQd3pEBadrrkcQOZ7sYYeDTCOS4goPC8,715
 docs/source/getting_started/index.rst,sha256=mcp1NdUwbPoNzpn7Owf5Qzfd6J_--ToU52PjmrbwjBY,1512
 docs/source/getting_started/install.rst,sha256=gE4L0ApiC_mwbjbYtkGW4ilyIAu_Jn-VIeoYlgRiOIw,7268
 docs/source/getting_started/overview.rst,sha256=Zy890bDCUVW37NvjhQFUJUae1Zkghr72Az4Qd0PhP_I,1068
@@ -156,13 +157,12 @@ docs/source/modeling/system.rst,sha256=NMOPNMOKG1_dRyNPPx-MiCKbbpadxWJxGyU6geRUs
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_1st_system.py,sha256=BLlJsHnEBeLfiMJvIjyPguMikfDjqGSzfn8cZ-tqCVc,1900
 tests/test_addressing.py,sha256=MIT713KCqMg0h2o4rBDZsGUrpGadmMlXnrrdq-wB77E,1364
-tests/test_andes_mats.py,sha256=O4nCthteh7Y91KsWnq_EcplvsIN8DY-lgEGkH5a7iOc,1669
 tests/test_case.py,sha256=8Jn1hwrB72l6-rqbCWTGJOcxicu4GHVDzGsLLxjDFos,8833
 tests/test_cli.py,sha256=TtCGBy2e7Ll_2gJTFo9juZtzhaakho_MqkcqhG2w2dk,870
 tests/test_export_csv.py,sha256=rZCafNrVbwDo7ZNC4MrL1gIcrU0c6YVw2q-QGL3O4K4,2921
 tests/test_group.py,sha256=Tq0s9gtenqrv4ws5YNzWxbiF4WgyhtMEAXZfJtew6M4,2699
 tests/test_interface.py,sha256=lXKR8OAsGIg5dV2Uj0UwGAl69hKnc_7EtCYvpP_0rrU,8157
-tests/test_io.py,sha256=LaNkRXZaItAFHqqXs6CC5iaxTMXiDEFGbwYODcOHPWc,1416
+tests/test_io.py,sha256=epa2f7gnZPAd-bX8MRmYn53ohk0H_SzGABuKOO5zn6g,2137
 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
@@ -180,8 +180,8 @@ tests/test_rtn_pflow.py,sha256=aDL5Ewm6lWqpdHqIIu-DTllhXzt4bMjsLJaKbJa8sXQ,6990
 tests/test_rtn_rted.py,sha256=1Vd4JCX3sfLnuXXzuUGFsEPTtqmdaDzDXpBcAQwnDf0,9785
 tests/test_rtn_uc.py,sha256=8KrqxOxW6tiN4Fxl417NyHJCgdZwXh2ioX0mQbHuEgU,8302
 tests/test_service.py,sha256=6IP6CAH2xHxGHZM4-R8LjZxVJ2L10LcGaPDyRIqKLmc,2438
-ltbams-1.0.7.dist-info/METADATA,sha256=Wd2Mlqkkwsqm2zA1DNsDL-RS55TJe8Ptod_oAWB55O8,14023
-ltbams-1.0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ltbams-1.0.7.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
-ltbams-1.0.7.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
-ltbams-1.0.7.dist-info/RECORD,,
+ltbams-1.0.8.dist-info/METADATA,sha256=Ui__dkyfMC9bk9tO-Bur2iMVqnieYJVZygg08Z26Q7w,14023
+ltbams-1.0.8.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+ltbams-1.0.8.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
+ltbams-1.0.8.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
+ltbams-1.0.8.dist-info/RECORD,,

{ltbams-1.0.7.dist-info → ltbams-1.0.8.dist-info}/WHEEL

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

tests/test_io.py

@@ -15,10 +15,19 @@ class TestMATPOWER(unittest.TestCase):
         self.mpc14 = ams.io.matpower.m2mpc(ams.get_case('matpower/case14.m'))
 
     def test_m2mpc(self):
+        """Test conversion from M file to mpc dict."""
+        # NOTE: when the keys are there, read them
         self.assertTupleEqual(self.mpc5['gencost'].shape, (5, 6))
+        self.assertTupleEqual(self.mpc5['gentype'].shape, (5,))
+        self.assertTupleEqual(self.mpc5['genfuel'].shape, (5,))
+
+        # NOTE: when the keys are not there, the read mpc will not complete them
         self.assertTupleEqual(self.mpc14['gencost'].shape, (5, 7))
+        self.assertNotIn('gentype', self.mpc14)
+        self.assertNotIn('genfuel', self.mpc14)
 
     def test_mpc2system(self):
+        """Test conversion from MPC to AMS System."""
         system5 = ams.system.System()
         ams.io.matpower.mpc2system(self.mpc5, system5)
         # In case5.m, the gencost has type 2 cost model, with 2 parameters.
@@ -26,6 +35,12 @@ class TestMATPOWER(unittest.TestCase):
                                       np.zeros(system5.StaticGen.n))
 
         system14 = ams.system.System()
+        # Test gentype length check
+        mpc14 = self.mpc14.copy()
+        mpc14['gentype'] = np.array(['WT'] * 6)
+        with self.assertRaises(ValueError, msg='gentype length check failed!'):
+            ams.io.matpower.mpc2system(mpc14, system14)
+
         ams.io.matpower.mpc2system(self.mpc14, system14)
         # In case14.m, the gencost has type 2 cost model, with 3 parameters.
         np.testing.assert_array_less(np.zeros(system14.StaticGen.n),

tests/test_andes_mats.py

@@ -1,61 +0,0 @@
-"""
-Test ANDES matrices.
-"""
-
-import unittest
-import numpy as np
-import importlib.metadata
-from packaging.version import parse as parse_version
-
-import ams
-
-
-class TestMatrices(unittest.TestCase):
-    """
-    Tests for system matrices consistency.
-    """
-
-    andes_version = importlib.metadata.version("andes")
-    if parse_version(andes_version) < parse_version('1.9.2'):
-        raise unittest.SkipTest("Requires ANDES version >= 1.9.2")
-
-    sp = ams.load(ams.get_case('matpower/case14.m'),
-                  setup=True, no_output=True, default_config=True,)
-    sa = sp.to_andes(setup=True, no_output=True, default_config=True,)
-
-    def setUp(self) -> None:
-        """
-        Test setup.
-        """
-
-    def test_build_y(self):
-        """
-        Test build_y consistency.
-        """
-        ysp = self.sp.Line.build_y()
-        ysa = self.sa.Line.build_y()
-        np.testing.assert_equal(np.array(ysp.V), np.array(ysa.V))
-
-    def test_build_Bp(self):
-        """
-        Test build_Bp consistency.
-        """
-        Bp_sp = self.sp.Line.build_Bp()
-        Bp_sa = self.sa.Line.build_Bp()
-        np.testing.assert_equal(np.array(Bp_sp.V), np.array(Bp_sa.V))
-
-    def test_build_Bpp(self):
-        """
-        Test build_Bpp consistency.
-        """
-        Bpp_sp = self.sp.Line.build_Bpp()
-        Bpp_sa = self.sa.Line.build_Bpp()
-        np.testing.assert_equal(np.array(Bpp_sp.V), np.array(Bpp_sa.V))
-
-    def test_build_Bdc(self):
-        """
-        Test build_Bdc consistency.
-        """
-        Bdc_sp = self.sp.Line.build_Bdc()
-        Bdc_sa = self.sa.Line.build_Bdc()
-        np.testing.assert_equal(np.array(Bdc_sp.V), np.array(Bdc_sa.V))