Skip to content

Commit

Permalink
Rerun examples with v0.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jinningwang committed Mar 7, 2024
1 parent b45ce49 commit 5f78b00
Show file tree
Hide file tree
Showing 11 changed files with 188 additions and 179 deletions.
51 changes: 31 additions & 20 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-03-02 22:47:52\n",
"ams:0.9.1\n"
"Last run time: 2024-03-06 20:34:20\n",
"ams:0.9.3\n"
]
}
],
Expand Down Expand Up @@ -77,10 +77,10 @@
"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.1153 seconds.\n",
"Input file parsed in 0.1106 seconds.\n",
"Zero line rates detacted in rate_a, rate_b, rate_c, adjusted to 999.\n",
"If expect a line outage, please set 'u' to 0.\n",
"System set up in 0.0019 seconds.\n"
"System set up in 0.0020 seconds.\n"
]
}
],
Expand Down Expand Up @@ -219,8 +219,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"Routine <RTEDES> initialized in 0.0188 seconds.\n",
"RTEDES solved as optimal in 0.1058 seconds, converged after -1 iteration using solver SCIP.\n"
"<RTEDES> initialized in 0.0191 seconds.\n",
"<RTEDES> solved as optimal in 0.0586 seconds, converged in -1 iteration with SCIP.\n"
]
},
{
Expand Down Expand Up @@ -316,8 +316,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"Routine <EDES> initialized in 0.0265 seconds.\n",
"EDES solved as optimal in 0.0553 seconds, converged after -1 iteration using solver SCIP.\n"
"<EDES> initialized in 0.0289 seconds.\n",
"<EDES> solved as optimal in 0.0674 seconds, converged in -1 iteration with SCIP.\n"
]
},
{
Expand Down Expand Up @@ -379,8 +379,8 @@
"text": [
"All generators are online at initial, make initial guess for commitment.\n",
"Turn off StaticGen ['PV_1'] as initial commitment guess.\n",
"Routine <UCES> initialized in 0.0282 seconds.\n",
"UCES solved as optimal in 0.1265 seconds, converged after -1 iteration using solver SCIP.\n"
"<UCES> initialized in 0.0307 seconds.\n",
"<UCES> solved as optimal in 0.1766 seconds, converged in -1 iteration with SCIP.\n"
]
},
{
Expand Down
102 changes: 51 additions & 51 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-03-02 16:57:40\n",
"ams:0.9.1\n"
"Last run time: 2024-03-06 20:32:33\n",
"ams:0.9.3\n"
]
}
],
Expand Down Expand Up @@ -127,10 +127,10 @@
"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.1114 seconds.\n",
"Input file parsed in 0.1155 seconds.\n",
"Zero line rates detacted in rate_a, rate_b, rate_c, adjusted to 999.\n",
"If expect a line outage, please set 'u' to 0.\n",
"System set up in 0.0038 seconds.\n"
"System set up in 0.0026 seconds.\n"
]
}
],
Expand Down Expand Up @@ -164,33 +164,33 @@
{
"data": {
"text/plain": [
"OrderedDict([('Summary', Summary (3 devices) at 0x14af9ea90),\n",
" ('Bus', Bus (5 devices) at 0x14af9ed60),\n",
" ('PQ', PQ (3 devices) at 0x14afbe580),\n",
" ('PV', PV (3 devices) at 0x14afcc1f0),\n",
" ('Slack', Slack (1 device) at 0x16a63d0a0),\n",
" ('Shunt', Shunt (0 devices) at 0x16a63db20),\n",
" ('Line', Line (7 devices) at 0x16a63dfd0),\n",
" ('PVD1', PVD1 (0 devices) at 0x16a6536d0),\n",
" ('ESD1', ESD1 (0 devices) at 0x16a653d00),\n",
" ('REGCA1', REGCA1 (0 devices) at 0x16a6662b0),\n",
" ('REGCV1', REGCV1 (0 devices) at 0x16a6668b0),\n",
" ('REGCV2', REGCV2 (0 devices) at 0x16a6740d0),\n",
" ('Area', Area (3 devices) at 0x16a674610),\n",
" ('Region', Region (2 devices) at 0x16a674d90),\n",
" ('SFR', SFR (2 devices) at 0x16a683580),\n",
" ('SR', SR (2 devices) at 0x16a683be0),\n",
" ('NSR', NSR (2 devices) at 0x16a68d040),\n",
" ('VSGR', VSGR (0 devices) at 0x16a68d460),\n",
" ('GCost', GCost (4 devices) at 0x16a68d8b0),\n",
" ('SFRCost', SFRCost (4 devices) at 0x16a68df40),\n",
" ('SRCost', SRCost (4 devices) at 0x16a69e520),\n",
" ('NSRCost', NSRCost (4 devices) at 0x16a69e940),\n",
" ('VSGCost', VSGCost (0 devices) at 0x16a69ed60),\n",
" ('DCost', DCost (3 devices) at 0x16a6a80a0),\n",
" ('TimeSlot', TimeSlot (0 devices) at 0x16a6a8610),\n",
" ('EDTSlot', EDTSlot (24 devices) at 0x16a6b60d0),\n",
" ('UCTSlot', UCTSlot (24 devices) at 0x16a6b64f0)])"
"OrderedDict([('Summary', Summary (3 devices) at 0x28eb62d00),\n",
" ('Bus', Bus (5 devices) at 0x28eb62fa0),\n",
" ('PQ', PQ (3 devices) at 0x28eb947f0),\n",
" ('PV', PV (3 devices) at 0x28eba0460),\n",
" ('Slack', Slack (1 device) at 0x28ebb7310),\n",
" ('Shunt', Shunt (0 devices) at 0x28ebb7d90),\n",
" ('Line', Line (7 devices) at 0x28ebc3280),\n",
" ('PVD1', PVD1 (0 devices) at 0x28ebcd940),\n",
" ('ESD1', ESD1 (0 devices) at 0x28ebcdf70),\n",
" ('REGCA1', REGCA1 (0 devices) at 0x28ebe0520),\n",
" ('REGCV1', REGCV1 (0 devices) at 0x28ebe0b20),\n",
" ('REGCV2', REGCV2 (0 devices) at 0x28ebea340),\n",
" ('Area', Area (3 devices) at 0x28ebea880),\n",
" ('Region', Region (2 devices) at 0x28ebf8040),\n",
" ('SFR', SFR (2 devices) at 0x28ebf87f0),\n",
" ('SR', SR (2 devices) at 0x28ebf8e50),\n",
" ('NSR', NSR (2 devices) at 0x28ec082b0),\n",
" ('VSGR', VSGR (0 devices) at 0x28ec086d0),\n",
" ('GCost', GCost (4 devices) at 0x28ec08b20),\n",
" ('SFRCost', SFRCost (4 devices) at 0x28ec161f0),\n",
" ('SRCost', SRCost (4 devices) at 0x28ec16790),\n",
" ('NSRCost', NSRCost (4 devices) at 0x28ec16bb0),\n",
" ('VSGCost', VSGCost (0 devices) at 0x28ec16fd0),\n",
" ('DCost', DCost (3 devices) at 0x28ec20310),\n",
" ('TimeSlot', TimeSlot (0 devices) at 0x28ec20880),\n",
" ('EDTSlot', EDTSlot (24 devices) at 0x28ec2a340),\n",
" ('UCTSlot', UCTSlot (24 devices) at 0x28ec2a760)])"
]
},
"execution_count": 5,
Expand Down Expand Up @@ -343,23 +343,23 @@
{
"data": {
"text/plain": [
"OrderedDict([('DCPF', DCPF at 0x14af9e6d0),\n",
" ('PFlow', PFlow at 0x16a6c2130),\n",
" ('CPF', CPF at 0x16a6c2760),\n",
" ('ACOPF', ACOPF at 0x16a6c2d90),\n",
" ('DCOPF', DCOPF at 0x16a6d66d0),\n",
" ('ED', ED at 0x16a6f04f0),\n",
" ('EDDG', EDDG at 0x16a71d760),\n",
" ('EDES', EDES at 0x16a7401c0),\n",
" ('RTED', RTED at 0x16a7656d0),\n",
" ('RTEDDG', RTEDDG at 0x16a765790),\n",
" ('RTEDES', RTEDES at 0x16a78ce20),\n",
" ('RTEDVIS', RTEDVIS at 0x16a7afbb0),\n",
" ('UC', UC at 0x16a7d2340),\n",
" ('UCDG', UCDG at 0x29410a0a0),\n",
" ('UCES', UCES at 0x29411dfa0),\n",
" ('DOPF', DOPF at 0x2941549d0),\n",
" ('DOPFVIS', DOPFVIS at 0x294165ca0)])"
"OrderedDict([('DCPF', DCPF at 0x28eb62940),\n",
" ('PFlow', PFlow at 0x28ec353a0),\n",
" ('CPF', CPF at 0x28ec35a00),\n",
" ('ACOPF', ACOPF at 0x28fa70040),\n",
" ('DCOPF', DCOPF at 0x28fa70940),\n",
" ('ED', ED at 0x28fa8b760),\n",
" ('EDDG', EDDG at 0x28fab99d0),\n",
" ('EDES', EDES at 0x28fadf460),\n",
" ('RTED', RTED at 0x28fc1a9a0),\n",
" ('RTEDDG', RTEDDG at 0x28fc1aa60),\n",
" ('RTEDES', RTEDES at 0x28fc50190),\n",
" ('RTEDVIS', RTEDVIS at 0x28fc63f10),\n",
" ('UC', UC at 0x28fc886d0),\n",
" ('UCDG', UCDG at 0x29231e3a0),\n",
" ('UCES', UCES at 0x292344310),\n",
" ('DOPF', DOPF at 0x292367d30),\n",
" ('DOPFVIS', DOPFVIS at 0x29238b070)])"
]
},
"execution_count": 7,
Expand Down Expand Up @@ -396,7 +396,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"Routine <RTED> initialized in 0.0124 seconds.\n"
"<RTED> initialized in 0.0132 seconds.\n"
]
},
{
Expand Down Expand Up @@ -433,7 +433,7 @@
{
"data": {
"text/plain": [
"['CLARABEL', 'ECOS', 'ECOS_BB', 'GUROBI', 'OSQP', 'SCIPY', 'SCS']"
"['CLARABEL', 'ECOS', 'ECOS_BB', 'GUROBI', 'OSQP', 'SCIP', 'SCIPY', 'SCS']"
]
},
"execution_count": 9,
Expand All @@ -454,7 +454,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"RTED solved as optimal in 0.0155 seconds, converged after 11 iterations using solver ECOS.\n"
"<RTED> solved as optimal in 0.0155 seconds, converged in 11 iterations with ECOS.\n"
]
},
{
Expand Down
Loading

0 comments on commit 5f78b00

Please sign in to comment.