Skip to content

Commit

Permalink
Merge pull request #82 from willu47/dc/decisions
Browse files Browse the repository at this point in the history
Digital communications decision module
  • Loading branch information
tomalrussell authored Jul 29, 2019
2 parents 6855abd + 6acb129 commit 2df0ad4
Show file tree
Hide file tree
Showing 8 changed files with 703 additions and 299 deletions.
3 changes: 3 additions & 0 deletions config/dimensions/exchanges.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: exchanges
description: Exchanges (Fixed network)
elements: ../digital_comms/dimensions/exchanges.csv
3 changes: 3 additions & 0 deletions config/dimensions/technology.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: technology
description: Technology options for the digital comms fixed network
elements: ../digital_comms/dimensions/technology.csv
25 changes: 14 additions & 11 deletions config/model_runs/digital_comms_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ description: ''
name: digital_comms_test
narratives: {}
scenarios:
adoption: fttp_baseline_adoption
adoption: fttp_high_adoption
sos_model: digital_comms_fixed_only
stamp: '2018-05-01T12:36:34.374Z'
strategies:
- type: rule-based
description: reduce emissions
path: planning/digital_decisions.py
classname: DigitalDecisions
# - type: pre-specified-planning
# description: fibre to the premises all in one go
# filename: ../digital_comms/strategies/fttp.csv
timesteps:
- 2019
- 2020
# - 2021
# - 2022
# - 2023
# - 2024
# - 2025
# - 2026
# - 2027
# - 2028
# - 2029
# - 2030
- 2021
- 2022
- 2023
- 2024
- 2025
- 2026
- 2027
- 2028
- 2029
- 2030
2 changes: 1 addition & 1 deletion config/scenarios/population_from_db.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: population
name: population_from_db
description: UK population, total people
provides:
- name: population_lad16
Expand Down
Loading

0 comments on commit 2df0ad4

Please sign in to comment.