Skip to content

Commit 2302378

Browse files
committed
add instances files, changes max cap, and alter src files
Besides including a .txt naming all instances, this commit changes creates the functions change_time_parameters and perform_plotting, corrects Expressions(), and changes the integration between run.jl and plotting.jl.
1 parent a5f1ef7 commit 2302378

File tree

8 files changed

+17813
-254
lines changed

8 files changed

+17813
-254
lines changed

examples/structures/8nodes/instances.txt

Lines changed: 17518 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
node,gen_tech,gcap_min,gcap_max
2-
1,1,0,1000000000
3-
1,2,0,1000000000
4-
1,3,0,1000000000
5-
1,4,0,1000000000
6-
1,5,0,1000000000
7-
1,6,0,1000000000
8-
1,7,0,1000000000
9-
1,8,0,1000000000
10-
2,1,0,1000000000
11-
2,2,0,1000000000
12-
2,3,0,1000000000
13-
2,4,0,1000000000
14-
2,5,0,1000000000
15-
2,6,0,1000000000
16-
2,7,0,1000000000
17-
2,8,0,1000000000
18-
3,1,0,1000000000
19-
3,2,0,1000000000
20-
3,3,0,1000000000
21-
3,4,0,1000000000
22-
3,5,0,1000000000
23-
3,6,0,1000000000
24-
3,7,0,1000000000
25-
3,8,0,1000000000
26-
4,1,0,1000000000
27-
4,2,0,1000000000
28-
4,3,0,1000000000
29-
4,4,0,1000000000
30-
4,5,0,1000000000
31-
4,6,0,1000000000
32-
4,7,0,1000000000
33-
4,8,0,1000000000
34-
5,1,0,1000000000
35-
5,2,0,1000000000
36-
5,3,0,1000000000
37-
5,4,0,1000000000
38-
5,5,0,1000000000
39-
5,6,0,1000000000
40-
5,7,0,1000000000
41-
5,8,0,1000000000
42-
6,1,0,1000000000
43-
6,2,0,1000000000
44-
6,3,0,1000000000
45-
6,4,0,1000000000
46-
6,5,0,1000000000
47-
6,6,0,1000000000
48-
6,7,0,1000000000
49-
6,8,0,1000000000
50-
7,1,0,1000000000
51-
7,2,0,1000000000
52-
7,3,0,1000000000
53-
7,4,0,1000000000
54-
7,5,0,1000000000
55-
7,6,0,1000000000
56-
7,7,0,1000000000
57-
7,8,0,1000000000
58-
8,1,0,1000000000
59-
8,2,0,1000000000
60-
8,3,0,1000000000
61-
8,4,0,1000000000
62-
8,5,0,1000000000
63-
8,6,0,1000000000
64-
8,7,0,1000000000
65-
8,8,0,1000000000
1+
node,gen_tech,gcap_min,gcap_max
2+
1,1,0,300000
3+
1,2,0,300000
4+
1,3,0,300000
5+
1,4,0,300000
6+
1,5,0,300000
7+
1,6,0,300000
8+
1,7,0,300000
9+
1,8,0,300000
10+
2,1,0,300000
11+
2,2,0,300000
12+
2,3,0,300000
13+
2,4,0,300000
14+
2,5,0,300000
15+
2,6,0,300000
16+
2,7,0,300000
17+
2,8,0,300000
18+
3,1,0,300000
19+
3,2,0,300000
20+
3,3,0,300000
21+
3,4,0,300000
22+
3,5,0,300000
23+
3,6,0,300000
24+
3,7,0,300000
25+
3,8,0,300000
26+
4,1,0,300000
27+
4,2,0,300000
28+
4,3,0,300000
29+
4,4,0,300000
30+
4,5,0,300000
31+
4,6,0,300000
32+
4,7,0,300000
33+
4,8,0,300000
34+
5,1,0,300000
35+
5,2,0,300000
36+
5,3,0,300000
37+
5,4,0,300000
38+
5,5,0,300000
39+
5,6,0,300000
40+
5,7,0,300000
41+
5,8,0,300000
42+
6,1,0,300000
43+
6,2,0,300000
44+
6,3,0,300000
45+
6,4,0,300000
46+
6,5,0,300000
47+
6,6,0,300000
48+
6,7,0,300000
49+
6,8,0,300000
50+
7,1,0,300000
51+
7,2,0,300000
52+
7,3,0,300000
53+
7,4,0,300000
54+
7,5,0,300000
55+
7,6,0,300000
56+
7,7,0,300000
57+
7,8,0,300000
58+
8,1,0,300000
59+
8,2,0,300000
60+
8,3,0,300000
61+
8,4,0,300000
62+
8,5,0,300000
63+
8,6,0,300000
64+
8,7,0,300000
65+
8,8,0,300000
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
s,node,scap_min,scap_max
2-
1,1,0,1000000000
3-
1,2,0,1000000000
4-
1,3,0,1000000000
5-
1,4,0,1000000000
6-
1,5,0,1000000000
7-
1,6,0,1000000000
8-
1,7,0,1000000000
9-
1,8,0,1000000000
1+
s,node,scap_min,scap_max
2+
1,1,0,100000
3+
1,2,0,100000
4+
1,3,0,100000
5+
1,4,0,100000
6+
1,5,0,100000
7+
1,6,0,100000
8+
1,7,0,100000
9+
1,8,0,100000
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
L_ind,line,dist,cost,converter_cost,M,C,B,efficiency,lifetime,tcap_min,tcap_max
2-
1,"[1, 2]",1665,400,150000,0.02,0,1,0.95,40,0,1000000000
3-
2,"[1, 3]",1071,400,150000,0.02,0,1,0.95,40,0,1000000000
4-
3,"[2, 3]",669,400,150000,0.02,0,1,0.95,40,0,1000000000
5-
4,"[2, 4]",561,400,150000,0.02,0,1,0.95,40,0,1000000000
6-
5,"[2, 6]",1093,400,150000,0.02,0,1,0.95,40,0,1000000000
7-
6,"[2, 7]",1617,400,150000,0.02,0,1,0.95,40,0,1000000000
8-
7,"[3, 4]",623,400,150000,0.02,0,1,0.95,40,0,1000000000
9-
8,"[3, 6]",1175,400,150000,0.02,0,1,0.95,40,0,1000000000
10-
9,"[4, 6]",595,400,150000,0.02,0,1,0.95,40,0,1000000000
11-
10,"[4, 7]",1484,400,150000,0.02,0,1,0.95,40,0,1000000000
12-
11,"[5, 6]",748,400,150000,0.02,0,1,0.95,40,0,1000000000
13-
12,"[5, 7]",817,400,150000,0.02,0,1,0.95,40,0,1000000000
14-
13,"[5, 10]",1124,400,150000,0.02,0,1,0.95,40,0,1000000000
15-
14,"[6, 7]",1175,400,150000,0.02,0,1,0.95,40,0,1000000000
16-
15,"[7, 10]",1451,400,150000,0.02,0,1,0.95,40,0,1000000000
1+
L_ind,line,dist,cost,converter_cost,M,C,B,efficiency,lifetime,tcap_min,tcap_max
2+
1,"[1, 2]",1665,400,150000,0.02,0,1,0.95,40,0,100000
3+
2,"[1, 3]",1071,400,150000,0.02,0,1,0.95,40,0,100000
4+
3,"[2, 3]",669,400,150000,0.02,0,1,0.95,40,0,100000
5+
4,"[2, 4]",561,400,150000,0.02,0,1,0.95,40,0,100000
6+
5,"[2, 6]",1093,400,150000,0.02,0,1,0.95,40,0,100000
7+
6,"[2, 7]",1617,400,150000,0.02,0,1,0.95,40,0,100000
8+
7,"[3, 4]",623,400,150000,0.02,0,1,0.95,40,0,100000
9+
8,"[3, 6]",1175,400,150000,0.02,0,1,0.95,40,0,100000
10+
9,"[4, 6]",595,400,150000,0.02,0,1,0.95,40,0,100000
11+
10,"[4, 7]",1484,400,150000,0.02,0,1,0.95,40,0,100000
12+
11,"[5, 6]",748,400,150000,0.02,0,1,0.95,40,0,100000
13+
12,"[5, 7]",817,400,150000,0.02,0,1,0.95,40,0,100000
14+
13,"[5, 10]",1124,400,150000,0.02,0,1,0.95,40,0,100000
15+
14,"[6, 7]",1175,400,150000,0.02,0,1,0.95,40,0,100000
16+
15,"[7, 10]",1451,400,150000,0.02,0,1,0.95,40,0,100000

src/EnergySystemModeling.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export EnergySystemModel,
1717
replace_nans,
1818
getdispatch,
1919
read_clusters,
20-
unpack_clusters_features
20+
unpack_clusters_features,
21+
change_time_parameters
2122

2223
include("plotting.jl")
2324
export plot_objective_values,
@@ -32,7 +33,8 @@ export plot_objective_values,
3233
plot_loss_of_load,
3334
plot_box,
3435
plot_box_all,
35-
plot_dispatch_bars
36+
plot_dispatch_bars,
37+
perform_plotting
3638

3739
include("aggreg.jl")
3840
export SeriesInstance,

0 commit comments

Comments
 (0)