Skip to content

Remove trade feature #542

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

Closed
wants to merge 34 commits into from
Closed

Remove trade feature #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fa59017
Add comments and simplify sector.next
tsmbland Oct 2, 2024
697ff3f
Simplify agent module, more comments
tsmbland Oct 3, 2024
b47c811
Simplify retirment profile code
tsmbland Oct 3, 2024
a86e07f
Simplify merge_assets
tsmbland Oct 3, 2024
3e51311
Revert change to merge_assets
tsmbland Oct 4, 2024
941a5a6
Delete unused factory
tsmbland Oct 4, 2024
9d2cac9
More comments added to code
tsmbland Oct 4, 2024
e386da1
Revert some changes to fix tests
tsmbland Oct 4, 2024
018ca5c
Fix tests
tsmbland Oct 4, 2024
4fd2e79
Small fix to another test
tsmbland Oct 4, 2024
3b0cb49
Remove more redundant code
tsmbland Oct 4, 2024
cc9d237
Fix test
tsmbland Oct 14, 2024
d054a3b
A few more tiny changes (e.g. typing)
tsmbland Oct 17, 2024
0c84ba9
Remove inline comment
tsmbland Oct 17, 2024
65313de
Merge branch 'v1.3' into refactor
tsmbland Oct 21, 2024
8d06e85
Merge branch 'v1.3' into refactor
tsmbland Oct 25, 2024
6975787
Merge branch 'broadcast_errors2' into refactor
tsmbland Oct 25, 2024
2e601ea
Merge branch 'v1.2.2' into refactor
tsmbland Oct 25, 2024
423fafe
Merge branch 'main' into refactor
tsmbland Oct 28, 2024
c270dfa
Merge branch 'main' into refactor
tsmbland Oct 28, 2024
2adde92
Small changes to tidy up
tsmbland Oct 28, 2024
e770c2e
Merge branch 'refactor' of https://github.com/EnergySystemsModellingL…
tsmbland Oct 28, 2024
7f3370a
Be more explicit in _inner_split
tsmbland Oct 29, 2024
789b093
Apply suggestions from code review
tsmbland Oct 30, 2024
557efd8
Switch copy to deepcopy
tsmbland Oct 30, 2024
8acbc52
Remove trade feature
tsmbland Oct 30, 2024
8e75cc2
Fix tiny error
tsmbland Oct 30, 2024
16dfc22
Delete tests
tsmbland Oct 30, 2024
674142d
Update tutorial model results files
tsmbland Oct 30, 2024
e149e68
Update example model results files
tsmbland Oct 30, 2024
6b29b49
Remove more references to trade
tsmbland Oct 31, 2024
3a12c8b
Delete trade model
tsmbland Oct 31, 2024
9ff10fd
Simplify capacity property
tsmbland Nov 4, 2024
3d33372
Merge branch 'v1.3' into trade
tsmbland Nov 5, 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
228 changes: 114 additions & 114 deletions docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
agent,capacity,dst_region,installed,region,sector,technology,type,year
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025
A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025
A1,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025
A2,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025
A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030
A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030
A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030
A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030
A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030
A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035
A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035
A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035
A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2035
A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040
A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040
A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040
A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2040
A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2040
A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040
A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045
A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045
A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045
A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2045
A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2045
A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045
A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050
A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050
A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2050
A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2050
A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050
A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
A1,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
A2,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050
agent,capacity,installed,region,sector,technology,type,year
A1,5.00000000000,2020,R1,residential,gasboiler,newcapa,2020
A2,5.00000000000,2020,R1,residential,gasboiler,newcapa,2020
A1,0.50000000000,2020,R1,power,gasCCGT,newcapa,2020
A2,0.50000000000,2020,R1,power,gasCCGT,newcapa,2020
A1,7.50000000000,2020,R1,gas,gassupply1,newcapa,2020
A2,7.50000000000,2020,R1,gas,gassupply1,newcapa,2020
A1,2.50000000000,2020,R1,residential,gasboiler,newcapa,2025
A1,9.50000000000,2020,R1,residential,heatpump,newcapa,2025
A2,12.00000000000,2020,R1,residential,gasboiler,newcapa,2025
A1,1.30560000000,2020,R1,power,gasCCGT,newcapa,2025
A2,0.50000000000,2020,R1,power,gasCCGT,newcapa,2025
A2,1.81250000000,2020,R1,power,windturbine,newcapa,2025
A1,9.17600000000,2020,R1,gas,gassupply1,newcapa,2025
A2,9.17600000000,2020,R1,gas,gassupply1,newcapa,2025
A1,9.50000000000,2020,R1,residential,heatpump,newcapa,2030
A1,5.50000000000,2025,R1,residential,heatpump,newcapa,2030
A2,9.50000000000,2020,R1,residential,gasboiler,newcapa,2030
A2,5.50000000000,2025,R1,residential,gasboiler,newcapa,2030
A1,0.80560000000,2020,R1,power,gasCCGT,newcapa,2030
A1,2.52780000000,2025,R1,power,gasCCGT,newcapa,2030
A2,1.81250000000,2020,R1,power,windturbine,newcapa,2030
A2,5.68750000000,2025,R1,power,windturbine,newcapa,2030
A1,5.42600000000,2020,R1,gas,gassupply1,newcapa,2030
A1,7.02400000000,2025,R1,gas,gassupply1,newcapa,2030
A2,5.42600000000,2020,R1,gas,gassupply1,newcapa,2030
A2,7.02400000000,2025,R1,gas,gassupply1,newcapa,2030
A1,5.50000000000,2025,R1,residential,heatpump,newcapa,2035
A1,12.50000000000,2030,R1,residential,heatpump,newcapa,2035
A2,5.50000000000,2025,R1,residential,gasboiler,newcapa,2035
A2,12.50000000000,2030,R1,residential,gasboiler,newcapa,2035
A1,0.80560000000,2020,R1,power,gasCCGT,newcapa,2035
A1,2.52780000000,2025,R1,power,gasCCGT,newcapa,2035
A1,0.37500000000,2030,R1,power,windturbine,newcapa,2035
A2,1.81250000000,2020,R1,power,windturbine,newcapa,2035
A2,5.68750000000,2025,R1,power,windturbine,newcapa,2035
A2,0.75000000000,2030,R1,power,windturbine,newcapa,2035
A1,1.67600000000,2020,R1,gas,gassupply1,newcapa,2035
A1,7.02400000000,2025,R1,gas,gassupply1,newcapa,2035
A1,5.68330000000,2030,R1,gas,gassupply1,newcapa,2035
A2,1.67600000000,2020,R1,gas,gassupply1,newcapa,2035
A2,7.02400000000,2025,R1,gas,gassupply1,newcapa,2035
A2,5.68330000000,2030,R1,gas,gassupply1,newcapa,2035
A1,12.50000000000,2030,R1,residential,heatpump,newcapa,2040
A1,8.50000000000,2035,R1,residential,heatpump,newcapa,2040
A2,12.50000000000,2030,R1,residential,gasboiler,newcapa,2040
A2,8.50000000000,2035,R1,residential,gasboiler,newcapa,2040
A1,0.80560000000,2020,R1,power,gasCCGT,newcapa,2040
A1,2.52780000000,2025,R1,power,gasCCGT,newcapa,2040
A1,0.37500000000,2030,R1,power,windturbine,newcapa,2040
A1,1.68750000000,2035,R1,power,windturbine,newcapa,2040
A2,1.81250000000,2020,R1,power,windturbine,newcapa,2040
A2,5.68750000000,2025,R1,power,windturbine,newcapa,2040
A2,0.75000000000,2030,R1,power,windturbine,newcapa,2040
A2,1.68750000000,2035,R1,power,windturbine,newcapa,2040
A1,1.67600000000,2020,R1,gas,gassupply1,newcapa,2040
A1,7.02400000000,2025,R1,gas,gassupply1,newcapa,2040
A1,5.68330000000,2030,R1,gas,gassupply1,newcapa,2040
A1,2.90000000000,2035,R1,gas,gassupply1,newcapa,2040
A2,1.67600000000,2020,R1,gas,gassupply1,newcapa,2040
A2,7.02400000000,2025,R1,gas,gassupply1,newcapa,2040
A2,5.68330000000,2030,R1,gas,gassupply1,newcapa,2040
A2,2.90000000000,2035,R1,gas,gassupply1,newcapa,2040
A1,8.50000000000,2035,R1,residential,heatpump,newcapa,2045
A1,15.50000000000,2040,R1,residential,heatpump,newcapa,2045
A2,8.50000000000,2035,R1,residential,gasboiler,newcapa,2045
A2,15.50000000000,2040,R1,residential,gasboiler,newcapa,2045
A1,0.80560000000,2020,R1,power,gasCCGT,newcapa,2045
A1,2.52780000000,2025,R1,power,gasCCGT,newcapa,2045
A1,0.37500000000,2030,R1,power,windturbine,newcapa,2045
A1,1.68750000000,2035,R1,power,windturbine,newcapa,2045
A1,1.50000000000,2040,R1,power,windturbine,newcapa,2045
A2,1.81250000000,2020,R1,power,windturbine,newcapa,2045
A2,5.68750000000,2025,R1,power,windturbine,newcapa,2045
A2,0.75000000000,2030,R1,power,windturbine,newcapa,2045
A2,1.68750000000,2035,R1,power,windturbine,newcapa,2045
A2,1.50000000000,2040,R1,power,windturbine,newcapa,2045
A1,1.67600000000,2020,R1,gas,gassupply1,newcapa,2045
A1,7.02400000000,2025,R1,gas,gassupply1,newcapa,2045
A1,5.68330000000,2030,R1,gas,gassupply1,newcapa,2045
A1,2.90000000000,2035,R1,gas,gassupply1,newcapa,2045
A1,0.48330000000,2040,R1,gas,gassupply1,newcapa,2045
A2,1.67600000000,2020,R1,gas,gassupply1,newcapa,2045
A2,7.02400000000,2025,R1,gas,gassupply1,newcapa,2045
A2,5.68330000000,2030,R1,gas,gassupply1,newcapa,2045
A2,2.90000000000,2035,R1,gas,gassupply1,newcapa,2045
A2,0.48330000000,2040,R1,gas,gassupply1,newcapa,2045
A1,15.50000000000,2040,R1,residential,heatpump,newcapa,2050
A1,11.50000000000,2045,R1,residential,heatpump,newcapa,2050
A2,15.50000000000,2040,R1,residential,gasboiler,newcapa,2050
A2,11.50000000000,2045,R1,residential,gasboiler,newcapa,2050
A1,0.80560000000,2020,R1,power,gasCCGT,newcapa,2050
A1,2.52780000000,2025,R1,power,gasCCGT,newcapa,2050
A1,0.37500000000,2030,R1,power,windturbine,newcapa,2050
A1,1.68750000000,2035,R1,power,windturbine,newcapa,2050
A1,1.50000000000,2040,R1,power,windturbine,newcapa,2050
A1,1.50000000000,2045,R1,power,windturbine,newcapa,2050
A2,5.68750000000,2025,R1,power,windturbine,newcapa,2050
A2,0.75000000000,2030,R1,power,windturbine,newcapa,2050
A2,1.68750000000,2035,R1,power,windturbine,newcapa,2050
A2,1.50000000000,2040,R1,power,windturbine,newcapa,2050
A2,3.15630000000,2045,R1,power,windturbine,newcapa,2050
A1,1.67600000000,2020,R1,gas,gassupply1,newcapa,2050
A1,7.02400000000,2025,R1,gas,gassupply1,newcapa,2050
A1,5.68330000000,2030,R1,gas,gassupply1,newcapa,2050
A1,2.90000000000,2035,R1,gas,gassupply1,newcapa,2050
A1,0.48330000000,2040,R1,gas,gassupply1,newcapa,2050
A1,1.45000000000,2045,R1,gas,gassupply1,newcapa,2050
A2,1.67600000000,2020,R1,gas,gassupply1,newcapa,2050
A2,7.02400000000,2025,R1,gas,gassupply1,newcapa,2050
A2,5.68330000000,2030,R1,gas,gassupply1,newcapa,2050
A2,2.90000000000,2035,R1,gas,gassupply1,newcapa,2050
A2,0.48330000000,2040,R1,gas,gassupply1,newcapa,2050
A2,1.45000000000,2045,R1,gas,gassupply1,newcapa,2050
Loading