From 10317a2f8ca3533134be53025effcc9a01d41434 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 17 Dec 2025 16:45:48 +0000
Subject: [PATCH 1/3] Fix bug with activity limits

---
 src/graph/validate.rs | 11 ++---------
 src/process.rs        | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/graph/validate.rs b/src/graph/validate.rs
index 8dcbaabf4..10f92c562 100644
--- a/src/graph/validate.rs
+++ b/src/graph/validate.rs
@@ -23,7 +23,6 @@ fn prepare_commodities_graph_for_validation(
     base_graph: &CommoditiesGraph,
     processes: &ProcessMap,
     commodities: &CommodityMap,
-    time_slice_info: &TimeSliceInfo,
     region_id: &RegionID,
     year: u32,
     time_slice_selection: &TimeSliceSelection,
@@ -42,7 +41,7 @@ fn prepare_commodities_graph_for_validation(
         let process = &processes[process_id];
 
         // Check if the process has availability > 0 in any time slice in the selection
-        can_be_active(process, &key, time_slice_selection, time_slice_info)
+        can_be_active(process, &key, time_slice_selection)
     });
 
     // Add demand edges
@@ -80,7 +79,6 @@ fn can_be_active(
     process: &Process,
     target: &(RegionID, u32),
     time_slice_selection: &TimeSliceSelection,
-    time_slice_info: &TimeSliceInfo,
 ) -> bool {
     let (target_region, target_year) = target;
 
@@ -92,11 +90,7 @@ fn can_be_active(
             let Some(limits_map) = process.activity_limits.get(target) else {
                 continue;
             };
-            if limits_map
-                .get_limit(time_slice_selection, time_slice_info)
-                .end()
-                > &Dimensionless(0.0)
-            {
+            if limits_map.get_limit(time_slice_selection).end() > &Dimensionless(0.0) {
                 return true;
             }
         }
@@ -220,7 +214,6 @@ pub fn validate_commodity_graphs_for_model(
                     base_graph,
                     processes,
                     commodities,
-                    time_slice_info,
                     region_id,
                     *year,
                     &ts_selection,
diff --git a/src/process.rs b/src/process.rs
index c07b29575..fa67d1645 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -3,7 +3,7 @@
 use crate::commodity::{Commodity, CommodityID};
 use crate::id::define_id_type;
 use crate::region::RegionID;
-use crate::time_slice::{Season, TimeSliceID, TimeSliceInfo, TimeSliceLevel, TimeSliceSelection};
+use crate::time_slice::{Season, TimeSliceID, TimeSliceInfo, TimeSliceSelection};
 use crate::units::{
     ActivityPerCapacity, Dimensionless, FlowPerActivity, MoneyPerActivity, MoneyPerCapacity,
     MoneyPerCapacityPerYear, MoneyPerFlow,
@@ -243,7 +243,7 @@ impl ActivityLimits {
     /// Add an annual limit
     fn add_annual_limit(&mut self, limit: RangeInclusive<Dimensionless>) -> Result<()> {
         // Get current limit for the year
-        let current_limit = self.get_limit_for_year(&TimeSliceInfo::default());
+        let current_limit = self.get_limit_for_year();
 
         // Ensure that the new limit overlaps with the current limit
         // If not, it's impossible to satisfy both limits, so we must exit with an error
@@ -266,12 +266,11 @@ impl ActivityLimits {
     pub fn get_limit(
         &self,
         time_slice_selection: &TimeSliceSelection,
-        time_slice_info: &TimeSliceInfo,
     ) -> RangeInclusive<Dimensionless> {
         match time_slice_selection {
             TimeSliceSelection::Single(ts_id) => self.get_limit_for_time_slice(ts_id),
             TimeSliceSelection::Season(season) => self.get_limit_for_season(season),
-            TimeSliceSelection::Annual => self.get_limit_for_year(time_slice_info),
+            TimeSliceSelection::Annual => self.get_limit_for_year(),
         }
     }
 
@@ -325,14 +324,16 @@ impl ActivityLimits {
     }
 
     /// Get the limit for the entire year
-    fn get_limit_for_year(&self, time_slice_info: &TimeSliceInfo) -> RangeInclusive<Dimensionless> {
+    fn get_limit_for_year(&self) -> RangeInclusive<Dimensionless> {
         // Get the sum of limits for all seasons
         let mut total_lower = Dimensionless(0.0);
         let mut total_upper = Dimensionless(0.0);
-        for ts_selection in time_slice_info.iter_selections_at_level(TimeSliceLevel::Season) {
-            let TimeSliceSelection::Season(season) = ts_selection else {
-                panic!("Expected season selection")
-            };
+        let seasons = self
+            .time_slice_limits
+            .keys()
+            .map(|ts_id| ts_id.season.clone())
+            .unique();
+        for season in seasons {
             let season_limit = self.get_limit_for_season(&season);
             total_lower += *season_limit.start();
             total_upper += *season_limit.end();
@@ -990,7 +991,7 @@ mod tests {
         }
 
         // Annual limit should be 0..1
-        let annual_limit = limits.get_limit(&TimeSliceSelection::Annual, &time_slice_info2);
+        let annual_limit = limits.get_limit(&TimeSliceSelection::Annual);
         assert_approx_eq!(Dimensionless, *annual_limit.start(), Dimensionless(0.0));
         assert_approx_eq!(Dimensionless, *annual_limit.end(), Dimensionless(1.0));
     }
@@ -1014,10 +1015,7 @@ mod tests {
         }
 
         // The seasonal limit should reflect the given bound
-        let season_limit = result.get_limit(
-            &TimeSliceSelection::Season("winter".into()),
-            &time_slice_info2,
-        );
+        let season_limit = result.get_limit(&TimeSliceSelection::Season("winter".into()));
         assert_eq!(*season_limit.end(), Dimensionless(0.01));
     }
 

From a9af416b54964e22522a855dd82c999100ec12fc Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 17 Dec 2025 16:52:15 +0000
Subject: [PATCH 2/3] Update results files

---
 tests/data/missing_commodity/assets.csv       |    4 +-
 .../missing_commodity/commodity_flows.csv     |  294 ++--
 .../missing_commodity/commodity_prices.csv    |   56 +-
 tests/data/simple/commodity_flows.csv         |   18 +-
 tests/data/simple/debug_appraisal_results.csv |   66 +-
 .../debug_appraisal_results_time_slices.csv   |   86 +-
 tests/data/simple/debug_dispatch_assets.csv   |  294 ++--
 tests/data/simple/debug_solver.csv            |   10 +-
 tests/data/two_outputs/assets.csv             |   18 +-
 tests/data/two_outputs/commodity_flows.csv    | 1538 ++++++++---------
 tests/data/two_outputs/commodity_prices.csv   |  236 +--
 11 files changed, 1260 insertions(+), 1360 deletions(-)

diff --git a/tests/data/missing_commodity/assets.csv b/tests/data/missing_commodity/assets.csv
index e0bf88902..d98db12a5 100644
--- a/tests/data/missing_commodity/assets.csv
+++ b/tests/data/missing_commodity/assets.csv
@@ -7,7 +7,7 @@ asset_id,process_id,region_id,agent_id,commission_year,decommission_year,capacit
 5,RELCHP,GBR,A0_RES,2020,2035,399.98
 6,RBIOBL,GBR,A0_RES,2030,,355.83840587648046
 7,BIOPLL,GBR,A0_BPL,2030,,427.00608705177655
-8,BIOPRO,GBR,A0_BPD,2030,,108.68349219309701
+8,BIOPRO,GBR,A0_BPD,2030,,448.35639140436535
 9,RBIOBL,GBR,A0_RES,2040,,3655.8189696
 10,BIOPLL,GBR,A0_BPL,2040,,2167.9571005431867
-11,BIOPRO,GBR,A0_BPD,2040,,2616.027854781616
+11,BIOPRO,GBR,A0_BPD,2040,,2276.354955570347
diff --git a/tests/data/missing_commodity/commodity_flows.csv b/tests/data/missing_commodity/commodity_flows.csv
index fd6ca6025..1ee7776f7 100644
--- a/tests/data/missing_commodity/commodity_flows.csv
+++ b/tests/data/missing_commodity/commodity_flows.csv
@@ -225,8 +225,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,5,RSHEAT,autumn.evening,15.437192051273913
 2030,0,GASPRD,winter.night,0.0
 2030,0,CO2EMT,winter.night,0.0
-2030,0,GASPRD,winter.day,182.9686101428585
-2030,0,CO2EMT,winter.day,935.5185036604356
+2030,0,GASPRD,winter.day,101.58864438130564
+2030,0,CO2EMT,winter.day,519.4227387216158
 2030,0,GASPRD,winter.peak,125.070625
 2030,0,CO2EMT,winter.peak,639.486105625
 2030,0,GASPRD,winter.evening,166.76083466742
@@ -235,32 +235,32 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,0,CO2EMT,peak.night,0.0
 2030,0,GASPRD,peak.day,0.0
 2030,0,CO2EMT,peak.day,0.0
-2030,0,GASPRD,peak.peak,66.12597124472265
-2030,0,CO2EMT,peak.peak,338.10209097426696
-2030,0,GASPRD,peak.evening,166.76083466742
-2030,0,CO2EMT,peak.evening,852.6481476545185
+2030,0,GASPRD,peak.peak,0.0
+2030,0,CO2EMT,peak.peak,0.0
+2030,0,GASPRD,peak.evening,154.5208120245226
+2030,0,CO2EMT,peak.evening,790.0649118813841
 2030,0,GASPRD,summer.night,0.0
 2030,0,CO2EMT,summer.night,0.0
 2030,0,GASPRD,summer.day,0.0
 2030,0,CO2EMT,summer.day,0.0
 2030,0,GASPRD,summer.peak,0.0
 2030,0,CO2EMT,summer.peak,0.0
-2030,0,GASPRD,summer.evening,-0.0
-2030,0,CO2EMT,summer.evening,-0.0
+2030,0,GASPRD,summer.evening,0.0
+2030,0,CO2EMT,summer.evening,0.0
 2030,0,GASPRD,autumn.night,0.0
 2030,0,CO2EMT,autumn.night,0.0
 2030,0,GASPRD,autumn.day,0.0
 2030,0,CO2EMT,autumn.day,0.0
 2030,0,GASPRD,autumn.peak,0.0
 2030,0,CO2EMT,autumn.peak,0.0
-2030,0,GASPRD,autumn.evening,164.21378572301475
-2030,0,CO2EMT,autumn.evening,839.6250864017745
+2030,0,GASPRD,autumn.evening,92.66782577914692
+2030,0,CO2EMT,autumn.evening,473.81059320877824
 2030,1,GASPRD,winter.night,-0.0
 2030,1,GASNAT,winter.night,0.0
 2030,1,CO2EMT,winter.night,0.0
-2030,1,GASPRD,winter.day,-185.23074036153295
-2030,1,GASNAT,winter.day,176.41022891574565
-2030,1,CO2EMT,winter.day,450.99275022310377
+2030,1,GASPRD,winter.day,-103.8507745999801
+2030,1,GASNAT,winter.day,98.90549961902866
+2030,1,CO2EMT,winter.day,252.8519097760468
 2030,1,GASPRD,winter.peak,-124.10114062500001
 2030,1,GASNAT,winter.peak,118.1915625
 2030,1,CO2EMT,winter.peak,302.15672953125005
@@ -273,12 +273,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,1,GASPRD,peak.day,-0.0
 2030,1,GASNAT,peak.day,0.0
 2030,1,CO2EMT,peak.day,0.0
-2030,1,GASPRD,peak.peak,-67.41861708839716
-2030,1,GASNAT,peak.peak,64.20820675085443
-2030,1,CO2EMT,peak.peak,164.14828055855938
-2030,1,GASPRD,peak.evening,-165.4681888237455
-2030,1,GASNAT,peak.evening,157.58875126070998
-2030,1,CO2EMT,peak.evening,402.87564259800513
+2030,1,GASPRD,peak.peak,-0.0
+2030,1,GASNAT,peak.peak,0.0
+2030,1,CO2EMT,peak.peak,0.0
+2030,1,GASPRD,peak.evening,-154.5208120245226
+2030,1,GASNAT,peak.evening,147.16267811859294
+2030,1,CO2EMT,peak.evening,376.2213866101829
 2030,1,GASPRD,summer.night,-0.0
 2030,1,GASNAT,summer.night,0.0
 2030,1,CO2EMT,summer.night,0.0
@@ -288,9 +288,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,1,GASPRD,summer.peak,-0.0
 2030,1,GASNAT,summer.peak,0.0
 2030,1,CO2EMT,summer.peak,0.0
-2030,1,GASPRD,summer.evening,0.0
-2030,1,GASNAT,summer.evening,-0.0
-2030,1,CO2EMT,summer.evening,-0.0
+2030,1,GASPRD,summer.evening,-0.0
+2030,1,GASNAT,summer.evening,0.0
+2030,1,CO2EMT,summer.evening,0.0
 2030,1,GASPRD,autumn.night,-0.0
 2030,1,GASNAT,autumn.night,0.0
 2030,1,CO2EMT,autumn.night,0.0
@@ -300,9 +300,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,1,GASPRD,autumn.peak,-0.0
 2030,1,GASNAT,autumn.peak,0.0
 2030,1,CO2EMT,autumn.peak,0.0
-2030,1,GASPRD,autumn.evening,-164.21378572301475
-2030,1,GASNAT,autumn.evening,156.39408164096642
-2030,1,CO2EMT,autumn.evening,399.82146971513066
+2030,1,GASPRD,autumn.evening,-92.66782577914692
+2030,1,GASNAT,autumn.evening,88.25507217061612
+2030,1,CO2EMT,autumn.evening,225.6240920041801
 2030,2,ELCTRI,winter.night,4.435312795545212
 2030,2,ELCTRI,winter.day,7.075379933645912
 2030,2,ELCTRI,winter.peak,1.9712501261051125
@@ -331,9 +331,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,3,GASNAT,winter.evening,-4.395089526235901
 2030,3,ELCTRI,winter.evening,2.9300596841572673
 2030,3,CO2EMT,winter.evening,224.7209274764416
-2030,3,GASNAT,peak.night,-8.382740663321101
-2030,3,ELCTRI,peak.night,5.5884937755474
-2030,3,CO2EMT,peak.night,428.6095301156078
+2030,3,GASNAT,peak.night,-6.213469739879806
+2030,3,ELCTRI,peak.night,4.142313159919871
+2030,3,CO2EMT,peak.night,317.69470780005446
 2030,3,GASNAT,peak.day,-11.066925767990737
 2030,3,ELCTRI,peak.day,7.3779505119938245
 2030,3,CO2EMT,peak.day,565.8519145173664
@@ -355,9 +355,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,3,GASNAT,summer.evening,-0.0
 2030,3,ELCTRI,summer.evening,0.0
 2030,3,CO2EMT,summer.evening,0.0
-2030,3,GASNAT,autumn.night,-8.382740663321101
-2030,3,ELCTRI,autumn.night,5.5884937755474
-2030,3,CO2EMT,autumn.night,428.6095301156078
+2030,3,GASNAT,autumn.night,-1.304830260188972
+2030,3,ELCTRI,autumn.night,0.8698868401259814
+2030,3,CO2EMT,autumn.night,66.71597120346213
 2030,3,GASNAT,autumn.day,-11.621339862602872
 2030,3,ELCTRI,autumn.day,7.747559908401914
 2030,3,CO2EMT,autumn.day,594.1991071748848
@@ -367,30 +367,30 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,3,GASNAT,autumn.evening,-4.790137538321099
 2030,3,ELCTRI,autumn.evening,3.1934250255473997
 2030,3,CO2EMT,autumn.evening,244.9197323343578
-2030,4,GASNAT,winter.night,-43.845148578709995
-2030,4,RSHEAT,winter.night,38.1262161554
-2030,4,CO2EMT,winter.night,2241.8024468294425
-2030,4,GASNAT,winter.day,-219.27676569358
-2030,4,RSHEAT,winter.day,190.6754484292
-2030,4,CO2EMT,winter.day,11211.621029912745
+2030,4,GASNAT,winter.night,-14.006615449537906
+2030,4,RSHEAT,winter.night,12.179665608293831
+2030,4,CO2EMT,winter.night,716.1582479348732
+2030,4,GASNAT,winter.day,-176.65028985322192
+2030,4,RSHEAT,winter.day,153.60894769845385
+2030,4,CO2EMT,winter.day,9032.129320195238
 2030,4,GASNAT,winter.peak,-104.21874999999999
 2030,4,RSHEAT,winter.peak,90.625
 2030,4,CO2EMT,winter.peak,5328.704687500001
-2030,4,GASNAT,winter.evening,-59.42976552888078
-2030,4,RSHEAT,winter.evening,51.678056981635464
-2030,4,CO2EMT,winter.evening,3038.6439114916748
-2030,4,GASNAT,peak.night,0.0
-2030,4,RSHEAT,peak.night,-0.0
-2030,4,CO2EMT,peak.night,-0.0
-2030,4,GASNAT,peak.day,-96.21279149075198
-2030,4,RSHEAT,peak.day,83.66329694848
-2030,4,CO2EMT,peak.day,4919.3600289221495
-2030,4,GASNAT,peak.peak,-66.12685298630602
-2030,4,RSHEAT,peak.peak,57.50161129244002
-2030,4,CO2EMT,peak.peak,3381.0659931898267
-2030,4,GASNAT,peak.evening,-31.696786742602278
-2030,4,RSHEAT,peak.evening,27.562423254436766
-2030,4,CO2EMT,peak.evening,1620.6567061492547
+2030,4,GASNAT,winter.evening,-54.39004520169392
+2030,4,RSHEAT,winter.evening,47.29569147973385
+2030,4,CO2EMT,winter.evening,2780.96301116261
+2030,4,GASNAT,peak.night,-0.0
+2030,4,RSHEAT,peak.night,0.0
+2030,4,CO2EMT,peak.night,0.0
+2030,4,GASNAT,peak.day,-53.58631565039388
+2030,4,RSHEAT,peak.day,46.59679621773381
+2030,4,CO2EMT,peak.day,2739.868319204639
+2030,4,GASNAT,peak.peak,-53.33891027512
+2030,4,RSHEAT,peak.peak,46.3816611088
+2030,4,CO2EMT,peak.peak,2727.218482366886
+2030,4,GASNAT,peak.evening,-14.646196324616199
+2030,4,RSHEAT,peak.evening,12.735822890970608
+2030,4,CO2EMT,peak.evening,748.8600180776263
 2030,4,GASNAT,summer.night,-0.0
 2030,4,RSHEAT,summer.night,0.0
 2030,4,CO2EMT,summer.night,0.0
@@ -406,15 +406,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,4,GASNAT,autumn.night,-0.0
 2030,4,RSHEAT,autumn.night,0.0
 2030,4,CO2EMT,autumn.night,0.0
-2030,4,GASNAT,autumn.day,-67.97422666003601
-2030,4,RSHEAT,autumn.day,59.10802318264001
-2030,4,CO2EMT,autumn.day,3475.5222091276414
-2030,4,GASNAT,autumn.peak,-50.64779148595636
-2030,4,RSHEAT,autumn.peak,44.0415578138751
-2030,4,CO2EMT,autumn.peak,2589.621578676949
-2030,4,GASNAT,autumn.evening,-9.385242305728973
-2030,4,RSHEAT,autumn.evening,8.16108026585128
-2030,4,CO2EMT,autumn.evening,479.8674390919224
+2030,4,GASNAT,autumn.day,-25.3477508196779
+2030,4,RSHEAT,autumn.day,22.041522451893826
+2030,4,CO2EMT,autumn.day,1296.0304994101311
+2030,4,GASNAT,autumn.peak,-37.85984877477035
+2030,4,RSHEAT,autumn.peak,32.92160763023509
+2030,4,CO2EMT,autumn.peak,1935.774067854008
+2030,4,GASNAT,autumn.evening,-3.7385617900549217
+2030,4,RSHEAT,autumn.evening,3.2509232956999323
+2030,4,CO2EMT,autumn.evening,191.15266432550817
 2030,5,ELCTRI,winter.night,-9.624518793997803
 2030,5,RSHEAT,winter.night,29.165208466660005
 2030,5,ELCTRI,winter.day,-13.749312543997803
@@ -423,8 +423,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,5,RSHEAT,winter.peak,12.499375
 2030,5,ELCTRI,winter.evening,-5.499725043997801
 2030,5,RSHEAT,winter.evening,16.66583346666
-2030,5,ELCTRI,peak.night,-8.439766292831097
-2030,5,RSHEAT,peak.night,25.575049372215442
+2030,5,ELCTRI,peak.night,-6.9935856772035665
+2030,5,RSHEAT,peak.night,21.192683870313836
 2030,5,ELCTRI,peak.day,-13.749312543997803
 2030,5,RSHEAT,peak.day,41.664583466660005
 2030,5,ELCTRI,peak.peak,-4.12479375
@@ -439,30 +439,30 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,5,RSHEAT,summer.peak,3.2120121331800005
 2030,5,ELCTRI,summer.evening,-0.7892279633502001
 2030,5,RSHEAT,summer.evening,2.39159988894
-2030,5,ELCTRI,autumn.night,-8.791775241529585
-2030,5,RSHEAT,autumn.night,26.641743156150255
+2030,5,ELCTRI,autumn.night,-4.073168306108166
+2030,5,RSHEAT,autumn.night,12.342934260933838
 2030,5,ELCTRI,autumn.day,-13.749312543997803
 2030,5,RSHEAT,autumn.day,41.664583466660005
 2030,5,ELCTRI,autumn.peak,-3.9439081325638172
 2030,5,RSHEAT,autumn.peak,11.9512367653449
 2030,5,ELCTRI,autumn.evening,-5.094273376920391
 2030,5,RSHEAT,autumn.evening,15.437192051273913
-2030,6,BIOPEL,winter.night,-0.0
-2030,6,RSHEAT,winter.night,0.0
-2030,6,BIOPEL,winter.day,-0.0
-2030,6,RSHEAT,winter.day,0.0
+2030,6,BIOPEL,winter.night,-31.135860656527402
+2030,6,RSHEAT,winter.night,25.94655054710617
+2030,6,BIOPEL,winter.day,-44.47980087689542
+2030,6,RSHEAT,winter.day,37.066500730746185
 2030,6,BIOPEL,winter.peak,-13.343940220368017
 2030,6,RSHEAT,winter.peak,11.119950183640015
-2030,6,BIOPEL,winter.evening,-12.533081833877455
-2030,6,RSHEAT,winter.evening,10.444234861564546
-2030,6,BIOPEL,peak.night,-25.877022054245472
-2030,6,RSHEAT,peak.night,21.56418504520456
-2030,6,BIOPEL,peak.day,-0.0
-2030,6,RSHEAT,peak.day,0.0
-2030,6,BIOPEL,peak.peak,-0.0
-2030,6,RSHEAT,peak.peak,0.0
-2030,6,BIOPEL,peak.evening,-0.0
-2030,6,RSHEAT,peak.evening,0.0
+2030,6,BIOPEL,winter.evening,-17.791920436159383
+2030,6,RSHEAT,winter.evening,14.826600363466154
+2030,6,BIOPEL,peak.night,-31.135860656527402
+2030,6,RSHEAT,peak.night,25.94655054710617
+2030,6,BIOPEL,peak.day,-44.47980087689542
+2030,6,RSHEAT,peak.day,37.066500730746185
+2030,6,BIOPEL,peak.peak,-13.343940220368017
+2030,6,RSHEAT,peak.peak,11.119950183640015
+2030,6,BIOPEL,peak.evening,-17.791920436159383
+2030,6,RSHEAT,peak.evening,14.826600363466154
 2030,6,BIOPEL,summer.night,-1.0731133525192167
 2030,6,RSHEAT,summer.night,0.8942611270993472
 2030,6,BIOPEL,summer.day,-0.0
@@ -471,28 +471,28 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,6,RSHEAT,summer.peak,0.0
 2030,6,BIOPEL,summer.evening,-0.0
 2030,6,RSHEAT,summer.evening,0.0
-2030,6,BIOPEL,autumn.night,-13.977289982267699
-2030,6,RSHEAT,autumn.night,11.64774165188975
-2030,6,BIOPEL,autumn.day,-0.0
-2030,6,RSHEAT,autumn.day,0.0
-2030,6,BIOPEL,autumn.peak,-0.0
-2030,6,RSHEAT,autumn.peak,0.0
-2030,6,BIOPEL,autumn.evening,-11.899732071977771
-2030,6,RSHEAT,autumn.evening,9.91644339331481
-2030,7,BIOPRD,winter.night,-0.0
-2030,7,BIOPEL,winter.night,0.0
-2030,7,BIOPRD,winter.day,-0.0
-2030,7,BIOPEL,winter.day,0.0
-2030,7,BIOPRD,winter.peak,-8.489356698990392
-2030,7,BIOPEL,winter.peak,8.085101618086087
+2030,6,BIOPEL,autumn.night,-31.135860656527402
+2030,6,RSHEAT,autumn.night,25.94655054710617
+2030,6,BIOPEL,autumn.day,-44.47980087689542
+2030,6,RSHEAT,autumn.day,37.066500730746185
+2030,6,BIOPEL,autumn.peak,-13.343940220368017
+2030,6,RSHEAT,autumn.peak,11.119950183640015
+2030,6,BIOPEL,autumn.evening,-17.791920436159383
+2030,6,RSHEAT,autumn.evening,14.826600363466154
+2030,7,BIOPRD,winter.night,-32.69265368935377
+2030,7,BIOPEL,winter.night,31.135860656527395
+2030,7,BIOPRD,winter.day,-46.7037909207402
+2030,7,BIOPEL,winter.day,44.479800876895425
+2030,7,BIOPRD,winter.peak,-14.011137231386419
+2030,7,BIOPEL,winter.peak,13.343940220368017
 2030,7,BIOPRD,winter.evening,-18.681516457967355
 2030,7,BIOPEL,winter.evening,17.791920436159383
-2030,7,BIOPRD,peak.night,-0.0
-2030,7,BIOPEL,peak.night,0.0
-2030,7,BIOPRD,peak.day,-0.0
-2030,7,BIOPEL,peak.day,0.0
-2030,7,BIOPRD,peak.peak,-8.489356698990392
-2030,7,BIOPEL,peak.peak,8.085101618086087
+2030,7,BIOPRD,peak.night,-32.69265368935377
+2030,7,BIOPEL,peak.night,31.135860656527395
+2030,7,BIOPRD,peak.day,-46.7037909207402
+2030,7,BIOPEL,peak.day,44.479800876895425
+2030,7,BIOPRD,peak.peak,-14.011137231386419
+2030,7,BIOPEL,peak.peak,13.343940220368017
 2030,7,BIOPRD,peak.evening,-18.681516457967355
 2030,7,BIOPEL,peak.evening,17.791920436159383
 2030,7,BIOPRD,summer.night,-0.0
@@ -503,30 +503,30 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,7,BIOPEL,summer.peak,0.0
 2030,7,BIOPRD,summer.evening,-1.1267690201451777
 2030,7,BIOPEL,summer.evening,1.0731133525192167
-2030,7,BIOPRD,autumn.night,-0.0
-2030,7,BIOPEL,autumn.night,0.0
-2030,7,BIOPRD,autumn.day,-0.0
-2030,7,BIOPEL,autumn.day,0.0
-2030,7,BIOPRD,autumn.peak,-8.489356698990392
-2030,7,BIOPEL,autumn.peak,8.085101618086087
+2030,7,BIOPRD,autumn.night,-32.69265368935377
+2030,7,BIOPEL,autumn.night,31.135860656527395
+2030,7,BIOPRD,autumn.day,-46.7037909207402
+2030,7,BIOPEL,autumn.day,44.479800876895425
+2030,7,BIOPRD,autumn.peak,-14.011137231386419
+2030,7,BIOPEL,autumn.peak,13.343940220368017
 2030,7,BIOPRD,autumn.evening,-18.681516457967355
 2030,7,BIOPEL,autumn.evening,17.791920436159383
-2030,8,BIOPRD,winter.night,7.924838008641155
-2030,8,BIOPRD,winter.day,11.321197139675437
-2030,8,BIOPRD,winter.peak,3.3963591310342816
-2030,8,BIOPRD,winter.evening,4.528478877606872
-2030,8,BIOPRD,peak.night,7.924838008641155
-2030,8,BIOPRD,peak.day,11.321197139675437
-2030,8,BIOPRD,peak.peak,3.3963591310342816
-2030,8,BIOPRD,peak.evening,4.528478877606872
+2030,8,BIOPRD,winter.night,32.692653689353776
+2030,8,BIOPRD,winter.day,46.70379092074019
+2030,8,BIOPRD,winter.peak,14.011137231386417
+2030,8,BIOPRD,winter.evening,18.68151645796735
+2030,8,BIOPRD,peak.night,32.692653689353776
+2030,8,BIOPRD,peak.day,46.70379092074019
+2030,8,BIOPRD,peak.peak,14.011137231386417
+2030,8,BIOPRD,peak.evening,18.68151645796735
 2030,8,BIOPRD,summer.night,0.0
 2030,8,BIOPRD,summer.day,0.0
 2030,8,BIOPRD,summer.peak,0.0
 2030,8,BIOPRD,summer.evening,1.1267690201451777
-2030,8,BIOPRD,autumn.night,7.924838008641155
-2030,8,BIOPRD,autumn.day,11.321197139675437
-2030,8,BIOPRD,autumn.peak,3.3963591310342816
-2030,8,BIOPRD,autumn.evening,4.528478877606872
+2030,8,BIOPRD,autumn.night,32.692653689353776
+2030,8,BIOPRD,autumn.day,46.70379092074019
+2030,8,BIOPRD,autumn.peak,14.011137231386417
+2030,8,BIOPRD,autumn.evening,18.68151645796735
 2040,6,BIOPEL,winter.night,-31.135860656527402
 2040,6,RSHEAT,winter.night,25.94655054710617
 2040,6,BIOPEL,winter.day,-44.47980087689542
@@ -567,22 +567,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,7,BIOPEL,winter.peak,13.343940220368017
 2040,7,BIOPRD,winter.evening,-18.681516457967355
 2040,7,BIOPEL,winter.evening,17.791920436159383
-2040,7,BIOPRD,peak.night,-0.0
-2040,7,BIOPEL,peak.night,0.0
-2040,7,BIOPRD,peak.day,-0.0
-2040,7,BIOPEL,peak.day,0.0
-2040,7,BIOPRD,peak.peak,-0.0
-2040,7,BIOPEL,peak.peak,0.0
-2040,7,BIOPRD,peak.evening,-0.0
-2040,7,BIOPEL,peak.evening,0.0
+2040,7,BIOPRD,peak.night,-32.692653689353776
+2040,7,BIOPEL,peak.night,31.135860656527406
+2040,7,BIOPRD,peak.day,-46.7037909207402
+2040,7,BIOPEL,peak.day,44.479800876895425
+2040,7,BIOPRD,peak.peak,-14.011137231386419
+2040,7,BIOPEL,peak.peak,13.343940220368017
+2040,7,BIOPRD,peak.evening,-18.681516457967355
+2040,7,BIOPEL,peak.evening,17.791920436159383
 2040,7,BIOPRD,summer.night,-0.0
 2040,7,BIOPEL,summer.night,0.0
 2040,7,BIOPRD,summer.day,-0.0
 2040,7,BIOPEL,summer.day,0.0
-2040,7,BIOPRD,summer.peak,-0.0
-2040,7,BIOPEL,summer.peak,0.0
-2040,7,BIOPRD,summer.evening,-0.0
-2040,7,BIOPEL,summer.evening,0.0
+2040,7,BIOPRD,summer.peak,-10.647253791359448
+2040,7,BIOPEL,summer.peak,10.140241706056617
+2040,7,BIOPRD,summer.evening,-18.681516457967355
+2040,7,BIOPEL,summer.evening,17.791920436159383
 2040,7,BIOPRD,autumn.night,-0.0
 2040,7,BIOPEL,autumn.night,0.0
 2040,7,BIOPRD,autumn.day,-0.0
@@ -591,10 +591,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,7,BIOPEL,autumn.peak,0.0
 2040,7,BIOPRD,autumn.evening,-0.0
 2040,7,BIOPEL,autumn.evening,0.0
-2040,8,BIOPRD,winter.night,7.924838008640879
-2040,8,BIOPRD,winter.day,11.321197139675437
-2040,8,BIOPRD,winter.peak,3.3963591310342816
-2040,8,BIOPRD,winter.evening,4.528478877606872
+2040,8,BIOPRD,winter.night,32.692653689353605
+2040,8,BIOPRD,winter.day,46.70379092074019
+2040,8,BIOPRD,winter.peak,14.011137231386417
+2040,8,BIOPRD,winter.evening,18.68151645796735
 2040,8,BIOPRD,peak.night,0.0
 2040,8,BIOPRD,peak.day,0.0
 2040,8,BIOPRD,peak.peak,0.0
@@ -649,8 +649,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,10,BIOPEL,winter.evening,90.33154657861847
 2040,10,BIOPRD,peak.night,-0.0
 2040,10,BIOPEL,peak.night,0.0
-2040,10,BIOPRD,peak.day,-227.9780274914425
-2040,10,BIOPEL,peak.day,217.12193094423094
+2040,10,BIOPRD,peak.day,-115.88892919199479
+2040,10,BIOPEL,peak.day,110.37040875428075
 2040,10,BIOPRD,peak.peak,-71.13609236157332
 2040,10,BIOPEL,peak.peak,67.74865939197458
 2040,10,BIOPRD,peak.evening,-94.8481239075494
@@ -661,8 +661,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,10,BIOPEL,summer.day,0.0
 2040,10,BIOPRD,summer.peak,-0.0
 2040,10,BIOPEL,summer.peak,0.0
-2040,10,BIOPRD,summer.evening,-29.3287702493268
-2040,10,BIOPEL,summer.evening,27.932162142216
+2040,10,BIOPRD,summer.evening,-0.0
+2040,10,BIOPEL,summer.evening,0.0
 2040,10,BIOPRD,autumn.night,-0.0
 2040,10,BIOPEL,autumn.night,0.0
 2040,10,BIOPRD,autumn.day,-150.04572883209727
@@ -671,19 +671,19 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,10,BIOPEL,autumn.peak,67.74865939197458
 2040,10,BIOPRD,autumn.evening,-94.8481239075494
 2040,10,BIOPEL,autumn.evening,90.33154657861847
-2040,11,BIOPRD,winter.night,190.75203194983547
-2040,11,BIOPRD,winter.day,272.50290241176094
-2040,11,BIOPRD,winter.peak,81.7508704619255
-2040,11,BIOPRD,winter.evening,109.00116148790995
+2040,11,BIOPRD,winter.night,165.9842162691228
+2040,11,BIOPRD,winter.day,237.12030863069614
+2040,11,BIOPRD,winter.peak,71.13609236157335
+2040,11,BIOPRD,winter.evening,94.84812390754944
 2040,11,BIOPRD,peak.night,0.0
-2040,11,BIOPRD,peak.day,203.2102118107298
-2040,11,BIOPRD,peak.peak,81.7508704619255
-2040,11,BIOPRD,peak.evening,109.00116148790995
+2040,11,BIOPRD,peak.day,227.97802749144245
+2040,11,BIOPRD,peak.peak,71.13609236157335
+2040,11,BIOPRD,peak.evening,94.84812390754944
 2040,11,BIOPRD,summer.night,0.0
 2040,11,BIOPRD,summer.day,0.0
 2040,11,BIOPRD,summer.peak,0.0
 2040,11,BIOPRD,summer.evening,29.3287702493268
 2040,11,BIOPRD,autumn.night,0.0
-2040,11,BIOPRD,autumn.day,125.27791315138455
-2040,11,BIOPRD,autumn.peak,81.7508704619255
-2040,11,BIOPRD,autumn.evening,109.00116148790995
+2040,11,BIOPRD,autumn.day,150.0457288320972
+2040,11,BIOPRD,autumn.peak,71.13609236157335
+2040,11,BIOPRD,autumn.evening,94.84812390754944
diff --git a/tests/data/missing_commodity/commodity_prices.csv b/tests/data/missing_commodity/commodity_prices.csv
index 4185d7c4d..f794a9c28 100644
--- a/tests/data/missing_commodity/commodity_prices.csv
+++ b/tests/data/missing_commodity/commodity_prices.csv
@@ -95,14 +95,14 @@ milestone_year,commodity_id,region_id,time_slice,price
 2020,RSHEAT,GBR,winter.evening,5.8665369
 2020,RSHEAT,GBR,winter.night,5.8665369
 2020,RSHEAT,GBR,winter.peak,5.8665369
-2030,BIOPEL,GBR,autumn.day,4.7221140833333335
-2030,BIOPEL,GBR,autumn.evening,4.7221140833333335
-2030,BIOPEL,GBR,autumn.night,4.7221140833333335
-2030,BIOPEL,GBR,autumn.peak,4.7221140833333335
-2030,BIOPEL,GBR,peak.day,4.7221140833333335
-2030,BIOPEL,GBR,peak.evening,4.7221140833333335
-2030,BIOPEL,GBR,peak.night,4.7221140833333335
-2030,BIOPEL,GBR,peak.peak,4.7221140833333335
+2030,BIOPEL,GBR,autumn.day,2.173159975
+2030,BIOPEL,GBR,autumn.evening,2.173159975
+2030,BIOPEL,GBR,autumn.night,2.173159975
+2030,BIOPEL,GBR,autumn.peak,2.173159975
+2030,BIOPEL,GBR,peak.day,2.173159975
+2030,BIOPEL,GBR,peak.evening,2.173159975
+2030,BIOPEL,GBR,peak.night,2.173159975
+2030,BIOPEL,GBR,peak.peak,2.173159975
 2030,BIOPEL,GBR,summer.day,0.5225
 2030,BIOPEL,GBR,summer.evening,0.5225
 2030,BIOPEL,GBR,summer.night,0.5225
@@ -111,14 +111,14 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,BIOPEL,GBR,winter.evening,4.7221140833333335
 2030,BIOPEL,GBR,winter.night,4.7221140833333335
 2030,BIOPEL,GBR,winter.peak,4.7221140833333335
-2030,BIOPRD,GBR,autumn.day,4.249632460317461
-2030,BIOPRD,GBR,autumn.evening,4.249632460317461
-2030,BIOPRD,GBR,autumn.night,4.249632460317461
-2030,BIOPRD,GBR,autumn.peak,4.249632460317461
-2030,BIOPRD,GBR,peak.day,4.249632460317461
-2030,BIOPRD,GBR,peak.evening,4.249632460317461
-2030,BIOPRD,GBR,peak.night,4.249632460317461
-2030,BIOPRD,GBR,peak.peak,4.249632460317461
+2030,BIOPRD,GBR,autumn.day,1.822057119047619
+2030,BIOPRD,GBR,autumn.evening,1.822057119047619
+2030,BIOPRD,GBR,autumn.night,1.822057119047619
+2030,BIOPRD,GBR,autumn.peak,1.822057119047619
+2030,BIOPRD,GBR,peak.day,1.822057119047619
+2030,BIOPRD,GBR,peak.evening,1.822057119047619
+2030,BIOPRD,GBR,peak.night,1.822057119047619
+2030,BIOPRD,GBR,peak.peak,1.822057119047619
 2030,BIOPRD,GBR,summer.day,0.25
 2030,BIOPRD,GBR,summer.evening,0.25
 2030,BIOPRD,GBR,summer.night,0.25
@@ -129,11 +129,11 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,BIOPRD,GBR,winter.peak,4.249632460317461
 2030,ELCTRI,GBR,autumn.day,7.993308999999999
 2030,ELCTRI,GBR,autumn.evening,17.26223303030303
-2030,ELCTRI,GBR,autumn.night,17.26223303030303
+2030,ELCTRI,GBR,autumn.night,7.993308999999999
 2030,ELCTRI,GBR,autumn.peak,17.26223303030303
 2030,ELCTRI,GBR,peak.day,7.993308999999999
 2030,ELCTRI,GBR,peak.evening,17.26223303030303
-2030,ELCTRI,GBR,peak.night,17.26223303030303
+2030,ELCTRI,GBR,peak.night,7.993308999999999
 2030,ELCTRI,GBR,peak.peak,7.993308999999999
 2030,ELCTRI,GBR,summer.day,0.4
 2030,ELCTRI,GBR,summer.evening,0.4
@@ -151,10 +151,10 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,GASNAT,GBR,peak.evening,2.9170059999999998
 2030,GASNAT,GBR,peak.night,2.9170059999999998
 2030,GASNAT,GBR,peak.peak,2.9170059999999998
-2030,GASNAT,GBR,summer.day,2.9170059999999998
-2030,GASNAT,GBR,summer.evening,2.9170059999999998
-2030,GASNAT,GBR,summer.night,2.9170059999999998
-2030,GASNAT,GBR,summer.peak,2.9170059999999998
+2030,GASNAT,GBR,summer.day,-0.0
+2030,GASNAT,GBR,summer.evening,-0.0
+2030,GASNAT,GBR,summer.night,-0.0
+2030,GASNAT,GBR,summer.peak,-0.0
 2030,GASNAT,GBR,winter.day,2.9170059999999998
 2030,GASNAT,GBR,winter.evening,2.9170059999999998
 2030,GASNAT,GBR,winter.night,2.9170059999999998
@@ -167,21 +167,21 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,GASPRD,GBR,peak.evening,2.20452
 2030,GASPRD,GBR,peak.night,2.20452
 2030,GASPRD,GBR,peak.peak,2.20452
-2030,GASPRD,GBR,summer.day,2.20452
-2030,GASPRD,GBR,summer.evening,2.20452
-2030,GASPRD,GBR,summer.night,2.20452
-2030,GASPRD,GBR,summer.peak,2.20452
+2030,GASPRD,GBR,summer.day,-0.0
+2030,GASPRD,GBR,summer.evening,-0.0
+2030,GASPRD,GBR,summer.night,-0.0
+2030,GASPRD,GBR,summer.peak,-0.0
 2030,GASPRD,GBR,winter.day,2.20452
 2030,GASPRD,GBR,winter.evening,2.20452
 2030,GASPRD,GBR,winter.night,2.20452
 2030,GASPRD,GBR,winter.peak,2.20452
 2030,RSHEAT,GBR,autumn.day,5.8665369
 2030,RSHEAT,GBR,autumn.evening,5.8665369
-2030,RSHEAT,GBR,autumn.night,5.8665369
+2030,RSHEAT,GBR,autumn.night,2.80779197
 2030,RSHEAT,GBR,autumn.peak,5.8665369
 2030,RSHEAT,GBR,peak.day,5.8665369
 2030,RSHEAT,GBR,peak.evening,5.8665369
-2030,RSHEAT,GBR,peak.night,5.8665369
+2030,RSHEAT,GBR,peak.night,2.80779197
 2030,RSHEAT,GBR,peak.peak,5.8665369
 2030,RSHEAT,GBR,summer.day,0.30200000000000005
 2030,RSHEAT,GBR,summer.evening,0.30200000000000005
diff --git a/tests/data/simple/commodity_flows.csv b/tests/data/simple/commodity_flows.csv
index 151e5864c..857d689e5 100644
--- a/tests/data/simple/commodity_flows.csv
+++ b/tests/data/simple/commodity_flows.csv
@@ -530,15 +530,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,1,GASPRD,winter.night,-289.5693294487456
 2040,1,GASNAT,winter.night,275.78031376071004
 2040,1,CO2EMT,winter.night,705.0323721292552
-2040,1,GASPRD,winter.day,-363.2261000417942
-2040,1,GASNAT,winter.day,345.929619087423
-2040,1,CO2EMT,winter.day,884.3690711969971
-2040,1,GASPRD,winter.peak,-0.0
-2040,1,GASNAT,winter.peak,0.0
-2040,1,CO2EMT,winter.peak,0.0
-2040,1,GASPRD,winter.evening,-0.0
-2040,1,GASNAT,winter.evening,0.0
-2040,1,CO2EMT,winter.evening,0.0
+2040,1,GASPRD,winter.day,-73.65677059304869
+2040,1,GASNAT,winter.day,70.14930532671303
+2040,1,CO2EMT,winter.day,179.33669906774188
+2040,1,GASPRD,winter.peak,-124.10114062500001
+2040,1,GASNAT,winter.peak,118.1915625
+2040,1,CO2EMT,winter.peak,302.15672953125005
+2040,1,GASPRD,winter.evening,-165.4681888237455
+2040,1,GASNAT,winter.evening,157.58875126070998
+2040,1,CO2EMT,winter.evening,402.87564259800513
 2040,1,GASPRD,peak.night,-0.0
 2040,1,GASNAT,peak.night,0.0
 2040,1,CO2EMT,peak.night,0.0
diff --git a/tests/data/simple/debug_appraisal_results.csv b/tests/data/simple/debug_appraisal_results.csv
index 276860476..aad542270 100644
--- a/tests/data/simple/debug_appraisal_results.csv
+++ b/tests/data/simple/debug_appraisal_results.csv
@@ -1,75 +1,75 @@
 milestone_year,run_description,asset_id,process_id,region_id,capacity,capacity_coefficient,metric
 2030,ironing out iteration 0; RSHEAT A0_RES round 0,4,RGASBR,GBR,2900.0,1.6668,10.682146961463904
 2030,ironing out iteration 0; RSHEAT A0_RES round 0,5,RELCHP,GBR,399.98,4.167,8.868981739360816
-2030,ironing out iteration 0; RSHEAT A0_RES round 0,,RGASBR,GBR,365.58184058764806,8.9714830438624,16.969542701647153
+2030,ironing out iteration 0; RSHEAT A0_RES round 0,,RGASBR,GBR,365.58184058764806,8.971483043862397,16.969542701647153
 2030,ironing out iteration 0; RSHEAT A0_RES round 0,,RELCHP,GBR,365.58184058764806,22.428707609655994,31.420829628529706
 2030,ironing out iteration 0; RSHEAT A0_RES round 1,4,RGASBR,GBR,2900.0,1.6668,12.82090004166788
-2030,ironing out iteration 0; RSHEAT A0_RES round 1,,RGASBR,GBR,365.58184058764806,8.9714830438624,19.093146917636513
+2030,ironing out iteration 0; RSHEAT A0_RES round 1,,RGASBR,GBR,365.58184058764806,8.971483043862397,19.09314691763651
 2030,ironing out iteration 0; RSHEAT A0_RES round 1,,RELCHP,GBR,365.58184058764806,22.428707609655994,36.72529006707172
-2030,ironing out iteration 0; RSHEAT A0_RES round 2,,RGASBR,GBR,355.83840587648046,8.9714830438624,292.9539943035968
+2030,ironing out iteration 0; RSHEAT A0_RES round 2,,RGASBR,GBR,355.83840587648046,8.971483043862397,292.9539943035967
 2030,ironing out iteration 0; RSHEAT A0_RES round 2,,RELCHP,GBR,355.83840587648046,22.428707609655994,720.5264354789919
 2030,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,3.964844,30.0,3.622816172114028
 2030,ironing out iteration 0; ELCTRI A0_ELC round 0,3,GASCGT,GBR,2.43,21.0,9.13946477915499
-2030,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,0.9199903183260988,140.16807219002084,14.726493327952324
+2030,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,0.9199903183260988,140.1680721900208,14.726493327952321
 2030,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,0.41849524413443256,95.25547377684373,12.076889630723867
 2030,ironing out iteration 0; ELCTRI A0_ELC round 1,3,GASCGT,GBR,2.43,21.0,9.46329962713631
-2030,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,0.9199903183260988,140.16807219002084,18.057159947743795
+2030,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,0.9199903183260988,140.1680721900208,18.05715994774379
 2030,ironing out iteration 0; ELCTRI A0_ELC round 1,,GASCGT,GBR,0.41849524413443256,95.25547377684373,13.892715957895085
 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,3782.13,0.21,3.7003598973069334
-2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,1526.365937531011,0.9811765053301458,4.547513312061563
+2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,1526.365937531011,0.9811765053301457,4.547513312061563
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,4002.26,0.3,3.467751035720352
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,1602.6842344075617,1.4016807219002085,4.846428429429666
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,1602.6842344075617,1.401680721900208,4.846428429429664
 2040,ironing out iteration 0; RSHEAT A0_RES round 0,6,RGASBR,GBR,355.83840587648046,1.6668,7.910651988850701
-2040,ironing out iteration 0; RSHEAT A0_RES round 0,,RGASBR,GBR,401.16573754764806,8.9714830438624,16.96954270164715
+2040,ironing out iteration 0; RSHEAT A0_RES round 0,,RGASBR,GBR,401.16573754764806,8.971483043862397,16.96954270164715
 2040,ironing out iteration 0; RSHEAT A0_RES round 0,,RELCHP,GBR,401.16573754764806,22.428707609655994,31.420829628529702
-2040,ironing out iteration 0; RSHEAT A0_RES round 1,,RGASBR,GBR,401.16573754764806,8.9714830438624,18.52936492459862
+2040,ironing out iteration 0; RSHEAT A0_RES round 1,,RGASBR,GBR,401.16573754764806,8.971483043862397,18.52936492459862
 2040,ironing out iteration 0; RSHEAT A0_RES round 1,,RELCHP,GBR,401.16573754764806,22.428707609655994,35.40994098367106
-2040,ironing out iteration 0; RSHEAT A0_RES round 2,,RGASBR,GBR,401.16573754764806,8.9714830438624,23.122931761022492
+2040,ironing out iteration 0; RSHEAT A0_RES round 2,,RGASBR,GBR,401.16573754764806,8.971483043862397,23.122931761022492
 2040,ironing out iteration 0; RSHEAT A0_RES round 2,,RELCHP,GBR,401.16573754764806,22.428707609655994,46.43024711665223
-2040,ironing out iteration 0; RSHEAT A0_RES round 3,,RGASBR,GBR,401.16573754764806,8.9714830438624,37.7175111265432
+2040,ironing out iteration 0; RSHEAT A0_RES round 3,,RGASBR,GBR,401.16573754764806,8.971483043862397,37.717511126543194
 2040,ironing out iteration 0; RSHEAT A0_RES round 3,,RELCHP,GBR,401.16573754764806,22.428707609655994,82.77458059208567
-2040,ironing out iteration 0; RSHEAT A0_RES round 4,,RGASBR,GBR,401.16573754764806,8.9714830438624,43.312726891923226
+2040,ironing out iteration 0; RSHEAT A0_RES round 4,,RGASBR,GBR,401.16573754764806,8.971483043862397,43.31272689192322
 2040,ironing out iteration 0; RSHEAT A0_RES round 4,,RELCHP,GBR,401.16573754764806,22.428707609655994,96.82223367869788
-2040,ironing out iteration 0; RSHEAT A0_RES round 5,,RGASBR,GBR,401.16573754764806,8.9714830438624,55.98733471331224
+2040,ironing out iteration 0; RSHEAT A0_RES round 5,,RGASBR,GBR,401.16573754764806,8.971483043862397,55.98733471331223
 2040,ironing out iteration 0; RSHEAT A0_RES round 5,,RELCHP,GBR,401.16573754764806,22.428707609655994,128.11733391280117
-2040,ironing out iteration 0; RSHEAT A0_RES round 6,,RGASBR,GBR,401.16573754764806,8.9714830438624,152.78630430986536
+2040,ironing out iteration 0; RSHEAT A0_RES round 6,,RGASBR,GBR,401.16573754764806,8.971483043862397,152.78630430986536
 2040,ironing out iteration 0; RSHEAT A0_RES round 6,,RELCHP,GBR,401.16573754764806,22.428707609655994,370.1072104946634
-2040,ironing out iteration 0; RSHEAT A0_RES round 7,,RGASBR,GBR,401.16573754764806,8.9714830438624,292.95399430359674
+2040,ironing out iteration 0; RSHEAT A0_RES round 7,,RGASBR,GBR,401.16573754764806,8.971483043862397,292.95399430359674
 2040,ironing out iteration 0; RSHEAT A0_RES round 7,,RELCHP,GBR,401.16573754764806,22.428707609655994,720.5264354789919
-2040,ironing out iteration 0; RSHEAT A0_RES round 8,,RGASBR,GBR,401.16573754764806,8.9714830438624,292.95399430359674
+2040,ironing out iteration 0; RSHEAT A0_RES round 8,,RGASBR,GBR,401.16573754764806,8.971483043862397,292.95399430359674
 2040,ironing out iteration 0; RSHEAT A0_RES round 8,,RELCHP,GBR,401.16573754764806,22.428707609655994,720.5264354789919
-2040,ironing out iteration 0; RSHEAT A0_RES round 9,,RGASBR,GBR,401.16573754764806,8.9714830438624,292.95399430359674
+2040,ironing out iteration 0; RSHEAT A0_RES round 9,,RGASBR,GBR,401.16573754764806,8.971483043862397,292.95399430359674
 2040,ironing out iteration 0; RSHEAT A0_RES round 9,,RELCHP,GBR,401.16573754764806,22.428707609655994,720.5264354789919
-2040,ironing out iteration 0; RSHEAT A0_RES round 10,,RGASBR,GBR,45.327331671168054,8.9714830438624,292.9539943035968
+2040,ironing out iteration 0; RSHEAT A0_RES round 10,,RGASBR,GBR,45.327331671168054,8.971483043862397,292.95399430359674
 2040,ironing out iteration 0; RSHEAT A0_RES round 10,,RELCHP,GBR,45.327331671168054,22.428707609655994,720.5264354789919
 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,3782.13,0.21,3.5296209362039472
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,1989.471785114026,0.9811765053301458,4.582348555785227
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,1989.471785114026,0.9811765053301457,4.582348555785228
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,4002.26,0.3,3.086521021442066
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,2088.9453743697272,1.4016807219002085,4.583580793978898
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,2088.9453743697272,1.401680721900208,4.583580793978898
 2040,ironing out iteration 1; RSHEAT A0_RES round 0,6,RGASBR,GBR,355.83840587648046,1.6668,7.910651988850701
-2040,ironing out iteration 1; RSHEAT A0_RES round 0,,RGASBR,GBR,401.16573754764806,8.9714830438624,16.96954270164715
+2040,ironing out iteration 1; RSHEAT A0_RES round 0,,RGASBR,GBR,401.16573754764806,8.971483043862397,16.96954270164715
 2040,ironing out iteration 1; RSHEAT A0_RES round 0,,RELCHP,GBR,401.16573754764806,22.428707609655994,28.05951450411788
-2040,ironing out iteration 1; RSHEAT A0_RES round 1,,RGASBR,GBR,401.16573754764806,8.9714830438624,18.52936492459862
+2040,ironing out iteration 1; RSHEAT A0_RES round 1,,RGASBR,GBR,401.16573754764806,8.971483043862397,18.52936492459862
 2040,ironing out iteration 1; RSHEAT A0_RES round 1,,RELCHP,GBR,401.16573754764806,22.428707609655994,31.95907006149655
-2040,ironing out iteration 1; RSHEAT A0_RES round 2,,RGASBR,GBR,401.16573754764806,8.9714830438624,23.122931761022492
+2040,ironing out iteration 1; RSHEAT A0_RES round 2,,RGASBR,GBR,401.16573754764806,8.971483043862397,23.122931761022492
 2040,ironing out iteration 1; RSHEAT A0_RES round 2,,RELCHP,GBR,401.16573754764806,22.428707609655994,43.44298715255623
-2040,ironing out iteration 1; RSHEAT A0_RES round 3,,RGASBR,GBR,401.16573754764806,8.9714830438624,37.7175111265432
+2040,ironing out iteration 1; RSHEAT A0_RES round 3,,RGASBR,GBR,401.16573754764806,8.971483043862397,37.717511126543194
 2040,ironing out iteration 1; RSHEAT A0_RES round 3,,RELCHP,GBR,401.16573754764806,22.428707609655994,79.929435566358
-2040,ironing out iteration 1; RSHEAT A0_RES round 4,,RGASBR,GBR,401.16573754764806,8.9714830438624,43.312726891923226
+2040,ironing out iteration 1; RSHEAT A0_RES round 4,,RGASBR,GBR,401.16573754764806,8.971483043862397,43.31272689192322
 2040,ironing out iteration 1; RSHEAT A0_RES round 4,,RELCHP,GBR,401.16573754764806,22.428707609655994,93.91747497980806
-2040,ironing out iteration 1; RSHEAT A0_RES round 5,,RGASBR,GBR,401.16573754764806,8.9714830438624,55.98733471331224
+2040,ironing out iteration 1; RSHEAT A0_RES round 5,,RGASBR,GBR,401.16573754764806,8.971483043862397,55.98733471331223
 2040,ironing out iteration 1; RSHEAT A0_RES round 5,,RELCHP,GBR,401.16573754764806,22.428707609655994,125.60399453328056
-2040,ironing out iteration 1; RSHEAT A0_RES round 6,,RGASBR,GBR,401.16573754764806,8.9714830438624,152.78630430986536
+2040,ironing out iteration 1; RSHEAT A0_RES round 6,,RGASBR,GBR,401.16573754764806,8.971483043862397,152.78630430986536
 2040,ironing out iteration 1; RSHEAT A0_RES round 6,,RELCHP,GBR,401.16573754764806,22.428707609655994,367.6014185246633
-2040,ironing out iteration 1; RSHEAT A0_RES round 7,,RGASBR,GBR,401.16573754764806,8.9714830438624,292.95399430359674
+2040,ironing out iteration 1; RSHEAT A0_RES round 7,,RGASBR,GBR,401.16573754764806,8.971483043862397,292.95399430359674
 2040,ironing out iteration 1; RSHEAT A0_RES round 7,,RELCHP,GBR,401.16573754764806,22.428707609655994,718.0206435089918
-2040,ironing out iteration 1; RSHEAT A0_RES round 8,,RGASBR,GBR,401.16573754764806,8.9714830438624,292.95399430359674
+2040,ironing out iteration 1; RSHEAT A0_RES round 8,,RGASBR,GBR,401.16573754764806,8.971483043862397,292.95399430359674
 2040,ironing out iteration 1; RSHEAT A0_RES round 8,,RELCHP,GBR,401.16573754764806,22.428707609655994,718.0206435089918
-2040,ironing out iteration 1; RSHEAT A0_RES round 9,,RGASBR,GBR,401.16573754764806,8.9714830438624,292.95399430359674
+2040,ironing out iteration 1; RSHEAT A0_RES round 9,,RGASBR,GBR,401.16573754764806,8.971483043862397,292.95399430359674
 2040,ironing out iteration 1; RSHEAT A0_RES round 9,,RELCHP,GBR,401.16573754764806,22.428707609655994,718.0206435089918
-2040,ironing out iteration 1; RSHEAT A0_RES round 10,,RGASBR,GBR,45.327331671168054,8.9714830438624,292.9539943035968
+2040,ironing out iteration 1; RSHEAT A0_RES round 10,,RGASBR,GBR,45.327331671168054,8.971483043862397,292.95399430359674
 2040,ironing out iteration 1; RSHEAT A0_RES round 10,,RELCHP,GBR,45.327331671168054,22.428707609655994,718.0206435089917
 2040,ironing out iteration 1; GASNAT A0_GPR round 0,1,GASPRC,GBR,3782.13,0.21,3.5296209362039472
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,1989.471785114026,0.9811765053301458,4.582348555785227
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,1989.471785114026,0.9811765053301457,4.582348555785228
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,4002.26,0.3,3.086521021442066
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,2088.9453743697272,1.4016807219002085,4.583580793978898
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,2088.9453743697272,1.401680721900208,4.583580793978898
diff --git a/tests/data/simple/debug_appraisal_results_time_slices.csv b/tests/data/simple/debug_appraisal_results_time_slices.csv
index 5657abf1c..667e5779a 100644
--- a/tests/data/simple/debug_appraisal_results_time_slices.csv
+++ b/tests/data/simple/debug_appraisal_results_time_slices.csv
@@ -280,13 +280,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.peak,47.698935547844094,2.9170059999999998,69.64757580857723,0.0
 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.evening,63.59858123924744,2.9170059999999998,53.6263462029441,0.0
 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.night,0.0,2.9170059999999998,0.44265925791417715,0.0
-2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,0.0,2.9170059999999998,0.0,0.0
+2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,0.44265925791417715,2.9170059999999998,0.0,0.0
 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.peak,0.0,2.9170059999999998,0.0,0.0
-2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,0.44265925791417715,2.9170059999999998,0.0,0.0
-2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,111.29751678709154,2.9170059999999998,52.415648192567105,0.0
-2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,20.73255863745299,2.9170059999999998,79.59556652263888,0.0
+2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,0.0,2.9170059999999998,0.0,0.0
+2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,36.632204328856346,2.9170059999999998,52.415648192567105,0.0
+2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,158.99645233493564,2.9170059999999998,79.59556652263888,0.0
 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,47.698935547844094,2.9170059999999998,67.98431689110299,0.0
-2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,63.59858123924744,2.9170059999999998,43.332060605327094,0.0
+2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,0.0,2.9170059999999998,43.332060605327094,0.0
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.20452,0.0,0.0
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,209.007363584943,2.20452,211.26949380361748,0.0
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.peak,125.070625,2.20452,124.10114062500001,0.0
@@ -312,13 +312,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.peak,25.200774101334943,2.20452,93.45737053048168,0.0
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.evening,66.7785103012098,2.20452,165.4681888237455,0.0
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.night,0.0,2.20452,0.0,0.0
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,0.0,2.20452,0.0,0.0
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,0.464792220809886,2.20452,0.0,0.0
 2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.peak,0.0,2.20452,0.0,0.0
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,0.464792220809886,2.20452,0.464792220809886,0.0
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,116.86239262644612,2.20452,0.0,0.0
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,0.0,2.20452,0.0,0.0
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,6.611636237443321,2.20452,24.784350341353754,0.0
-2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,66.7785103012098,2.20452,165.4681888237455,0.0
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,0.0,2.20452,0.464792220809886,0.0
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,0.0,2.20452,0.0,0.0
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,166.94627495168243,2.20452,0.0,0.0
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,23.306264213416824,2.20452,24.784350341353754,0.0
+2030,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,0.0,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 0; RSHEAT A0_RES round 0,6,RGASBR,GBR,winter.night,25.94655054710617,5.8665369,73.84123332206,47.894682774953836
 2040,ironing out iteration 0; RSHEAT A0_RES round 0,6,RGASBR,GBR,winter.day,37.066500730746185,5.8665369,254.95484159586002,217.88834086511383
 2040,ironing out iteration 0; RSHEAT A0_RES round 0,6,RGASBR,GBR,winter.peak,11.119950183640015,5.8665369,125.36429298364001,114.2443428
@@ -712,15 +712,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.peak,62.17099328481331,2.9170059999999998,88.336709606306,0.0
 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.evening,82.89465837624168,2.9170059999999998,53.589679499623,0.0
 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.night,0.0,2.9170059999999998,7.3878574402420005,0.0
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,0.0,2.9170059999999998,12.309069277277,0.0
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,26.768322052957004,2.9170059999999998,12.309069277277,0.0
 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.peak,0.0,2.9170059999999998,4.053351218157,0.0
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,26.768322052957004,2.9170059999999998,3.0180441172809997,0.0
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,145.065651661055,2.9170059999999998,48.318849199246,0.0
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,0.0,2.9170059999999998,127.168500921695,0.0
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,60.479719221753314,2.9170059999999998,70.659279201103,0.0
-2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,82.89465837624168,2.9170059999999998,42.293399937006,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.20452,0.0,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,360.9639698231197,2.20452,363.2261000417942,0.0
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,0.0,2.9170059999999998,3.0180441172809997,0.0
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,19.03239102836838,2.9170059999999998,48.318849199246,0.0
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,207.2366449458683,2.9170059999999998,127.168500921695,0.0
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,62.17099328481331,2.9170059999999998,70.659279201103,0.0
+2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,0.0,2.9170059999999998,42.293399937006,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.20452,289.5693294487456,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,360.9639698231197,2.20452,73.65677059304863,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.peak,125.070625,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.evening,166.76083466742,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,peak.night,0.0,2.20452,0.0,0.0
@@ -735,8 +735,8 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.day,302.8620307220025,2.20452,13.292701273257007,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.peak,0.0,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.evening,0.0,2.20452,165.4681888237455,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.night,152.31893424410774,2.20452,0.0,130.55908380916256
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.day,217.59847719316173,2.20452,363.2261000417942,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.night,152.31893424410774,2.20452,289.5693294487456,130.55908380916256
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.day,217.59847719316173,2.20452,73.65677059304863,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.peak,65.27954294905398,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.evening,87.03939129505376,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.night,7.629738833272256,2.20452,0.0,0.0
@@ -744,13 +744,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.peak,65.27954294905398,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.evening,87.03939129505376,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.night,0.0,2.20452,0.0,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,0.0,2.20452,0.0,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,28.106738155604855,2.20452,0.0,0.0
 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.peak,0.0,2.20452,0.0,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,28.106738155604855,2.20452,28.106738155604855,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,152.31893424410774,2.20452,0.0,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,0.0,2.20452,13.292701273257007,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,63.50370518284099,2.20452,124.10114062500001,0.0
-2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,87.03939129505376,2.20452,165.4681888237455,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,0.0,2.20452,28.106738155604855,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,19.984010579786798,2.20452,0.0,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,217.59847719316173,2.20452,13.292701273257007,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,65.27954294905398,2.20452,124.10114062500001,0.0
+2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,0.0,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 1; RSHEAT A0_RES round 0,6,RGASBR,GBR,winter.night,25.94655054710617,5.8665369,73.84123332206,47.894682774953836
 2040,ironing out iteration 1; RSHEAT A0_RES round 0,6,RGASBR,GBR,winter.day,37.066500730746185,5.8665369,254.95484159586002,217.88834086511383
 2040,ironing out iteration 1; RSHEAT A0_RES round 0,6,RGASBR,GBR,winter.peak,11.119950183640015,5.8665369,125.36429298364001,114.2443428
@@ -1144,15 +1144,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.peak,62.17099328481331,2.9170059999999998,88.336709606306,0.0
 2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.evening,82.89465837624168,2.9170059999999998,53.589679499623,0.0
 2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.night,0.0,2.9170059999999998,7.3878574402420005,0.0
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,0.0,2.9170059999999998,12.309069277277,0.0
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,26.768322052957004,2.9170059999999998,12.309069277277,0.0
 2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.peak,0.0,2.9170059999999998,4.053351218157,0.0
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,26.768322052957004,2.9170059999999998,3.0180441172809997,0.0
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,145.065651661055,2.9170059999999998,48.318849199246,0.0
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,0.0,2.9170059999999998,127.168500921695,0.0
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,60.479719221753314,2.9170059999999998,70.659279201103,0.0
-2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,82.89465837624168,2.9170059999999998,42.293399937006,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.20452,0.0,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,360.9639698231197,2.20452,363.2261000417942,0.0
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,0.0,2.9170059999999998,3.0180441172809997,0.0
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,19.03239102836838,2.9170059999999998,48.318849199246,0.0
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,207.2366449458683,2.9170059999999998,127.168500921695,0.0
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,62.17099328481331,2.9170059999999998,70.659279201103,0.0
+2040,ironing out iteration 1; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,0.0,2.9170059999999998,42.293399937006,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.20452,289.5693294487456,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,360.9639698231197,2.20452,73.65677059304863,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.peak,125.070625,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.evening,166.76083466742,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,peak.night,0.0,2.20452,0.0,0.0
@@ -1167,8 +1167,8 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.day,302.8620307220025,2.20452,13.292701273257007,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.peak,0.0,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.evening,0.0,2.20452,165.4681888237455,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.night,152.31893424410774,2.20452,0.0,130.55908380916256
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.day,217.59847719316173,2.20452,363.2261000417942,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.night,152.31893424410774,2.20452,289.5693294487456,130.55908380916256
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.day,217.59847719316173,2.20452,73.65677059304863,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.peak,65.27954294905398,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.evening,87.03939129505376,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.night,7.629738833272256,2.20452,0.0,0.0
@@ -1176,10 +1176,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.peak,65.27954294905398,2.20452,124.10114062500001,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.evening,87.03939129505376,2.20452,165.4681888237455,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.night,0.0,2.20452,0.0,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,0.0,2.20452,0.0,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,28.106738155604855,2.20452,0.0,0.0
 2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.peak,0.0,2.20452,0.0,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,28.106738155604855,2.20452,28.106738155604855,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,152.31893424410774,2.20452,0.0,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,0.0,2.20452,13.292701273257007,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,63.50370518284099,2.20452,124.10114062500001,0.0
-2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,87.03939129505376,2.20452,165.4681888237455,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,0.0,2.20452,28.106738155604855,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,19.984010579786798,2.20452,0.0,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,217.59847719316173,2.20452,13.292701273257007,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,65.27954294905398,2.20452,124.10114062500001,0.0
+2040,ironing out iteration 1; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,0.0,2.20452,165.4681888237455,0.0
diff --git a/tests/data/simple/debug_dispatch_assets.csv b/tests/data/simple/debug_dispatch_assets.csv
index 816f1e4b0..762f6907f 100644
--- a/tests/data/simple/debug_dispatch_assets.csv
+++ b/tests/data/simple/debug_dispatch_assets.csv
@@ -96,33 +96,33 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2020,final without candidates,5,RELCHP,GBR,autumn.peak,11.9512367653449,-0.0,0.0
 2020,final without candidates,5,RELCHP,GBR,autumn.evening,15.437192051273913,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2020,final with candidates,0,GASDRV,GBR,winter.day,151.10292198068424,-0.0,0.0
+2020,final with candidates,0,GASDRV,GBR,winter.day,151.1029469806843,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,peak.day,0.0,-0.0,0.0
-2020,final with candidates,0,GASDRV,GBR,peak.peak,58.67429209279456,-0.0,0.0
+2020,final with candidates,0,GASDRV,GBR,peak.peak,58.67429209279453,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0
-2020,final with candidates,0,GASDRV,GBR,summer.evening,0.168529625841434,-0.0,0.0
+2020,final with candidates,0,GASDRV,GBR,summer.evening,0.16855462584153408,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0
 2020,final with candidates,0,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0
-2020,final with candidates,0,GASDRV,GBR,autumn.evening,163.38645938726435,-0.0,0.0
+2020,final with candidates,0,GASDRV,GBR,autumn.evening,163.38648438726446,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,1,GASPRC,GBR,winter.day,146.06195328510356,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,1,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
-2020,final with candidates,1,GASPRC,GBR,peak.peak,57.11136827282769,-0.0,0.0
+2020,final with candidates,1,GASPRC,GBR,peak.peak,57.11139327282777,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16
-2020,final with candidates,1,GASPRC,GBR,summer.evening,0.1605032150870752,-0.0,0.0
+2020,final with candidates,1,GASPRC,GBR,summer.evening,0.1605032150870753,-0.0,0.0
 2020,final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,1,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16
@@ -145,13 +145,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2020,final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0
 2020,final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0
 2020,final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0
-2020,final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0
-2020,final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0
+2020,final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0
+2020,final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0
 2020,final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0
-2020,final with candidates,3,GASCGT,GBR,peak.day,7.3774647114145555,-0.0,0.0
-2020,final with candidates,3,GASCGT,GBR,peak.peak,2.347006181744309,-0.0,0.0
+2020,final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0
+2020,final with candidates,3,GASCGT,GBR,peak.peak,2.3471047442443087,-0.0,0.0
 2020,final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0
-2020,final with candidates,3,GASCGT,GBR,summer.night,0.10678883089039881,-0.0,0.0
+2020,final with candidates,3,GASCGT,GBR,summer.night,0.10701881005811686,-0.0,0.0
 2020,final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309
 2020,final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309
 2020,final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309
@@ -191,30 +191,30 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2020,final with candidates,5,RELCHP,GBR,autumn.day,41.664583466660005,-3.05874493,0.0
 2020,final with candidates,5,RELCHP,GBR,autumn.peak,11.951650691317264,-0.0,0.0
 2020,final with candidates,5,RELCHP,GBR,autumn.evening,15.437731397467225,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0
 2020,final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
 2020,final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0
 2020,final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0
 2020,final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0
-2020,final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0
+2020,final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0
 2020,final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
 2020,final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0
 2020,final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0
 2020,final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2020,final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2020,final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2020,final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0
-2020,final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0
+2020,final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
+2020,final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
+2020,final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16
+2020,final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16
 2020,final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
 2020,final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0
 2020,final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0
@@ -241,13 +241,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2020,final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0
 2020,final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0
 2020,final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0
-2020,final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0
-2020,final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0
+2020,final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0
+2020,final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0
 2020,final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0
-2020,final with candidates,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0
-2020,final with candidates,,GASCGT,GBR,peak.peak,0.0000985625,-0.0,0.0
+2020,final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0
+2020,final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0
 2020,final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0
-2020,final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0
+2020,final with candidates,,GASCGT,GBR,summer.night,0.0,-0.0,0.0
 2020,final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309
 2020,final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309
 2020,final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309
@@ -799,10 +799,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0
 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0
 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0
-2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0
 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.day,7.3774647114145555,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.peak,2.3470061817443093,-0.0,0.0
@@ -816,17 +816,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.peak,2.39506875,-9.26892403030303,0.0
 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.evening,3.1934250255473997,-9.26892403030303,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
-2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,201.20839307010357,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,201.2083930701036,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
-2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,89.00555785782771,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,89.00558285782782,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16
-2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,0.44257233208707547,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,0.4425973320871755,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16
 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,23.602386596208433,-0.0,0.0
@@ -842,10 +842,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,0.46470219869143425,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,0.4647271986915343,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.peak,23.48986133234436,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234447,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0
@@ -855,26 +855,26 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16
+2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0
@@ -895,10 +895,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0
 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0
 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0
-2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0
-2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0
+2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0
 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0
 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.peak,0.0000985625,-0.0,0.0
@@ -1056,33 +1056,33 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,final without candidates,6,RGASBR,GBR,autumn.peak,0.0,-0.0,0.0
 2030,final without candidates,6,RGASBR,GBR,autumn.evening,0.0,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2030,final with candidates,0,GASDRV,GBR,winter.day,209.00668375493444,-0.0,0.0
+2030,final with candidates,0,GASDRV,GBR,winter.day,209.00670875493444,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,peak.day,0.0,-0.0,0.0
-2030,final with candidates,0,GASDRV,GBR,peak.peak,92.1631911570446,-0.0,0.0
+2030,final with candidates,0,GASDRV,GBR,peak.peak,92.16319115704454,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0
-2030,final with candidates,0,GASDRV,GBR,summer.evening,0.46470219869143425,-0.0,0.0
+2030,final with candidates,0,GASDRV,GBR,summer.evening,0.46472719869153434,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0
-2030,final with candidates,0,GASDRV,GBR,autumn.peak,23.48986133234436,-0.0,0.0
+2030,final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234447,-0.0,0.0
 2030,final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
-2030,final with candidates,1,GASPRC,GBR,winter.day,201.20839307010377,-0.0,0.0
+2030,final with candidates,1,GASPRC,GBR,winter.day,201.20839307010365,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2030,final with candidates,1,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
-2030,final with candidates,1,GASPRC,GBR,peak.peak,89.00555785782768,-0.0,0.0
+2030,final with candidates,1,GASPRC,GBR,peak.peak,89.00558285782776,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16
 2030,final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16
 2030,final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16
-2030,final with candidates,1,GASPRC,GBR,summer.evening,0.44257233208707547,-0.0,0.0
+2030,final with candidates,1,GASPRC,GBR,summer.evening,0.4425723320870756,-0.0,0.0
 2030,final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16
 2030,final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16
 2030,final with candidates,1,GASPRC,GBR,autumn.peak,23.602386596208447,-0.0,0.0
@@ -1105,13 +1105,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0
 2030,final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0
 2030,final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0
-2030,final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0
-2030,final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0
+2030,final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0
+2030,final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0
 2030,final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0
-2030,final with candidates,3,GASCGT,GBR,peak.day,7.3774647114145555,-0.0,0.0
-2030,final with candidates,3,GASCGT,GBR,peak.peak,2.347006181744309,-0.0,0.0
+2030,final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0
+2030,final with candidates,3,GASCGT,GBR,peak.peak,2.3471047442443087,-0.0,0.0
 2030,final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0
-2030,final with candidates,3,GASCGT,GBR,summer.night,0.294834908890399,-0.0,0.0
+2030,final with candidates,3,GASCGT,GBR,summer.night,0.29506488805811704,-0.0,0.0
 2030,final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309
 2030,final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309
 2030,final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309
@@ -1167,30 +1167,30 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,final with candidates,6,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0
 2030,final with candidates,6,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0
 2030,final with candidates,6,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0
 2030,final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
 2030,final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0
 2030,final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0
 2030,final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0
-2030,final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0
+2030,final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0
 2030,final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
 2030,final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0
 2030,final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0
 2030,final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2030,final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2030,final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2030,final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0
-2030,final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0
+2030,final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
+2030,final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
+2030,final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16
+2030,final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16
 2030,final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
 2030,final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0
 2030,final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0
@@ -1217,13 +1217,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2030,final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0
 2030,final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0
 2030,final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0
-2030,final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0
-2030,final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0
+2030,final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0
+2030,final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0
 2030,final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0
-2030,final with candidates,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0
-2030,final with candidates,,GASCGT,GBR,peak.peak,0.0000985625,-0.0,0.0
+2030,final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0
+2030,final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0
 2030,final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0
-2030,final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0
+2030,final with candidates,,GASCGT,GBR,summer.night,0.0,-0.0,0.0
 2030,final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309
 2030,final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309
 2030,final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309
@@ -1327,8 +1327,8 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; post GASNAT|GBR investment,,RGASBR,GBR,autumn.day,73.51480441855382,-0.0,0.0
 2040,ironing out iteration 0; post GASNAT|GBR investment,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0
 2040,ironing out iteration 0; post GASNAT|GBR investment,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0
-2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,winter.day,345.929619087423,-0.0,0.0
+2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
+2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,winter.day,70.14930532671298,-0.0,0.0
 2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; post GASNAT|GBR investment,1,GASPRC,GBR,peak.night,0.0,-0.0,0.0
@@ -1376,9 +1376,9 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; post GASPRD|GBR investment,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
-2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.day,345.92961908742296,-0.0,0.0
-2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.day,70.14930532671298,-0.0,0.0
+2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
+2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,peak.day,83.78840078266302,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
@@ -1392,7 +1392,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 0; post GASPRD|GBR investment,0,GASDRV,GBR,winter.day,360.9639698231197,-0.0,0.0
+2040,ironing out iteration 0; post GASPRD|GBR investment,0,GASDRV,GBR,winter.day,360.9639698231196,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 0; post GASPRD|GBR investment,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
@@ -1440,9 +1440,9 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; final without candidates,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
-2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.day,345.92961908742296,-0.0,0.0
-2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.day,70.14930532671298,-0.0,0.0
+2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
+2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,peak.day,83.78840078266302,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
@@ -1456,7 +1456,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 0; final without candidates,0,GASDRV,GBR,winter.day,360.9639698231197,-0.0,0.0
+2040,ironing out iteration 0; final without candidates,0,GASDRV,GBR,winter.day,360.9639698231196,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 0; final without candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
@@ -1504,11 +1504,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; final with candidates,,RGASBR,GBR,autumn.peak,50.32289817057999,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,RGASBR,GBR,autumn.evening,21.950264980307146,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,345.9295653374228,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,345.9295903374229,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.day,83.78834703266278,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.day,83.78837203266289,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16
@@ -1520,11 +1520,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561935,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561946,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,85.71563541562142,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,85.71566041562158,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0
@@ -1539,10 +1539,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0
@@ -1551,14 +1551,14 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0
-2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16
 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0
@@ -1695,8 +1695,8 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; post GASNAT|GBR investment,,RGASBR,GBR,autumn.day,73.51480441855382,-0.0,0.0
 2040,ironing out iteration 1; post GASNAT|GBR investment,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0
 2040,ironing out iteration 1; post GASNAT|GBR investment,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0
-2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,winter.day,345.929619087423,-0.0,0.0
+2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
+2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,winter.day,70.14930532671298,-0.0,0.0
 2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; post GASNAT|GBR investment,1,GASPRC,GBR,peak.night,0.0,-0.0,0.0
@@ -1744,9 +1744,9 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; post GASPRD|GBR investment,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
-2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.day,345.92961908742296,-0.0,0.0
-2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.day,70.14930532671298,-0.0,0.0
+2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
+2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,peak.day,83.78840078266302,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
@@ -1760,7 +1760,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 1; post GASPRD|GBR investment,0,GASDRV,GBR,winter.day,360.9639698231197,-0.0,0.0
+2040,ironing out iteration 1; post GASPRD|GBR investment,0,GASDRV,GBR,winter.day,360.9639698231196,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 1; post GASPRD|GBR investment,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
@@ -1808,9 +1808,9 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; final without candidates,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
-2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.day,345.92961908742296,-0.0,0.0
-2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.day,70.14930532671298,-0.0,0.0
+2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
+2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,peak.day,83.78840078266302,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
@@ -1824,7 +1824,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 1; final without candidates,0,GASDRV,GBR,winter.day,360.9639698231197,-0.0,0.0
+2040,ironing out iteration 1; final without candidates,0,GASDRV,GBR,winter.day,360.9639698231196,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 1; final without candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
@@ -1872,11 +1872,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; final with candidates,,RGASBR,GBR,autumn.peak,50.32289817057999,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,RGASBR,GBR,autumn.evening,21.950264980307146,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.day,345.9295653374228,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.day,345.9295903374229,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
-2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.day,83.78834703266278,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.day,83.78837203266289,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16
@@ -1888,11 +1888,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561935,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561946,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.day,85.71563541562142,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.day,85.71566041562158,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0
@@ -1907,10 +1907,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0
@@ -1919,14 +1919,14 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0
-2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16
+2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16
 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0
 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0
@@ -2016,9 +2016,9 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity
 2040,final without candidates,0,GASDRV,GBR,autumn.peak,125.070625,-0.0,0.0
 2040,final without candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0
 2040,final without candidates,1,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0
-2040,final without candidates,1,GASPRC,GBR,winter.day,345.929619087423,-0.0,0.0
-2040,final without candidates,1,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16
-2040,final without candidates,1,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16
+2040,final without candidates,1,GASPRC,GBR,winter.day,70.14930532671303,-0.0,0.0
+2040,final without candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0
+2040,final without candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0
 2040,final without candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16
 2040,final without candidates,1,GASPRC,GBR,peak.day,83.78840078266308,-0.0,0.0
 2040,final without candidates,1,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0
diff --git a/tests/data/simple/debug_solver.csv b/tests/data/simple/debug_solver.csv
index 2a6efc6c4..0eb50cc51 100644
--- a/tests/data/simple/debug_solver.csv
+++ b/tests/data/simple/debug_solver.csv
@@ -1,22 +1,22 @@
 milestone_year,run_description,objective_value
 2020,final without candidates,4132.120065800383
-2020,final with candidates,4132.101429603421
+2020,final with candidates,4132.101429603424
 2030,ironing out iteration 0; post RSHEAT|GBR investment,5324.82265531636
 2030,ironing out iteration 0; post ELCTRI|GBR investment,4708.71265302254
 2030,ironing out iteration 0; post GASNAT|GBR investment,4708.712653022539
 2030,ironing out iteration 0; post GASPRD|GBR investment,4708.712653022539
 2030,ironing out iteration 0; final without candidates,4708.712653022539
-2030,ironing out iteration 0; final with candidates,4708.694016825576
+2030,ironing out iteration 0; final with candidates,4708.694016825579
 2030,final without candidates,4708.712653022538
-2030,final with candidates,4708.694016825575
+2030,final with candidates,4708.694016825577
 2040,ironing out iteration 0; post RSHEAT|GBR investment,6613.816363708183
 2040,ironing out iteration 0; post GASNAT|GBR investment,6613.816363708183
 2040,ironing out iteration 0; post GASPRD|GBR investment,6613.816363708185
 2040,ironing out iteration 0; final without candidates,6613.816363708185
-2040,ironing out iteration 0; final with candidates,6613.815807254492
+2040,ironing out iteration 0; final with candidates,6613.815807254493
 2040,ironing out iteration 1; post RSHEAT|GBR investment,6613.816363708183
 2040,ironing out iteration 1; post GASNAT|GBR investment,6613.816363708183
 2040,ironing out iteration 1; post GASPRD|GBR investment,6613.816363708185
 2040,ironing out iteration 1; final without candidates,6613.816363708185
-2040,ironing out iteration 1; final with candidates,6613.815807254492
+2040,ironing out iteration 1; final with candidates,6613.815807254493
 2040,final without candidates,6613.816363708183
diff --git a/tests/data/two_outputs/assets.csv b/tests/data/two_outputs/assets.csv
index 60fe76307..a3172853b 100644
--- a/tests/data/two_outputs/assets.csv
+++ b/tests/data/two_outputs/assets.csv
@@ -1,7 +1,7 @@
 asset_id,process_id,region_id,agent_id,commission_year,decommission_year,capacity
-0,GASDRV,GBR,A0_OAG,2020,2040,4010.2
+0,GASDRV,GBR,A0_OAG,2020,,4010.2
 1,OAGRSV,GBR,A0_OAG,2020,,1738.05
-2,GASPRC,GBR,A0_OAG,2020,2040,3789.64
+2,GASPRC,GBR,A0_OAG,2020,,3789.64
 3,OILREF,GBR,A0_OAG,2020,2030,716.5
 4,OILRF2,GBR,A0_OAG,2020,2030,573.9
 5,WNDFRM,GBR,A0_ELC,2020,,3.964844
@@ -14,15 +14,11 @@ asset_id,process_id,region_id,agent_id,commission_year,decommission_year,capacit
 12,RELCHP,GBR,A0_RES,2020,2035,399.98
 13,THYBCR,GBR,A0_TRA,2030,2040,777.3007440837425
 14,RBIOBL,GBR,A0_RES,2030,,355.83840587648046
-15,GASCGT,GBR,A0_ELC,2030,,20.438653637505244
-16,OILRF2,GBR,A0_REF,2030,,573.2592977069628
+15,GASCGT,GBR,A0_ELC,2030,,20.929725052317597
+16,OILRF2,GBR,A0_REF,2030,,756.7022737069626
 17,BIOPLL,GBR,A0_BPL,2030,,427.00608705177655
-18,BIOPRO,GBR,A0_BPD,2030,,90.58909042947406
+18,BIOPRO,GBR,A0_BPD,2030,,448.35639140436535
 19,THYBCR,GBR,A0_TRA,2040,,912.8939641298439
 20,RBIOBL,GBR,A0_RES,2040,,3655.8189696
-21,GASCGT,GBR,A0_ELC,2040,,0.48812757810420004
-22,GASPRC,GBR,A0_OAG,2040,,811.3008312921271
-23,OILRF2,GBR,A0_REF,2040,,99.99999960000015
-24,BIOPLL,GBR,A0_BPL,2040,,2167.9571005431867
-25,GASDRV,GBR,A0_OAG,2040,,851.8658728567336
-26,BIOPRO,GBR,A0_BPD,2040,,2634.1222565452385
+21,BIOPLL,GBR,A0_BPL,2040,,2167.9571005431867
+22,BIOPRO,GBR,A0_BPD,2040,,2276.354955570347
diff --git a/tests/data/two_outputs/commodity_flows.csv b/tests/data/two_outputs/commodity_flows.csv
index 715e7a6bf..d2043ae06 100644
--- a/tests/data/two_outputs/commodity_flows.csv
+++ b/tests/data/two_outputs/commodity_flows.csv
@@ -1,8 +1,8 @@
 milestone_year,asset_id,commodity_id,time_slice,flow
 2020,0,GASPRD,winter.night,0.0
 2020,0,CO2EMT,winter.night,0.0
-2020,0,GASPRD,winter.day,123.0490207287616
-2020,0,CO2EMT,winter.day,629.1496429861581
+2020,0,GASPRD,winter.day,131.83463743981306
+2020,0,CO2EMT,winter.day,674.0705012297642
 2020,0,GASPRD,winter.peak,125.31875
 2020,0,CO2EMT,winter.peak,640.75476875
 2020,0,GASPRD,winter.evening,167.09166800339997
@@ -11,8 +11,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,0,CO2EMT,peak.night,0.0
 2020,0,GASPRD,peak.day,0.0
 2020,0,CO2EMT,peak.day,0.0
-2020,0,GASPRD,peak.peak,22.74310423725649
-2020,0,CO2EMT,peak.peak,116.28549196509243
+2020,0,GASPRD,peak.peak,42.4969248120197
+2020,0,CO2EMT,peak.peak,217.28677656385673
 2020,0,GASPRD,peak.evening,167.09166800339997
 2020,0,CO2EMT,peak.evening,854.3396985013842
 2020,0,GASPRD,summer.night,0.0
@@ -29,11 +29,11 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,0,CO2EMT,autumn.day,0.0
 2020,0,GASPRD,autumn.peak,0.0
 2020,0,CO2EMT,autumn.peak,0.0
-2020,0,GASPRD,autumn.evening,127.7777035845995
-2020,0,CO2EMT,autumn.evening,653.3273984280572
-2020,1,OILCRD,winter.night,72.50741635009152
-2020,1,GASPRD,winter.night,7.2507416350091525
-2020,1,CO2EMT,winter.night,531.6968840952211
+2020,0,GASPRD,autumn.evening,149.14402336788473
+2020,0,CO2EMT,autumn.evening,762.5733914799947
+2020,1,OILCRD,winter.night,69.32038713667626
+2020,1,GASPRD,winter.night,6.932038713667627
+2020,1,CO2EMT,winter.night,508.326398873247
 2020,1,OILCRD,winter.day,181.04687557935
 2020,1,GASPRD,winter.day,18.104687557935
 2020,1,CO2EMT,winter.day,1327.6167386233735
@@ -43,9 +43,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,1,OILCRD,winter.evening,72.41875057934999
 2020,1,GASPRD,winter.evening,7.241875057934999
 2020,1,CO2EMT,winter.evening,531.0466979983735
-2020,1,OILCRD,peak.night,78.02252794070938
-2020,1,GASPRD,peak.night,7.802252794070938
-2020,1,CO2EMT,peak.night,572.1391973892219
+2020,1,OILCRD,peak.night,67.809007003184
+2020,1,GASPRD,peak.night,6.780900700318401
+2020,1,CO2EMT,peak.night,497.24344835434835
 2020,1,OILCRD,peak.day,181.04687557935
 2020,1,GASPRD,peak.day,18.104687557935
 2020,1,CO2EMT,peak.day,1327.6167386233735
@@ -55,9 +55,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,1,OILCRD,peak.evening,72.41875057934999
 2020,1,GASPRD,peak.evening,7.241875057934999
 2020,1,CO2EMT,peak.evening,531.0466979983735
-2020,1,OILCRD,summer.night,61.71890975387353
-2020,1,GASPRD,summer.night,6.171890975387353
-2020,1,CO2EMT,summer.night,452.5847652251546
+2020,1,OILCRD,summer.night,64.29198655118572
+2020,1,GASPRD,summer.night,6.429198655118572
+2020,1,CO2EMT,summer.night,471.45313737984486
 2020,1,OILCRD,summer.day,181.04687557935
 2020,1,GASPRD,summer.day,18.104687557935
 2020,1,CO2EMT,summer.day,1327.6167386233735
@@ -67,9 +67,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,1,OILCRD,summer.evening,72.41875057934999
 2020,1,GASPRD,summer.evening,7.241875057934999
 2020,1,CO2EMT,summer.evening,531.0466979983735
-2020,1,OILCRD,autumn.night,78.54735525349957
-2020,1,GASPRD,autumn.night,7.854735525349958
-2020,1,CO2EMT,autumn.night,575.9877560739124
+2020,1,OILCRD,autumn.night,67.809007003184
+2020,1,GASPRD,autumn.night,6.780900700318401
+2020,1,CO2EMT,autumn.night,497.24344835434835
 2020,1,OILCRD,autumn.day,181.04687557935
 2020,1,GASPRD,autumn.day,18.104687557935
 2020,1,CO2EMT,autumn.day,1327.6167386233735
@@ -82,9 +82,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,2,GASPRD,winter.night,-0.0
 2020,2,GASNAT,winter.night,0.0
 2020,2,CO2EMT,winter.night,0.0
-2020,2,GASPRD,winter.day,-163.3438354066667
-2020,2,GASNAT,winter.day,155.56555753015874
-2020,2,CO2EMT,winter.day,397.70334782585087
+2020,2,GASPRD,winter.day,-171.81074919637666
+2020,2,GASNAT,winter.day,163.62928494893015
+2020,2,CO2EMT,winter.day,418.31826697194
 2020,2,GASPRD,winter.peak,-124.3475625
 2020,2,GASNAT,winter.peak,118.42625
 2020,2,CO2EMT,winter.peak,302.756708125
@@ -97,9 +97,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,2,GASPRD,peak.day,-0.0
 2020,2,GASNAT,peak.day,0.0
 2020,2,CO2EMT,peak.day,0.0
-2020,2,GASPRD,peak.peak,-62.618242574223416
-2020,2,GASNAT,peak.peak,59.63642149926039
-2020,2,CO2EMT,peak.peak,152.4605115628592
+2020,2,GASPRD,peak.peak,-81.35071105523407
+2020,2,GASNAT,peak.peak,77.47686767165149
+2020,2,CO2EMT,peak.peak,198.06961220257705
 2020,2,GASPRD,peak.evening,-165.796751326374
 2020,2,GASNAT,peak.evening,157.90166792987998
 2020,2,CO2EMT,peak.evening,403.6756140627382
@@ -112,25 +112,25 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,2,GASPRD,summer.peak,-0.0
 2020,2,GASNAT,summer.peak,0.0
 2020,2,CO2EMT,summer.peak,0.0
-2020,2,GASPRD,summer.evening,-15.970065942013894
-2020,2,GASNAT,summer.evening,15.209586611441804
-2020,2,CO2EMT,summer.evening,38.883308172150976
+2020,2,GASPRD,summer.evening,-13.659210763495965
+2020,2,GASNAT,summer.evening,13.008772155710442
+2020,2,CO2EMT,summer.evening,33.25692601607375
 2020,2,GASPRD,autumn.night,-0.0
 2020,2,GASNAT,autumn.night,0.0
 2020,2,CO2EMT,autumn.night,0.0
 2020,2,GASPRD,autumn.day,-0.0
 2020,2,GASNAT,autumn.day,0.0
 2020,2,CO2EMT,autumn.day,0.0
-2020,2,GASPRD,autumn.peak,-0.6136566494454627
-2020,2,GASNAT,autumn.peak,0.584434904233774
-2020,2,CO2EMT,autumn.peak,1.4941078326736432
+2020,2,GASPRD,autumn.peak,-20.90614160769915
+2020,2,GASNAT,autumn.peak,19.910611054951573
+2020,2,CO2EMT,autumn.peak,50.9014771619837
 2020,2,GASPRD,autumn.evening,-165.796751326374
 2020,2,GASNAT,autumn.evening,157.90166792987998
 2020,2,CO2EMT,autumn.evening,403.6756140627382
-2020,3,OILCRD,winter.night,-33.89167282434446
-2020,3,GASOLI,winter.night,13.035258778594024
-2020,3,DIESEL,winter.night,13.035258778594024
-2020,3,CO2EMT,winter.night,573.5253157405798
+2020,3,OILCRD,winter.night,-42.75813053954552
+2020,3,GASOLI,winter.night,16.445434822902122
+2020,3,DIESEL,winter.night,16.445434822902122
+2020,3,CO2EMT,winter.night,723.5662413380476
 2020,3,OILCRD,winter.day,-97.02604197715002
 2020,3,GASOLI,winter.day,37.317708452750004
 2020,3,DIESEL,winter.day,37.317708452750004
@@ -143,10 +143,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,3,GASOLI,winter.evening,14.927083452749999
 2020,3,DIESEL,winter.evening,14.927083452749999
 2020,3,CO2EMT,winter.evening,656.7618177540944
-2020,3,OILCRD,peak.night,-41.92073823587587
-2020,3,GASOLI,peak.night,16.123360859952257
-2020,3,DIESEL,peak.night,16.123360859952257
-2020,3,CO2EMT,peak.night,709.3956311161794
+2020,3,OILCRD,peak.night,-42.75813053954552
+2020,3,GASOLI,peak.night,16.445434822902122
+2020,3,DIESEL,peak.night,16.445434822902122
+2020,3,CO2EMT,peak.night,723.5662413380476
 2020,3,OILCRD,peak.day,-97.02604197715002
 2020,3,GASOLI,peak.day,37.317708452750004
 2020,3,DIESEL,peak.day,37.317708452750004
@@ -159,10 +159,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,3,GASOLI,peak.evening,14.927083452749999
 2020,3,DIESEL,peak.evening,14.927083452749999
 2020,3,CO2EMT,peak.evening,656.7618177540944
-2020,3,OILCRD,summer.night,-27.59567676804398
-2020,3,GASOLI,summer.night,10.61372183386307
-2020,3,DIESEL,summer.night,10.61372183386307
-2020,3,CO2EMT,summer.night,466.9825332463073
+2020,3,OILCRD,summer.night,-35.66956218668087
+2020,3,GASOLI,summer.night,13.719062379492641
+2020,3,DIESEL,summer.night,13.719062379492641
+2020,3,CO2EMT,summer.night,603.6113065729172
 2020,3,OILCRD,summer.day,-97.02604197715002
 2020,3,GASOLI,summer.day,37.317708452750004
 2020,3,DIESEL,summer.day,37.317708452750004
@@ -175,10 +175,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,3,GASOLI,summer.evening,14.927083452749999
 2020,3,DIESEL,summer.evening,14.927083452749999
 2020,3,CO2EMT,summer.evening,656.7618177540944
-2020,3,OILCRD,autumn.night,-39.54028073249722
-2020,3,GASOLI,autumn.night,15.2078002817297
-2020,3,DIESEL,autumn.night,15.2078002817297
-2020,3,CO2EMT,autumn.night,669.1127967955433
+2020,3,OILCRD,autumn.night,-42.75813053954552
+2020,3,GASOLI,autumn.night,16.445434822902122
+2020,3,DIESEL,autumn.night,16.445434822902122
+2020,3,CO2EMT,autumn.night,723.5662413380476
 2020,3,OILCRD,autumn.day,-97.02604197715002
 2020,3,GASOLI,autumn.day,37.317708452750004
 2020,3,DIESEL,autumn.day,37.317708452750004
@@ -191,9 +191,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,3,GASOLI,autumn.evening,14.927083452749999
 2020,3,DIESEL,autumn.evening,14.927083452749999
 2020,3,CO2EMT,autumn.evening,656.7618177540944
-2020,4,OILCRD,winter.night,-48.318316478941014
-2020,4,GASOLI,winter.night,36.884211052626725
-2020,4,CO2EMT,winter.night,811.452643157788
+2020,4,OILCRD,winter.night,-36.26482955032473
+2020,4,GASOLI,winter.night,27.68307599261429
+2020,4,CO2EMT,winter.night,609.0276718375144
 2020,4,OILCRD,winter.day,-78.313437750603
 2020,4,GASOLI,winter.day,59.7812501913
 2020,4,CO2EMT,winter.day,1315.1875042086
@@ -203,9 +203,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,4,OILCRD,winter.evening,-31.325375250603
 2020,4,GASOLI,winter.evening,23.912500191299998
 2020,4,CO2EMT,winter.evening,526.0750042085999
-2020,4,OILCRD,peak.night,-45.80436265802745
-2020,4,GASOLI,peak.night,34.965162334372096
-2020,4,CO2EMT,peak.night,769.2335713561861
+2020,4,OILCRD,peak.night,-34.75344941683244
+2020,4,GASOLI,peak.night,26.52935069987209
+2020,4,CO2EMT,peak.night,583.645715397186
 2020,4,OILCRD,peak.day,-78.313437750603
 2020,4,GASOLI,peak.day,59.7812501913
 2020,4,CO2EMT,peak.day,1315.1875042086
@@ -215,9 +215,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,4,OILCRD,peak.evening,-31.325375250603
 2020,4,GASOLI,peak.evening,23.912500191299998
 2020,4,CO2EMT,peak.evening,526.0750042085999
-2020,4,OILCRD,summer.night,-43.82580593902355
-2020,4,GASOLI,summer.night,33.454813693911106
-2020,4,CO2EMT,summer.night,736.0059012660444
+2020,4,OILCRD,summer.night,-38.32499731769885
+2020,4,GASOLI,summer.night,29.255723143281564
+2020,4,CO2EMT,summer.night,643.6259091521944
 2020,4,OILCRD,summer.day,-78.313437750603
 2020,4,GASOLI,summer.day,59.7812501913
 2020,4,CO2EMT,summer.day,1315.1875042086
@@ -227,9 +227,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,4,OILCRD,summer.evening,-31.325375250603
 2020,4,GASOLI,summer.evening,23.912500191299998
 2020,4,CO2EMT,summer.evening,526.0750042085999
-2020,4,OILCRD,autumn.night,-48.7096474741962
-2020,4,GASOLI,autumn.night,37.18293700320321
-2020,4,CO2EMT,autumn.night,818.0246140704705
+2020,4,OILCRD,autumn.night,-34.75344941683244
+2020,4,GASOLI,autumn.night,26.52935069987209
+2020,4,CO2EMT,autumn.night,583.645715397186
 2020,4,OILCRD,autumn.day,-78.313437750603
 2020,4,GASOLI,autumn.day,59.7812501913
 2020,4,CO2EMT,autumn.day,1315.1875042086
@@ -255,9 +255,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,5,ELCTRI,autumn.day,6.001752635595889
 2020,5,ELCTRI,autumn.peak,1.5488393825638174
 2020,5,ELCTRI,autumn.evening,1.9008483513729915
-2020,6,GASNAT,winter.night,-10.34561285979423
-2020,6,ELCTRI,winter.night,6.89707523986282
-2020,6,CO2EMT,winter.night,528.9711855212789
+2020,6,GASNAT,winter.night,-7.783808997678887
+2020,6,ELCTRI,winter.night,5.189205998452591
+2020,6,CO2EMT,winter.night,397.9861540513214
 2020,6,GASNAT,winter.day,-14.77944692229423
 2020,6,ELCTRI,winter.day,9.85296461486282
 2020,6,CO2EMT,winter.day,755.6731211369039
@@ -267,9 +267,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,6,GASNAT,winter.evening,-5.911778797294229
 2020,6,ELCTRI,winter.evening,3.9411858648628195
 2020,6,CO2EMT,winter.evening,302.2692499056539
-2020,6,GASNAT,peak.night,-10.34561285979423
-2020,6,ELCTRI,peak.night,6.89707523986282
-2020,6,CO2EMT,peak.night,528.9711855212789
+2020,6,GASNAT,peak.night,-10.15986941507116
+2020,6,ELCTRI,peak.night,6.773246276714106
+2020,6,CO2EMT,peak.night,519.4741231925883
 2020,6,GASNAT,peak.day,-14.77944692229423
 2020,6,ELCTRI,peak.day,9.85296461486282
 2020,6,CO2EMT,peak.day,755.6731211369039
@@ -279,9 +279,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,6,GASNAT,peak.evening,-5.911778797294229
 2020,6,ELCTRI,peak.evening,3.9411858648628195
 2020,6,CO2EMT,peak.evening,302.2692499056539
-2020,6,GASNAT,summer.night,-5.590003543272633
-2020,6,ELCTRI,summer.night,3.726669028848422
-2020,6,CO2EMT,summer.night,285.8168811675297
+2020,6,GASNAT,summer.night,-3.389189087541271
+2020,6,ELCTRI,summer.night,2.2594593916941808
+2020,6,CO2EMT,summer.night,173.28923804598517
 2020,6,GASNAT,summer.day,-5.276859587187547
 2020,6,ELCTRI,summer.day,3.517906391458365
 2020,6,CO2EMT,summer.day,269.8058306928993
@@ -291,9 +291,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,6,GASNAT,summer.evening,-2.5870943911617568
 2020,6,ELCTRI,summer.evening,1.724729594107838
 2020,6,CO2EMT,summer.evening,132.27813622010063
-2020,6,GASNAT,autumn.night,-10.34561285979423
-2020,6,ELCTRI,autumn.night,6.89707523986282
-2020,6,CO2EMT,autumn.night,528.9711855212789
+2020,6,GASNAT,autumn.night,-9.631855992023427
+2020,6,ELCTRI,autumn.night,6.421237328015618
+2020,6,CO2EMT,autumn.night,492.47679687215776
 2020,6,GASNAT,autumn.day,-14.77944692229423
 2020,6,ELCTRI,autumn.day,9.85296461486282
 2020,6,CO2EMT,autumn.day,755.6731211369039
@@ -306,27 +306,27 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,7,GASOLI,winter.night,-0.0
 2020,7,TPASKM,winter.night,0.0
 2020,7,CO2EMT,winter.night,0.0
-2020,7,GASOLI,winter.day,-123.88425180810792
-2020,7,TPASKM,winter.day,45.83717316395784
-2020,7,CO2EMT,winter.day,8238.302742970238
-2020,7,GASOLI,winter.peak,-37.39845722829836
-2020,7,TPASKM,winter.peak,13.837429172948276
-2020,7,CO2EMT,winter.peak,2486.9974049968882
-2020,7,GASOLI,winter.evening,-49.95499056791446
-2020,7,TPASKM,winter.evening,18.48334650809518
-2020,7,CO2EMT,winter.evening,3322.0068718513858
+2020,7,GASOLI,winter.day,-120.8157447798665
+2020,7,TPASKM,winter.day,44.701825563633406
+2020,7,CO2EMT,winter.day,8034.247025648383
+2020,7,GASOLI,winter.peak,-37.398448272521826
+2020,7,TPASKM,winter.peak,13.837425859310958
+2020,7,CO2EMT,winter.peak,2486.9968094377487
+2020,7,GASOLI,winter.evening,-48.32629754122805
+2020,7,TPASKM,winter.evening,17.8807300882875
+2020,7,CO2EMT,winter.evening,3213.69878560657
 2020,7,GASOLI,peak.night,-0.0
 2020,7,TPASKM,peak.night,0.0
 2020,7,CO2EMT,peak.night,0.0
-2020,7,GASOLI,peak.day,-124.96881992691871
-2020,7,TPASKM,peak.day,46.23846336787369
-2020,7,CO2EMT,peak.day,8310.42652285129
-2020,7,GASOLI,peak.peak,-37.696713463026995
-2020,7,TPASKM,peak.peak,13.947783979785733
-2020,7,CO2EMT,peak.peak,2506.8314446008803
-2020,7,GASOLI,peak.evening,-50.69003629913671
-2020,7,TPASKM,peak.evening,18.755313428617498
-2020,7,CO2EMT,peak.evening,3370.887412964203
+2020,7,GASOLI,peak.day,-120.8157447798665
+2020,7,TPASKM,peak.day,44.701825563633406
+2020,7,CO2EMT,peak.day,8034.247025648383
+2020,7,GASOLI,peak.peak,-36.244722979779624
+2020,7,TPASKM,peak.peak,13.4105475010433
+2020,7,CO2EMT,peak.peak,2410.274077491523
+2020,7,GASOLI,peak.evening,-48.32629754122805
+2020,7,TPASKM,peak.evening,17.8807300882875
+2020,7,CO2EMT,peak.evening,3213.69878560657
 2020,7,GASOLI,summer.night,-0.0
 2020,7,TPASKM,summer.night,0.0
 2020,7,CO2EMT,summer.night,0.0
@@ -342,18 +342,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,7,GASOLI,autumn.night,-0.0
 2020,7,TPASKM,autumn.night,0.0
 2020,7,CO2EMT,autumn.night,0.0
-2020,7,GASOLI,autumn.day,-125.53821818628423
-2020,7,TPASKM,autumn.day,46.44914072381576
-2020,7,CO2EMT,autumn.day,8348.291507088668
-2020,7,GASOLI,autumn.peak,-38.01752703402869
-2020,7,TPASKM,autumn.peak,14.0664850010433
-2020,7,CO2EMT,autumn.peak,2528.165547066617
-2020,7,GASOLI,autumn.evening,-50.69003629913671
-2020,7,TPASKM,autumn.evening,18.755313428617498
-2020,7,CO2EMT,autumn.evening,3370.887412964203
-2020,8,DIESEL,winter.night,-6.987862929442765
-2020,8,TPASKM,winter.night,3.144538318563698
-2020,8,CO2EMT,winter.night,484.3287796182322
+2020,7,GASOLI,autumn.day,-120.8157447798665
+2020,7,TPASKM,autumn.day,44.701825563633406
+2020,7,CO2EMT,autumn.day,8034.247025648383
+2020,7,GASOLI,autumn.peak,-36.244722979779624
+2020,7,TPASKM,autumn.peak,13.4105475010433
+2020,7,CO2EMT,autumn.peak,2410.274077491523
+2020,7,GASOLI,autumn.evening,-48.32629754122805
+2020,7,TPASKM,autumn.evening,17.8807300882875
+2020,7,CO2EMT,autumn.evening,3213.69878560657
+2020,8,DIESEL,winter.night,-10.398038973750863
+2020,8,TPASKM,winter.night,4.6791175386558
+2020,8,CO2EMT,winter.night,720.6880812387606
 2020,8,DIESEL,winter.day,-40.87500012671251
 2020,8,TPASKM,winter.day,18.393750058860004
 2020,8,CO2EMT,winter.day,2833.0462586569984
@@ -363,9 +363,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,8,DIESEL,winter.evening,-16.350000129165
 2020,8,TPASKM,winter.evening,7.35750005886
 2020,8,CO2EMT,winter.evening,1133.218508902248
-2020,8,DIESEL,peak.night,-10.075965010801001
-2020,8,TPASKM,peak.night,4.5341842553138685
-2020,8,CO2EMT,peak.night,698.3651348676941
+2020,8,DIESEL,peak.night,-10.398038973750863
+2020,8,TPASKM,peak.night,4.6791175386558
+2020,8,CO2EMT,peak.night,720.6880812387606
 2020,8,DIESEL,peak.day,-40.87500012671251
 2020,8,TPASKM,peak.day,18.393750058860004
 2020,8,CO2EMT,peak.day,2833.0462586569984
@@ -375,9 +375,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,8,DIESEL,peak.evening,-16.350000129165
 2020,8,TPASKM,peak.evening,7.35750005886
 2020,8,CO2EMT,peak.evening,1133.218508902248
-2020,8,DIESEL,summer.night,-4.566325984711812
-2020,8,TPASKM,summer.night,2.0548466933258
-2020,8,CO2EMT,summer.night,316.49205398636155
+2020,8,DIESEL,summer.night,-7.671666530341383
+2020,8,TPASKM,summer.night,3.4522499389988472
+2020,8,CO2EMT,summer.night,531.7232071944169
 2020,8,DIESEL,summer.day,-40.87500012671251
 2020,8,TPASKM,summer.day,18.393750058860004
 2020,8,CO2EMT,summer.day,2833.0462586569984
@@ -387,9 +387,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,8,DIESEL,summer.evening,-16.350000129165
 2020,8,TPASKM,summer.evening,7.35750005886
 2020,8,CO2EMT,summer.evening,1133.218508902248
-2020,8,DIESEL,autumn.night,-9.160404432578442
-2020,8,TPASKM,autumn.night,4.122181995072517
-2020,8,CO2EMT,autumn.night,634.9076311938985
+2020,8,DIESEL,autumn.night,-10.398038973750863
+2020,8,TPASKM,autumn.night,4.6791175386558
+2020,8,CO2EMT,autumn.night,720.6880812387606
 2020,8,DIESEL,autumn.day,-40.87500012671251
 2020,8,TPASKM,autumn.day,18.393750058860004
 2020,8,CO2EMT,autumn.day,2833.0462586569984
@@ -399,24 +399,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,8,DIESEL,autumn.evening,-16.350000129165
 2020,8,TPASKM,autumn.evening,7.35750005886
 2020,8,CO2EMT,autumn.evening,1133.218508902248
-2020,9,ELCTRI,winter.night,-0.7733845879195496
-2020,9,TPASKM,winter.night,0.44082921509210177
-2020,9,ELCTRI,winter.day,-1.8440539299265
-2020,9,TPASKM,winter.day,1.0511107400055495
-2020,9,ELCTRI,winter.peak,-0.4018523300113622
-2020,9,TPASKM,winter.peak,0.22905582809502367
-2020,9,ELCTRI,winter.evening,-0.47713494830862285
-2020,9,TPASKM,winter.evening,0.2719669205223167
+2020,9,ELCTRI,winter.night,-0.0
+2020,9,TPASKM,winter.night,0.0
+2020,9,ELCTRI,winter.day,-3.835891825332145
+2020,9,TPASKM,winter.day,2.1864583403299997
+2020,9,ELCTRI,winter.peak,-0.40185814341016624
+2020,9,TPASKM,winter.peak,0.2290591417323418
+2020,9,ELCTRI,winter.evening,-1.5343567374977702
+2020,9,TPASKM,winter.evening,0.8745833403299998
 2020,9,ELCTRI,peak.night,-0.0
 2020,9,TPASKM,peak.night,0.0
-2020,9,ELCTRI,peak.day,-1.140036028284567
-2020,9,TPASKM,peak.day,0.6498205360897121
-2020,9,ELCTRI,peak.peak,-0.20824740572544187
-2020,9,TPASKM,peak.peak,0.11870102125756682
-2020,9,ELCTRI,peak.evening,-0.0
-2020,9,TPASKM,peak.evening,0.0
-2020,9,ELCTRI,summer.night,-2.6851242814149576
-2020,9,TPASKM,summer.night,1.53052084033
+2020,9,ELCTRI,peak.day,-3.835891825332145
+2020,9,TPASKM,peak.day,2.1864583403299997
+2020,9,ELCTRI,peak.peak,-1.1507675439171874
+2020,9,TPASKM,peak.peak,0.6559375
+2020,9,ELCTRI,peak.evening,-1.5343567374977702
+2020,9,TPASKM,peak.evening,0.8745833403299998
+2020,9,ELCTRI,summer.night,-2.1523992977513964
+2020,9,TPASKM,summer.night,1.2268675996569525
 2020,9,ELCTRI,summer.day,-3.835891825332145
 2020,9,TPASKM,summer.day,2.1864583403299997
 2020,9,ELCTRI,summer.peak,-1.1507675439171874
@@ -425,15 +425,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,9,TPASKM,summer.evening,0.8745833403299998
 2020,9,ELCTRI,autumn.night,-0.0
 2020,9,TPASKM,autumn.night,0.0
-2020,9,ELCTRI,autumn.day,-0.7704266318764761
-2020,9,TPASKM,autumn.day,0.4391431801476342
-2020,9,ELCTRI,autumn.peak,-0.0
-2020,9,TPASKM,autumn.peak,0.0
-2020,9,ELCTRI,autumn.evening,-0.0
-2020,9,TPASKM,autumn.evening,0.0
-2020,10,ELCTRI,winter.night,-0.9344846534906798
-2020,10,GASOLI,winter.night,-1.093750005
-2020,10,TPASKM,winter.night,1.093750005
+2020,9,ELCTRI,autumn.day,-3.835891825332145
+2020,9,TPASKM,autumn.day,2.1864583403299997
+2020,9,ELCTRI,autumn.peak,-1.1507675439171874
+2020,9,TPASKM,autumn.peak,0.6559375
+2020,9,ELCTRI,autumn.evening,-1.5343567374977702
+2020,9,TPASKM,autumn.evening,0.8745833403299998
+2020,10,ELCTRI,winter.night,-0.0
+2020,10,GASOLI,winter.night,-0.0
+2020,10,TPASKM,winter.night,0.0
 2020,10,ELCTRI,winter.day,-1.3349780745844297
 2020,10,GASOLI,winter.day,-1.562500005
 2020,10,TPASKM,winter.day,1.562500005
@@ -443,9 +443,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,10,ELCTRI,winter.evening,-0.5339912323969298
 2020,10,GASOLI,winter.evening,-0.625000005
 2020,10,TPASKM,winter.evening,0.625000005
-2020,10,ELCTRI,peak.night,-0.12382896314871417
-2020,10,GASOLI,peak.night,-0.14493328334193104
-2020,10,TPASKM,peak.night,0.14493328334193104
+2020,10,ELCTRI,peak.night,-0.0
+2020,10,GASOLI,peak.night,-0.0
+2020,10,TPASKM,peak.night,0.0
 2020,10,ELCTRI,peak.day,-1.3349780745844297
 2020,10,GASOLI,peak.day,-1.562500005
 2020,10,TPASKM,peak.day,1.562500005
@@ -455,9 +455,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,10,ELCTRI,peak.evening,-0.5339912323969298
 2020,10,GASOLI,peak.evening,-0.625000005
 2020,10,TPASKM,peak.evening,0.625000005
-2020,10,ELCTRI,summer.night,-0.9344846534906798
-2020,10,GASOLI,summer.night,-1.093750005
-2020,10,TPASKM,summer.night,1.093750005
+2020,10,ELCTRI,summer.night,-0.0
+2020,10,GASOLI,summer.night,-0.0
+2020,10,TPASKM,summer.night,0.0
 2020,10,ELCTRI,summer.day,-1.3349780745844297
 2020,10,GASOLI,summer.day,-1.562500005
 2020,10,TPASKM,summer.day,1.562500005
@@ -467,9 +467,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,10,ELCTRI,summer.evening,-0.5339912323969298
 2020,10,GASOLI,summer.evening,-0.625000005
 2020,10,TPASKM,summer.evening,0.625000005
-2020,10,ELCTRI,autumn.night,-0.47583791184720253
-2020,10,GASOLI,autumn.night,-0.5569355435832827
-2020,10,TPASKM,autumn.night,0.5569355435832827
+2020,10,ELCTRI,autumn.night,-0.0
+2020,10,GASOLI,autumn.night,-0.0
+2020,10,TPASKM,autumn.night,0.0
 2020,10,ELCTRI,autumn.day,-1.3349780745844297
 2020,10,GASOLI,autumn.day,-1.562500005
 2020,10,TPASKM,autumn.day,1.562500005
@@ -482,27 +482,27 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,11,GASNAT,winter.night,-36.31286857370999
 2020,11,RSHEAT,winter.night,31.576407455399995
 2020,11,CO2EMT,winter.night,1856.6769701737921
-2020,11,GASNAT,winter.day,-193.26973453857997
-2020,11,RSHEAT,winter.day,168.06063872919998
-2020,11,CO2EMT,winter.day,9881.881526957595
-2020,11,GASNAT,winter.peak,-104.21872974118598
-2020,11,RSHEAT,winter.peak,90.62498238363999
-2020,11,CO2EMT,winter.peak,5328.7036516668395
-2020,11,GASNAT,winter.evening,-62.62146996467999
-2020,11,RSHEAT,winter.evening,54.453452143199996
-2020,11,CO2EMT,winter.evening,3201.8357592940883
+2020,11,GASNAT,winter.day,-200.21098781044813
+2020,11,RSHEAT,winter.day,174.09651113952012
+2020,11,CO2EMT,winter.day,10236.787806748214
+2020,11,GASNAT,winter.peak,-104.21874999999999
+2020,11,RSHEAT,winter.peak,90.625
+2020,11,CO2EMT,winter.peak,5328.704687500001
+2020,11,GASNAT,winter.evening,-66.3057277148846
+2020,11,RSHEAT,winter.evening,57.65715453468226
+2020,11,CO2EMT,winter.evening,3390.21185806205
 2020,11,GASNAT,peak.night,-15.393589558373995
 2020,11,RSHEAT,peak.night,13.385730050759996
 2020,11,CO2EMT,peak.night,787.0742341196624
-2020,11,GASNAT,peak.day,-82.18418839575197
-2020,11,RSHEAT,peak.day,71.46451164847998
-2020,11,CO2EMT,peak.day,4202.077552674799
-2020,11,GASNAT,peak.peak,-58.291277616306004
-2020,11,RSHEAT,peak.peak,50.688067492440005
-2020,11,CO2EMT,peak.peak,2980.433024521726
-2020,11,GASNAT,peak.evening,-26.198361216825717
-2020,11,RSHEAT,peak.evening,22.781183666804974
-2020,11,CO2EMT,peak.evening,1339.522209016299
+2020,11,GASNAT,peak.day,-91.57883738546323
+2020,11,RSHEAT,peak.day,79.63377163953325
+2020,11,CO2EMT,peak.day,4682.4259555187355
+2020,11,GASNAT,peak.peak,-61.57581749182269
+2020,11,RSHEAT,peak.peak,53.54418912332408
+2020,11,CO2EMT,peak.peak,3148.3715483568944
+2020,11,GASNAT,peak.evening,-31.545361968711887
+2020,11,RSHEAT,peak.evening,27.43074953801034
+2020,11,CO2EMT,peak.evening,1612.914357460239
 2020,11,GASNAT,summer.night,-0.0
 2020,11,RSHEAT,summer.night,0.0
 2020,11,CO2EMT,summer.night,0.0
@@ -518,31 +518,31 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,11,GASNAT,autumn.night,-6.206976122586998
 2020,11,RSHEAT,autumn.night,5.397370541379999
 2020,11,CO2EMT,autumn.night,317.36268914787325
-2020,11,GASNAT,autumn.day,-56.69422338503598
-2020,11,RSHEAT,autumn.day,49.29932468263999
-2020,11,CO2EMT,autumn.day,2898.7756416768902
-2020,11,GASNAT,autumn.peak,-43.82151003734367
-2020,11,RSHEAT,autumn.peak,38.105660902037975
-2020,11,CO2EMT,autumn.peak,2240.593808209382
-2020,11,GASNAT,autumn.evening,-16.29272064726444
-2020,11,RSHEAT,autumn.evening,14.167583171534297
-2020,11,CO2EMT,autumn.evening,833.0468066946308
+2020,11,GASNAT,autumn.day,-67.37690511980574
+2020,11,RSHEAT,autumn.day,58.58861314765717
+2020,11,CO2EMT,autumn.day,3444.981158775668
+2020,11,GASNAT,autumn.peak,-47.83176056917629
+2020,11,RSHEAT,autumn.peak,41.5928352775446
+2020,11,CO2EMT,autumn.peak,2445.6379179019837
+2020,11,GASNAT,autumn.evening,-21.639721399150606
+2020,11,RSHEAT,autumn.evening,18.817149042739658
+2020,11,CO2EMT,autumn.evening,1106.4389551385705
 2020,12,ELCTRI,winter.night,-9.624518793997803
 2020,12,RSHEAT,winter.night,29.165208466660005
-2020,12,ELCTRI,winter.day,-13.749312543997803
-2020,12,RSHEAT,winter.day,41.664583466660005
-2020,12,ELCTRI,winter.peak,-4.12479375
-2020,12,RSHEAT,winter.peak,12.499375
-2020,12,ELCTRI,winter.evening,-5.499725043997801
-2020,12,RSHEAT,winter.evening,16.66583346666
+2020,12,ELCTRI,winter.day,-11.75747464859216
+2020,12,RSHEAT,winter.day,35.628711056339874
+2020,12,ELCTRI,winter.peak,-4.124787936601196
+2020,12,RSHEAT,winter.peak,12.499357383639989
+2020,12,ELCTRI,winter.evening,-4.442503254808654
+2020,12,RSHEAT,winter.evening,13.462131075177737
 2020,12,ELCTRI,peak.night,-9.624518793997803
 2020,12,RSHEAT,peak.night,29.165208466660005
-2020,12,ELCTRI,peak.day,-13.749312543997803
-2020,12,RSHEAT,peak.day,41.664583466660005
-2020,12,ELCTRI,peak.peak,-4.12479375
-2020,12,RSHEAT,peak.peak,12.499375
-2020,12,ELCTRI,peak.evening,-5.13203850628096
-2020,12,RSHEAT,peak.evening,15.55163183721503
+2020,12,ELCTRI,peak.day,-11.053456746950225
+2020,12,RSHEAT,peak.day,33.49532347560674
+2020,12,ELCTRI,peak.peak,-3.1822736118082546
+2020,12,RSHEAT,peak.peak,9.643253369115923
+2020,12,ELCTRI,peak.evening,-3.5976817687831897
+2020,12,RSHEAT,peak.evening,10.902065966009665
 2020,12,ELCTRI,summer.night,-1.7439017181564
 2020,12,RSHEAT,summer.night,5.28455066108
 2020,12,ELCTRI,summer.day,-2.9055524196533997
@@ -553,24 +553,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2020,12,RSHEAT,summer.evening,2.1588135889399998
 2020,12,ELCTRI,autumn.night,-9.624518793997803
 2020,12,RSHEAT,autumn.night,29.165208466660005
-2020,12,ELCTRI,autumn.day,-13.749312543997803
-2020,12,RSHEAT,autumn.day,41.664583466660005
-2020,12,ELCTRI,autumn.peak,-4.104235336470067
-2020,12,RSHEAT,autumn.peak,12.437076777182021
-2020,12,ELCTRI,autumn.evening,-5.308042983838882
-2020,12,RSHEAT,autumn.evening,16.0849787389057
+2020,12,ELCTRI,autumn.day,-10.683847350542132
+2020,12,RSHEAT,autumn.day,32.375295001642826
+2020,12,ELCTRI,autumn.peak,-2.95346779255288
+2020,12,RSHEAT,autumn.peak,8.949902401675393
+2020,12,ELCTRI,autumn.evening,-3.7736862463411116
+2020,12,RSHEAT,autumn.evening,11.435412867700338
 2030,0,GASPRD,winter.night,0.0
 2030,0,CO2EMT,winter.night,0.0
-2030,0,GASPRD,winter.day,360.80325255229957
-2030,0,CO2EMT,winter.day,1844.7870302999079
+2030,0,GASPRD,winter.day,275.0881696842048
+2030,0,CO2EMT,winter.day,1406.5258115953393
 2030,0,GASPRD,winter.peak,125.31875
 2030,0,CO2EMT,winter.peak,640.75476875
 2030,0,GASPRD,winter.evening,167.09166800339997
 2030,0,CO2EMT,winter.evening,854.3396985013842
 2030,0,GASPRD,peak.night,0.0
 2030,0,CO2EMT,peak.night,0.0
-2030,0,GASPRD,peak.day,116.55401669288233
-2030,0,CO2EMT,peak.day,595.9406873507074
+2030,0,GASPRD,peak.day,34.97707019493225
+2030,0,CO2EMT,peak.day,178.83775990668863
 2030,0,GASPRD,peak.peak,125.31875
 2030,0,CO2EMT,peak.peak,640.75476875
 2030,0,GASPRD,peak.evening,167.09166800339997
@@ -581,14 +581,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,0,CO2EMT,summer.day,0.0
 2030,0,GASPRD,summer.peak,0.0
 2030,0,CO2EMT,summer.peak,0.0
-2030,0,GASPRD,summer.evening,162.23377935738907
-2030,0,CO2EMT,summer.evening,829.5013138543304
+2030,0,GASPRD,summer.evening,160.55077961917425
+2030,0,CO2EMT,summer.evening,820.896136192838
 2030,0,GASPRD,autumn.night,0.0
 2030,0,CO2EMT,autumn.night,0.0
-2030,0,GASPRD,autumn.day,48.714485210628766
-2030,0,CO2EMT,autumn.day,249.0771628819449
-2030,0,GASPRD,autumn.peak,125.31875
-2030,0,CO2EMT,autumn.peak,640.75476875
+2030,0,GASPRD,autumn.day,0.0
+2030,0,CO2EMT,autumn.day,0.0
+2030,0,GASPRD,autumn.peak,98.43266121031027
+2030,0,CO2EMT,autumn.peak,503.2861967683165
 2030,0,GASPRD,autumn.evening,167.09166800339997
 2030,0,CO2EMT,autumn.evening,854.3396985013842
 2030,1,OILCRD,winter.night,0.0
@@ -642,9 +642,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,2,GASPRD,winter.night,-0.0
 2030,2,GASNAT,winter.night,0.0
 2030,2,CO2EMT,winter.night,0.0
-2030,2,GASPRD,winter.day,-381.8435988043255
-2030,2,GASNAT,winter.day,363.6605702898338
-2030,2,CO2EMT,winter.day,929.6982479459601
+2030,2,GASPRD,winter.day,-296.1285159362307
+2030,2,GASNAT,winter.day,282.0271580345054
+2030,2,CO2EMT,winter.day,721.0024295152132
 2030,2,GASPRD,winter.peak,-124.3475625
 2030,2,GASNAT,winter.peak,118.42625
 2030,2,CO2EMT,winter.peak,302.756708125
@@ -654,9 +654,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,2,GASPRD,peak.night,-0.0
 2030,2,GASNAT,peak.night,0.0
 2030,2,CO2EMT,peak.night,0.0
-2030,2,GASPRD,peak.day,-137.59436294490823
-2030,2,GASNAT,peak.day,131.04225042372212
-2030,2,CO2EMT,peak.day,335.00951320824566
+2030,2,GASPRD,peak.day,-56.01741644695821
+2030,2,GASNAT,peak.day,53.34992042567448
+2030,2,CO2EMT,peak.day,136.38907156823683
 2030,2,GASPRD,peak.peak,-124.3475625
 2030,2,GASNAT,peak.peak,118.42625
 2030,2,CO2EMT,peak.peak,302.756708125
@@ -669,21 +669,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,2,GASPRD,summer.day,-0.0
 2030,2,GASNAT,summer.day,0.0
 2030,2,CO2EMT,summer.day,0.0
-2030,2,GASPRD,summer.peak,-15.211270106015089
-2030,2,GASNAT,summer.peak,14.48692391049056
-2030,2,CO2EMT,summer.peak,37.035820977169124
+2030,2,GASPRD,summer.peak,-13.528270367800289
+2030,2,GASNAT,summer.peak,12.884067016952656
+2030,2,CO2EMT,summer.peak,32.93811732883947
 2030,2,GASPRD,summer.evening,-165.796751326374
 2030,2,GASNAT,summer.evening,157.90166792987998
 2030,2,CO2EMT,summer.evening,403.6756140627382
 2030,2,GASPRD,autumn.night,-0.0
 2030,2,GASNAT,autumn.night,0.0
 2030,2,CO2EMT,autumn.night,0.0
-2030,2,GASPRD,autumn.day,-69.75483146265469
-2030,2,GASNAT,autumn.day,66.4331728215759
-2030,2,CO2EMT,autumn.day,169.8364063183588
-2030,2,GASPRD,autumn.peak,-124.3475625
-2030,2,GASNAT,autumn.peak,118.42625
-2030,2,CO2EMT,autumn.peak,302.756708125
+2030,2,GASPRD,autumn.day,-0.0
+2030,2,GASNAT,autumn.day,0.0
+2030,2,CO2EMT,autumn.day,0.0
+2030,2,GASPRD,autumn.peak,-118.50181996233623
+2030,2,GASNAT,autumn.peak,112.85887615460592
+2030,2,CO2EMT,autumn.peak,288.52371688925007
 2030,2,GASPRD,autumn.evening,-165.796751326374
 2030,2,GASNAT,autumn.evening,157.90166792987998
 2030,2,CO2EMT,autumn.evening,403.6756140627382
@@ -706,15 +706,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,6,GASNAT,winter.night,-0.0
 2030,6,ELCTRI,winter.night,0.0
 2030,6,CO2EMT,winter.night,0.0
-2030,6,GASNAT,winter.day,-14.77944692229423
-2030,6,ELCTRI,winter.day,9.85296461486282
-2030,6,CO2EMT,winter.day,755.6731211369039
-2030,6,GASNAT,winter.peak,-4.143426676071123
-2030,6,ELCTRI,winter.peak,2.7622844507140822
-2030,6,CO2EMT,winter.peak,211.8534059475165
-2030,6,GASNAT,winter.evening,-5.911778797294229
-2030,6,ELCTRI,winter.evening,3.9411858648628195
-2030,6,CO2EMT,winter.evening,302.2692499056539
+2030,6,GASNAT,winter.day,-10.634542383009325
+2030,6,ELCTRI,winter.day,7.089694922006217
+2030,6,CO2EMT,winter.day,543.7441520432668
+2030,6,GASNAT,winter.peak,-4.4338340625
+2030,6,ELCTRI,winter.peak,2.955889375
+2030,6,CO2EMT,winter.peak,226.70193561562496
+2030,6,GASNAT,winter.evening,-4.644546568256023
+2030,6,ELCTRI,winter.evening,3.0963643788373485
+2030,6,CO2EMT,winter.evening,237.4756660349304
 2030,6,GASNAT,peak.night,-0.0
 2030,6,ELCTRI,peak.night,0.0
 2030,6,CO2EMT,peak.night,0.0
@@ -724,57 +724,57 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,6,GASNAT,peak.peak,-4.4338340625
 2030,6,ELCTRI,peak.peak,2.955889375
 2030,6,CO2EMT,peak.peak,226.70193561562496
-2030,6,GASNAT,peak.evening,-5.911778797294229
-2030,6,ELCTRI,peak.evening,3.9411858648628195
-2030,6,CO2EMT,peak.evening,302.2692499056539
-2030,6,GASNAT,summer.night,-0.0
-2030,6,ELCTRI,summer.night,0.0
-2030,6,CO2EMT,summer.night,0.0
-2030,6,GASNAT,summer.day,-14.77944692229423
-2030,6,ELCTRI,summer.day,9.85296461486282
-2030,6,CO2EMT,summer.day,755.6731211369039
-2030,6,GASNAT,summer.peak,-4.4338340625
-2030,6,ELCTRI,summer.peak,2.955889375
-2030,6,CO2EMT,summer.peak,226.70193561562496
+2030,6,GASNAT,peak.evening,-5.911778797294223
+2030,6,ELCTRI,peak.evening,3.941185864862815
+2030,6,CO2EMT,peak.evening,302.26924990565357
+2030,6,GASNAT,summer.night,-4.808493968439487
+2030,6,ELCTRI,summer.night,3.205662645626325
+2030,6,CO2EMT,summer.night,245.85829660631097
+2030,6,GASNAT,summer.day,-0.0
+2030,6,ELCTRI,summer.day,0.0
+2030,6,CO2EMT,summer.day,0.0
+2030,6,GASNAT,summer.peak,-0.0
+2030,6,ELCTRI,summer.peak,0.0
+2030,6,CO2EMT,summer.peak,0.0
 2030,6,GASNAT,summer.evening,-5.911778797294229
 2030,6,ELCTRI,summer.evening,3.9411858648628195
 2030,6,CO2EMT,summer.evening,302.2692499056539
-2030,6,GASNAT,autumn.night,-0.0
-2030,6,ELCTRI,autumn.night,0.0
-2030,6,CO2EMT,autumn.night,0.0
+2030,6,GASNAT,autumn.night,-8.568586664948883
+2030,6,ELCTRI,autumn.night,5.712391109965922
+2030,6,CO2EMT,autumn.night,438.11183617883637
 2030,6,GASNAT,autumn.day,-14.77944692229423
 2030,6,ELCTRI,autumn.day,9.85296461486282
 2030,6,CO2EMT,autumn.day,755.6731211369039
 2030,6,GASNAT,autumn.peak,-4.4338340625
 2030,6,ELCTRI,autumn.peak,2.955889375
 2030,6,CO2EMT,autumn.peak,226.70193561562496
-2030,6,GASNAT,autumn.evening,-5.911778797294229
-2030,6,ELCTRI,autumn.evening,3.9411858648628195
-2030,6,CO2EMT,autumn.evening,302.2692499056539
-2030,11,GASNAT,winter.night,-43.845148578709995
-2030,11,RSHEAT,winter.night,38.1262161554
-2030,11,CO2EMT,winter.night,2241.8024468294425
-2030,11,GASNAT,winter.day,-219.27676569358
-2030,11,RSHEAT,winter.day,190.6754484292
-2030,11,CO2EMT,winter.day,11211.621029912745
+2030,6,GASNAT,autumn.evening,-5.647772080957336
+2030,6,ELCTRI,autumn.evening,3.7651813873048905
+2030,6,CO2EMT,autumn.evening,288.77058649934855
+2030,11,GASNAT,winter.night,-14.006615449537906
+2030,11,RSHEAT,winter.night,12.179665608293831
+2030,11,CO2EMT,winter.night,716.1582479348732
+2030,11,GASNAT,winter.day,-176.65028985322192
+2030,11,RSHEAT,winter.day,153.60894769845385
+2030,11,CO2EMT,winter.day,9032.129320195238
 2030,11,GASNAT,winter.peak,-104.21874999999999
 2030,11,RSHEAT,winter.peak,90.625
 2030,11,CO2EMT,winter.peak,5328.704687500001
-2030,11,GASNAT,winter.evening,-63.55844848749201
-2030,11,RSHEAT,winter.evening,55.26821607608001
-2030,11,CO2EMT,winter.evening,3249.7434711654664
+2030,11,GASNAT,winter.evening,-54.39004520169392
+2030,11,RSHEAT,winter.evening,47.29569147973385
+2030,11,CO2EMT,winter.evening,2780.96301116261
 2030,11,GASNAT,peak.night,-0.0
 2030,11,RSHEAT,peak.night,0.0
 2030,11,CO2EMT,peak.night,0.0
-2030,11,GASNAT,peak.day,-96.21279149075198
-2030,11,RSHEAT,peak.day,83.66329694848
-2030,11,CO2EMT,peak.day,4919.3600289221495
-2030,11,GASNAT,peak.peak,-66.12685298630602
-2030,11,RSHEAT,peak.peak,57.50161129244002
-2030,11,CO2EMT,peak.peak,3381.0659931898267
-2030,11,GASNAT,peak.evening,-31.919446065483193
-2030,11,RSHEAT,peak.evening,27.75604005694191
-2030,11,CO2EMT,peak.evening,1632.041277328156
+2030,11,GASNAT,peak.day,-53.58631565039388
+2030,11,RSHEAT,peak.day,46.59679621773381
+2030,11,CO2EMT,peak.day,2739.868319204639
+2030,11,GASNAT,peak.peak,-53.33891027512
+2030,11,RSHEAT,peak.peak,46.3816611088
+2030,11,CO2EMT,peak.peak,2727.218482366886
+2030,11,GASNAT,peak.evening,-12.619909759977926
+2030,11,RSHEAT,peak.evening,10.97383457389385
+2030,11,CO2EMT,peak.evening,645.2559860276715
 2030,11,GASNAT,summer.night,-0.0
 2030,11,RSHEAT,summer.night,0.0
 2030,11,CO2EMT,summer.night,0.0
@@ -790,15 +790,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,11,GASNAT,autumn.night,-0.0
 2030,11,RSHEAT,autumn.night,0.0
 2030,11,CO2EMT,autumn.night,0.0
-2030,11,GASNAT,autumn.day,-67.97422666003601
-2030,11,RSHEAT,autumn.day,59.10802318264001
-2030,11,CO2EMT,autumn.day,3475.5222091276414
-2030,11,GASNAT,autumn.peak,-50.81478612865962
-2030,11,RSHEAT,autumn.peak,44.18677054666054
-2030,11,CO2EMT,autumn.peak,2598.1600147583663
-2030,11,GASNAT,autumn.evening,-10.834599480134909
-2030,11,RSHEAT,autumn.evening,9.421390852291225
-2030,11,CO2EMT,autumn.evening,553.9730714192979
+2030,11,GASNAT,autumn.day,-25.3477508196779
+2030,11,RSHEAT,autumn.day,22.041522451893826
+2030,11,CO2EMT,autumn.day,1296.0304994101311
+2030,11,GASNAT,autumn.peak,-37.22948980491698
+2030,11,RSHEAT,autumn.peak,32.37346939557999
+2030,11,CO2EMT,autumn.peak,1903.5438137254057
+2030,11,GASNAT,autumn.evening,-2.325624162360921
+2030,11,RSHEAT,autumn.evening,2.0222818803138445
+2030,11,CO2EMT,autumn.evening,118.90916342151391
 2030,12,ELCTRI,winter.night,-9.624518793997803
 2030,12,RSHEAT,winter.night,29.165208466660005
 2030,12,ELCTRI,winter.day,-13.749312543997803
@@ -807,30 +807,30 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,12,RSHEAT,winter.peak,12.499375
 2030,12,ELCTRI,winter.evening,-5.499725043997801
 2030,12,RSHEAT,winter.evening,16.66583346666
-2030,12,ELCTRI,peak.night,-9.624518793997803
-2030,12,RSHEAT,peak.night,29.165208466660005
+2030,12,ELCTRI,peak.night,-6.9935856772035665
+2030,12,RSHEAT,peak.night,21.192683870313836
 2030,12,ELCTRI,peak.day,-13.749312543997803
 2030,12,RSHEAT,peak.day,41.664583466660005
 2030,12,ELCTRI,peak.peak,-4.12479375
 2030,12,RSHEAT,peak.peak,12.499375
-2030,12,ELCTRI,peak.evening,-4.854375354535772
-2030,12,RSHEAT,peak.evening,14.710228347078097
+2030,12,ELCTRI,peak.evening,-5.499725043997801
+2030,12,RSHEAT,peak.evening,16.66583346666
 2030,12,ELCTRI,summer.night,-0.0
 2030,12,RSHEAT,summer.night,0.0
-2030,12,ELCTRI,summer.day,-0.2793432990083996
-2030,12,RSHEAT,summer.day,0.8464948454799988
+2030,12,ELCTRI,summer.day,-0.0
+2030,12,RSHEAT,summer.day,0.0
 2030,12,ELCTRI,summer.peak,-0.0
 2030,12,RSHEAT,summer.peak,0.0
-2030,12,ELCTRI,summer.evening,-0.7892279633502001
-2030,12,RSHEAT,summer.evening,2.39159988894
-2030,12,ELCTRI,autumn.night,-9.624518793997803
-2030,12,RSHEAT,autumn.night,29.165208466660005
+2030,12,ELCTRI,summer.evening,-0.0
+2030,12,RSHEAT,summer.evening,0.0
+2030,12,ELCTRI,autumn.night,-4.073168306108166
+2030,12,RSHEAT,autumn.night,12.342934260933838
 2030,12,ELCTRI,autumn.day,-13.749312543997803
 2030,12,RSHEAT,autumn.day,41.664583466660005
-2030,12,ELCTRI,autumn.peak,-3.8959879307446244
-2030,12,RSHEAT,autumn.peak,11.806024032559467
-2030,12,ELCTRI,autumn.evening,-5.030379832093697
-2030,12,RSHEAT,autumn.evening,15.243575248768778
+2030,12,ELCTRI,autumn.peak,-4.12479375
+2030,12,RSHEAT,autumn.peak,12.499375
+2030,12,ELCTRI,autumn.evening,-5.499725043997801
+2030,12,RSHEAT,autumn.evening,16.66583346666
 2030,13,ELCTRI,winter.night,-4.8425042698399405
 2030,13,GASOLI,winter.night,-5.667818138655801
 2030,13,TPASKM,winter.night,5.667818138655801
@@ -879,188 +879,220 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2030,13,ELCTRI,autumn.evening,-27.671451920975297
 2030,13,GASOLI,autumn.evening,-32.3875309924775
 2030,13,TPASKM,autumn.evening,32.3875309924775
-2030,14,BIOPEL,winter.night,-0.0
-2030,14,RSHEAT,winter.night,0.0
-2030,14,BIOPEL,winter.day,-0.0
-2030,14,RSHEAT,winter.day,0.0
+2030,14,BIOPEL,winter.night,-31.135860656527402
+2030,14,RSHEAT,winter.night,25.94655054710617
+2030,14,BIOPEL,winter.day,-44.47980087689542
+2030,14,RSHEAT,winter.day,37.066500730746185
 2030,14,BIOPEL,winter.peak,-13.343940220368017
 2030,14,RSHEAT,winter.peak,11.119950183640015
-2030,14,BIOPEL,winter.evening,-8.224890920543984
-2030,14,RSHEAT,winter.evening,6.854075767119987
-2030,14,BIOPEL,peak.night,-21.568831140912
-2030,14,RSHEAT,peak.night,17.97402595076
-2030,14,BIOPEL,peak.day,-0.0
-2030,14,RSHEAT,peak.day,0.0
-2030,14,BIOPEL,peak.peak,-0.0
-2030,14,RSHEAT,peak.peak,0.0
-2030,14,BIOPEL,peak.evening,0.0
-2030,14,RSHEAT,peak.evening,-0.0
+2030,14,BIOPEL,winter.evening,-17.791920436159383
+2030,14,RSHEAT,winter.evening,14.826600363466154
+2030,14,BIOPEL,peak.night,-31.135860656527402
+2030,14,RSHEAT,peak.night,25.94655054710617
+2030,14,BIOPEL,peak.day,-44.47980087689542
+2030,14,RSHEAT,peak.day,37.066500730746185
+2030,14,BIOPEL,peak.peak,-13.343940220368017
+2030,14,RSHEAT,peak.peak,11.119950183640015
+2030,14,BIOPEL,peak.evening,-17.791920436159383
+2030,14,RSHEAT,peak.evening,14.826600363466154
 2030,14,BIOPEL,summer.night,-7.025264713296
 2030,14,RSHEAT,summer.night,5.85438726108
-2030,14,BIOPEL,summer.day,-10.689151867800001
-2030,14,RSHEAT,summer.day,8.907626556500002
+2030,14,BIOPEL,summer.day,-11.704945682376001
+2030,14,RSHEAT,summer.day,9.75412140198
 2030,14,BIOPEL,summer.peak,-3.8544145598160005
 2030,14,RSHEAT,summer.peak,3.2120121331800005
-2030,14,BIOPEL,summer.evening,-0.0
-2030,14,RSHEAT,summer.evening,0.0
-2030,14,BIOPEL,autumn.night,-10.949131609656003
-2030,14,RSHEAT,autumn.night,9.124276341380003
-2030,14,BIOPEL,autumn.day,-0.0
-2030,14,RSHEAT,autumn.day,0.0
-2030,14,BIOPEL,autumn.peak,-0.0
-2030,14,RSHEAT,autumn.peak,0.0
-2030,14,BIOPEL,autumn.evening,-10.619699531255998
-2030,14,RSHEAT,autumn.evening,8.849749609379998
+2030,14,BIOPEL,summer.evening,-2.869919866728
+2030,14,RSHEAT,summer.evening,2.39159988894
+2030,14,BIOPEL,autumn.night,-31.135860656527402
+2030,14,RSHEAT,autumn.night,25.94655054710617
+2030,14,BIOPEL,autumn.day,-44.47980087689542
+2030,14,RSHEAT,autumn.day,37.066500730746185
+2030,14,BIOPEL,autumn.peak,-13.343940220368017
+2030,14,RSHEAT,autumn.peak,11.119950183640015
+2030,14,BIOPEL,autumn.evening,-17.791920436159383
+2030,14,RSHEAT,autumn.evening,14.826600363466154
 2030,15,GASNAT,winter.night,-15.047565402438797
 2030,15,ELCTRI,winter.night,10.031710268292532
 2030,15,CO2EMT,winter.night,769.3820190266956
-2030,15,GASNAT,winter.day,-98.9993970642295
-2030,15,ELCTRI,winter.day,65.99959804281967
-2030,15,CO2EMT,winter.day,5061.839171894054
-2030,15,GASNAT,winter.peak,-30.217271987199155
-2030,15,ELCTRI,winter.peak,20.144847991466104
-2030,15,CO2EMT,winter.peak,1545.0091167054927
-2030,15,GASNAT,winter.evening,-39.99048861040462
-2030,15,ELCTRI,winter.evening,26.660325740269744
-2030,15,CO2EMT,winter.evening,2044.713682649988
-2030,15,GASNAT,peak.night,-17.42362581983107
-2030,15,ELCTRI,peak.night,11.615750546554047
-2030,15,CO2EMT,peak.night,890.8699881679626
+2030,15,GASNAT,winter.day,-103.14430160351442
+2030,15,ELCTRI,winter.day,68.76286773567628
+2030,15,CO2EMT,winter.day,5273.768140987692
+2030,15,GASNAT,winter.peak,-29.92686460077028
+2030,15,ELCTRI,winter.peak,19.951243067180187
+2030,15,CO2EMT,winter.peak,1530.1605870373842
+2030,15,GASNAT,winter.evening,-41.257720839442825
+2030,15,ELCTRI,winter.evening,27.505147226295215
+2030,15,CO2EMT,winter.evening,2109.5072665207113
+2030,15,GASNAT,peak.night,-13.477226144639717
+2030,15,ELCTRI,peak.night,8.984817429759811
+2030,15,CO2EMT,peak.night,689.0905727754287
 2030,15,GASNAT,peak.day,-100.0554239166924
 2030,15,ELCTRI,peak.day,66.7036159444616
 2030,15,CO2EMT,peak.day,5115.833824860482
 2030,15,GASNAT,peak.peak,-30.21727198719916
 2030,15,ELCTRI,peak.peak,20.144847991466108
 2030,15,CO2EMT,peak.peak,1545.009116705493
-2030,15,GASNAT,peak.evening,-40.28969630524977
-2030,15,ELCTRI,peak.evening,26.85979753683318
-2030,15,CO2EMT,peak.evening,2060.012172087421
-2030,15,GASNAT,summer.night,-4.808493968439487
-2030,15,ELCTRI,summer.night,3.205662645626325
-2030,15,CO2EMT,summer.night,245.85829660631097
-2030,15,GASNAT,summer.day,-82.56973920504686
-2030,15,ELCTRI,summer.day,55.04649280336457
-2030,15,CO2EMT,summer.day,4221.790765554046
-2030,15,GASNAT,summer.peak,-24.690098145807305
-2030,15,ELCTRI,summer.peak,16.460065430538204
-2030,15,CO2EMT,summer.peak,1262.4047181951275
-2030,15,GASNAT,summer.evening,-35.195200738988426
-2030,15,ELCTRI,summer.evening,23.463467159325617
-2030,15,CO2EMT,summer.evening,1799.530613784478
-2030,15,GASNAT,autumn.night,-16.89561239678334
-2030,15,ELCTRI,autumn.night,11.263741597855558
-2030,15,CO2EMT,autumn.night,863.872661847532
+2030,15,GASNAT,peak.evening,-41.257720839442825
+2030,15,ELCTRI,peak.evening,27.505147226295215
+2030,15,CO2EMT,peak.evening,2109.5072665207113
+2030,15,GASNAT,summer.night,-0.0
+2030,15,ELCTRI,summer.night,0.0
+2030,15,CO2EMT,summer.night,0.0
+2030,15,GASNAT,summer.day,-96.93017117882849
+2030,15,ELCTRI,summer.day,64.620114119219
+2030,15,CO2EMT,summer.day,4956.039652373501
+2030,15,GASNAT,summer.peak,-29.123932208307302
+2030,15,ELCTRI,summer.peak,19.415954805538203
+2030,15,CO2EMT,summer.peak,1489.1066538107523
+2030,15,GASNAT,summer.evening,-34.011358793963126
+2030,15,ELCTRI,summer.evening,22.674239195975417
+2030,15,CO2EMT,summer.evening,1739.0007751353344
+2030,15,GASNAT,autumn.night,-0.0
+2030,15,ELCTRI,autumn.night,0.0
+2030,15,CO2EMT,autumn.night,0.0
 2030,15,GASNAT,autumn.day,-100.60983801130455
 2030,15,ELCTRI,autumn.day,67.0732253408697
 2030,15,CO2EMT,autumn.day,5144.181017518001
-2030,15,GASNAT,autumn.peak,-30.217271987199155
-2030,15,ELCTRI,autumn.peak,20.144847991466104
-2030,15,CO2EMT,autumn.peak,1545.0091167054927
-2030,15,GASNAT,autumn.evening,-40.28969630524977
-2030,15,ELCTRI,autumn.evening,26.85979753683318
-2030,15,CO2EMT,autumn.evening,2060.012172087421
-2030,16,OILCRD,winter.night,-54.75820608337376
-2030,16,GASOLI,winter.night,41.80015731555248
-2030,16,CO2EMT,winter.night,919.6034609421546
-2030,16,OILCRD,winter.day,-78.22600858325254
-2030,16,GASOLI,winter.day,59.71451036889506
-2030,16,CO2EMT,winter.day,1313.7192281156913
-2030,16,OILCRD,winter.peak,-23.46780249987879
-2030,16,GASOLI,winter.peak,17.914353053342587
-2030,16,CO2EMT,winter.peak,394.11576717353694
-2030,16,OILCRD,winter.evening,-31.290403583494946
-2030,16,GASOLI,winter.evening,23.88580426220988
-2030,16,CO2EMT,winter.evening,525.4876937686174
-2030,16,OILCRD,peak.night,-54.75820608337376
-2030,16,GASOLI,peak.night,41.80015731555248
-2030,16,CO2EMT,peak.night,919.6034609421546
-2030,16,OILCRD,peak.day,-78.22600858325254
-2030,16,GASOLI,peak.day,59.71451036889506
-2030,16,CO2EMT,peak.day,1313.7192281156913
-2030,16,OILCRD,peak.peak,-23.46780249987879
-2030,16,GASOLI,peak.peak,17.914353053342587
-2030,16,CO2EMT,peak.peak,394.11576717353694
-2030,16,OILCRD,peak.evening,-31.290403583494946
-2030,16,GASOLI,peak.evening,23.88580426220988
-2030,16,CO2EMT,peak.evening,525.4876937686174
-2030,16,OILCRD,summer.night,-54.75820608337376
-2030,16,GASOLI,summer.night,41.80015731555248
-2030,16,CO2EMT,summer.night,919.6034609421546
-2030,16,OILCRD,summer.day,-78.22600858325254
-2030,16,GASOLI,summer.day,59.71451036889506
-2030,16,CO2EMT,summer.day,1313.7192281156913
-2030,16,OILCRD,summer.peak,-23.46780249987879
-2030,16,GASOLI,summer.peak,17.914353053342587
-2030,16,CO2EMT,summer.peak,394.11576717353694
-2030,16,OILCRD,summer.evening,-31.290403583494946
-2030,16,GASOLI,summer.evening,23.88580426220988
-2030,16,CO2EMT,summer.evening,525.4876937686174
-2030,16,OILCRD,autumn.night,-54.75820608337376
-2030,16,GASOLI,autumn.night,41.80015731555248
-2030,16,CO2EMT,autumn.night,919.6034609421546
-2030,16,OILCRD,autumn.day,-78.22600858325254
-2030,16,GASOLI,autumn.day,59.71451036889506
-2030,16,CO2EMT,autumn.day,1313.7192281156913
-2030,16,OILCRD,autumn.peak,-23.46780249987879
-2030,16,GASOLI,autumn.peak,17.914353053342587
-2030,16,CO2EMT,autumn.peak,394.11576717353694
-2030,16,OILCRD,autumn.evening,-31.290403583494946
-2030,16,GASOLI,autumn.evening,23.88580426220988
-2030,16,CO2EMT,autumn.evening,525.4876937686174
-2030,17,BIOPRD,winter.night,-0.0
-2030,17,BIOPEL,winter.night,0.0
-2030,17,BIOPRD,winter.day,-0.0
-2030,17,BIOPEL,winter.day,0.0
-2030,17,BIOPRD,winter.peak,-3.965756239990249
-2030,17,BIOPEL,winter.peak,3.7769107047526176
+2030,15,GASNAT,autumn.peak,-30.560480716082225
+2030,15,ELCTRI,autumn.peak,20.373653810721482
+2030,15,CO2EMT,autumn.peak,1562.557379013284
+2030,15,GASNAT,autumn.evening,-41.257720839442825
+2030,15,ELCTRI,autumn.evening,27.505147226295215
+2030,15,CO2EMT,autumn.evening,2109.5072665207113
+2030,16,OILCRD,winter.night,-12.203257219833601
+2030,16,GASOLI,winter.night,9.315463526590534
+2030,16,CO2EMT,winter.night,204.94019758499175
+2030,16,OILCRD,winter.day,-103.2583314300226
+2030,16,GASOLI,winter.day,78.82315376337603
+2030,16,CO2EMT,winter.day,1734.1093827942725
+2030,16,OILCRD,winter.peak,-30.977499329878782
+2030,16,GASOLI,winter.peak,23.64694605334258
+2030,16,CO2EMT,winter.peak,520.2328131735368
+2030,16,OILCRD,winter.evening,-41.30333277026503
+2030,16,GASOLI,winter.evening,31.529261656690863
+2030,16,CO2EMT,winter.evening,693.6437564471989
+2030,16,OILCRD,peak.night,-12.203257219833601
+2030,16,GASOLI,peak.night,9.315463526590534
+2030,16,CO2EMT,peak.night,204.94019758499175
+2030,16,OILCRD,peak.day,-103.2583314300226
+2030,16,GASOLI,peak.day,78.82315376337603
+2030,16,CO2EMT,peak.day,1734.1093827942725
+2030,16,OILCRD,peak.peak,-30.977499329878782
+2030,16,GASOLI,peak.peak,23.64694605334258
+2030,16,CO2EMT,peak.peak,520.2328131735368
+2030,16,OILCRD,peak.evening,-41.30333277026503
+2030,16,GASOLI,peak.evening,31.529261656690863
+2030,16,CO2EMT,peak.evening,693.6437564471989
+2030,16,OILCRD,summer.night,-12.203257219833601
+2030,16,GASOLI,summer.night,9.315463526590534
+2030,16,CO2EMT,summer.night,204.94019758499175
+2030,16,OILCRD,summer.day,-103.2583314300226
+2030,16,GASOLI,summer.day,78.82315376337603
+2030,16,CO2EMT,summer.day,1734.1093827942725
+2030,16,OILCRD,summer.peak,-30.977499329878782
+2030,16,GASOLI,summer.peak,23.64694605334258
+2030,16,CO2EMT,summer.peak,520.2328131735368
+2030,16,OILCRD,summer.evening,-41.30333277026503
+2030,16,GASOLI,summer.evening,31.529261656690863
+2030,16,CO2EMT,summer.evening,693.6437564471989
+2030,16,OILCRD,autumn.night,-12.203257219833601
+2030,16,GASOLI,autumn.night,9.315463526590534
+2030,16,CO2EMT,autumn.night,204.94019758499175
+2030,16,OILCRD,autumn.day,-103.2583314300226
+2030,16,GASOLI,autumn.day,78.82315376337603
+2030,16,CO2EMT,autumn.day,1734.1093827942725
+2030,16,OILCRD,autumn.peak,-30.977499329878782
+2030,16,GASOLI,autumn.peak,23.64694605334258
+2030,16,CO2EMT,autumn.peak,520.2328131735368
+2030,16,OILCRD,autumn.evening,-41.30333277026503
+2030,16,GASOLI,autumn.evening,31.529261656690863
+2030,16,CO2EMT,autumn.evening,693.6437564471989
+2030,17,BIOPRD,winter.night,-32.69265368935377
+2030,17,BIOPEL,winter.night,31.135860656527395
+2030,17,BIOPRD,winter.day,-46.7037909207402
+2030,17,BIOPEL,winter.day,44.479800876895425
+2030,17,BIOPRD,winter.peak,-14.011137231386419
+2030,17,BIOPEL,winter.peak,13.343940220368017
 2030,17,BIOPRD,winter.evening,-18.681516457967355
 2030,17,BIOPEL,winter.evening,17.791920436159383
-2030,17,BIOPRD,peak.night,-0.0
-2030,17,BIOPEL,peak.night,0.0
-2030,17,BIOPRD,peak.day,-0.0
-2030,17,BIOPEL,peak.day,0.0
-2030,17,BIOPRD,peak.peak,-3.965756239990249
-2030,17,BIOPEL,peak.peak,3.7769107047526176
+2030,17,BIOPRD,peak.night,-32.69265368935377
+2030,17,BIOPEL,peak.night,31.135860656527395
+2030,17,BIOPRD,peak.day,-46.7037909207402
+2030,17,BIOPEL,peak.day,44.479800876895425
+2030,17,BIOPRD,peak.peak,-14.011137231386419
+2030,17,BIOPEL,peak.peak,13.343940220368017
 2030,17,BIOPRD,peak.evening,-18.681516457967355
 2030,17,BIOPEL,peak.evening,17.791920436159383
 2030,17,BIOPRD,summer.night,-0.0
 2030,17,BIOPEL,summer.night,0.0
 2030,17,BIOPRD,summer.day,-0.0
 2030,17,BIOPEL,summer.day,0.0
-2030,17,BIOPRD,summer.peak,-3.9657562399902497
-2030,17,BIOPEL,summer.peak,3.7769107047526185
+2030,17,BIOPRD,summer.peak,-8.045755605359451
+2030,17,BIOPEL,summer.peak,7.6626243860566206
 2030,17,BIOPRD,summer.evening,-18.681516457967355
 2030,17,BIOPEL,summer.evening,17.791920436159383
-2030,17,BIOPRD,autumn.night,-0.0
-2030,17,BIOPEL,autumn.night,0.0
-2030,17,BIOPRD,autumn.day,-0.0
-2030,17,BIOPEL,autumn.day,0.0
-2030,17,BIOPRD,autumn.peak,-3.965756239990249
-2030,17,BIOPEL,autumn.peak,3.7769107047526176
+2030,17,BIOPRD,autumn.night,-32.69265368935377
+2030,17,BIOPEL,autumn.night,31.135860656527395
+2030,17,BIOPRD,autumn.day,-46.7037909207402
+2030,17,BIOPEL,autumn.day,44.479800876895425
+2030,17,BIOPRD,autumn.peak,-14.011137231386419
+2030,17,BIOPEL,autumn.peak,13.343940220368017
 2030,17,BIOPRD,autumn.evening,-18.681516457967355
 2030,17,BIOPEL,autumn.evening,17.791920436159383
-2030,18,BIOPRD,winter.night,6.605454540678847
-2030,18,BIOPRD,winter.day,9.43636361659991
-2030,18,BIOPRD,winter.peak,2.830909075921064
-2030,18,BIOPRD,winter.evening,3.7745454647577823
-2030,18,BIOPRD,peak.night,6.605454540678847
-2030,18,BIOPRD,peak.day,9.43636361659991
-2030,18,BIOPRD,peak.peak,2.830909075921064
-2030,18,BIOPRD,peak.evening,3.7745454647577823
-2030,18,BIOPRD,summer.night,6.605454540678847
-2030,18,BIOPRD,summer.day,9.43636361659991
-2030,18,BIOPRD,summer.peak,2.830909075921064
-2030,18,BIOPRD,summer.evening,3.7745454647577823
-2030,18,BIOPRD,autumn.night,6.605454540678847
-2030,18,BIOPRD,autumn.day,9.43636361659991
-2030,18,BIOPRD,autumn.peak,2.830909075921064
-2030,18,BIOPRD,autumn.evening,3.7745454647577823
+2030,18,BIOPRD,winter.night,32.692653689353776
+2030,18,BIOPRD,winter.day,46.70379092074019
+2030,18,BIOPRD,winter.peak,14.011137231386417
+2030,18,BIOPRD,winter.evening,18.68151645796735
+2030,18,BIOPRD,peak.night,32.692653689353776
+2030,18,BIOPRD,peak.day,46.70379092074019
+2030,18,BIOPRD,peak.peak,14.011137231386417
+2030,18,BIOPRD,peak.evening,18.68151645796735
+2030,18,BIOPRD,summer.night,0.0
+2030,18,BIOPRD,summer.day,0.0
+2030,18,BIOPRD,summer.peak,8.045755605359457
+2030,18,BIOPRD,summer.evening,18.68151645796735
+2030,18,BIOPRD,autumn.night,32.692653689353776
+2030,18,BIOPRD,autumn.day,46.70379092074019
+2030,18,BIOPRD,autumn.peak,14.011137231386417
+2030,18,BIOPRD,autumn.evening,18.68151645796735
+2040,0,GASPRD,winter.night,0.0
+2040,0,CO2EMT,winter.night,0.0
+2040,0,GASPRD,winter.day,0.0
+2040,0,CO2EMT,winter.day,0.0
+2040,0,GASPRD,winter.peak,12.071980068513625
+2040,0,CO2EMT,winter.peak,61.72403409031017
+2040,0,GASPRD,winter.evening,167.09166800339997
+2040,0,CO2EMT,winter.evening,854.3396985013842
+2040,0,GASPRD,peak.night,0.0
+2040,0,CO2EMT,peak.night,0.0
+2040,0,GASPRD,peak.day,0.0
+2040,0,CO2EMT,peak.day,0.0
+2040,0,GASPRD,peak.peak,17.31119329810204
+2040,0,CO2EMT,peak.peak,88.51213133319574
+2040,0,GASPRD,peak.evening,167.09166800339997
+2040,0,CO2EMT,peak.evening,854.3396985013842
+2040,0,GASPRD,summer.night,0.0
+2040,0,CO2EMT,summer.night,0.0
+2040,0,GASPRD,summer.day,0.0
+2040,0,CO2EMT,summer.day,0.0
+2040,0,GASPRD,summer.peak,23.825558987649288
+2040,0,CO2EMT,summer.peak,121.82008310385082
+2040,0,GASPRD,summer.evening,167.09166800339997
+2040,0,CO2EMT,summer.evening,854.3396985013842
+2040,0,GASPRD,autumn.night,0.0
+2040,0,CO2EMT,autumn.night,0.0
+2040,0,GASPRD,autumn.day,0.0
+2040,0,CO2EMT,autumn.day,0.0
+2040,0,GASPRD,autumn.peak,17.42207611641814
+2040,0,CO2EMT,autumn.peak,89.07907518324596
+2040,0,GASPRD,autumn.evening,167.09166800339997
+2040,0,CO2EMT,autumn.evening,854.3396985013842
 2040,1,OILCRD,winter.night,0.0
 2040,1,GASPRD,winter.night,0.0
 2040,1,CO2EMT,winter.night,0.0
-2040,1,OILCRD,winter.day,93.75960767065004
-2040,1,GASPRD,winter.day,9.375960767065004
-2040,1,CO2EMT,winter.day,687.5392030488767
+2040,1,OILCRD,winter.day,93.75960767065001
+2040,1,GASPRD,winter.day,9.375960767065001
+2040,1,CO2EMT,winter.day,687.5392030488765
 2040,1,OILCRD,winter.peak,54.3140625
 2040,1,GASPRD,winter.peak,5.43140625
 2040,1,CO2EMT,winter.peak,398.2850203125
@@ -1070,9 +1102,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,1,OILCRD,peak.night,0.0
 2040,1,GASPRD,peak.night,0.0
 2040,1,CO2EMT,peak.night,0.0
-2040,1,OILCRD,peak.day,93.75960767065004
-2040,1,GASPRD,peak.day,9.375960767065004
-2040,1,CO2EMT,peak.day,687.5392030488767
+2040,1,OILCRD,peak.day,93.75960767065001
+2040,1,GASPRD,peak.day,9.375960767065001
+2040,1,CO2EMT,peak.day,687.5392030488765
 2040,1,OILCRD,peak.peak,54.3140625
 2040,1,GASPRD,peak.peak,5.43140625
 2040,1,CO2EMT,peak.peak,398.2850203125
@@ -1082,9 +1114,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,1,OILCRD,summer.night,0.0
 2040,1,GASPRD,summer.night,0.0
 2040,1,CO2EMT,summer.night,0.0
-2040,1,OILCRD,summer.day,93.75960767065004
-2040,1,GASPRD,summer.day,9.375960767065004
-2040,1,CO2EMT,summer.day,687.5392030488767
+2040,1,OILCRD,summer.day,93.75960767065001
+2040,1,GASPRD,summer.day,9.375960767065001
+2040,1,CO2EMT,summer.day,687.5392030488765
 2040,1,OILCRD,summer.peak,54.3140625
 2040,1,GASPRD,summer.peak,5.43140625
 2040,1,CO2EMT,summer.peak,398.2850203125
@@ -1094,15 +1126,63 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,1,OILCRD,autumn.night,0.0
 2040,1,GASPRD,autumn.night,0.0
 2040,1,CO2EMT,autumn.night,0.0
-2040,1,OILCRD,autumn.day,93.75960767065004
-2040,1,GASPRD,autumn.day,9.375960767065004
-2040,1,CO2EMT,autumn.day,687.5392030488767
+2040,1,OILCRD,autumn.day,93.75960767065001
+2040,1,GASPRD,autumn.day,9.375960767065001
+2040,1,CO2EMT,autumn.day,687.5392030488765
 2040,1,OILCRD,autumn.peak,54.3140625
 2040,1,GASPRD,autumn.peak,5.43140625
 2040,1,CO2EMT,autumn.peak,398.2850203125
 2040,1,OILCRD,autumn.evening,72.41875057934999
 2040,1,GASPRD,autumn.evening,7.241875057934999
 2040,1,CO2EMT,autumn.evening,531.0466979983735
+2040,2,GASPRD,winter.night,-0.0
+2040,2,GASNAT,winter.night,0.0
+2040,2,CO2EMT,winter.night,0.0
+2040,2,GASPRD,winter.day,-0.0
+2040,2,GASNAT,winter.day,0.0
+2040,2,CO2EMT,winter.day,0.0
+2040,2,GASPRD,winter.peak,-35.416138820539636
+2040,2,GASNAT,winter.peak,33.72965601956156
+2040,2,CO2EMT,winter.peak,86.22986561400913
+2040,2,GASPRD,winter.evening,-165.796751326374
+2040,2,GASNAT,winter.evening,157.90166792987998
+2040,2,CO2EMT,winter.evening,403.6756140627382
+2040,2,GASPRD,peak.night,-0.0
+2040,2,GASNAT,peak.night,0.0
+2040,2,CO2EMT,peak.night,0.0
+2040,2,GASPRD,peak.day,-0.0
+2040,2,GASNAT,peak.day,0.0
+2040,2,CO2EMT,peak.day,0.0
+2040,2,GASPRD,peak.peak,-40.65535205012804
+2040,2,GASNAT,peak.peak,38.719382904883844
+2040,2,CO2EMT,peak.peak,98.98610239633555
+2040,2,GASPRD,peak.evening,-165.796751326374
+2040,2,GASNAT,peak.evening,157.90166792987998
+2040,2,CO2EMT,peak.evening,403.6756140627382
+2040,2,GASPRD,summer.night,-0.0
+2040,2,GASNAT,summer.night,0.0
+2040,2,CO2EMT,summer.night,0.0
+2040,2,GASPRD,summer.day,-0.0
+2040,2,GASNAT,summer.day,0.0
+2040,2,CO2EMT,summer.day,0.0
+2040,2,GASPRD,summer.peak,-47.169717739675285
+2040,2,GASNAT,summer.peak,44.92354070445265
+2040,2,CO2EMT,summer.peak,114.8470318109332
+2040,2,GASPRD,summer.evening,-165.796751326374
+2040,2,GASNAT,summer.evening,157.90166792987998
+2040,2,CO2EMT,summer.evening,403.6756140627382
+2040,2,GASPRD,autumn.night,-0.0
+2040,2,GASNAT,autumn.night,0.0
+2040,2,CO2EMT,autumn.night,0.0
+2040,2,GASPRD,autumn.day,-0.0
+2040,2,GASNAT,autumn.day,0.0
+2040,2,CO2EMT,autumn.day,0.0
+2040,2,GASPRD,autumn.peak,-40.766234868444144
+2040,2,GASNAT,autumn.peak,38.82498558899442
+2040,2,CO2EMT,autumn.peak,99.25607565826425
+2040,2,GASPRD,autumn.evening,-165.796751326374
+2040,2,GASNAT,autumn.evening,157.90166792987998
+2040,2,CO2EMT,autumn.evening,403.6756140627382
 2040,5,ELCTRI,winter.night,4.435312795545212
 2040,5,ELCTRI,winter.day,7.075379933645912
 2040,5,ELCTRI,winter.peak,1.9712501261051125
@@ -1119,54 +1199,54 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,5,ELCTRI,autumn.day,6.001752635595889
 2040,5,ELCTRI,autumn.peak,1.5488393825638174
 2040,5,ELCTRI,autumn.evening,1.9008483513729915
-2040,6,GASNAT,winter.night,-0.0
-2040,6,ELCTRI,winter.night,0.0
-2040,6,CO2EMT,winter.night,0.0
-2040,6,GASNAT,winter.day,-8.12647874472118
-2040,6,ELCTRI,winter.day,5.417652496480786
-2040,6,CO2EMT,winter.day,415.50685821759384
-2040,6,GASNAT,winter.peak,-2.6649891582699743
-2040,6,ELCTRI,winter.peak,1.7766594388466495
-2040,6,CO2EMT,winter.peak,136.26089566234376
-2040,6,GASNAT,winter.evening,-3.641321047739023
-2040,6,ELCTRI,winter.evening,2.4275473651593487
-2040,6,CO2EMT,winter.evening,186.18074517089622
+2040,6,GASNAT,winter.night,-1.8778850857827112
+2040,6,ELCTRI,winter.night,1.2519233905218075
+2040,6,CO2EMT,winter.night,96.01626443607002
+2040,6,GASNAT,winter.day,-14.77944692229423
+2040,6,ELCTRI,winter.day,9.85296461486282
+2040,6,CO2EMT,winter.day,755.6731211369039
+2040,6,GASNAT,winter.peak,-2.6606368796867645
+2040,6,ELCTRI,winter.peak,1.7737579197911764
+2040,6,CO2EMT,winter.peak,136.03836365838427
+2040,6,GASNAT,winter.evening,-5.911778797294229
+2040,6,ELCTRI,winter.evening,3.9411858648628195
+2040,6,CO2EMT,winter.evening,302.2692499056539
 2040,6,GASNAT,peak.night,-0.0
 2040,6,ELCTRI,peak.night,0.0
 2040,6,CO2EMT,peak.night,0.0
-2040,6,GASNAT,peak.day,-9.182505597184079
-2040,6,ELCTRI,peak.day,6.121670398122719
-2040,6,CO2EMT,peak.day,469.50151118402187
-2040,6,GASNAT,peak.peak,-2.955396544698856
-2040,6,ELCTRI,peak.peak,1.9702643631325707
-2040,6,CO2EMT,peak.peak,151.1094253304525
-2040,6,GASNAT,peak.evening,-4.9085532767772175
-2040,6,ELCTRI,peak.evening,3.2723688511848117
-2040,6,CO2EMT,peak.evening,250.97432904161911
+2040,6,GASNAT,peak.day,-9.16799800186029
+2040,6,ELCTRI,peak.day,6.11199866790686
+2040,6,CO2EMT,peak.day,468.7597378351166
+2040,6,GASNAT,peak.peak,-2.9510442661156464
+2040,6,ELCTRI,peak.peak,1.9673628440770976
+2040,6,CO2EMT,peak.peak,150.88689332649298
+2040,6,GASNAT,peak.evening,-4.9027502386198485
+2040,6,ELCTRI,peak.evening,3.268500159079899
+2040,6,CO2EMT,peak.evening,250.67761970063282
 2040,6,GASNAT,summer.night,-0.0
 2040,6,ELCTRI,summer.night,0.0
 2040,6,CO2EMT,summer.night,0.0
-2040,6,GASNAT,summer.day,-11.901774753022632
-2040,6,ELCTRI,summer.day,7.934516502015088
-2040,6,CO2EMT,summer.day,608.5377431220471
-2040,6,GASNAT,summer.peak,-3.6154133283069982
-2040,6,ELCTRI,summer.peak,2.4102755522046655
-2040,6,CO2EMT,summer.peak,184.8560834763368
-2040,6,GASNAT,summer.evening,-5.911778797294231
-2040,6,ELCTRI,summer.evening,3.9411858648628204
-2040,6,CO2EMT,summer.evening,302.26924990565396
-2040,6,GASNAT,autumn.night,-0.0
-2040,6,ELCTRI,autumn.night,0.0
-2040,6,CO2EMT,autumn.night,0.0
-2040,6,GASNAT,autumn.day,-9.7369196917962
-2040,6,ELCTRI,autumn.day,6.491279794530799
-2040,6,CO2EMT,autumn.day,497.8487038415396
-2040,6,GASNAT,autumn.peak,-3.298605273581917
-2040,6,ELCTRI,autumn.peak,2.1990701823879446
-2040,6,CO2EMT,autumn.peak,168.6576876382434
-2040,6,GASNAT,autumn.evening,-4.644546560440336
-2040,6,ELCTRI,autumn.evening,3.0963643736268907
-2040,6,CO2EMT,autumn.evening,237.47566563531436
+2040,6,GASNAT,summer.day,-14.77944692229423
+2040,6,ELCTRI,summer.day,9.85296461486282
+2040,6,CO2EMT,summer.day,755.6731211369039
+2040,6,GASNAT,summer.peak,-3.611061049723789
+2040,6,ELCTRI,summer.peak,2.4073740331491926
+2040,6,CO2EMT,summer.peak,184.63355147237732
+2040,6,GASNAT,summer.evening,-5.911778797294229
+2040,6,ELCTRI,summer.evening,3.9411858648628195
+2040,6,CO2EMT,summer.evening,302.2692499056539
+2040,6,GASNAT,autumn.night,-3.7259320801272513
+2040,6,ELCTRI,autumn.night,2.483954720084834
+2040,6,CO2EMT,autumn.night,190.50690725690635
+2040,6,GASNAT,autumn.day,-14.77944692229423
+2040,6,ELCTRI,autumn.day,9.85296461486282
+2040,6,CO2EMT,autumn.day,755.6731211369039
+2040,6,GASNAT,autumn.peak,-4.4338340625
+2040,6,ELCTRI,autumn.peak,2.955889375
+2040,6,CO2EMT,autumn.peak,226.70193561562496
+2040,6,GASNAT,autumn.evening,-5.911778797294229
+2040,6,ELCTRI,autumn.evening,3.9411858648628195
+2040,6,CO2EMT,autumn.evening,302.2692499056539
 2040,14,BIOPEL,winter.night,-31.135860656527402
 2040,14,RSHEAT,winter.night,25.94655054710617
 2040,14,BIOPEL,winter.day,-44.47980087689542
@@ -1199,102 +1279,102 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,14,RSHEAT,autumn.peak,11.119950183640015
 2040,14,BIOPEL,autumn.evening,-17.791920436159383
 2040,14,RSHEAT,autumn.evening,14.826600363466154
-2040,15,GASNAT,winter.night,-0.19399747349360652
-2040,15,ELCTRI,winter.night,0.12933164899573768
-2040,15,CO2EMT,winter.night,9.919090819728101
-2040,15,GASNAT,winter.day,-100.7242402796481
-2040,15,ELCTRI,winter.day,67.1494935197654
-2040,15,CO2EMT,winter.day,5150.030405498407
-2040,15,GASNAT,winter.peak,-30.217271987199155
-2040,15,ELCTRI,winter.peak,20.144847991466104
-2040,15,CO2EMT,winter.peak,1545.0091167054927
-2040,15,GASNAT,winter.evening,-40.28969630524977
-2040,15,ELCTRI,winter.evening,26.85979753683318
-2040,15,CO2EMT,winter.evening,2060.012172087421
-2040,15,GASNAT,peak.night,-2.57005789088588
-2040,15,ELCTRI,peak.night,1.7133719272572532
-2040,15,CO2EMT,peak.night,131.407059960995
-2040,15,GASNAT,peak.day,-100.7242402796481
-2040,15,ELCTRI,peak.day,67.1494935197654
-2040,15,CO2EMT,peak.day,5150.030405498407
-2040,15,GASNAT,peak.peak,-30.217271987199155
-2040,15,ELCTRI,peak.peak,20.144847991466104
-2040,15,CO2EMT,peak.peak,1545.0091167054927
-2040,15,GASNAT,peak.evening,-40.28969630524977
-2040,15,ELCTRI,peak.evening,26.85979753683318
-2040,15,CO2EMT,peak.evening,2060.012172087421
-2040,15,GASNAT,summer.night,-4.391704230491001
-2040,15,ELCTRI,summer.night,2.927802820327334
-2040,15,CO2EMT,summer.night,224.54783730500486
-2040,15,GASNAT,summer.day,-100.7242402796481
-2040,15,ELCTRI,summer.day,67.1494935197654
-2040,15,CO2EMT,summer.day,5150.030405498407
-2040,15,GASNAT,summer.peak,-30.217271987199155
-2040,15,ELCTRI,summer.peak,20.144847991466104
-2040,15,CO2EMT,summer.peak,1545.0091167054927
-2040,15,GASNAT,summer.evening,-40.28969630524977
-2040,15,ELCTRI,summer.evening,26.85979753683318
-2040,15,CO2EMT,summer.evening,2060.012172087421
-2040,15,GASNAT,autumn.night,-2.0420444678381466
-2040,15,ELCTRI,autumn.night,1.3613629785587644
-2040,15,CO2EMT,autumn.night,104.40973364056443
-2040,15,GASNAT,autumn.day,-100.7242402796481
-2040,15,ELCTRI,autumn.day,67.1494935197654
-2040,15,CO2EMT,autumn.day,5150.030405498407
-2040,15,GASNAT,autumn.peak,-30.217271987199155
-2040,15,ELCTRI,autumn.peak,20.144847991466104
-2040,15,CO2EMT,autumn.peak,1545.0091167054927
-2040,15,GASNAT,autumn.evening,-40.28969630524977
-2040,15,ELCTRI,autumn.evening,26.85979753683318
-2040,15,CO2EMT,autumn.evening,2060.012172087421
-2040,16,OILCRD,winter.night,-54.75820608337371
-2040,16,GASOLI,winter.night,41.80015731555245
-2040,16,CO2EMT,winter.night,919.6034609421538
-2040,16,OILCRD,winter.day,-78.22600858325254
-2040,16,GASOLI,winter.day,59.71451036889506
-2040,16,CO2EMT,winter.day,1313.7192281156913
-2040,16,OILCRD,winter.peak,-23.46780249987879
-2040,16,GASOLI,winter.peak,17.914353053342587
-2040,16,CO2EMT,winter.peak,394.11576717353694
-2040,16,OILCRD,winter.evening,-31.290403583494946
-2040,16,GASOLI,winter.evening,23.88580426220988
-2040,16,CO2EMT,winter.evening,525.4876937686174
-2040,16,OILCRD,peak.night,-54.75820608337371
-2040,16,GASOLI,peak.night,41.80015731555245
-2040,16,CO2EMT,peak.night,919.6034609421538
-2040,16,OILCRD,peak.day,-78.22600858325254
-2040,16,GASOLI,peak.day,59.71451036889506
-2040,16,CO2EMT,peak.day,1313.7192281156913
-2040,16,OILCRD,peak.peak,-23.46780249987879
-2040,16,GASOLI,peak.peak,17.914353053342587
-2040,16,CO2EMT,peak.peak,394.11576717353694
-2040,16,OILCRD,peak.evening,-31.290403583494946
-2040,16,GASOLI,peak.evening,23.88580426220988
-2040,16,CO2EMT,peak.evening,525.4876937686174
-2040,16,OILCRD,summer.night,-54.75820608337371
-2040,16,GASOLI,summer.night,41.80015731555245
-2040,16,CO2EMT,summer.night,919.6034609421538
-2040,16,OILCRD,summer.day,-78.22600858325254
-2040,16,GASOLI,summer.day,59.71451036889506
-2040,16,CO2EMT,summer.day,1313.7192281156913
-2040,16,OILCRD,summer.peak,-23.46780249987879
-2040,16,GASOLI,summer.peak,17.914353053342587
-2040,16,CO2EMT,summer.peak,394.11576717353694
-2040,16,OILCRD,summer.evening,-31.290403583494946
-2040,16,GASOLI,summer.evening,23.88580426220988
-2040,16,CO2EMT,summer.evening,525.4876937686174
-2040,16,OILCRD,autumn.night,-54.75820608337371
-2040,16,GASOLI,autumn.night,41.80015731555245
-2040,16,CO2EMT,autumn.night,919.6034609421538
-2040,16,OILCRD,autumn.day,-78.22600858325254
-2040,16,GASOLI,autumn.day,59.71451036889506
-2040,16,CO2EMT,autumn.day,1313.7192281156913
-2040,16,OILCRD,autumn.peak,-23.46780249987879
-2040,16,GASOLI,autumn.peak,17.914353053342587
-2040,16,CO2EMT,autumn.peak,394.11576717353694
-2040,16,OILCRD,autumn.evening,-31.290403583494946
-2040,16,GASOLI,autumn.evening,23.88580426220988
-2040,16,CO2EMT,autumn.evening,525.4876937686174
+2040,15,GASNAT,winter.night,-0.0
+2040,15,ELCTRI,winter.night,0.0
+2040,15,CO2EMT,winter.night,0.0
+2040,15,GASNAT,winter.day,-96.47682583061757
+2040,15,ELCTRI,winter.day,64.31788388707838
+2040,15,CO2EMT,winter.day,4932.860104719476
+2040,15,GASNAT,winter.peak,-30.943290382035794
+2040,15,ELCTRI,winter.peak,20.62886025469053
+2040,15,CO2EMT,winter.peak,1582.13043723349
+2040,15,GASNAT,winter.evening,-38.981460051730245
+2040,15,ELCTRI,winter.evening,25.98764003448683
+2040,15,CO2EMT,winter.evening,1993.1220524449673
+2040,15,GASNAT,peak.night,-4.253945503174984
+2040,15,ELCTRI,peak.night,2.835963668783323
+2040,15,CO2EMT,peak.night,217.50423357733695
+2040,15,GASNAT,peak.day,-103.14430160351442
+2040,15,ELCTRI,peak.day,68.76286773567628
+2040,15,CO2EMT,peak.day,5273.768140987692
+2040,15,GASNAT,peak.peak,-30.943290382035794
+2040,15,ELCTRI,peak.peak,20.62886025469053
+2040,15,CO2EMT,peak.peak,1582.13043723349
+2040,15,GASNAT,peak.evening,-41.257720839442825
+2040,15,ELCTRI,peak.evening,27.505147226295215
+2040,15,CO2EMT,peak.evening,2109.5072665207113
+2040,15,GASNAT,summer.night,-6.0755918427801054
+2040,15,ELCTRI,summer.night,4.050394561853404
+2040,15,CO2EMT,summer.night,310.64501092134674
+2040,15,GASNAT,summer.day,-100.25212183891902
+2040,15,ELCTRI,summer.day,66.83474789261268
+2040,15,CO2EMT,summer.day,5125.890989623929
+2040,15,GASNAT,summer.peak,-30.943290382035794
+2040,15,ELCTRI,summer.peak,20.62886025469053
+2040,15,CO2EMT,summer.peak,1582.13043723349
+2040,15,GASNAT,summer.evening,-41.251917801285444
+2040,15,ELCTRI,summer.evening,27.5012785341903
+2040,15,CO2EMT,summer.evening,2109.2105571797247
+2040,15,GASNAT,autumn.night,-0.0
+2040,15,ELCTRI,autumn.night,0.0
+2040,15,CO2EMT,autumn.night,0.0
+2040,15,GASNAT,autumn.day,-98.0872667776926
+2040,15,ELCTRI,autumn.day,65.39151118512841
+2040,15,CO2EMT,autumn.day,5015.201950343423
+2040,15,GASNAT,autumn.peak,-29.8037093145345
+2040,15,ELCTRI,autumn.peak,19.869139543023
+2040,15,CO2EMT,autumn.peak,1523.8636572521489
+2040,15,GASNAT,autumn.evening,-39.98468556443156
+2040,15,ELCTRI,autumn.evening,26.656457042954372
+2040,15,CO2EMT,autumn.evening,2044.4169729093853
+2040,16,OILCRD,winter.night,-44.9532572198336
+2040,16,GASOLI,winter.night,34.315463526590534
+2040,16,CO2EMT,winter.night,754.9401975849918
+2040,16,OILCRD,winter.day,-103.2583314300226
+2040,16,GASOLI,winter.day,78.82315376337603
+2040,16,CO2EMT,winter.day,1734.1093827942725
+2040,16,OILCRD,winter.peak,-30.977499329878782
+2040,16,GASOLI,winter.peak,23.64694605334258
+2040,16,CO2EMT,winter.peak,520.2328131735368
+2040,16,OILCRD,winter.evening,-41.30333277026503
+2040,16,GASOLI,winter.evening,31.529261656690863
+2040,16,CO2EMT,winter.evening,693.6437564471989
+2040,16,OILCRD,peak.night,-44.9532572198336
+2040,16,GASOLI,peak.night,34.315463526590534
+2040,16,CO2EMT,peak.night,754.9401975849918
+2040,16,OILCRD,peak.day,-103.2583314300226
+2040,16,GASOLI,peak.day,78.82315376337603
+2040,16,CO2EMT,peak.day,1734.1093827942725
+2040,16,OILCRD,peak.peak,-30.977499329878782
+2040,16,GASOLI,peak.peak,23.64694605334258
+2040,16,CO2EMT,peak.peak,520.2328131735368
+2040,16,OILCRD,peak.evening,-41.30333277026503
+2040,16,GASOLI,peak.evening,31.529261656690863
+2040,16,CO2EMT,peak.evening,693.6437564471989
+2040,16,OILCRD,summer.night,-44.9532572198336
+2040,16,GASOLI,summer.night,34.315463526590534
+2040,16,CO2EMT,summer.night,754.9401975849918
+2040,16,OILCRD,summer.day,-103.2583314300226
+2040,16,GASOLI,summer.day,78.82315376337603
+2040,16,CO2EMT,summer.day,1734.1093827942725
+2040,16,OILCRD,summer.peak,-30.977499329878782
+2040,16,GASOLI,summer.peak,23.64694605334258
+2040,16,CO2EMT,summer.peak,520.2328131735368
+2040,16,OILCRD,summer.evening,-41.30333277026503
+2040,16,GASOLI,summer.evening,31.529261656690863
+2040,16,CO2EMT,summer.evening,693.6437564471989
+2040,16,OILCRD,autumn.night,-44.9532572198336
+2040,16,GASOLI,autumn.night,34.315463526590534
+2040,16,CO2EMT,autumn.night,754.9401975849918
+2040,16,OILCRD,autumn.day,-103.2583314300226
+2040,16,GASOLI,autumn.day,78.82315376337603
+2040,16,CO2EMT,autumn.day,1734.1093827942725
+2040,16,OILCRD,autumn.peak,-30.977499329878782
+2040,16,GASOLI,autumn.peak,23.64694605334258
+2040,16,CO2EMT,autumn.peak,520.2328131735368
+2040,16,OILCRD,autumn.evening,-41.30333277026503
+2040,16,GASOLI,autumn.evening,31.529261656690863
+2040,16,CO2EMT,autumn.evening,693.6437564471989
 2040,17,BIOPRD,winter.night,-32.692653689353804
 2040,17,BIOPEL,winter.night,31.135860656527434
 2040,17,BIOPRD,winter.day,-46.7037909207402
@@ -1315,22 +1395,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,17,BIOPEL,summer.night,0.0
 2040,17,BIOPRD,summer.day,-0.0
 2040,17,BIOPEL,summer.day,0.0
-2040,17,BIOPRD,summer.peak,-0.0
-2040,17,BIOPEL,summer.peak,0.0
-2040,17,BIOPRD,summer.evening,-0.0
-2040,17,BIOPEL,summer.evening,0.0
-2040,17,BIOPRD,autumn.night,-0.0
-2040,17,BIOPEL,autumn.night,0.0
-2040,17,BIOPRD,autumn.day,-0.0
-2040,17,BIOPEL,autumn.day,0.0
-2040,17,BIOPRD,autumn.peak,-0.0
-2040,17,BIOPEL,autumn.peak,0.0
-2040,17,BIOPRD,autumn.evening,-0.0
-2040,17,BIOPEL,autumn.evening,0.0
-2040,18,BIOPRD,winter.night,6.605454540678691
-2040,18,BIOPRD,winter.day,9.43636361659991
-2040,18,BIOPRD,winter.peak,2.830909075921064
-2040,18,BIOPRD,winter.evening,3.7745454647577823
+2040,17,BIOPRD,summer.peak,-10.647253791359448
+2040,17,BIOPEL,summer.peak,10.140241706056617
+2040,17,BIOPRD,summer.evening,-18.681516457967355
+2040,17,BIOPEL,summer.evening,17.791920436159383
+2040,17,BIOPRD,autumn.night,-32.692653689353776
+2040,17,BIOPEL,autumn.night,31.135860656527406
+2040,17,BIOPRD,autumn.day,-46.7037909207402
+2040,17,BIOPEL,autumn.day,44.479800876895425
+2040,17,BIOPRD,autumn.peak,-14.011137231386419
+2040,17,BIOPEL,autumn.peak,13.343940220368017
+2040,17,BIOPRD,autumn.evening,-18.681516457967355
+2040,17,BIOPEL,autumn.evening,17.791920436159383
+2040,18,BIOPRD,winter.night,32.692653689353605
+2040,18,BIOPRD,winter.day,46.70379092074019
+2040,18,BIOPRD,winter.peak,14.011137231386417
+2040,18,BIOPRD,winter.evening,18.68151645796735
 2040,18,BIOPRD,peak.night,0.0
 2040,18,BIOPRD,peak.day,0.0
 2040,18,BIOPRD,peak.peak,0.0
@@ -1423,227 +1503,51 @@ milestone_year,asset_id,commodity_id,time_slice,flow
 2040,20,RSHEAT,autumn.peak,50.32290129557999
 2040,20,BIOPEL,autumn.evening,-26.340322976368615
 2040,20,RSHEAT,autumn.evening,21.950269146973845
-2040,21,GASNAT,winter.night,-1.6838876122891047
-2040,21,ELCTRI,winter.night,1.1225917415260698
-2040,21,CO2EMT,winter.night,86.09717361634192
-2040,21,GASNAT,winter.day,-2.405553728542533
-2040,21,ELCTRI,winter.day,1.603702485695022
-2040,21,CO2EMT,winter.day,122.9959621403797
-2040,21,GASNAT,winter.peak,-0.7216661162534282
-2040,21,ELCTRI,winter.peak,0.48111074416895216
-2040,21,CO2EMT,winter.peak,36.89878852403778
-2040,21,GASNAT,winter.evening,-0.9622214960356763
-2040,21,ELCTRI,winter.evening,0.6414809973571175
-2040,21,CO2EMT,winter.evening,49.19838509230412
-2040,21,GASNAT,peak.night,-1.6838876122891047
-2040,21,ELCTRI,peak.night,1.1225917415260698
-2040,21,CO2EMT,peak.night,86.09717361634192
-2040,21,GASNAT,peak.day,-2.405553728542533
-2040,21,ELCTRI,peak.day,1.603702485695022
-2040,21,CO2EMT,peak.day,122.9959621403797
-2040,21,GASNAT,peak.peak,-0.7216661162534282
-2040,21,ELCTRI,peak.peak,0.48111074416895216
-2040,21,CO2EMT,peak.peak,36.89878852403778
-2040,21,GASNAT,peak.evening,-0.9622214960356763
-2040,21,ELCTRI,peak.evening,0.6414809973571175
-2040,21,CO2EMT,peak.evening,49.19838509230412
-2040,21,GASNAT,summer.night,-1.6838876122891047
-2040,21,ELCTRI,summer.night,1.1225917415260698
-2040,21,CO2EMT,summer.night,86.09717361634192
-2040,21,GASNAT,summer.day,-2.405553728542533
-2040,21,ELCTRI,summer.day,1.603702485695022
-2040,21,CO2EMT,summer.day,122.9959621403797
-2040,21,GASNAT,summer.peak,-0.7216661162534282
-2040,21,ELCTRI,summer.peak,0.48111074416895216
-2040,21,CO2EMT,summer.peak,36.89878852403778
-2040,21,GASNAT,summer.evening,-0.9622214960356763
-2040,21,ELCTRI,summer.evening,0.6414809973571175
-2040,21,CO2EMT,summer.evening,49.19838509230412
-2040,21,GASNAT,autumn.night,-1.6838876122891047
-2040,21,ELCTRI,autumn.night,1.1225917415260698
-2040,21,CO2EMT,autumn.night,86.09717361634192
-2040,21,GASNAT,autumn.day,-2.405553728542533
-2040,21,ELCTRI,autumn.day,1.603702485695022
-2040,21,CO2EMT,autumn.day,122.9959621403797
-2040,21,GASNAT,autumn.peak,-0.7216661162534282
-2040,21,ELCTRI,autumn.peak,0.48111074416895216
-2040,21,CO2EMT,autumn.peak,36.89878852403778
-2040,21,GASNAT,autumn.evening,-0.9622214960356763
-2040,21,ELCTRI,autumn.evening,0.6414809973571175
-2040,21,CO2EMT,autumn.evening,49.19838509230412
-2040,22,GASPRD,winter.night,-50.361641260623216
-2040,22,GASNAT,winter.night,47.963467867260206
-2040,22,CO2EMT,winter.night,122.61860560265073
-2040,22,GASPRD,winter.day,-88.73602870653171
-2040,22,GASNAT,winter.day,84.51050353003019
-2040,22,CO2EMT,winter.day,216.0511022745222
-2040,22,GASPRD,winter.peak,-26.620808526772922
-2040,22,GASNAT,winter.peak,25.353150977878972
-2040,22,CO2EMT,winter.peak,64.8153304749476
-2040,22,GASPRD,winter.evening,-35.494411652985846
-2040,22,GASNAT,winter.evening,33.804201574272234
-2040,22,CO2EMT,winter.evening,86.42044132462698
-2040,22,GASPRD,peak.night,-55.60085449021158
-2040,22,GASNAT,peak.night,52.953194752582455
-2040,22,CO2EMT,peak.night,135.37484238497706
-2040,22,GASPRD,peak.day,-88.73602870653171
-2040,22,GASNAT,peak.day,84.51050353003019
-2040,22,CO2EMT,peak.day,216.0511022745222
-2040,22,GASPRD,peak.peak,-26.620808526772922
-2040,22,GASNAT,peak.peak,25.353150977878972
-2040,22,CO2EMT,peak.peak,64.8153304749476
-2040,22,GASPRD,peak.evening,-35.494411652985846
-2040,22,GASNAT,peak.evening,33.804201574272234
-2040,22,CO2EMT,peak.evening,86.42044132462698
-2040,22,GASPRD,summer.night,-62.11522017975885
-2040,22,GASNAT,summer.night,59.15735255215128
-2040,22,CO2EMT,summer.night,151.23577179957476
-2040,22,GASPRD,summer.day,-88.73602870653171
-2040,22,GASNAT,summer.day,84.51050353003019
-2040,22,CO2EMT,summer.day,216.0511022745222
-2040,22,GASPRD,summer.peak,-26.620808526772922
-2040,22,GASNAT,summer.peak,25.353150977878972
-2040,22,CO2EMT,summer.peak,64.8153304749476
-2040,22,GASPRD,summer.evening,-35.494411652985846
-2040,22,GASNAT,summer.evening,33.804201574272234
-2040,22,CO2EMT,summer.evening,86.42044132462698
-2040,22,GASPRD,autumn.night,-55.711737308527674
-2040,22,GASNAT,autumn.night,53.05879743669302
-2040,22,CO2EMT,autumn.night,135.64481564690573
-2040,22,GASPRD,autumn.day,-88.73602870653171
-2040,22,GASNAT,autumn.day,84.51050353003019
-2040,22,CO2EMT,autumn.day,216.0511022745222
-2040,22,GASPRD,autumn.peak,-26.620808526772922
-2040,22,GASNAT,autumn.peak,25.353150977878972
-2040,22,CO2EMT,autumn.peak,64.8153304749476
-2040,22,GASPRD,autumn.evening,-35.494411652985846
-2040,22,GASNAT,autumn.evening,33.804201574272234
-2040,22,CO2EMT,autumn.evening,86.42044132462698
-2040,23,OILCRD,winter.night,-9.552083338791682
-2040,23,GASOLI,winter.night,7.291666670833345
-2040,23,CO2EMT,winter.night,160.41666675833358
-2040,23,OILCRD,winter.day,-13.645833322416689
-2040,23,GASOLI,winter.day,10.41666665833335
-2040,23,CO2EMT,winter.day,229.1666664833337
-2040,23,OILCRD,winter.peak,-4.093749983625006
-2040,23,GASOLI,winter.peak,3.1249999875000047
-2040,23,CO2EMT,winter.peak,68.74999972500011
-2040,23,OILCRD,winter.evening,-5.458333355166675
-2040,23,GASOLI,winter.evening,4.1666666833333394
-2040,23,CO2EMT,winter.evening,91.66666703333347
-2040,23,OILCRD,peak.night,-9.552083338791682
-2040,23,GASOLI,peak.night,7.291666670833345
-2040,23,CO2EMT,peak.night,160.41666675833358
-2040,23,OILCRD,peak.day,-13.645833322416689
-2040,23,GASOLI,peak.day,10.41666665833335
-2040,23,CO2EMT,peak.day,229.1666664833337
-2040,23,OILCRD,peak.peak,-4.093749983625006
-2040,23,GASOLI,peak.peak,3.1249999875000047
-2040,23,CO2EMT,peak.peak,68.74999972500011
-2040,23,OILCRD,peak.evening,-5.458333355166675
-2040,23,GASOLI,peak.evening,4.1666666833333394
-2040,23,CO2EMT,peak.evening,91.66666703333347
-2040,23,OILCRD,summer.night,-9.552083338791682
-2040,23,GASOLI,summer.night,7.291666670833345
-2040,23,CO2EMT,summer.night,160.41666675833358
-2040,23,OILCRD,summer.day,-13.645833322416689
-2040,23,GASOLI,summer.day,10.41666665833335
-2040,23,CO2EMT,summer.day,229.1666664833337
-2040,23,OILCRD,summer.peak,-4.093749983625006
-2040,23,GASOLI,summer.peak,3.1249999875000047
-2040,23,CO2EMT,summer.peak,68.74999972500011
-2040,23,OILCRD,summer.evening,-5.458333355166675
-2040,23,GASOLI,summer.evening,4.1666666833333394
-2040,23,CO2EMT,summer.evening,91.66666703333347
-2040,23,OILCRD,autumn.night,-9.552083338791682
-2040,23,GASOLI,autumn.night,7.291666670833345
-2040,23,CO2EMT,autumn.night,160.41666675833358
-2040,23,OILCRD,autumn.day,-13.645833322416689
-2040,23,GASOLI,autumn.day,10.41666665833335
-2040,23,CO2EMT,autumn.day,229.1666664833337
-2040,23,OILCRD,autumn.peak,-4.093749983625006
-2040,23,GASOLI,autumn.peak,3.1249999875000047
-2040,23,CO2EMT,autumn.peak,68.74999972500011
-2040,23,OILCRD,autumn.evening,-5.458333355166675
-2040,23,GASOLI,autumn.evening,4.1666666833333394
-2040,23,CO2EMT,autumn.evening,91.66666703333347
-2040,24,BIOPRD,winter.night,-165.98421626912275
-2040,24,BIOPEL,winter.night,158.08020597059308
-2040,24,BIOPRD,winter.day,-237.12030863069606
-2040,24,BIOPEL,winter.day,225.82886536256765
-2040,24,BIOPRD,winter.peak,-71.13609236157332
-2040,24,BIOPEL,winter.peak,67.74865939197458
-2040,24,BIOPRD,winter.evening,-94.8481239075494
-2040,24,BIOPEL,winter.evening,90.33154657861847
-2040,24,BIOPRD,peak.night,-0.0
-2040,24,BIOPEL,peak.night,0.0
-2040,24,BIOPRD,peak.day,-227.9780274914425
-2040,24,BIOPEL,peak.day,217.12193094423094
-2040,24,BIOPRD,peak.peak,-71.13609236157332
-2040,24,BIOPEL,peak.peak,67.74865939197458
-2040,24,BIOPRD,peak.evening,-94.8481239075494
-2040,24,BIOPEL,peak.evening,90.33154657861847
-2040,24,BIOPRD,summer.night,-0.0
-2040,24,BIOPEL,summer.night,0.0
-2040,24,BIOPRD,summer.day,-0.0
-2040,24,BIOPEL,summer.day,0.0
-2040,24,BIOPRD,summer.peak,-0.0
-2040,24,BIOPEL,summer.peak,0.0
-2040,24,BIOPRD,summer.evening,-29.3287702493268
-2040,24,BIOPEL,summer.evening,27.932162142216
-2040,24,BIOPRD,autumn.night,-0.0
-2040,24,BIOPEL,autumn.night,0.0
-2040,24,BIOPRD,autumn.day,-150.04572883209727
-2040,24,BIOPEL,autumn.day,142.90069412580692
-2040,24,BIOPRD,autumn.peak,-71.13609236157332
-2040,24,BIOPEL,autumn.peak,67.74865939197458
-2040,24,BIOPRD,autumn.evening,-94.8481239075494
-2040,24,BIOPEL,autumn.evening,90.33154657861847
-2040,25,GASPRD,winter.night,28.31239918562322
-2040,25,CO2EMT,winter.night,144.76129703609155
-2040,25,GASPRD,winter.day,88.73602870653171
-2040,25,CO2EMT,winter.day,453.7073147764967
-2040,25,GASPRD,winter.peak,26.620808526772926
-2040,25,CO2EMT,winter.peak,136.11219399739
-2040,25,GASPRD,winter.evening,35.49441165298585
-2040,25,CO2EMT,winter.evening,181.48292678171669
-2040,25,GASPRD,peak.night,33.55161241521158
-2040,25,CO2EMT,peak.night,171.54939427897682
-2040,25,GASPRD,peak.day,88.73602870653171
-2040,25,CO2EMT,peak.day,453.7073147764967
-2040,25,GASPRD,peak.peak,26.620808526772926
-2040,25,CO2EMT,peak.peak,136.11219399739
-2040,25,GASPRD,peak.evening,35.49441165298585
-2040,25,CO2EMT,peak.evening,181.48292678171669
-2040,25,GASPRD,summer.night,40.065978104758855
-2040,25,CO2EMT,summer.night,204.85734604963204
-2040,25,GASPRD,summer.day,88.73602870653171
-2040,25,CO2EMT,summer.day,453.7073147764967
-2040,25,GASPRD,summer.peak,26.620808526772926
-2040,25,CO2EMT,summer.peak,136.11219399739
-2040,25,GASPRD,summer.evening,35.49441165298585
-2040,25,CO2EMT,summer.evening,181.48292678171669
-2040,25,GASPRD,autumn.night,33.66249523352768
-2040,25,CO2EMT,autumn.night,172.11633812902704
-2040,25,GASPRD,autumn.day,88.73602870653171
-2040,25,CO2EMT,autumn.day,453.7073147764967
-2040,25,GASPRD,autumn.peak,26.620808526772926
-2040,25,CO2EMT,autumn.peak,136.11219399739
-2040,25,GASPRD,autumn.evening,35.49441165298585
-2040,25,CO2EMT,autumn.evening,181.48292678171669
-2040,26,BIOPRD,winter.night,192.07141541779774
-2040,26,BIOPRD,winter.day,274.3877359348364
-2040,26,BIOPRD,winter.peak,82.3163205170387
-2040,26,BIOPRD,winter.evening,109.75509490075902
-2040,26,BIOPRD,peak.night,0.0
-2040,26,BIOPRD,peak.day,201.89082834276752
-2040,26,BIOPRD,peak.peak,82.3163205170387
-2040,26,BIOPRD,peak.evening,109.75509490075902
-2040,26,BIOPRD,summer.night,0.0
-2040,26,BIOPRD,summer.day,0.0
-2040,26,BIOPRD,summer.peak,0.0
-2040,26,BIOPRD,summer.evening,29.3287702493268
-2040,26,BIOPRD,autumn.night,0.0
-2040,26,BIOPRD,autumn.day,123.95852968342227
-2040,26,BIOPRD,autumn.peak,82.3163205170387
-2040,26,BIOPRD,autumn.evening,109.75509490075902
+2040,21,BIOPRD,winter.night,-165.98421626912275
+2040,21,BIOPEL,winter.night,158.08020597059308
+2040,21,BIOPRD,winter.day,-237.12030863069606
+2040,21,BIOPEL,winter.day,225.82886536256765
+2040,21,BIOPRD,winter.peak,-71.13609236157332
+2040,21,BIOPEL,winter.peak,67.74865939197458
+2040,21,BIOPRD,winter.evening,-94.8481239075494
+2040,21,BIOPEL,winter.evening,90.33154657861847
+2040,21,BIOPRD,peak.night,-0.0
+2040,21,BIOPEL,peak.night,0.0
+2040,21,BIOPRD,peak.day,-227.9780274914425
+2040,21,BIOPEL,peak.day,217.12193094423094
+2040,21,BIOPRD,peak.peak,-71.13609236157332
+2040,21,BIOPEL,peak.peak,67.74865939197458
+2040,21,BIOPRD,peak.evening,-94.8481239075494
+2040,21,BIOPEL,peak.evening,90.33154657861847
+2040,21,BIOPRD,summer.night,-0.0
+2040,21,BIOPEL,summer.night,0.0
+2040,21,BIOPRD,summer.day,-0.0
+2040,21,BIOPEL,summer.day,0.0
+2040,21,BIOPRD,summer.peak,-0.0
+2040,21,BIOPEL,summer.peak,0.0
+2040,21,BIOPRD,summer.evening,-0.0
+2040,21,BIOPEL,summer.evening,0.0
+2040,21,BIOPRD,autumn.night,-0.0
+2040,21,BIOPEL,autumn.night,0.0
+2040,21,BIOPRD,autumn.day,-37.95663053264955
+2040,21,BIOPEL,autumn.day,36.149171935856714
+2040,21,BIOPRD,autumn.peak,-71.13609236157332
+2040,21,BIOPEL,autumn.peak,67.74865939197458
+2040,21,BIOPRD,autumn.evening,-94.8481239075494
+2040,21,BIOPEL,autumn.evening,90.33154657861847
+2040,22,BIOPRD,winter.night,165.9842162691228
+2040,22,BIOPRD,winter.day,237.12030863069614
+2040,22,BIOPRD,winter.peak,71.13609236157335
+2040,22,BIOPRD,winter.evening,94.84812390754944
+2040,22,BIOPRD,peak.night,0.0
+2040,22,BIOPRD,peak.day,227.97802749144245
+2040,22,BIOPRD,peak.peak,71.13609236157335
+2040,22,BIOPRD,peak.evening,94.84812390754944
+2040,22,BIOPRD,summer.night,0.0
+2040,22,BIOPRD,summer.day,0.0
+2040,22,BIOPRD,summer.peak,0.0
+2040,22,BIOPRD,summer.evening,29.3287702493268
+2040,22,BIOPRD,autumn.night,0.0
+2040,22,BIOPRD,autumn.day,150.0457288320972
+2040,22,BIOPRD,autumn.peak,71.13609236157335
+2040,22,BIOPRD,autumn.evening,94.84812390754944
diff --git a/tests/data/two_outputs/commodity_prices.csv b/tests/data/two_outputs/commodity_prices.csv
index fdd80b879..90afb497e 100644
--- a/tests/data/two_outputs/commodity_prices.csv
+++ b/tests/data/two_outputs/commodity_prices.csv
@@ -15,54 +15,54 @@ milestone_year,commodity_id,region_id,time_slice,price
 2020,BIOPEL,GBR,winter.evening,4.7221140833333335
 2020,BIOPEL,GBR,winter.night,4.7221140833333335
 2020,BIOPEL,GBR,winter.peak,4.7221140833333335
-2020,BIOPRD,GBR,autumn.day,4.249632460317461
-2020,BIOPRD,GBR,autumn.evening,4.249632460317461
-2020,BIOPRD,GBR,autumn.night,4.249632460317461
-2020,BIOPRD,GBR,autumn.peak,4.249632460317461
-2020,BIOPRD,GBR,peak.day,4.249632460317461
-2020,BIOPRD,GBR,peak.evening,4.249632460317461
-2020,BIOPRD,GBR,peak.night,4.249632460317461
-2020,BIOPRD,GBR,peak.peak,4.249632460317461
-2020,BIOPRD,GBR,summer.day,0.912692619047619
-2020,BIOPRD,GBR,summer.evening,0.912692619047619
-2020,BIOPRD,GBR,summer.night,0.912692619047619
-2020,BIOPRD,GBR,summer.peak,0.912692619047619
-2020,BIOPRD,GBR,winter.day,4.249632460317461
-2020,BIOPRD,GBR,winter.evening,4.249632460317461
-2020,BIOPRD,GBR,winter.night,4.249632460317461
-2020,BIOPRD,GBR,winter.peak,4.249632460317461
-2020,DIESEL,GBR,autumn.day,5.483919719999999
-2020,DIESEL,GBR,autumn.evening,5.483919719999999
-2020,DIESEL,GBR,autumn.night,5.483919719999999
-2020,DIESEL,GBR,autumn.peak,5.483919719999999
-2020,DIESEL,GBR,peak.day,5.483919719999999
-2020,DIESEL,GBR,peak.evening,5.483919719999999
-2020,DIESEL,GBR,peak.night,5.483919719999999
-2020,DIESEL,GBR,peak.peak,5.483919719999999
-2020,DIESEL,GBR,summer.day,5.768302800000001
-2020,DIESEL,GBR,summer.evening,5.768302800000001
-2020,DIESEL,GBR,summer.night,5.768302800000001
-2020,DIESEL,GBR,summer.peak,5.768302800000001
-2020,DIESEL,GBR,winter.day,5.483919719999999
-2020,DIESEL,GBR,winter.evening,5.483919719999999
-2020,DIESEL,GBR,winter.night,5.483919719999999
-2020,DIESEL,GBR,winter.peak,5.483919719999999
-2020,ELCTRI,GBR,autumn.day,12.730960906659151
+2020,BIOPRD,GBR,autumn.day,3.586939841269842
+2020,BIOPRD,GBR,autumn.evening,3.586939841269842
+2020,BIOPRD,GBR,autumn.night,3.586939841269842
+2020,BIOPRD,GBR,autumn.peak,3.586939841269842
+2020,BIOPRD,GBR,peak.day,3.5869398412698414
+2020,BIOPRD,GBR,peak.evening,3.5869398412698414
+2020,BIOPRD,GBR,peak.night,3.5869398412698414
+2020,BIOPRD,GBR,peak.peak,3.5869398412698414
+2020,BIOPRD,GBR,summer.day,0.25
+2020,BIOPRD,GBR,summer.evening,0.25
+2020,BIOPRD,GBR,summer.night,0.25
+2020,BIOPRD,GBR,summer.peak,0.25
+2020,BIOPRD,GBR,winter.day,3.5869398412698414
+2020,BIOPRD,GBR,winter.evening,3.5869398412698414
+2020,BIOPRD,GBR,winter.night,3.5869398412698414
+2020,BIOPRD,GBR,winter.peak,3.5869398412698414
+2020,DIESEL,GBR,autumn.day,0.4990774469726027
+2020,DIESEL,GBR,autumn.evening,0.4990774469726027
+2020,DIESEL,GBR,autumn.night,0.4990774469726027
+2020,DIESEL,GBR,autumn.peak,0.4990774469726027
+2020,DIESEL,GBR,peak.day,0.4990774469726027
+2020,DIESEL,GBR,peak.evening,0.4990774469726027
+2020,DIESEL,GBR,peak.night,0.4990774469726027
+2020,DIESEL,GBR,peak.peak,0.4990774469726027
+2020,DIESEL,GBR,summer.day,0.7834605269726034
+2020,DIESEL,GBR,summer.evening,0.7834605269726034
+2020,DIESEL,GBR,summer.night,0.7834605269726034
+2020,DIESEL,GBR,summer.peak,0.7834605269726034
+2020,DIESEL,GBR,winter.day,0.4990774469726027
+2020,DIESEL,GBR,winter.evening,0.4990774469726027
+2020,DIESEL,GBR,winter.night,0.4990774469726027
+2020,DIESEL,GBR,winter.peak,0.4990774469726027
+2020,ELCTRI,GBR,autumn.day,17.26223303030303
 2020,ELCTRI,GBR,autumn.evening,17.26223303030303
-2020,ELCTRI,GBR,autumn.night,14.948653883199047
+2020,ELCTRI,GBR,autumn.night,7.993308999999999
 2020,ELCTRI,GBR,autumn.peak,17.26223303030303
-2020,ELCTRI,GBR,peak.day,12.730960906659151
+2020,ELCTRI,GBR,peak.day,17.26223303030303
 2020,ELCTRI,GBR,peak.evening,17.26223303030303
-2020,ELCTRI,GBR,peak.night,14.948653883199047
-2020,ELCTRI,GBR,peak.peak,12.730960906659151
+2020,ELCTRI,GBR,peak.night,7.993308999999999
+2020,ELCTRI,GBR,peak.peak,17.26223303030303
 2020,ELCTRI,GBR,summer.day,4.52119
 2020,ELCTRI,GBR,summer.evening,4.52119
 2020,ELCTRI,GBR,summer.night,4.52119
 2020,ELCTRI,GBR,summer.peak,4.52119
-2020,ELCTRI,GBR,winter.day,12.730960906659151
-2020,ELCTRI,GBR,winter.evening,12.730960906659151
-2020,ELCTRI,GBR,winter.night,10.475104976941614
-2020,ELCTRI,GBR,winter.peak,12.730960906659151
+2020,ELCTRI,GBR,winter.day,17.26223303030303
+2020,ELCTRI,GBR,winter.evening,17.26223303030303
+2020,ELCTRI,GBR,winter.night,7.993308999999999
+2020,ELCTRI,GBR,winter.peak,20.410312516918875
 2020,GASNAT,GBR,autumn.day,2.9170059999999998
 2020,GASNAT,GBR,autumn.evening,2.9170059999999998
 2020,GASNAT,GBR,autumn.night,2.9170059999999998
@@ -79,22 +79,22 @@ milestone_year,commodity_id,region_id,time_slice,price
 2020,GASNAT,GBR,winter.evening,2.9170059999999998
 2020,GASNAT,GBR,winter.night,2.9170059999999998
 2020,GASNAT,GBR,winter.peak,2.9170059999999998
-2020,GASOLI,GBR,autumn.day,5.585457080000001
-2020,GASOLI,GBR,autumn.evening,5.585457080000001
-2020,GASOLI,GBR,autumn.night,5.585457080000001
-2020,GASOLI,GBR,autumn.peak,5.585457080000001
-2020,GASOLI,GBR,peak.day,5.585457080000001
-2020,GASOLI,GBR,peak.evening,5.585457080000001
-2020,GASOLI,GBR,peak.night,5.585457080000001
-2020,GASOLI,GBR,peak.peak,5.585457080000001
-2020,GASOLI,GBR,summer.day,5.8742491999999995
-2020,GASOLI,GBR,summer.evening,5.8742491999999995
-2020,GASOLI,GBR,summer.night,5.8742491999999995
-2020,GASOLI,GBR,summer.peak,5.8742491999999995
-2020,GASOLI,GBR,winter.day,5.585457080000001
-2020,GASOLI,GBR,winter.evening,5.585457080000001
-2020,GASOLI,GBR,winter.night,5.585457080000001
-2020,GASOLI,GBR,winter.peak,5.585457080000001
+2020,GASOLI,GBR,autumn.day,10.570299353027398
+2020,GASOLI,GBR,autumn.evening,10.570299353027398
+2020,GASOLI,GBR,autumn.night,10.570299353027398
+2020,GASOLI,GBR,autumn.peak,10.570299353027398
+2020,GASOLI,GBR,peak.day,10.570299353027398
+2020,GASOLI,GBR,peak.evening,10.570299353027398
+2020,GASOLI,GBR,peak.night,10.570299353027398
+2020,GASOLI,GBR,peak.peak,10.570299353027398
+2020,GASOLI,GBR,summer.day,10.859091473027396
+2020,GASOLI,GBR,summer.evening,10.859091473027396
+2020,GASOLI,GBR,summer.night,10.859091473027396
+2020,GASOLI,GBR,summer.peak,10.859091473027396
+2020,GASOLI,GBR,winter.day,10.570299353027398
+2020,GASOLI,GBR,winter.evening,10.570299353027398
+2020,GASOLI,GBR,winter.night,10.570299353027398
+2020,GASOLI,GBR,winter.peak,10.570299353027398
 2020,GASPRD,GBR,autumn.day,2.20452
 2020,GASPRD,GBR,autumn.evening,2.20452
 2020,GASPRD,GBR,autumn.night,2.20452
@@ -142,63 +142,63 @@ milestone_year,commodity_id,region_id,time_slice,price
 2020,RSHEAT,GBR,winter.day,5.8665369
 2020,RSHEAT,GBR,winter.evening,5.8665369
 2020,RSHEAT,GBR,winter.night,5.8665369
-2020,RSHEAT,GBR,winter.peak,5.8665369
-2020,TPASKM,GBR,autumn.day,22.48501913560649
-2020,TPASKM,GBR,autumn.evening,22.48501913560649
-2020,TPASKM,GBR,autumn.night,18.527377153448015
-2020,TPASKM,GBR,autumn.peak,22.48501913560649
-2020,TPASKM,GBR,peak.day,22.48501913560649
-2020,TPASKM,GBR,peak.evening,22.48501913560649
-2020,TPASKM,GBR,peak.night,18.527377153448015
-2020,TPASKM,GBR,peak.peak,22.48501913560649
-2020,TPASKM,GBR,summer.day,23.265538378935588
-2020,TPASKM,GBR,summer.evening,23.265538378935588
-2020,TPASKM,GBR,summer.night,19.15933955338482
-2020,TPASKM,GBR,summer.peak,23.265538378935588
-2020,TPASKM,GBR,winter.day,22.48501913560649
-2020,TPASKM,GBR,winter.evening,22.48501913560649
-2020,TPASKM,GBR,winter.night,18.527377153448015
-2020,TPASKM,GBR,winter.peak,22.48501913560649
-2030,BIOPEL,GBR,autumn.day,4.7221140833333335
-2030,BIOPEL,GBR,autumn.evening,4.7221140833333335
-2030,BIOPEL,GBR,autumn.night,4.7221140833333335
-2030,BIOPEL,GBR,autumn.peak,4.7221140833333335
-2030,BIOPEL,GBR,peak.day,4.7221140833333335
-2030,BIOPEL,GBR,peak.evening,4.7221140833333335
-2030,BIOPEL,GBR,peak.night,4.7221140833333335
-2030,BIOPEL,GBR,peak.peak,4.7221140833333335
-2030,BIOPEL,GBR,summer.day,2.173159975
-2030,BIOPEL,GBR,summer.evening,2.173159975
-2030,BIOPEL,GBR,summer.night,2.173159975
-2030,BIOPEL,GBR,summer.peak,2.173159975
+2020,RSHEAT,GBR,winter.peak,6.905403130583229
+2020,TPASKM,GBR,autumn.day,35.9575658209463
+2020,TPASKM,GBR,autumn.evening,35.9575658209463
+2020,TPASKM,GBR,autumn.night,7.449949881161544
+2020,TPASKM,GBR,autumn.peak,35.9575658209463
+2020,TPASKM,GBR,peak.day,35.9575658209463
+2020,TPASKM,GBR,peak.evening,35.9575658209463
+2020,TPASKM,GBR,peak.night,7.449949881161544
+2020,TPASKM,GBR,peak.peak,35.9575658209463
+2020,TPASKM,GBR,summer.day,36.738085064275396
+2020,TPASKM,GBR,summer.evening,36.738085064275396
+2020,TPASKM,GBR,summer.night,8.081912281098349
+2020,TPASKM,GBR,summer.peak,36.738085064275396
+2020,TPASKM,GBR,winter.day,35.9575658209463
+2020,TPASKM,GBR,winter.evening,35.9575658209463
+2020,TPASKM,GBR,winter.night,7.449949881161544
+2020,TPASKM,GBR,winter.peak,35.9575658209463
+2030,BIOPEL,GBR,autumn.day,2.173159975
+2030,BIOPEL,GBR,autumn.evening,2.173159975
+2030,BIOPEL,GBR,autumn.night,2.173159975
+2030,BIOPEL,GBR,autumn.peak,2.173159975
+2030,BIOPEL,GBR,peak.day,2.173159975
+2030,BIOPEL,GBR,peak.evening,2.173159975
+2030,BIOPEL,GBR,peak.night,2.173159975
+2030,BIOPEL,GBR,peak.peak,2.173159975
+2030,BIOPEL,GBR,summer.day,0.5225
+2030,BIOPEL,GBR,summer.evening,0.5225
+2030,BIOPEL,GBR,summer.night,0.5225
+2030,BIOPEL,GBR,summer.peak,0.5225
 2030,BIOPEL,GBR,winter.day,4.7221140833333335
 2030,BIOPEL,GBR,winter.evening,4.7221140833333335
 2030,BIOPEL,GBR,winter.night,4.7221140833333335
 2030,BIOPEL,GBR,winter.peak,4.7221140833333335
-2030,BIOPRD,GBR,autumn.day,4.249632460317461
-2030,BIOPRD,GBR,autumn.evening,4.249632460317461
-2030,BIOPRD,GBR,autumn.night,4.249632460317461
-2030,BIOPRD,GBR,autumn.peak,4.249632460317461
-2030,BIOPRD,GBR,peak.day,4.249632460317461
-2030,BIOPRD,GBR,peak.evening,4.249632460317461
-2030,BIOPRD,GBR,peak.night,4.249632460317461
-2030,BIOPRD,GBR,peak.peak,4.249632460317461
-2030,BIOPRD,GBR,summer.day,1.822057119047619
-2030,BIOPRD,GBR,summer.evening,1.822057119047619
-2030,BIOPRD,GBR,summer.night,1.822057119047619
-2030,BIOPRD,GBR,summer.peak,1.822057119047619
+2030,BIOPRD,GBR,autumn.day,1.822057119047619
+2030,BIOPRD,GBR,autumn.evening,1.822057119047619
+2030,BIOPRD,GBR,autumn.night,1.822057119047619
+2030,BIOPRD,GBR,autumn.peak,1.822057119047619
+2030,BIOPRD,GBR,peak.day,1.822057119047619
+2030,BIOPRD,GBR,peak.evening,1.822057119047619
+2030,BIOPRD,GBR,peak.night,1.822057119047619
+2030,BIOPRD,GBR,peak.peak,1.822057119047619
+2030,BIOPRD,GBR,summer.day,0.25
+2030,BIOPRD,GBR,summer.evening,0.25
+2030,BIOPRD,GBR,summer.night,0.25
+2030,BIOPRD,GBR,summer.peak,0.25
 2030,BIOPRD,GBR,winter.day,4.249632460317461
 2030,BIOPRD,GBR,winter.evening,4.249632460317461
 2030,BIOPRD,GBR,winter.night,4.249632460317461
 2030,BIOPRD,GBR,winter.peak,4.249632460317461
-2030,DIESEL,GBR,autumn.day,6.373430018579993
-2030,DIESEL,GBR,autumn.evening,6.373430018579993
-2030,DIESEL,GBR,autumn.night,6.373430018579993
-2030,DIESEL,GBR,autumn.peak,6.373430018579993
-2030,DIESEL,GBR,peak.day,5.483919719999999
-2030,DIESEL,GBR,peak.evening,5.483919719999999
-2030,DIESEL,GBR,peak.night,5.483919719999999
-2030,DIESEL,GBR,peak.peak,5.483919719999999
+2030,DIESEL,GBR,autumn.day,2.8097726472596607
+2030,DIESEL,GBR,autumn.evening,2.8097726472596607
+2030,DIESEL,GBR,autumn.night,2.8097726472596607
+2030,DIESEL,GBR,autumn.peak,2.8097726472596607
+2030,DIESEL,GBR,peak.day,2.8097726472596607
+2030,DIESEL,GBR,peak.evening,2.8097726472596607
+2030,DIESEL,GBR,peak.night,2.8097726472596607
+2030,DIESEL,GBR,peak.peak,2.8097726472596607
 2030,DIESEL,GBR,summer.day,2.8097726472596607
 2030,DIESEL,GBR,summer.evening,2.8097726472596607
 2030,DIESEL,GBR,summer.night,2.8097726472596607
@@ -208,11 +208,11 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,DIESEL,GBR,winter.night,2.8097726472596607
 2030,DIESEL,GBR,winter.peak,2.8097726472596607
 2030,ELCTRI,GBR,autumn.day,7.993308999999999
-2030,ELCTRI,GBR,autumn.evening,17.26223303030303
+2030,ELCTRI,GBR,autumn.evening,7.993308999999999
 2030,ELCTRI,GBR,autumn.night,7.993308999999999
-2030,ELCTRI,GBR,autumn.peak,17.26223303030303
+2030,ELCTRI,GBR,autumn.peak,7.993308999999999
 2030,ELCTRI,GBR,peak.day,7.993308999999999
-2030,ELCTRI,GBR,peak.evening,17.26223303030303
+2030,ELCTRI,GBR,peak.evening,7.993308999999999
 2030,ELCTRI,GBR,peak.night,7.993308999999999
 2030,ELCTRI,GBR,peak.peak,7.993308999999999
 2030,ELCTRI,GBR,summer.day,7.993308999999999
@@ -289,26 +289,26 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,OILCRD,GBR,winter.peak,3.072868
 2030,RSHEAT,GBR,autumn.day,5.8665369
 2030,RSHEAT,GBR,autumn.evening,5.8665369
-2030,RSHEAT,GBR,autumn.night,5.8665369
+2030,RSHEAT,GBR,autumn.night,2.80779197
 2030,RSHEAT,GBR,autumn.peak,5.8665369
 2030,RSHEAT,GBR,peak.day,5.8665369
 2030,RSHEAT,GBR,peak.evening,5.8665369
-2030,RSHEAT,GBR,peak.night,5.8665369
+2030,RSHEAT,GBR,peak.night,2.80779197
 2030,RSHEAT,GBR,peak.peak,5.8665369
-2030,RSHEAT,GBR,summer.day,2.80779197
-2030,RSHEAT,GBR,summer.evening,2.80779197
-2030,RSHEAT,GBR,summer.night,2.80779197
-2030,RSHEAT,GBR,summer.peak,2.80779197
+2030,RSHEAT,GBR,summer.day,0.827
+2030,RSHEAT,GBR,summer.evening,0.827
+2030,RSHEAT,GBR,summer.night,0.827
+2030,RSHEAT,GBR,summer.peak,0.827
 2030,RSHEAT,GBR,winter.day,5.8665369
 2030,RSHEAT,GBR,winter.evening,5.8665369
 2030,RSHEAT,GBR,winter.night,5.8665369
 2030,RSHEAT,GBR,winter.peak,5.8665369
 2030,TPASKM,GBR,autumn.day,12.584828103508185
-2030,TPASKM,GBR,autumn.evening,20.50406670565033
+2030,TPASKM,GBR,autumn.evening,12.584828103508185
 2030,TPASKM,GBR,autumn.night,12.584828103508185
-2030,TPASKM,GBR,autumn.peak,20.50406670565033
+2030,TPASKM,GBR,autumn.peak,12.584828103508185
 2030,TPASKM,GBR,peak.day,12.584828103508185
-2030,TPASKM,GBR,peak.evening,20.50406670565033
+2030,TPASKM,GBR,peak.evening,12.584828103508185
 2030,TPASKM,GBR,peak.night,12.584828103508185
 2030,TPASKM,GBR,peak.peak,12.584828103508185
 2030,TPASKM,GBR,summer.day,12.584828103508185

From 8f9ba792abfcef8e4a1ef9cbb03a019bf4d453fd Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 18 Dec 2025 14:36:33 +0000
Subject: [PATCH 3/3] Add test for annual limit

---
 src/process.rs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/process.rs b/src/process.rs
index fa67d1645..9d08edd3b 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -1019,6 +1019,33 @@ mod tests {
         assert_eq!(*season_limit.end(), Dimensionless(0.01));
     }
 
+    #[rstest]
+    fn test_new_from_limits_with_annual_limit_applied(time_slice_info2: TimeSliceInfo) {
+        let mut limits = HashMap::new();
+
+        // Set an annual upper limit that is stricter than the sum of timeslices
+        limits.insert(
+            TimeSliceSelection::Annual,
+            Dimensionless(0.0)..=Dimensionless(0.01),
+        );
+
+        let result = ActivityLimits::new_from_limits(&limits, &time_slice_info2).unwrap();
+
+        // Each timeslice upper bound should be capped by the annual upper bound (0.01)
+        for (ts_id, _ts_len) in time_slice_info2.iter() {
+            let ts_limit = result.get_limit_for_time_slice(&ts_id);
+            assert_eq!(*ts_limit.end(), Dimensionless(0.01));
+        }
+
+        // The seasonal limit should be capped by the annual upper bound (0.01)
+        let season_limit = result.get_limit(&TimeSliceSelection::Season("winter".into()));
+        assert_eq!(*season_limit.end(), Dimensionless(0.01));
+
+        // The annual limit should reflect the given bound
+        let annual_limit = result.get_limit(&TimeSliceSelection::Annual);
+        assert_eq!(*annual_limit.end(), Dimensionless(0.01));
+    }
+
     #[rstest]
     fn test_new_from_limits_missing_timeslices_error(time_slice_info2: TimeSliceInfo) {
         let mut limits = HashMap::new();