Merge remote-tracking branch 'origin/main' into move-settings.toml-from-model-dir

alexdewar · alexdewar · commit 24cda2df57bd · 2025-06-23T17:38:18.000+01:00
diff --git a/examples/simple_mc/agent_commodity_portions.csv b/examples/simple_mc/agent_commodity_portions.csv
@@ -0,0 +1,7 @@
+agent_id,commodity_id,years,commodity_portion
+A0_GEX,GASPRD,all,1
+A0_GPR,GASNAT,all,1
+A0_BPD,BIOPRD,all,1
+A0_BPL,BIOPEL,all,1
+A0_ELC,ELCTRI,all,1
+A0_RES,RSHEAT,all,1
diff --git a/examples/simple_mc/agent_cost_limits.csv b/examples/simple_mc/agent_cost_limits.csv
@@ -0,0 +1,5 @@
+agent_id,years,capex_limit,annual_cost_limit
+A0_GEX,all,,
+A0_GPR,all,,
+A0_ELC,all,,
+A0_RES,all,,
diff --git a/examples/simple_mc/agent_objectives.csv b/examples/simple_mc/agent_objectives.csv
@@ -0,0 +1,12 @@
+agent_id,years,objective_type,decision_weight,decision_lexico_order
+A0_GEX,2020,lcox,,
+A0_GEX,2030,lcox,,
+A0_GPR,2020,lcox,,
+A0_GPR,2030,lcox,,
+A0_BPD,2020,lcox,,
+A0_BPD,2030,lcox,,
+A0_BPL,all,lcox,,
+A0_ELC,2020,lcox,,
+A0_ELC,2030,lcox,,
+A0_RES,2020,lcox,,
+A0_RES,2030,lcox,,
diff --git a/examples/simple_mc/agent_search_space.csv b/examples/simple_mc/agent_search_space.csv
@@ -0,0 +1 @@
+agent_id,commodity_id,years,search_space
diff --git a/examples/simple_mc/agents.csv b/examples/simple_mc/agents.csv
@@ -0,0 +1,7 @@
+id,description,regions,decision_rule,decision_lexico_tolerance
+A0_GEX,Gas extractors,all,single,
+A0_GPR,Gas processors,all,single,
+A0_BPD,Biomass producer,all,single,
+A0_BPL,Biomass pelletiser,all,single,
+A0_ELC,Electricity generators,all,single,
+A0_RES,Residential consumer,all,single,
diff --git a/examples/simple_mc/assets.csv b/examples/simple_mc/assets.csv
@@ -0,0 +1,7 @@
+process_id,region_id,agent_id,capacity,commission_year
+GASDRV,GBR,A0_GEX,4002.26,2020
+GASPRC,GBR,A0_GPR,3782.13,2020
+WNDFRM,GBR,A0_ELC,3.964844,2020
+GASCGT,GBR,A0_ELC,2.43,2020
+RGASBR,GBR,A0_RES,2900.0,2020
+RELCHP,GBR,A0_RES,399.98,2020
diff --git a/examples/simple_mc/commodities.csv b/examples/simple_mc/commodities.csv
@@ -0,0 +1,8 @@
+id,description,type,time_slice_level
+GASPRD,Gas produced,sed,season
+GASNAT,Natural gas,sed,season
+BIOPRD,Biomass produced,sed,season
+BIOPEL,Biomass pellets,sed,season
+ELCTRI,Electricity,sed,daynight
+RSHEAT,Residential heating,svd,daynight
+CO2EMT,CO2 emitted,oth,annual
diff --git a/examples/simple_mc/commodity_levies.csv b/examples/simple_mc/commodity_levies.csv
@@ -0,0 +1,2 @@
+commodity_id,regions,years,time_slice,balance_type,value
+CO2EMT,all,all,annual,net,0.04
diff --git a/examples/simple_mc/demand.csv b/examples/simple_mc/demand.csv
@@ -0,0 +1,3 @@
+commodity_id,region_id,year,demand
+RSHEAT,GBR,2020,927.38
+RSHEAT,GBR,2030,927.38
diff --git a/examples/simple_mc/demand_slicing.csv b/examples/simple_mc/demand_slicing.csv
@@ -0,0 +1,17 @@
+commodity_id,region_id,time_slice,fraction
+RSHEAT,GBR,winter.night,0.065498087
+RSHEAT,GBR,winter.day,0.226148097
+RSHEAT,GBR,winter.peak,0.111199678
+RSHEAT,GBR,winter.evening,0.076688397
+RSHEAT,GBR,peak.night,0.045882959
+RSHEAT,GBR,peak.day,0.121987853
+RSHEAT,GBR,peak.peak,0.068135438
+RSHEAT,GBR,peak.evening,0.041334529
+RSHEAT,GBR,summer.night,0.005698366
+RSHEAT,GBR,summer.day,0.009494171
+RSHEAT,GBR,summer.peak,0.003126411
+RSHEAT,GBR,summer.evening,0.002327863
+RSHEAT,GBR,autumn.night,0.037269058
+RSHEAT,GBR,autumn.day,0.098086985
+RSHEAT,GBR,autumn.peak,0.054500569
+RSHEAT,GBR,autumn.evening,0.032621538
diff --git a/examples/simple_mc/model.toml b/examples/simple_mc/model.toml
@@ -0,0 +1,2 @@
+[milestone_years]
+years = [2020, 2030]
diff --git a/examples/simple_mc/process_availabilities.csv b/examples/simple_mc/process_availabilities.csv
@@ -0,0 +1,25 @@
+process_id,regions,years,time_slice,limit_type,value
+GASDRV,all,all,annual,up,0.9
+GASPRC,all,all,annual,up,0.9
+BIOPRO,all,all,annual,up,1.0
+BIOPLL,all,all,annual,up,0.95
+GASCGT,all,all,annual,up,0.9
+RGASBR,all,all,annual,up,1.0
+RELCHP,all,all,annual,up,1.0
+RBIOBL,all,all,annual,up,1.0
+WNDFRM,all,all,winter.night,up,0.486418015
+WNDFRM,all,all,winter.day,up,0.543166784
+WNDFRM,all,all,winter.peak,up,0.504433498
+WNDFRM,all,all,winter.evening,up,0.493173821
+WNDFRM,all,all,peak.night,up,0.312697296
+WNDFRM,all,all,peak.day,up,0.489120338
+WNDFRM,all,all,peak.peak,up,0.454890922
+WNDFRM,all,all,peak.evening,up,0.331034483
+WNDFRM,all,all,summer.night,up,0.17951141
+WNDFRM,all,all,summer.day,up,0.349950739
+WNDFRM,all,all,summer.peak,up,0.342294159
+WNDFRM,all,all,summer.evening,up,0.202674173
+WNDFRM,all,all,autumn.night,up,0.3513019
+WNDFRM,all,all,autumn.day,up,0.460745954
+WNDFRM,all,all,autumn.peak,up,0.396340605
+WNDFRM,all,all,autumn.evening,up,0.364813512
diff --git a/examples/simple_mc/process_flows.csv b/examples/simple_mc/process_flows.csv
@@ -0,0 +1,20 @@
+process_id,commodity_id,regions,years,coeff,type,cost
+GASDRV,GASPRD,all,all,1.0,fixed,
+GASPRC,GASPRD,all,all,-1.05,fixed,
+GASPRC,GASNAT,all,all,1.0,fixed,
+BIOPRO,BIOPRD,all,all,1.0,fixed,
+BIOPLL,BIOPRD,all,all,-1.05,fixed,
+BIOPLL,BIOPEL,all,all,1.0,fixed,
+WNDFRM,ELCTRI,all,all,1.0,fixed,
+GASCGT,GASNAT,all,all,-1.5,fixed,
+GASCGT,ELCTRI,all,all,1.0,fixed,
+RGASBR,GASNAT,all,all,-1.15,fixed,
+RGASBR,RSHEAT,all,all,1.0,fixed,
+RELCHP,ELCTRI,all,all,-0.33,fixed,
+RELCHP,RSHEAT,all,all,1.0,fixed,
+GASDRV,CO2EMT,all,all,5.113,fixed,
+GASPRC,CO2EMT,all,all,2.5565,fixed,
+GASCGT,CO2EMT,all,all,76.695,fixed,
+RGASBR,CO2EMT,all,all,58.7995,fixed,
+RBIOBL,BIOPEL,all,all,-1.2,fixed,
+RBIOBL,RSHEAT,all,all,1,fixed,
diff --git a/examples/simple_mc/process_parameters.csv b/examples/simple_mc/process_parameters.csv
@@ -0,0 +1,10 @@
+process_id,regions,years,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate,capacity_to_activity
+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
+BIOPRO,all,all,1.0,0.2,0.25,20,0.09,1.0
+BIOPLL,all,all,2.0,0.22,0.26,20,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
+RBIOBL,all,all,60,1.05,0.2,20,0.1,1.0
diff --git a/examples/simple_mc/processes.csv b/examples/simple_mc/processes.csv
@@ -0,0 +1,10 @@
+id,description,regions,start_year,end_year
+GASDRV,Dry gas extraction,all,2020,2030
+GASPRC,Gas processing,all,2020,2030
+BIOPRO,Biomass production,all,2020,2030
+BIOPLL,Biomass pelletiser,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
+RBIOBL,Biomass boiler,all,2020,2030
diff --git a/examples/simple_mc/regions.csv b/examples/simple_mc/regions.csv
@@ -0,0 +1,2 @@
+id,description
+GBR,United Kingdom
diff --git a/examples/simple_mc/settings.toml b/examples/simple_mc/settings.toml
@@ -0,0 +1,3 @@
+# Modify this file if you want to change your program settings
+# log_level = "info"
+# debug_model = false
diff --git a/examples/simple_mc/time_slices.csv b/examples/simple_mc/time_slices.csv
@@ -0,0 +1,17 @@
+season,time_of_day,fraction
+winter,night,0.072916667
+winter,day,0.104166667
+winter,peak,0.03125
+winter,evening,0.041666667
+peak,night,0.072916667
+peak,day,0.104166667
+peak,peak,0.03125
+peak,evening,0.041666667
+summer,night,0.072916667
+summer,day,0.104166667
+summer,peak,0.03125
+summer,evening,0.041666667
+autumn,night,0.072916667
+autumn,day,0.104166667
+autumn,peak,0.03125
+autumn,evening,0.041666667
diff --git a/src/units.rs b/src/units.rs
@@ -27,9 +27,9 @@ macro_rules! base_unit_struct {
             }
         }
         impl std::ops::Div<$name> for $name {
-            type Output = $name;
-            fn div(self, rhs: $name) -> $name {
-                $name(self.0 / rhs.0)
+            type Output = Dimensionless;
+            fn div(self, rhs: $name) -> Dimensionless {
+                Dimensionless(self.0 / rhs.0)
             }
         }
         impl std::iter::Sum for $name {
@@ -60,19 +60,19 @@ macro_rules! base_unit_struct {
         }
         impl $name {
             /// Returns the underlying f64 value.
-            pub fn value(self) -> f64 {
+            pub fn value(&self) -> f64 {
                 self.0
             }
             /// Returns true if the value is a normal number.
-            pub fn is_normal(self) -> bool {
+            pub fn is_normal(&self) -> bool {
                 self.0.is_normal()
             }
             /// Returns true if the value is finite.
-            pub fn is_finite(self) -> bool {
+            pub fn is_finite(&self) -> bool {
                 self.0.is_finite()
             }
             /// Returns the absolute value of this unit.
-            pub fn abs(self) -> Self {
+            pub fn abs(&self) -> Self {
                 $name(self.0.abs())
             }
         }
diff --git a/tests/data/simple_mc/assets.csv b/tests/data/simple_mc/assets.csv
@@ -0,0 +1,7 @@
+milestone_year,asset_id,process_id,region_id,agent_id,commission_year
+2020,0,GASDRV,GBR,A0_GEX,2020
+2020,1,GASPRC,GBR,A0_GPR,2020
+2020,2,WNDFRM,GBR,A0_ELC,2020
+2020,3,GASCGT,GBR,A0_ELC,2020
+2020,4,RGASBR,GBR,A0_RES,2020
+2020,5,RELCHP,GBR,A0_RES,2020
diff --git a/tests/data/simple_mc/commodity_flows.csv b/tests/data/simple_mc/commodity_flows.csv
diff --git a/tests/data/simple_mc/commodity_prices.csv b/tests/data/simple_mc/commodity_prices.csv
diff --git a/tests/data/simple_mc/debug_activity_duals.csv b/tests/data/simple_mc/debug_activity_duals.csv
diff --git a/tests/data/simple_mc/debug_commodity_balance_duals.csv b/tests/data/simple_mc/debug_commodity_balance_duals.csv
diff --git a/tests/regression_simple_mc.rs b/tests/regression_simple_mc.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+agent_id,commodity_id,years,search_space`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+commodity_id,regions,years,time_slice,balance_type,value`
	`2`	`+CO2EMT,all,all,annual,net,0.04`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+commodity_id,region_id,year,demand`
	`2`	`+RSHEAT,GBR,2020,927.38`
	`3`	`+RSHEAT,GBR,2030,927.38`