Merge pull request #564 from EnergySystemsModellingLab/multiple-year-region-for-demand

Refactor tests for demand code

Author: alexdewar

examples/simple/agents.csv

@@ -1,5 +1,5 @@
 id,description,regions,decision_rule,decision_lexico_tolerance
-A0_GEX,Gas extractors,GBR,single,
-A0_GPR,Gas processors,GBR,single,
-A0_ELC,Electricity generators,GBR,single,
-A0_RES,Residential consumer,GBR,single,
+A0_GEX,Gas extractors,all,single,
+A0_GPR,Gas processors,all,single,
+A0_ELC,Electricity generators,all,single,
+A0_RES,Residential consumer,all,single,

examples/simple/commodity_costs.csv

@@ -1,2 +1,2 @@
 commodity_id,regions,years,time_slice,balance_type,value
-CO2EMT,GBR,all,annual,net,0.04
+CO2EMT,all,all,annual,net,0.04

examples/simple/process_parameters.csv

@@ -1,7 +1,7 @@
 process_id,regions,years,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate,capacity_to_activity
-GASDRV,GBR,all,10.0,0.3,2.0,25,0.1,1.0
-GASPRC,GBR,all,7.0,0.21,0.5,25,0.1,1.0
-WNDFRM,GBR,all,1000.0,30.0,0.4,25,0.1,31.54
-GASCGT,GBR,all,700.0,21.0,0.55,30,0.1,31.54
-RGASBR,GBR,all,55.56,1.6668,0.16,15,0.1,1.0
-RELCHP,GBR,all,138.9,4.167,0.17,15,0.1,1.0
+GASDRV,all,all,10.0,0.3,2.0,25,0.1,1.0
+GASPRC,all,all,7.0,0.21,0.5,25,0.1,1.0
+WNDFRM,all,all,1000.0,30.0,0.4,25,0.1,31.54
+GASCGT,all,all,700.0,21.0,0.55,30,0.1,31.54
+RGASBR,all,all,55.56,1.6668,0.16,15,0.1,1.0
+RELCHP,all,all,138.9,4.167,0.17,15,0.1,1.0

examples/simple/processes.csv

@@ -1,7 +1,7 @@
 id,description,regions,start_year,end_year
-GASDRV,Dry gas extraction,GBR,2020,2030
-GASPRC,Gas processing,GBR,2020,2030
-WNDFRM,Wind farm,GBR,2020,2030
-GASCGT,Gas combined cycle turbine,GBR,2020,2030
-RGASBR,Gas boiler,GBR,2020,2030
-RELCHP,Heat pump,GBR,2020,2030
+GASDRV,Dry gas extraction,all,2020,2030
+GASPRC,Gas processing,all,2020,2030
+WNDFRM,Wind farm,all,2020,2030
+GASCGT,Gas combined cycle turbine,all,2020,2030
+RGASBR,Gas boiler,all,2020,2030
+RELCHP,Heat pump,all,2020,2030

src/fixture.rs

@@ -4,12 +4,13 @@ use crate::agent::{
     Agent, AgentCommodityPortionsMap, AgentCostLimitsMap, AgentMap, AgentObjectiveMap,
     AgentSearchSpaceMap, DecisionRule,
 };
+use crate::commodity::CommodityID;
 use crate::process::{
     Process, ProcessEnergyLimitsMap, ProcessFlowsMap, ProcessMap, ProcessParameter,
     ProcessParameterMap,
 };
 use crate::region::RegionID;
-use crate::time_slice::TimeSliceID;
+use crate::time_slice::{TimeSliceID, TimeSliceInfo};
 use indexmap::indexmap;
 use itertools::Itertools;
 use rstest::fixture;
@@ -28,6 +29,11 @@ macro_rules! assert_error {
 }
 pub(crate) use assert_error;
 
+#[fixture]
+pub fn commodity_ids() -> HashSet<CommodityID> {
+    iter::once("commodity1".into()).collect()
+}
+
 #[fixture]
 pub fn region_ids() -> HashSet<RegionID> {
     ["GBR".into(), "USA".into()].into_iter().collect()
@@ -97,3 +103,20 @@ pub fn time_slice() -> TimeSliceID {
         time_of_day: "day".into(),
     }
 }
+
+#[fixture]
+pub fn time_slice_info() -> TimeSliceInfo {
+    TimeSliceInfo {
+        seasons: iter::once("winter".into()).collect(),
+        times_of_day: iter::once("day".into()).collect(),
+        fractions: [(
+            TimeSliceID {
+                season: "winter".into(),
+                time_of_day: "day".into(),
+            },
+            1.0,
+        )]
+        .into_iter()
+        .collect(),
+    }
+}