Skip to content

Commit bad5a3a

Browse files
tsmblandtsmbland
authored
Remove foresight parameter (#641)
* Move broadcast_techs out of quantities module * Update _inner_split * Fix trade model * Fix constraints tests * Fix demand_share tests * Fix quantities tests * Fix trade tests * Fix adhoc model * Rename broadcast_techs to broadcast_over_assets * Better docstring, rename argument * Delete filter_with_template * Remove `broadcast_over_assets` from `capacity_in_use` * Fix trade tests * Edit TODO * Remove foresight parameter * Update settings and documentation * Temporarily suppress test * Fix carbon budget framework * Revert change to settings * Update settings and documentation * Revert change to settings * Update results * Small changes to fix tests * Add warning about deprecated parameter * Clarify log messages * Better final message
1 parent 4f28593 commit bad5a3a

File tree

76 files changed

+252
-1228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+252
-1228
lines changed

‎docs/advanced-guide/extending-muse.ipynb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,6 @@
560560
"outputs": [],
561561
"source": [
562562
"all_txt_files = sorted((Path() / \"Results\").glob(\"Residential*.txt\"))\n",
563-
"assert len(all_txt_files) == 7\n",
564563
"assert \"Hello, you!\" in all_txt_files[0].read_text()\n",
565564
"all_txt_files"
566565
]

‎docs/inputs/toml.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ a whole.
2424
.. code-block:: TOML
2525
2626
time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
27-
foresight = 5
2827
regions = ["USA"]
2928
interest_rate = 0.1
3029
interpolation_mode = 'Active'
@@ -38,10 +37,6 @@ a whole.
3837
*time_framework*
3938
Required. List of years for which the simulation will run.
4039

41-
*foresight*
42-
Required. Integer defining the number of years at which prices are updated at every iteration.
43-
It needs to equal or be a multiple of the interval of years in the *time_framework*. Default to 5 years.
44-
4540
*region*
4641
Subset of regions to consider. If not given, defaults to all regions found in the
4742
simulation data.

‎docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,3 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
9191
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
9292
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
9393
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
94-
A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
95-
A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
96-
A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
97-
A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050
98-
A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
99-
A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
100-
A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
101-
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
102-
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
103-
A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050
104-
A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
105-
A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
106-
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
107-
A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
108-
A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050
109-
A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
110-
A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
111-
A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
112-
A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
113-
A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
114-
A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
115-
A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
116-
A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
117-
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
118-
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
119-
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
120-
A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050

‎docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146-
electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050
147-
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148-
heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050
149-
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150-
electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050
151-
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152-
heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050
153-
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154-
electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050
155-
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156-
heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050
157-
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158-
electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050
159-
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160-
heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050
161-
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162-
electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050
163-
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164-
heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050
165-
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166-
electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050
167-
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168-
heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050
169-
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎docs/tutorial-code/add-agent/1-single-objective/settings.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Global settings - most REQUIRED
22

33
time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
4-
foresight = 5 # Has to be a multiple of the minimum separation between the years in time framework
54
regions = ["R1"]
65
interest_rate = 0.1
76
interpolation_mode = 'Active'

‎docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,3 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
9191
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
9292
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
9393
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
94-
A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
95-
A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
96-
A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
97-
A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
98-
A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
99-
A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
100-
A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
101-
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
102-
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
103-
A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050
104-
A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
105-
A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
106-
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
107-
A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
108-
A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050
109-
A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
110-
A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
111-
A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
112-
A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
113-
A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
114-
A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
115-
A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
116-
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
117-
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
118-
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050

‎docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146-
electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050
147-
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148-
heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050
149-
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150-
electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050
151-
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152-
heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050
153-
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154-
electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050
155-
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156-
heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050
157-
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158-
electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050
159-
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160-
heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050
161-
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162-
electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050
163-
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164-
heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050
165-
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166-
electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050
167-
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168-
heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050
169-
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎docs/tutorial-code/add-agent/2-multiple-objective/settings.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Global settings - most REQUIRED
22

33
time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
4-
foresight = 5 # Has to be a multiple of the minimum separation between the years in time framework
54
regions = ["R1"]
65
interest_rate = 0.1
76
interpolation_mode = 'Active'

‎docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,3 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045
3838
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045
3939
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045
4040
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
41-
A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050
42-
A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050
43-
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050
44-
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050
45-
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050
46-
A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050
47-
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050
48-
A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050
49-
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050
50-
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050

‎docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146-
electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050
147-
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148-
heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050
149-
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150-
electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050
151-
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152-
heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050
153-
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154-
electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050
155-
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156-
heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050
157-
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158-
electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050
159-
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160-
heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050
161-
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162-
electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050
163-
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164-
heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050
165-
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166-
electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050
167-
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168-
heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050
169-
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

0 commit comments

Comments
 (0)