Merge pull request #67 from willu47/wrap/dc_fixed

Update digital comms wrapper

To do:

- smif decision module access to scenario data - see nismod/smif#328
- nismod digital_comms adoption scenario data provision from FTP -

config/model_runs/digital_comms_test.yml

@@ -6,7 +6,11 @@ scenarios:
   adoption: fttp_baseline_adoption
 sos_model: digital_comms_fixed_only
 stamp: '2018-05-01T12:36:34.374Z'
-strategies: []
+strategies:
+- type: rule-based
+  description: reduce emissions
+  path: planning/digital_decisions.py
+  classname: DigitalDecisions
 timesteps:
 - 2019
 - 2020

config/scenarios/adoption.yml

@@ -15,26 +15,26 @@ provides:
 variants:
 - description: Baseline FTTP adoption for the UK
   data:
-    adoption: fttp_baseline_adoption.csv
+    adoption: ../digital_comms/scenarios/fttp_baseline_adoption.csv
   name: fttp_baseline_adoption
 - description: High FTTP adoption for the UK
   data:
-    adoption: fttp_high_adoption.csv
+    adoption: ../digital_comms/scenarios/fttp_high_adoption.csv
   name: fttp_high_adoption
 - description: Low FTTP adoption for the UK
   data:
-    adoption: fttp_low_adoption.csv
+    adoption: ../digital_comms/scenarios/fttp_low_adoption.csv
   name: fttp_low_adoption
 - description: Baseline FTTDP adoption for the UK
   data:
-    adoption: fttdp_baseline_adoption.csv
+    adoption: ../digital_comms/scenarios/fttdp_baseline_adoption.csv
   name: fttdp_baseline_adoption
 - description: High FTTDP adoption for the UK
   data:
-    adoption: fttdp_high_adoption.csv
+    adoption: ../digital_comms/scenarios/fttdp_high_adoption.csv
   name: fttdp_high_adoption
 - description: Low FTTDP adoption for the UK
   data:
-    adoption: fttdp_low_adoption.csv
+    adoption: ../digital_comms/scenarios/fttdp_low_adoption.csv
   name: fttdp_low_adoption
 name: adoption

config/sector_models/digital_comms_fixed_network.yml

@@ -23,7 +23,7 @@ parameters:
   - 1000
   default: ../digital_comms/parameters/defaults.csv
   dims: []
-  name: costs_links_fiber_meter
+  name: costs_links_fibre_meter
   unit: GBP
 - description: The cost of installing a copper link
   dtype: int
@@ -420,133 +420,133 @@ outputs:
   dtype: int
   unit: Number of premises
 - name: interventions
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: assets
 - name: distribution_upgrades
-  dims: 
+  dims:
   - broadband_distributions
   - annual
   dtype: int
   unit: GBP
 - name: distribution_upgrade_costs_fttp
-  dims: 
+  dims:
   - broadband_distributions
   - annual
   dtype: int
   unit: GBP
 - name: distribution_upgrade_costs_fttdp
-  dims: 
+  dims:
   - broadband_distributions
   - annual
   dtype: int
   unit: GBP
 - name: premises_upgrade_costs_fttp
-  dims: 
+  dims:
   - broadband_distributions
   - annual
   dtype: int
   unit: GBP
 - name: premises_upgrade_costs_fttdp
-  dims: 
+  dims:
   - broadband_distributions
   - annual
   dtype: int
   unit: GBP
 - name: premises_by_distribution
-  dims: 
+  dims:
   - broadband_distributions
   - annual
   dtype: int
-  unit: premises 
+  unit: premises
 - name: premises_adoption_desirability
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: premises_connection_statistics
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: premises_passed_with_fttp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: percentage_of_premises_passed_with_fttp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
-  unit: premises 
+  unit: premises
 - name: premises_connected_with_fttp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: percentage_of_premises_connected_with_fttp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
-  unit: premises 
+  unit: premises
 - name: premises_passed_with_fttdp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: percentage_of_premises_passed_with_fttdp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
-  unit: premises 
+  unit: premises
 - name: premises_connected_with_fttdp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: percentage_of_premises_connected_with_fttdp
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
-  unit: premises   
+  unit: premises
 - name: percentage_of_premises_with_fttc
-  dims: 
+  dims:
   - national
   - annual
   dtype: int
   unit: premises
 - name: lad_premises_with_fttp
-  dims: 
+  dims:
   - lad_uk_2016
   - annual
   dtype: int
   unit: premises
 - name: lad_premises_with_fttdp
-  dims: 
+  dims:
   - lad_uk_2016
   - annual
   dtype: int
   unit: premises
 - name: lad_premises_with_fttc
-  dims: 
+  dims:
   - lad_uk_2016
   - annual
   dtype: int
   unit: premises
 - name: lad_premises_with_adsl
-  dims: 
+  dims:
   - lad_uk_2016
   - annual
   dtype: int