Skip to content

Commit

Permalink
Rerun examples
Browse files Browse the repository at this point in the history
  • Loading branch information
jinningwang committed May 25, 2024
1 parent bc97bef commit cddb7ef
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 142 deletions.
104 changes: 53 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-04-21 17:29:32\n",
"ams:0.9.6\n"
"Last run time: 2024-05-24 20:24:57\n",
"ams:0.9.7\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.1118 seconds.\n",
"Input file parsed in 0.2674 seconds.\n",
"Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n",
"System set up in 0.0020 seconds.\n"
"System set up in 0.0043 seconds.\n"
]
}
],
Expand Down Expand Up @@ -163,33 +163,35 @@
{
"data": {
"text/plain": [
"OrderedDict([('Summary', Summary (3 devices) at 0x1271e9970),\n",
" ('Bus', Bus (5 devices) at 0x2920881c0),\n",
" ('PQ', PQ (3 devices) at 0x292088940),\n",
" ('Slack', Slack (1 device) at 0x29209d5b0),\n",
" ('PV', PV (3 devices) at 0x2920ad490),\n",
" ('Shunt', Shunt (0 devices) at 0x2920adee0),\n",
" ('Line', Line (7 devices) at 0x2920bb3d0),\n",
" ('PVD1', PVD1 (0 devices) at 0x2920c9ac0),\n",
" ('ESD1', ESD1 (0 devices) at 0x2920db160),\n",
" ('REGCA1', REGCA1 (0 devices) at 0x2920db6d0),\n",
" ('REGCV1', REGCV1 (0 devices) at 0x2920dbcd0),\n",
" ('REGCV2', REGCV2 (0 devices) at 0x2920e8550),\n",
" ('Area', Area (3 devices) at 0x2920e8af0),\n",
" ('Region', Region (2 devices) at 0x2920f02b0),\n",
" ('SFR', SFR (2 devices) at 0x2920f0a60),\n",
" ('SR', SR (2 devices) at 0x292207100),\n",
" ('NSR', NSR (2 devices) at 0x292207520),\n",
" ('VSGR', VSGR (0 devices) at 0x292207940),\n",
" ('GCost', GCost (4 devices) at 0x292207d90),\n",
" ('SFRCost', SFRCost (4 devices) at 0x292211460),\n",
" ('SRCost', SRCost (4 devices) at 0x292211a00),\n",
" ('NSRCost', NSRCost (4 devices) at 0x292211e20),\n",
" ('VSGCost', VSGCost (0 devices) at 0x29221e280),\n",
" ('DCost', DCost (3 devices) at 0x29221e580),\n",
" ('TimeSlot', TimeSlot (0 devices) at 0x29221eaf0),\n",
" ('EDTSlot', EDTSlot (24 devices) at 0x2922295b0),\n",
" ('UCTSlot', UCTSlot (24 devices) at 0x2922299d0)])"
"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)])"
]
},
"execution_count": 5,
Expand Down Expand Up @@ -342,23 +344,23 @@
{
"data": {
"text/plain": [
"OrderedDict([('DCPF', DCPF at 0x2920880d0),\n",
" ('PFlow', PFlow at 0x292239640),\n",
" ('CPF', CPF at 0x292239d00),\n",
" ('ACOPF', ACOPF at 0x29224c3a0),\n",
" ('DCOPF', DCOPF at 0x29224cc70),\n",
" ('ED', ED at 0x29226cc40),\n",
" ('EDDG', EDDG at 0x2922a4100),\n",
" ('EDES', EDES at 0x2922b8d30),\n",
" ('RTED', RTED at 0x2922ef490),\n",
" ('RTEDDG', RTEDDG at 0x2922ef550),\n",
" ('RTEDES', RTEDES at 0x292327040),\n",
" ('RTEDVIS', RTEDVIS at 0x29233bfa0),\n",
" ('UC', UC at 0x29235c940),\n",
" ('UCDG', UCDG at 0x2960517f0),\n",
" ('UCES', UCES at 0x296075940),\n",
" ('DOPF', DOPF at 0x2960ae580),\n",
" ('DOPFVIS', DOPFVIS at 0x2960c0a60)])"
"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)])"
]
},
"execution_count": 7,
Expand Down Expand Up @@ -395,7 +397,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0133 seconds.\n"
"<RTED> initialized in 0.0225 seconds.\n"
]
},
{
Expand Down Expand Up @@ -432,7 +434,7 @@
{
"data": {
"text/plain": [
"['CLARABEL', 'ECOS', 'ECOS_BB', 'GUROBI', 'OSQP', 'SCIP', 'SCIPY', 'SCS']"
"['CLARABEL', 'ECOS', 'ECOS_BB', 'GUROBI', 'SCIP', 'SCIPY', 'SCS']"
]
},
"execution_count": 9,
Expand All @@ -453,7 +455,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0165 seconds, converged in 12 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0221 seconds, converged in 12 iterations with ECOS.\n"
]
},
{
Expand Down
54 changes: 27 additions & 27 deletions examples/ex2.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Last run time: 2024-04-21 17:29:40\n",
"ams:0.9.6\n"
"Last run time: 2024-05-24 20:25:16\n",
"ams:0.9.7\n"
]
}
],
Expand Down Expand Up @@ -82,9 +82,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.0945 seconds.\n",
"Input file parsed in 0.1640 seconds.\n",
"Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n",
"System set up in 0.0022 seconds.\n"
"System set up in 0.0032 seconds.\n"
]
}
],
Expand Down Expand Up @@ -269,8 +269,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0137 seconds.\n",
"<RTED> solved as optimal in 0.0152 seconds, converged in 12 iterations with ECOS.\n"
"<RTED> initialized in 0.0196 seconds.\n",
"<RTED> solved as optimal in 0.0202 seconds, converged in 12 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -423,7 +423,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0017 seconds, converged in 12 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0022 seconds, converged in 12 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -478,7 +478,7 @@
{
"data": {
"text/plain": [
"StaticLoad (3 devices) at 0x17f154850"
"StaticLoad (3 devices) at 0x16a9d3550"
]
},
"execution_count": 14,
Expand Down Expand Up @@ -697,7 +697,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0018 seconds, converged in 10 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0030 seconds, converged in 10 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -1014,7 +1014,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0143 seconds, converged in 10 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0248 seconds, converged in 10 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -1428,7 +1428,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0149 seconds, converged in 10 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0206 seconds, converged in 10 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -1499,9 +1499,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.0397 seconds.\n",
"Input file parsed in 0.0550 seconds.\n",
"Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n",
"System set up in 0.0031 seconds.\n"
"System set up in 0.0035 seconds.\n"
]
}
],
Expand All @@ -1520,7 +1520,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0169 seconds.\n"
"<RTED> initialized in 0.0162 seconds.\n"
]
},
{
Expand Down Expand Up @@ -1635,7 +1635,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0154 seconds, converged in 11 iterations with ECOS.\n"
"<RTED> solved as optimal in 0.0207 seconds, converged in 11 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -1757,8 +1757,8 @@
"output_type": "stream",
"text": [
"Disabled constraints: plflb, plfub\n",
"<RTED> initialized in 0.0013 seconds.\n",
"<RTED> solved as optimal in 0.0122 seconds, converged in 11 iterations with ECOS.\n"
"<RTED> initialized in 0.0015 seconds.\n",
"<RTED> solved as optimal in 0.0174 seconds, converged in 11 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -1879,8 +1879,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0008 seconds.\n",
"<RTED> solved as optimal in 0.0128 seconds, converged in 11 iterations with ECOS.\n"
"<RTED> initialized in 0.0010 seconds.\n",
"<RTED> solved as optimal in 0.0196 seconds, converged in 11 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -1961,7 +1961,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0017 seconds.\n"
"<RTED> initialized in 0.0024 seconds.\n"
]
},
{
Expand Down Expand Up @@ -2036,9 +2036,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.0401 seconds.\n",
"Input file parsed in 0.0728 seconds.\n",
"Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n",
"System set up in 0.0030 seconds.\n"
"System set up in 0.0073 seconds.\n"
]
}
],
Expand Down Expand Up @@ -2084,8 +2084,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> initialized in 0.0119 seconds.\n",
"<RTED> solved as optimal in 0.0144 seconds, converged in 12 iterations with ECOS.\n"
"<RTED> initialized in 0.0226 seconds.\n",
"<RTED> solved as optimal in 0.0257 seconds, converged in 12 iterations with ECOS.\n"
]
},
{
Expand Down Expand Up @@ -2184,7 +2184,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<RTED> solved as optimal in 0.0164 seconds, converged in 325 iterations with SCS.\n"
"<RTED> solved as optimal in 0.1165 seconds, converged in 325 iterations with SCS.\n"
]
},
{
Expand Down Expand Up @@ -2292,8 +2292,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"<DCOPF> initialized in 0.0058 seconds.\n",
"<DCOPF> solved as optimal in 0.0091 seconds, converged in 225 iterations with SCS.\n"
"<DCOPF> initialized in 0.0362 seconds.\n",
"<DCOPF> solved as optimal in 0.0308 seconds, converged in 225 iterations with SCS.\n"
]
},
{
Expand Down
10 changes: 5 additions & 5 deletions examples/ex3.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Last run time: 2024-04-21 17:29:49\n",
"ams:0.9.6\n"
"Last run time: 2024-05-24 20:25:29\n",
"ams:0.9.7\n"
]
}
],
Expand Down Expand Up @@ -73,9 +73,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.0897 seconds.\n",
"Input file parsed in 0.1492 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.0039 seconds.\n"
]
}
],
Expand Down Expand Up @@ -110,7 +110,7 @@
" ACTopology | Bus \n",
" Collection | Area, Region \n",
" Cost | GCost, SFRCost, VSGCost, DCost\n",
" DG | PVD1, ESD1 \n",
" DG | PVD1, ESD1, EV1, EV2 \n",
" Horizon | TimeSlot, EDTSlot, UCTSlot \n",
" Information | Summary \n",
" RenGen | REGCA1 \n",
Expand Down
Loading

0 comments on commit cddb7ef

Please sign in to comment.