Skip to content

Change objective normalization in weighted_sum decision method #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsmbland merged 7 commits into from
Aug 14, 2024
Merged

Change objective normalization in weighted_sum decision method #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b906d9f
Change weighted sum normalization
tsmbland Aug 9, 2024
f9f4f8a
Modify test
tsmbland Aug 9, 2024
c33d78c
Modify tutorial model
tsmbland Aug 9, 2024
9f89c84
Simplify model
tsmbland Aug 9, 2024
42646d5
Modify notebook
tsmbland Aug 9, 2024
86e30d8
Tutorial 2 now based on default model
tsmbland Aug 9, 2024
3620170
Merge branch 'develop' into weighted_sum
tsmbland Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.77330000000
0,2030,R1,gassupply1,2020,10.27330000000
0,2035,R1,gassupply1,2020,2.77330000000
0,2040,R1,gassupply1,2020,2.77330000000
0,2045,R1,gassupply1,2020,2.77330000000
0,2050,R1,gassupply1,2020,2.77330000000
0,2059,R1,gassupply1,2020,2.77330000000
0,2025,R1,gassupply1,2020,18.38780000000
0,2030,R1,gassupply1,2020,10.88780000000
0,2035,R1,gassupply1,2020,3.38780000000
0,2040,R1,gassupply1,2020,3.38780000000
0,2045,R1,gassupply1,2020,3.38780000000
0,2050,R1,gassupply1,2020,3.38780000000
0,2059,R1,gassupply1,2020,3.38780000000
30 changes: 15 additions & 15 deletions docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.77330000000
0,2030,R1,gassupply1,2020,10.27330000000
0,2035,R1,gassupply1,2020,2.77330000000
0,2040,R1,gassupply1,2020,2.77330000000
0,2045,R1,gassupply1,2020,2.77330000000
0,2050,R1,gassupply1,2020,2.77330000000
0,2059,R1,gassupply1,2020,2.77330000000
1,2030,R1,gassupply1,2025,11.99330000000
1,2035,R1,gassupply1,2025,11.99330000000
1,2040,R1,gassupply1,2025,11.99330000000
1,2045,R1,gassupply1,2025,11.99330000000
1,2050,R1,gassupply1,2025,11.99330000000
1,2059,R1,gassupply1,2025,11.99330000000
1,2060,R1,gassupply1,2025,11.99330000000
1,2064,R1,gassupply1,2025,11.99330000000
0,2025,R1,gassupply1,2020,18.38780000000
0,2030,R1,gassupply1,2020,10.88780000000
0,2035,R1,gassupply1,2020,3.38780000000
0,2040,R1,gassupply1,2020,3.38780000000
0,2045,R1,gassupply1,2020,3.38780000000
0,2050,R1,gassupply1,2020,3.38780000000
0,2059,R1,gassupply1,2020,3.38780000000
1,2030,R1,gassupply1,2025,12.17660000000
1,2035,R1,gassupply1,2025,12.17660000000
1,2040,R1,gassupply1,2025,12.17660000000
1,2045,R1,gassupply1,2025,12.17660000000
1,2050,R1,gassupply1,2025,12.17660000000
1,2059,R1,gassupply1,2025,12.17660000000
1,2060,R1,gassupply1,2025,12.17660000000
1,2064,R1,gassupply1,2025,12.17660000000
48 changes: 24 additions & 24 deletions docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.77330000000
0,2030,R1,gassupply1,2020,10.27330000000
0,2035,R1,gassupply1,2020,2.77330000000
0,2040,R1,gassupply1,2020,2.77330000000
0,2045,R1,gassupply1,2020,2.77330000000
0,2050,R1,gassupply1,2020,2.77330000000
0,2059,R1,gassupply1,2020,2.77330000000
1,2030,R1,gassupply1,2025,11.99330000000
1,2035,R1,gassupply1,2025,11.99330000000
1,2040,R1,gassupply1,2025,11.99330000000
1,2045,R1,gassupply1,2025,11.99330000000
1,2050,R1,gassupply1,2025,11.99330000000
1,2059,R1,gassupply1,2025,11.99330000000
1,2060,R1,gassupply1,2025,11.99330000000
1,2064,R1,gassupply1,2025,11.99330000000
2,2035,R1,gassupply1,2030,9.52420000000
2,2040,R1,gassupply1,2030,9.52420000000
2,2045,R1,gassupply1,2030,9.52420000000
2,2050,R1,gassupply1,2030,9.52420000000
2,2059,R1,gassupply1,2030,9.52420000000
2,2060,R1,gassupply1,2030,9.52420000000
2,2064,R1,gassupply1,2030,9.52420000000
2,2065,R1,gassupply1,2030,9.52420000000
2,2069,R1,gassupply1,2030,9.52420000000
0,2025,R1,gassupply1,2020,18.38780000000
0,2030,R1,gassupply1,2020,10.88780000000
0,2035,R1,gassupply1,2020,3.38780000000
0,2040,R1,gassupply1,2020,3.38780000000
0,2045,R1,gassupply1,2020,3.38780000000
0,2050,R1,gassupply1,2020,3.38780000000
0,2059,R1,gassupply1,2020,3.38780000000
1,2030,R1,gassupply1,2025,12.17660000000
1,2035,R1,gassupply1,2025,12.17660000000
1,2040,R1,gassupply1,2025,12.17660000000
1,2045,R1,gassupply1,2025,12.17660000000
1,2050,R1,gassupply1,2025,12.17660000000
1,2059,R1,gassupply1,2025,12.17660000000
1,2060,R1,gassupply1,2025,12.17660000000
1,2064,R1,gassupply1,2025,12.17660000000
2,2035,R1,gassupply1,2030,14.17140000000
2,2040,R1,gassupply1,2030,14.17140000000
2,2045,R1,gassupply1,2030,14.17140000000
2,2050,R1,gassupply1,2030,14.17140000000
2,2059,R1,gassupply1,2030,14.17140000000
2,2060,R1,gassupply1,2030,14.17140000000
2,2064,R1,gassupply1,2030,14.17140000000
2,2065,R1,gassupply1,2030,14.17140000000
2,2069,R1,gassupply1,2030,14.17140000000
58 changes: 34 additions & 24 deletions docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.77330000000
0,2030,R1,gassupply1,2020,10.27330000000
0,2035,R1,gassupply1,2020,2.77330000000
0,2040,R1,gassupply1,2020,2.77330000000
0,2045,R1,gassupply1,2020,2.77330000000
0,2050,R1,gassupply1,2020,2.77330000000
0,2059,R1,gassupply1,2020,2.77330000000
1,2030,R1,gassupply1,2025,11.99330000000
1,2035,R1,gassupply1,2025,11.99330000000
1,2040,R1,gassupply1,2025,11.99330000000
1,2045,R1,gassupply1,2025,11.99330000000
1,2050,R1,gassupply1,2025,11.99330000000
1,2059,R1,gassupply1,2025,11.99330000000
1,2060,R1,gassupply1,2025,11.99330000000
1,2064,R1,gassupply1,2025,11.99330000000
2,2035,R1,gassupply1,2030,9.52420000000
2,2040,R1,gassupply1,2030,9.52420000000
2,2045,R1,gassupply1,2030,9.52420000000
2,2050,R1,gassupply1,2030,9.52420000000
2,2059,R1,gassupply1,2030,9.52420000000
2,2060,R1,gassupply1,2030,9.52420000000
2,2064,R1,gassupply1,2030,9.52420000000
2,2065,R1,gassupply1,2030,9.52420000000
2,2069,R1,gassupply1,2030,9.52420000000
0,2025,R1,gassupply1,2020,18.38780000000
0,2030,R1,gassupply1,2020,10.88780000000
0,2035,R1,gassupply1,2020,3.38780000000
0,2040,R1,gassupply1,2020,3.38780000000
0,2045,R1,gassupply1,2020,3.38780000000
0,2050,R1,gassupply1,2020,3.38780000000
0,2059,R1,gassupply1,2020,3.38780000000
1,2030,R1,gassupply1,2025,12.17660000000
1,2035,R1,gassupply1,2025,12.17660000000
1,2040,R1,gassupply1,2025,12.17660000000
1,2045,R1,gassupply1,2025,12.17660000000
1,2050,R1,gassupply1,2025,12.17660000000
1,2059,R1,gassupply1,2025,12.17660000000
1,2060,R1,gassupply1,2025,12.17660000000
1,2064,R1,gassupply1,2025,12.17660000000
2,2035,R1,gassupply1,2030,14.17140000000
2,2040,R1,gassupply1,2030,14.17140000000
2,2045,R1,gassupply1,2030,14.17140000000
2,2050,R1,gassupply1,2030,14.17140000000
2,2059,R1,gassupply1,2030,14.17140000000
2,2060,R1,gassupply1,2030,14.17140000000
2,2064,R1,gassupply1,2030,14.17140000000
2,2065,R1,gassupply1,2030,14.17140000000
2,2069,R1,gassupply1,2030,14.17140000000
3,2040,R1,gassupply1,2035,2.23740000000
3,2045,R1,gassupply1,2035,2.23740000000
3,2050,R1,gassupply1,2035,2.23740000000
3,2059,R1,gassupply1,2035,2.23740000000
3,2060,R1,gassupply1,2035,2.23740000000
3,2064,R1,gassupply1,2035,2.23740000000
3,2065,R1,gassupply1,2035,2.23740000000
3,2069,R1,gassupply1,2035,2.23740000000
3,2070,R1,gassupply1,2035,2.23740000000
3,2074,R1,gassupply1,2035,2.23740000000
69 changes: 45 additions & 24 deletions docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,47 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.77330000000
0,2030,R1,gassupply1,2020,10.27330000000
0,2035,R1,gassupply1,2020,2.77330000000
0,2040,R1,gassupply1,2020,2.77330000000
0,2045,R1,gassupply1,2020,2.77330000000
0,2050,R1,gassupply1,2020,2.77330000000
0,2059,R1,gassupply1,2020,2.77330000000
1,2030,R1,gassupply1,2025,11.99330000000
1,2035,R1,gassupply1,2025,11.99330000000
1,2040,R1,gassupply1,2025,11.99330000000
1,2045,R1,gassupply1,2025,11.99330000000
1,2050,R1,gassupply1,2025,11.99330000000
1,2059,R1,gassupply1,2025,11.99330000000
1,2060,R1,gassupply1,2025,11.99330000000
1,2064,R1,gassupply1,2025,11.99330000000
2,2035,R1,gassupply1,2030,9.52420000000
2,2040,R1,gassupply1,2030,9.52420000000
2,2045,R1,gassupply1,2030,9.52420000000
2,2050,R1,gassupply1,2030,9.52420000000
2,2059,R1,gassupply1,2030,9.52420000000
2,2060,R1,gassupply1,2030,9.52420000000
2,2064,R1,gassupply1,2030,9.52420000000
2,2065,R1,gassupply1,2030,9.52420000000
2,2069,R1,gassupply1,2030,9.52420000000
0,2025,R1,gassupply1,2020,18.38780000000
0,2030,R1,gassupply1,2020,10.88780000000
0,2035,R1,gassupply1,2020,3.38780000000
0,2040,R1,gassupply1,2020,3.38780000000
0,2045,R1,gassupply1,2020,3.38780000000
0,2050,R1,gassupply1,2020,3.38780000000
0,2059,R1,gassupply1,2020,3.38780000000
1,2030,R1,gassupply1,2025,12.17660000000
1,2035,R1,gassupply1,2025,12.17660000000
1,2040,R1,gassupply1,2025,12.17660000000
1,2045,R1,gassupply1,2025,12.17660000000
1,2050,R1,gassupply1,2025,12.17660000000
1,2059,R1,gassupply1,2025,12.17660000000
1,2060,R1,gassupply1,2025,12.17660000000
1,2064,R1,gassupply1,2025,12.17660000000
2,2035,R1,gassupply1,2030,14.17140000000
2,2040,R1,gassupply1,2030,14.17140000000
2,2045,R1,gassupply1,2030,14.17140000000
2,2050,R1,gassupply1,2030,14.17140000000
2,2059,R1,gassupply1,2030,14.17140000000
2,2060,R1,gassupply1,2030,14.17140000000
2,2064,R1,gassupply1,2030,14.17140000000
2,2065,R1,gassupply1,2030,14.17140000000
2,2069,R1,gassupply1,2030,14.17140000000
3,2040,R1,gassupply1,2035,2.23740000000
3,2045,R1,gassupply1,2035,2.23740000000
3,2050,R1,gassupply1,2035,2.23740000000
3,2059,R1,gassupply1,2035,2.23740000000
3,2060,R1,gassupply1,2035,2.23740000000
3,2064,R1,gassupply1,2035,2.23740000000
3,2065,R1,gassupply1,2035,2.23740000000
3,2069,R1,gassupply1,2035,2.23740000000
3,2070,R1,gassupply1,2035,2.23740000000
3,2074,R1,gassupply1,2035,2.23740000000
4,2045,R1,gassupply1,2040,4.13670000000
4,2050,R1,gassupply1,2040,4.13670000000
4,2059,R1,gassupply1,2040,4.13670000000
4,2060,R1,gassupply1,2040,4.13670000000
4,2064,R1,gassupply1,2040,4.13670000000
4,2065,R1,gassupply1,2040,4.13670000000
4,2069,R1,gassupply1,2040,4.13670000000
4,2070,R1,gassupply1,2040,4.13670000000
4,2074,R1,gassupply1,2040,4.13670000000
4,2075,R1,gassupply1,2040,4.13670000000
4,2079,R1,gassupply1,2040,4.13670000000
81 changes: 57 additions & 24 deletions docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,59 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.77330000000
0,2030,R1,gassupply1,2020,10.27330000000
0,2035,R1,gassupply1,2020,2.77330000000
0,2040,R1,gassupply1,2020,2.77330000000
0,2045,R1,gassupply1,2020,2.77330000000
0,2050,R1,gassupply1,2020,2.77330000000
0,2059,R1,gassupply1,2020,2.77330000000
1,2030,R1,gassupply1,2025,11.99330000000
1,2035,R1,gassupply1,2025,11.99330000000
1,2040,R1,gassupply1,2025,11.99330000000
1,2045,R1,gassupply1,2025,11.99330000000
1,2050,R1,gassupply1,2025,11.99330000000
1,2059,R1,gassupply1,2025,11.99330000000
1,2060,R1,gassupply1,2025,11.99330000000
1,2064,R1,gassupply1,2025,11.99330000000
2,2035,R1,gassupply1,2030,9.52420000000
2,2040,R1,gassupply1,2030,9.52420000000
2,2045,R1,gassupply1,2030,9.52420000000
2,2050,R1,gassupply1,2030,9.52420000000
2,2059,R1,gassupply1,2030,9.52420000000
2,2060,R1,gassupply1,2030,9.52420000000
2,2064,R1,gassupply1,2030,9.52420000000
2,2065,R1,gassupply1,2030,9.52420000000
2,2069,R1,gassupply1,2030,9.52420000000
0,2025,R1,gassupply1,2020,18.38780000000
0,2030,R1,gassupply1,2020,10.88780000000
0,2035,R1,gassupply1,2020,3.38780000000
0,2040,R1,gassupply1,2020,3.38780000000
0,2045,R1,gassupply1,2020,3.38780000000
0,2050,R1,gassupply1,2020,3.38780000000
0,2059,R1,gassupply1,2020,3.38780000000
1,2030,R1,gassupply1,2025,12.17660000000
1,2035,R1,gassupply1,2025,12.17660000000
1,2040,R1,gassupply1,2025,12.17660000000
1,2045,R1,gassupply1,2025,12.17660000000
1,2050,R1,gassupply1,2025,12.17660000000
1,2059,R1,gassupply1,2025,12.17660000000
1,2060,R1,gassupply1,2025,12.17660000000
1,2064,R1,gassupply1,2025,12.17660000000
2,2035,R1,gassupply1,2030,14.17140000000
2,2040,R1,gassupply1,2030,14.17140000000
2,2045,R1,gassupply1,2030,14.17140000000
2,2050,R1,gassupply1,2030,14.17140000000
2,2059,R1,gassupply1,2030,14.17140000000
2,2060,R1,gassupply1,2030,14.17140000000
2,2064,R1,gassupply1,2030,14.17140000000
2,2065,R1,gassupply1,2030,14.17140000000
2,2069,R1,gassupply1,2030,14.17140000000
3,2040,R1,gassupply1,2035,2.23740000000
3,2045,R1,gassupply1,2035,2.23740000000
3,2050,R1,gassupply1,2035,2.23740000000
3,2059,R1,gassupply1,2035,2.23740000000
3,2060,R1,gassupply1,2035,2.23740000000
3,2064,R1,gassupply1,2035,2.23740000000
3,2065,R1,gassupply1,2035,2.23740000000
3,2069,R1,gassupply1,2035,2.23740000000
3,2070,R1,gassupply1,2035,2.23740000000
3,2074,R1,gassupply1,2035,2.23740000000
4,2045,R1,gassupply1,2040,4.13670000000
4,2050,R1,gassupply1,2040,4.13670000000
4,2059,R1,gassupply1,2040,4.13670000000
4,2060,R1,gassupply1,2040,4.13670000000
4,2064,R1,gassupply1,2040,4.13670000000
4,2065,R1,gassupply1,2040,4.13670000000
4,2069,R1,gassupply1,2040,4.13670000000
4,2070,R1,gassupply1,2040,4.13670000000
4,2074,R1,gassupply1,2040,4.13670000000
4,2075,R1,gassupply1,2040,4.13670000000
4,2079,R1,gassupply1,2040,4.13670000000
5,2050,R1,gassupply1,2045,3.86350000000
5,2059,R1,gassupply1,2045,3.86350000000
5,2060,R1,gassupply1,2045,3.86350000000
5,2064,R1,gassupply1,2045,3.86350000000
5,2065,R1,gassupply1,2045,3.86350000000
5,2069,R1,gassupply1,2045,3.86350000000
5,2070,R1,gassupply1,2045,3.86350000000
5,2074,R1,gassupply1,2045,3.86350000000
5,2075,R1,gassupply1,2045,3.86350000000
5,2079,R1,gassupply1,2045,3.86350000000
5,2080,R1,gassupply1,2045,3.86350000000
5,2084,R1,gassupply1,2045,3.86350000000
Loading