From cddb7efe50ffcc91f57288c51401d9f0e40ffcef Mon Sep 17 00:00:00 2001 From: jinningwang Date: Fri, 24 May 2024 20:27:52 -0400 Subject: [PATCH] Rerun examples --- examples/ex1.ipynb | 104 +++++++++--------- examples/ex2.ipynb | 54 ++++----- examples/ex3.ipynb | 10 +- examples/ex4.ipynb | 20 ++-- examples/ex6.ipynb | 39 ++++--- examples/ex7.ipynb | 22 ++-- examples/ex8.ipynb | 26 ++--- .../verification/ams_dcopf_verification.ipynb | 18 +-- 8 files changed, 151 insertions(+), 142 deletions(-) diff --git a/examples/ex1.ipynb b/examples/ex1.ipynb index e0924c4f..12ca8b01 100644 --- a/examples/ex1.ipynb +++ b/examples/ex1.ipynb @@ -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" ] } ], @@ -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" ] } ], @@ -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, @@ -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, @@ -395,7 +397,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0133 seconds.\n" + " initialized in 0.0225 seconds.\n" ] }, { @@ -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, @@ -453,7 +455,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0165 seconds, converged in 12 iterations with ECOS.\n" + " solved as optimal in 0.0221 seconds, converged in 12 iterations with ECOS.\n" ] }, { diff --git a/examples/ex2.ipynb b/examples/ex2.ipynb index 35912233..5a6aeb89 100644 --- a/examples/ex2.ipynb +++ b/examples/ex2.ipynb @@ -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" ] } ], @@ -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" ] } ], @@ -269,8 +269,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0137 seconds.\n", - " solved as optimal in 0.0152 seconds, converged in 12 iterations with ECOS.\n" + " initialized in 0.0196 seconds.\n", + " solved as optimal in 0.0202 seconds, converged in 12 iterations with ECOS.\n" ] }, { @@ -423,7 +423,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0017 seconds, converged in 12 iterations with ECOS.\n" + " solved as optimal in 0.0022 seconds, converged in 12 iterations with ECOS.\n" ] }, { @@ -478,7 +478,7 @@ { "data": { "text/plain": [ - "StaticLoad (3 devices) at 0x17f154850" + "StaticLoad (3 devices) at 0x16a9d3550" ] }, "execution_count": 14, @@ -697,7 +697,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0018 seconds, converged in 10 iterations with ECOS.\n" + " solved as optimal in 0.0030 seconds, converged in 10 iterations with ECOS.\n" ] }, { @@ -1014,7 +1014,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0143 seconds, converged in 10 iterations with ECOS.\n" + " solved as optimal in 0.0248 seconds, converged in 10 iterations with ECOS.\n" ] }, { @@ -1428,7 +1428,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0149 seconds, converged in 10 iterations with ECOS.\n" + " solved as optimal in 0.0206 seconds, converged in 10 iterations with ECOS.\n" ] }, { @@ -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" ] } ], @@ -1520,7 +1520,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0169 seconds.\n" + " initialized in 0.0162 seconds.\n" ] }, { @@ -1635,7 +1635,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0154 seconds, converged in 11 iterations with ECOS.\n" + " solved as optimal in 0.0207 seconds, converged in 11 iterations with ECOS.\n" ] }, { @@ -1757,8 +1757,8 @@ "output_type": "stream", "text": [ "Disabled constraints: plflb, plfub\n", - " initialized in 0.0013 seconds.\n", - " solved as optimal in 0.0122 seconds, converged in 11 iterations with ECOS.\n" + " initialized in 0.0015 seconds.\n", + " solved as optimal in 0.0174 seconds, converged in 11 iterations with ECOS.\n" ] }, { @@ -1879,8 +1879,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0008 seconds.\n", - " solved as optimal in 0.0128 seconds, converged in 11 iterations with ECOS.\n" + " initialized in 0.0010 seconds.\n", + " solved as optimal in 0.0196 seconds, converged in 11 iterations with ECOS.\n" ] }, { @@ -1961,7 +1961,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0017 seconds.\n" + " initialized in 0.0024 seconds.\n" ] }, { @@ -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" ] } ], @@ -2084,8 +2084,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0119 seconds.\n", - " solved as optimal in 0.0144 seconds, converged in 12 iterations with ECOS.\n" + " initialized in 0.0226 seconds.\n", + " solved as optimal in 0.0257 seconds, converged in 12 iterations with ECOS.\n" ] }, { @@ -2184,7 +2184,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0164 seconds, converged in 325 iterations with SCS.\n" + " solved as optimal in 0.1165 seconds, converged in 325 iterations with SCS.\n" ] }, { @@ -2292,8 +2292,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0058 seconds.\n", - " solved as optimal in 0.0091 seconds, converged in 225 iterations with SCS.\n" + " initialized in 0.0362 seconds.\n", + " solved as optimal in 0.0308 seconds, converged in 225 iterations with SCS.\n" ] }, { diff --git a/examples/ex3.ipynb b/examples/ex3.ipynb index 0d608d23..69daa57d 100644 --- a/examples/ex3.ipynb +++ b/examples/ex3.ipynb @@ -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" ] } ], @@ -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" ] } ], @@ -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", diff --git a/examples/ex4.ipynb b/examples/ex4.ipynb index eee14ffc..02e2fb1a 100644 --- a/examples/ex4.ipynb +++ b/examples/ex4.ipynb @@ -45,8 +45,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last run time: 2024-04-21 17:29:57\n", - "ams:0.9.6\n" + "Last run time: 2024-05-24 20:25:46\n", + "ams:0.9.7\n" ] } ], @@ -89,8 +89,8 @@ "output_type": "stream", "text": [ "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/ieee14/ieee14_uced.xlsx\"...\n", - "Input file parsed in 0.1016 seconds.\n", - "System set up in 0.0016 seconds.\n", + "Input file parsed in 0.1589 seconds.\n", + "System set up in 0.0028 seconds.\n", "-> Systen size:\n", "Base: 100 MVA; Frequency: 60 Hz\n", "14 Buses; 20 Lines; 5 Static Generators\n", @@ -129,9 +129,9 @@ "output_type": "stream", "text": [ "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/ieee14/ieee14.json\"...\n", - "Input file parsed in 0.0020 seconds.\n", + "Input file parsed in 0.0031 seconds.\n", "Zero line rates detacted in rate_c, adjusted to 999.\n", - "System set up in 0.0024 seconds.\n", + "System set up in 0.0035 seconds.\n", "-> Systen size:\n", "Base: 100 MVA; Frequency: 60 Hz\n", "14 Buses; 20 Lines; 5 Static Generators\n", @@ -166,9 +166,9 @@ "output_type": "stream", "text": [ "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/matpower/case14.m\"...\n", - "Input file parsed in 0.0045 seconds.\n", + "Input file parsed in 0.0068 seconds.\n", "Zero line rates detacted in rate_a, rate_b, rate_c, adjusted to 999.\n", - "System set up in 0.0021 seconds.\n", + "System set up in 0.0033 seconds.\n", "-> Systen size:\n", "Base: 100.0 MVA; Frequency: 60 Hz\n", "14 Buses; 20 Lines; 5 Static Generators\n", @@ -220,9 +220,9 @@ "output_type": "stream", "text": [ "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/ieee14/ieee14.raw\"...\n", - "Input file parsed in 0.0114 seconds.\n", + "Input file parsed in 0.0134 seconds.\n", "Zero line rates detacted in rate_c, adjusted to 999.\n", - "System set up in 0.0027 seconds.\n", + "System set up in 0.0031 seconds.\n", "-> Systen size:\n", "Base: 100.0 MVA; Frequency: 60.0 Hz\n", "14 Buses; 20 Lines; 5 Static Generators\n", diff --git a/examples/ex6.ipynb b/examples/ex6.ipynb index 90a23075..1100b3dc 100644 --- a/examples/ex6.ipynb +++ b/examples/ex6.ipynb @@ -37,8 +37,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last run time: 2024-04-21 17:30:15\n", - "ams:0.9.6\n" + "Last run time: 2024-05-24 20:26:30\n", + "ams:0.9.7\n" ] } ], @@ -75,9 +75,9 @@ "output_type": "stream", "text": [ "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_demo.xlsx\"...\n", - "Input file parsed in 0.0926 seconds.\n", + "Input file parsed in 0.1462 seconds.\n", "Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n", - "System set up in 0.0025 seconds.\n" + "System set up in 0.0033 seconds.\n" ] } ], @@ -218,6 +218,7 @@ " area\n", " zone\n", " owner\n", + " type\n", " \n", " \n", " uid\n", @@ -234,6 +235,7 @@ " \n", " \n", " \n", + " \n", " \n", " \n", " \n", @@ -252,6 +254,7 @@ " 1\n", " ZONE_1\n", " None\n", + " 1\n", " \n", " \n", " 1\n", @@ -268,6 +271,7 @@ " 1\n", " ZONE_1\n", " None\n", + " 1\n", " \n", " \n", " 2\n", @@ -284,6 +288,7 @@ " 2\n", " ZONE_1\n", " None\n", + " 1\n", " \n", " \n", " 3\n", @@ -300,6 +305,7 @@ " 2\n", " ZONE_1\n", " None\n", + " 1\n", " \n", " \n", " 4\n", @@ -316,6 +322,7 @@ " 3\n", " ZONE_1\n", " None\n", + " 1\n", " \n", " \n", "\n", @@ -330,13 +337,13 @@ "3 Bus_4 1.0 D 230.0 1.1 0.9 1.0 0.0 0 0 2 \n", "4 Bus_5 1.0 E 230.0 1.1 0.9 1.0 0.0 0 0 3 \n", "\n", - " zone owner \n", - "uid \n", - "0 ZONE_1 None \n", - "1 ZONE_1 None \n", - "2 ZONE_1 None \n", - "3 ZONE_1 None \n", - "4 ZONE_1 None " + " zone owner type \n", + "uid \n", + "0 ZONE_1 None 1 \n", + "1 ZONE_1 None 1 \n", + "2 ZONE_1 None 1 \n", + "3 ZONE_1 None 1 \n", + "4 ZONE_1 None 1 " ] }, "execution_count": 6, @@ -371,9 +378,9 @@ { "data": { "text/plain": [ - "OrderedDict([('TimeSlot', TimeSlot (0 devices) at 0x2905f8af0),\n", - " ('EDTSlot', EDTSlot (6 devices) at 0x2906045b0),\n", - " ('UCTSlot', UCTSlot (6 devices) at 0x2906049d0)])" + "OrderedDict([('TimeSlot', TimeSlot (0 devices) at 0x168c3a3d0),\n", + " ('EDTSlot', EDTSlot (6 devices) at 0x168c3ae50),\n", + " ('UCTSlot', UCTSlot (6 devices) at 0x168c462b0)])" ] }, "execution_count": 7, @@ -553,7 +560,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0200 seconds.\n" + " initialized in 0.0277 seconds.\n" ] }, { @@ -580,7 +587,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0233 seconds, converged in 11 iterations with ECOS.\n" + " solved as optimal in 0.0343 seconds, converged in 11 iterations with ECOS.\n" ] }, { diff --git a/examples/ex7.ipynb b/examples/ex7.ipynb index ff69e470..15148038 100644 --- a/examples/ex7.ipynb +++ b/examples/ex7.ipynb @@ -42,8 +42,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last run time: 2024-04-21 17:30:21\n", - "ams:0.9.6\n" + "Last run time: 2024-05-24 20:26:42\n", + "ams:0.9.7\n" ] } ], @@ -79,9 +79,9 @@ "output_type": "stream", "text": [ "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_demo.xlsx\"...\n", - "Input file parsed in 0.0997 seconds.\n", + "Input file parsed in 0.1448 seconds.\n", "Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n", - "System set up in 0.0021 seconds.\n" + "System set up in 0.0037 seconds.\n" ] } ], @@ -100,8 +100,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0089 seconds.\n", - " solved as optimal in 0.0098 seconds, converged in 10 iterations with ECOS.\n" + " initialized in 0.0139 seconds.\n", + " solved as optimal in 0.0128 seconds, converged in 10 iterations with ECOS.\n" ] }, { @@ -144,7 +144,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Report saved to \"pjm5bus_demo_out.txt\" in 0.0050 seconds.\n" + "Report saved to \"pjm5bus_demo_out.txt\" in 0.0018 seconds.\n" ] }, { @@ -178,12 +178,12 @@ "name": "stdout", "output_type": "stream", "text": [ - "AMS 0.9.6\n", + "AMS 0.9.7\n", "Copyright (C) 2023-2024 Jinning Wang\n", "\n", "AMS comes with ABSOLUTELY NO WARRANTY\n", "Case file: /Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_demo.xlsx\n", - "Report time: 04/21/2024 05:30:21 PM\n", + "Report time: 05/24/2024 08:26:42 PM\n", "\n", "\n", "========== System Statistics ==========\n", @@ -266,8 +266,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0187 seconds.\n", - " solved as optimal in 0.0216 seconds, converged in 11 iterations with ECOS.\n" + " initialized in 0.0313 seconds.\n", + " solved as optimal in 0.0361 seconds, converged in 11 iterations with ECOS.\n" ] }, { diff --git a/examples/ex8.ipynb b/examples/ex8.ipynb index 4d2c9eab..3d9998aa 100644 --- a/examples/ex8.ipynb +++ b/examples/ex8.ipynb @@ -39,8 +39,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last run time: 2024-04-21 17:30:31\n", - "ams:0.9.6.post3.dev0+gfd3786e\n" + "Last run time: 2024-05-24 20:26:55\n", + "ams:0.9.7\n" ] } ], @@ -75,10 +75,10 @@ "name": "stderr", "output_type": "stream", "text": [ - "Parsing input file \"/Users/jinningwang/Documents/work/ams/ams/cases/5bus/pjm5bus_demo.xlsx\"...\n", - "Input file parsed in 0.1127 seconds.\n", + "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_demo.xlsx\"...\n", + "Input file parsed in 0.1468 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.0038 seconds.\n" ] } ], @@ -105,7 +105,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0093 seconds.\n" + " initialized in 0.0162 seconds.\n" ] }, { @@ -431,7 +431,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0071 seconds.\n" + " initialized in 0.0109 seconds.\n" ] }, { @@ -465,7 +465,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0116 seconds, converged in 10 iterations with ECOS.\n" + " solved as optimal in 0.0155 seconds, converged in 10 iterations with ECOS.\n" ] }, { @@ -566,10 +566,10 @@ "name": "stderr", "output_type": "stream", "text": [ - "Parsing input file \"/Users/jinningwang/Documents/work/ams/ams/cases/5bus/pjm5bus_demo.xlsx\"...\n", - "Input file parsed in 0.0385 seconds.\n", + "Parsing input file \"/Users/jinningwang/Documents/work/mambaforge/envs/amsre/lib/python3.9/site-packages/ams/cases/5bus/pjm5bus_demo.xlsx\"...\n", + "Input file parsed in 0.0521 seconds.\n", "Zero line rates detacted in rate_b, rate_c, adjusted to 999.\n", - "System set up in 0.0023 seconds.\n" + "System set up in 0.0034 seconds.\n" ] } ], @@ -588,8 +588,8 @@ "name": "stderr", "output_type": "stream", "text": [ - " initialized in 0.0071 seconds.\n", - " solved as optimal in 0.0091 seconds, converged in 10 iterations with ECOS.\n" + " initialized in 0.0104 seconds.\n", + " solved as optimal in 0.0117 seconds, converged in 10 iterations with ECOS.\n" ] }, { diff --git a/examples/verification/ams_dcopf_verification.ipynb b/examples/verification/ams_dcopf_verification.ipynb index d8a3820d..8b292384 100644 --- a/examples/verification/ams_dcopf_verification.ipynb +++ b/examples/verification/ams_dcopf_verification.ipynb @@ -43,8 +43,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last run time: 2024-04-21 17:30:41\n", - "ams: 0.9.6\n" + "Last run time: 2024-05-24 20:27:17\n", + "ams: 0.9.7\n" ] } ], @@ -103,12 +103,12 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0080 seconds, converged in 13 iterations with ECOS.\n", - " solved as optimal in 0.0097 seconds, converged in 17 iterations with ECOS.\n", - " solved as optimal in 0.0194 seconds, converged in 15 iterations with ECOS.\n", - " solved as optimal in 0.0200 seconds, converged in 17 iterations with ECOS.\n", - " solved as optimal in 0.0211 seconds, converged in 17 iterations with ECOS.\n", - " solved as optimal in 0.0321 seconds, converged in 17 iterations with ECOS.\n" + " solved as optimal in 0.0134 seconds, converged in 13 iterations with ECOS.\n", + " solved as optimal in 0.0149 seconds, converged in 17 iterations with ECOS.\n", + " solved as optimal in 0.0313 seconds, converged in 15 iterations with ECOS.\n", + " solved as optimal in 0.0328 seconds, converged in 17 iterations with ECOS.\n", + " solved as optimal in 0.0358 seconds, converged in 17 iterations with ECOS.\n", + " solved as optimal in 0.0584 seconds, converged in 17 iterations with ECOS.\n" ] } ], @@ -176,7 +176,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " solved as optimal in 0.0181 seconds, converged in 14 iterations with ECOS.\n" + " solved as optimal in 0.0180 seconds, converged in 14 iterations with ECOS.\n" ] }, {