Skip to content

Commit

Permalink
Rerun examples
Browse files Browse the repository at this point in the history
  • Loading branch information
jinningwang committed Jun 19, 2024
1 parent 2e4f4da commit 2c2eca7
Show file tree
Hide file tree
Showing 11 changed files with 214 additions and 228 deletions.
91 changes: 42 additions & 49 deletions examples/demonstration/demo_AGC.ipynb
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions examples/demonstration/demo_ESD1.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Last run time: 2024-04-21 17:32:43\n",
"ams:0.9.6\n"
"Last run time: 2024-06-18 20:15:02\n",
"ams:0.9.8\n"
]
}
],
Expand Down Expand Up @@ -77,9 +77,9 @@
"output_type": "stream",
"text": [
"Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_uced_esd1.xlsx\"...\n",
"Input file parsed in 0.1406 seconds.\n",
"Input file parsed in 0.1104 seconds.\n",
"Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n",
"System set up in 0.0019 seconds.\n"
"System set up in 0.0027 seconds.\n"
]
}
],
Expand Down Expand Up @@ -218,8 +218,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTEDES> initialized in 0.0198 seconds.\n",
"<RTEDES> solved as optimal in 0.0547 seconds, converged in -1 iteration with SCIP.\n"
"<RTEDES> initialized in 0.0205 seconds.\n",
"<RTEDES> solved as optimal in 0.0260 seconds, converged in -1 iteration with SCIP.\n"
]
},
{
Expand Down Expand Up @@ -315,8 +315,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<EDES> initialized in 0.0321 seconds.\n",
"<EDES> solved as optimal in 0.0529 seconds, converged in -1 iteration with SCIP.\n"
"<EDES> initialized in 0.0268 seconds.\n",
"<EDES> solved as optimal in 0.0457 seconds, converged in -1 iteration with SCIP.\n"
]
},
{
Expand Down Expand Up @@ -378,8 +378,8 @@
"text": [
"All generators are online at initial, make initial guess for commitment.\n",
"Turn off StaticGen ['PV_1'] as initial commitment guess.\n",
"<UCES> initialized in 0.0369 seconds.\n",
"<UCES> solved as optimal in 0.1760 seconds, converged in -1 iteration with SCIP.\n"
"<UCES> initialized in 0.0289 seconds.\n",
"<UCES> solved as optimal in 0.0850 seconds, converged in -1 iteration with SCIP.\n"
]
},
{
Expand Down
108 changes: 54 additions & 54 deletions examples/ex1.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Last run time: 2024-05-24 20:24:57\n",
"ams:0.9.7\n"
"Last run time: 2024-06-18 20:15:21\n",
"ams:0.9.8\n"
]
}
],
Expand Down Expand Up @@ -127,9 +127,9 @@
"output_type": "stream",
"text": [
"Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_uced.xlsx\"...\n",
"Input file parsed in 0.2674 seconds.\n",
"Input file parsed in 0.1224 seconds.\n",
"Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n",
"System set up in 0.0043 seconds.\n"
"System set up in 0.0022 seconds.\n"
]
}
],
Expand Down Expand Up @@ -163,35 +163,35 @@
{
"data": {
"text/plain": [
"OrderedDict([('Summary', Summary (3 devices) at 0x123268af0),\n",
" ('Bus', Bus (5 devices) at 0x123268dc0),\n",
" ('PQ', PQ (3 devices) at 0x12327f5b0),\n",
" ('Slack', Slack (1 device) at 0x12328c220),\n",
" ('PV', PV (3 devices) at 0x1232a6130),\n",
" ('Shunt', Shunt (0 devices) at 0x1232a6bb0),\n",
" ('Line', Line (7 devices) at 0x1232ae0a0),\n",
" ('PVD1', PVD1 (0 devices) at 0x1232bc850),\n",
" ('ESD1', ESD1 (0 devices) at 0x1232bcfd0),\n",
" ('EV1', EV1 (0 devices) at 0x1232d2580),\n",
" ('EV2', EV2 (0 devices) at 0x1232d2bb0),\n",
" ('REGCA1', REGCA1 (0 devices) at 0x1232dc0d0),\n",
" ('REGCV1', REGCV1 (0 devices) at 0x1232dc580),\n",
" ('REGCV2', REGCV2 (0 devices) at 0x1232dcdc0),\n",
" ('Area', Area (3 devices) at 0x1232e73a0),\n",
" ('Region', Region (2 devices) at 0x1232e7b20),\n",
" ('SFR', SFR (2 devices) at 0x1232f3310),\n",
" ('SR', SR (2 devices) at 0x1232f3970),\n",
" ('NSR', NSR (2 devices) at 0x1232f3d90),\n",
" ('VSGR', VSGR (0 devices) at 0x1233011f0),\n",
" ('GCost', GCost (4 devices) at 0x123301640),\n",
" ('SFRCost', SFRCost (4 devices) at 0x123301cd0),\n",
" ('SRCost', SRCost (4 devices) at 0x1233112b0),\n",
" ('NSRCost', NSRCost (4 devices) at 0x1233116d0),\n",
" ('VSGCost', VSGCost (0 devices) at 0x123311af0),\n",
" ('DCost', DCost (3 devices) at 0x123311df0),\n",
" ('TimeSlot', TimeSlot (0 devices) at 0x12331b3a0),\n",
" ('EDTSlot', EDTSlot (24 devices) at 0x12331be20),\n",
" ('UCTSlot', UCTSlot (24 devices) at 0x123327280)])"
"OrderedDict([('Summary', Summary (3 devices) at 0x103780700),\n",
" ('Bus', Bus (5 devices) at 0x1226d8e50),\n",
" ('PQ', PQ (3 devices) at 0x1226ee6d0),\n",
" ('Slack', Slack (1 device) at 0x1226fd340),\n",
" ('PV', PV (3 devices) at 0x122717250),\n",
" ('Shunt', Shunt (0 devices) at 0x122717cd0),\n",
" ('Line', Line (7 devices) at 0x1227211c0),\n",
" ('PVD1', PVD1 (0 devices) at 0x12272d970),\n",
" ('ESD1', ESD1 (0 devices) at 0x12273e130),\n",
" ('EV1', EV1 (0 devices) at 0x12273e6a0),\n",
" ('EV2', EV2 (0 devices) at 0x12273ecd0),\n",
" ('REGCA1', REGCA1 (0 devices) at 0x12274c1f0),\n",
" ('REGCV1', REGCV1 (0 devices) at 0x12274c6a0),\n",
" ('REGCV2', REGCV2 (0 devices) at 0x12274cee0),\n",
" ('Area', Area (3 devices) at 0x1227584c0),\n",
" ('Region', Region (2 devices) at 0x122758c40),\n",
" ('SFR', SFR (2 devices) at 0x122767430),\n",
" ('SR', SR (2 devices) at 0x122767a90),\n",
" ('NSR', NSR (2 devices) at 0x122767eb0),\n",
" ('VSGR', VSGR (0 devices) at 0x122775310),\n",
" ('GCost', GCost (4 devices) at 0x122775760),\n",
" ('SFRCost', SFRCost (4 devices) at 0x122775df0),\n",
" ('SRCost', SRCost (4 devices) at 0x1227833d0),\n",
" ('NSRCost', NSRCost (4 devices) at 0x1227837f0),\n",
" ('VSGCost', VSGCost (0 devices) at 0x122783c10),\n",
" ('DCost', DCost (3 devices) at 0x122783f10),\n",
" ('TimeSlot', TimeSlot (0 devices) at 0x12278e4c0),\n",
" ('EDTSlot', EDTSlot (24 devices) at 0x12278ef40),\n",
" ('UCTSlot', UCTSlot (24 devices) at 0x12279a3a0)])"
]
},
"execution_count": 5,
Expand Down Expand Up @@ -344,23 +344,23 @@
{
"data": {
"text/plain": [
"OrderedDict([('DCPF', DCPF at 0x123268730),\n",
" ('PFlow', PFlow at 0x123327eb0),\n",
" ('CPF', CPF at 0x1233375b0),\n",
" ('ACOPF', ACOPF at 0x123337c10),\n",
" ('DCOPF', DCOPF at 0x123350520),\n",
" ('ED', ED at 0x1233674f0),\n",
" ('EDDG', EDDG at 0x123391940),\n",
" ('EDES', EDES at 0x1233b65b0),\n",
" ('RTED', RTED at 0x1233d7cd0),\n",
" ('RTEDDG', RTEDDG at 0x1233d7d90),\n",
" ('RTEDES', RTEDES at 0x123411880),\n",
" ('RTEDVIS', RTEDVIS at 0x123433820),\n",
" ('UC', UC at 0x1266e46d0),\n",
" ('UCDG', UCDG at 0x1268a2b80),\n",
" ('UCES', UCES at 0x1268c5cd0),\n",
" ('DOPF', DOPF at 0x1268fd910),\n",
" ('DOPFVIS', DOPFVIS at 0x12690fdf0)])"
"OrderedDict([('DCPF', DCPF at 0x1226d8dc0),\n",
" ('PFlow', PFlow at 0x12279afd0),\n",
" ('CPF', CPF at 0x1227a96d0),\n",
" ('ACOPF', ACOPF at 0x1227a9d30),\n",
" ('DCOPF', DCOPF at 0x1227bd640),\n",
" ('ED', ED at 0x1227d5610),\n",
" ('EDDG', EDDG at 0x122803a60),\n",
" ('EDES', EDES at 0x1228276d0),\n",
" ('RTED', RTED at 0x12284bdf0),\n",
" ('RTEDDG', RTEDDG at 0x12284beb0),\n",
" ('RTEDES', RTEDES at 0x1228829a0),\n",
" ('RTEDVIS', RTEDVIS at 0x1228a5940),\n",
" ('UC', UC at 0x1259417f0),\n",
" ('UCDG', UCDG at 0x125d0dca0),\n",
" ('UCES', UCES at 0x125d2fdf0),\n",
" ('DOPF', DOPF at 0x125d66a30),\n",
" ('DOPFVIS', DOPFVIS at 0x125d7bf10)])"
]
},
"execution_count": 7,
Expand Down Expand Up @@ -397,7 +397,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0225 seconds.\n"
"<RTED> initialized in 0.0127 seconds.\n"
]
},
{
Expand Down Expand Up @@ -455,7 +455,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0221 seconds, converged in 12 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0133 seconds, converged in 10 iterations with CLARABEL.\n"
]
},
{
Expand Down Expand Up @@ -603,7 +603,7 @@
{
"data": {
"text/plain": [
"0.19537500005620873"
"0.1953750000267141"
]
},
"execution_count": 15,
Expand Down Expand Up @@ -700,7 +700,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.undefined"
"version": "3.9.18"
},
"orig_nbformat": 4,
"vscode": {
Expand Down
Loading

0 comments on commit 2c2eca7

Please sign in to comment.