Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f2eb833
Catch end of life and construction in used techs
idelder Mar 12, 2026
3ce0278
Use None for commodities in materials outputs to avoid foreign key co…
idelder Mar 12, 2026
52f4256
Techs used for materials are not unused
idelder Mar 12, 2026
ffc0f9c
Update warning for clarity
idelder Mar 12, 2026
f053d1c
Update myopic filtering for constructioninput and emissionembodied
idelder Mar 12, 2026
3531c93
Update myopic filtering for emissionendoflife and endoflifeoutput
idelder Mar 12, 2026
2629f7c
Fix output_curtailment FK so test runs myopically
idelder Mar 12, 2026
24f6dc8
Add sector labels to materials test so it runs myopically
idelder Mar 12, 2026
b575859
Worship at the altar of strong typing
idelder Mar 12, 2026
cf4e02e
Indent efficiency block in network_model_data so EOL isnt skipped
idelder Mar 14, 2026
04fae53
Add eol out and construction in to living techs
idelder Mar 14, 2026
18ffcff
Fix flow balance check on table writer for material flows
idelder Mar 14, 2026
9e023b2
Enable eol/retirement tracking of inactive existing capacity too
idelder Mar 14, 2026
1f275bc
Fix unused existing capacity definition in mediumville
idelder Mar 14, 2026
5619478
Add a myopic mode to materials test
idelder Mar 14, 2026
95750e4
Switch to set comprehension for the rabbit
idelder Mar 14, 2026
06fe0dd
Underscore unused param for the rabbit
idelder Mar 14, 2026
1340cf2
Remove a couple bad type casts
idelder Mar 14, 2026
0531717
Dodge a wee typing issue
idelder Mar 14, 2026
1d9bb8c
Tidy up some schema tables
idelder Mar 14, 2026
3f89bbd
Topical ointment for the nonetype disease
idelder Mar 14, 2026
f674db3
Remove redundant FKs
idelder Mar 14, 2026
07f8e38
Fix network check for survival curve eol outputs
idelder Mar 14, 2026
d8202a2
Move abs from capacity output check as these can be tiny negatives in…
idelder Mar 14, 2026
db3a186
Fix retirement periods logic
idelder Mar 14, 2026
8e01b3c
Make periods a list to preserve order in network_model_data
idelder Mar 14, 2026
83d84f4
Update living check to process level
idelder Mar 14, 2026
1d8a428
Get lifetime with eol output data and update logic
idelder Mar 14, 2026
860fae8
Fix typing in network_model_data
idelder Mar 14, 2026
1a041db
Remove now unnecessary existing capacity check
idelder Mar 14, 2026
d8a8279
Get this rabbit off my back
idelder Mar 14, 2026
42bc5e2
Add a tech_all check on retirement_periods construction
idelder Mar 16, 2026
cba8975
Add an unlim_cap check for materials flows in network_model_data
idelder Mar 16, 2026
556c5b1
Only add eol_out to used techs if actually retiring
idelder Mar 16, 2026
399ff5a
Add an existing capacity check on retirementperiods
idelder Mar 16, 2026
64a85bf
Add silent processes to validation sets for emission end of life
idelder Mar 16, 2026
8f8ea60
Add silent processes to validation set
idelder Mar 16, 2026
49f8095
Update emission end of life validation set
idelder Mar 16, 2026
fc0d408
Add room for emission end of life in checkefficiencyindices
idelder Mar 16, 2026
e0a9059
Fix typing and tidy up
idelder Mar 16, 2026
2bc7614
Update test network model data
idelder Mar 16, 2026
f7c6503
Add existing capacity check
idelder Mar 16, 2026
9c71375
Only info level for filtering in myopic mode
idelder Mar 16, 2026
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
Prev Previous commit
Next Next commit
Update test network model data
  • Loading branch information
idelder committed Mar 16, 2026
commit 2bc76140e7787e31b6bd7539e99d752f697af8fc
22 changes: 22 additions & 0 deletions tests/test_network_model_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ class ScenarioType(TypedDict):
('R1', 'p2', 't5', 2000, 'd2', 100),
],
'FROM end_of_life_output': [],
'FROM emission_end_of_life': [],
'FROM construction_input': [],
'FROM existing_capacity': [],
'FROM main.linked_tech': [],
'FROM cost_variable': [],
},
Expand Down Expand Up @@ -103,7 +105,9 @@ class ScenarioType(TypedDict):
('R1', 's1', 't1', 2000, 'd1', 100),
],
'FROM end_of_life_output': [],
'FROM emission_end_of_life': [],
'FROM construction_input': [],
'FROM existing_capacity': [],
'FROM main.linked_tech': [('R1', 't4', 'nox', 'driven')],
'FROM cost_variable': [],
},
Expand Down Expand Up @@ -141,7 +145,9 @@ class ScenarioType(TypedDict):
('R1', 's1', 't1', 2000, 'd1', 100),
],
'FROM end_of_life_output': [],
'FROM emission_end_of_life': [],
'FROM construction_input': [],
'FROM existing_capacity': [],
'FROM main.linked_tech': [('R1', 't4', 'nox', 'driven')],
'FROM cost_variable': [],
},
Expand Down Expand Up @@ -312,10 +318,18 @@ def dispatcher(query: str, *_: object) -> MagicMock:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM emission_end_of_life' in query:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM construction_input' in query:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM existing_capacity' in query:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM main.linked_tech' in query:
m = MagicMock()
m.fetchall.return_value = []
Expand Down Expand Up @@ -400,10 +414,18 @@ def dispatcher(query: str, *_: object) -> MagicMock:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM emission_end_of_life' in query:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM construction_input' in query:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM existing_capacity' in query:
m = MagicMock()
m.fetchall.return_value = []
return m
elif 'FROM main.linked_tech' in query:
m = MagicMock()
m.fetchall.return_value = []
Expand Down
Loading