diff --git a/src/asset.rs b/src/asset.rs
index 9fcc3e11c..371133da7 100644
--- a/src/asset.rs
+++ b/src/asset.rs
@@ -345,6 +345,16 @@ impl Asset {
         lb..=ub
     }
 
+    /// Get the activity limits per unit of capacity for this asset for a given time slice selection
+    pub fn get_activity_per_capacity_limits_for_selection(
+        &self,
+        time_slice_selection: &TimeSliceSelection,
+    ) -> RangeInclusive<ActivityPerCapacity> {
+        let limits = self.activity_limits.get_limit(time_slice_selection);
+        let cap2act = self.process.capacity_to_activity;
+        (cap2act * *limits.start())..=(cap2act * *limits.end())
+    }
+
     /// Iterate over activity limits for this asset
     pub fn iter_activity_limits(
         &self,
diff --git a/src/simulation/investment.rs b/src/simulation/investment.rs
index 025ae59cd..959a22f75 100644
--- a/src/simulation/investment.rs
+++ b/src/simulation/investment.rs
@@ -7,14 +7,15 @@ use crate::model::Model;
 use crate::output::DataWriter;
 use crate::region::RegionID;
 use crate::simulation::prices::Prices;
-use crate::time_slice::{TimeSliceID, TimeSliceInfo};
-use crate::units::{Capacity, Dimensionless, Flow, FlowPerCapacity};
+use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceLevel};
+use crate::units::{ActivityPerCapacity, Capacity, Dimensionless, Flow, FlowPerCapacity};
 use anyhow::{Context, Result, bail, ensure};
 use indexmap::IndexMap;
 use itertools::{Itertools, chain};
 use log::debug;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Display;
+use strum::IntoEnumIterator;
 
 pub mod appraisal;
 use appraisal::coefficients::calculate_coefficients_for_assets;
@@ -570,7 +571,19 @@ where
     })
 }
 
-/// Get the maximum required capacity across time slices
+/// Returns the minimum installed capacity required for `asset` to satisfy the demand that it can
+/// potentially serve, accounting for its activity constraints.
+///
+/// The returned value is the maximum capacity requirement implied by any time-slice selection,
+/// since constraints at coarser aggregation levels (e.g. seasonal or annual limits) can require
+/// more capacity than constraints at the finest time-slice level.
+///
+/// Demand is evaluated using the commodity's balance level. Demand within a balance bucket is
+/// treated as fungible: if the asset is capable of operating in any constituent time slice of a
+/// bucket, then all demand in that bucket is considered serviceable by the asset.
+///
+/// Selections whose maximum supply is zero are ignored. Such selections would otherwise imply an
+/// infinite capacity requirement and therefore provide no useful lower bound.
 fn get_demand_limiting_capacity(
     time_slice_info: &TimeSliceInfo,
     asset: &Asset,
@@ -579,23 +592,62 @@ fn get_demand_limiting_capacity(
 ) -> Capacity {
     let coeff = asset.get_flow(&commodity.id).unwrap().coeff;
     let mut capacity = Capacity(0.0);
-
-    for time_slice_selection in time_slice_info.iter_selections_at_level(commodity.time_slice_level)
-    {
-        let demand_for_selection: Flow = time_slice_selection
-            .iter(time_slice_info)
-            .map(|(time_slice, _)| demand[time_slice])
-            .sum();
-
-        // Calculate max capacity required for this time slice selection
-        // For commodities with a coarse time slice level, we have to allow the possibility that all
-        // of the demand gets served by production in a single time slice
-        for (time_slice, _) in time_slice_selection.iter(time_slice_info) {
-            let max_flow_per_cap =
-                *asset.get_activity_per_capacity_limits(time_slice).end() * coeff;
-            if max_flow_per_cap != FlowPerCapacity(0.0) {
-                capacity = capacity.max(demand_for_selection / max_flow_per_cap);
+    let mut demand_cache: HashMap<_, Flow> = HashMap::new();
+
+    // Calculate demand-limiting capacity at each timeslice level and take the max.
+    for level in TimeSliceLevel::iter() {
+        for selection in time_slice_info.iter_selections_at_level(level) {
+            // Maximum supply within this selection according to the asset's activity limits.
+            let max_supply_for_selection = *asset
+                .get_activity_per_capacity_limits_for_selection(&selection)
+                .end()
+                * coeff;
+
+            // Selections with zero supply would imply infinite demand-limiting capacity,
+            // so they do not contribute to the maximum.
+            if max_supply_for_selection == FlowPerCapacity(0.0) {
+                continue;
             }
+
+            // Serviceable demand within this selection.
+            //
+            // Demand is effectively grouped into balance buckets at the commodity's
+            // balance level. A balance bucket contributes if:
+            //   1. The bucket is contained within this selection, and
+            //   2. The asset can operate in at least one constituent timeslice
+            //      within that bucket.
+            //
+            // Demand within a balance bucket is fungible, so if the asset can serve
+            // any timeslice in the bucket, all demand in that bucket is considered
+            // serviceable.
+            let demand_selection_level = level.max(commodity.time_slice_level);
+            let demand_selection = selection
+                .containing_selection_at_level(demand_selection_level)
+                .unwrap();
+            let serviceable_demand_for_selection = *demand_cache
+                .entry(demand_selection.clone())
+                .or_insert_with(|| {
+                    demand_selection
+                        .iter_at_level(time_slice_info, commodity.time_slice_level)
+                        .unwrap()
+                        .filter(|(bucket, _)| {
+                            bucket.iter(time_slice_info).any(|(ts, _)| {
+                                *asset.get_activity_per_capacity_limits(ts).end()
+                                    > ActivityPerCapacity(0.0)
+                            })
+                        })
+                        .map(|(bucket, _)| {
+                            bucket
+                                .iter(time_slice_info)
+                                .map(|(ts, _)| demand[ts])
+                                .sum::<Flow>()
+                        })
+                        .sum()
+                });
+
+            // Calculate demand-limiting capacity for this selection and take the
+            // maximum across all selections.
+            capacity = capacity.max(serviceable_demand_for_selection / max_supply_for_selection);
         }
     }
 
@@ -931,7 +983,7 @@ mod tests {
         ProcessInvestmentConstraint, ProcessInvestmentConstraintsMap, ProcessParameterMap,
     };
     use crate::region::RegionID;
-    use crate::time_slice::{TimeSliceID, TimeSliceInfo};
+    use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceSelection};
     use crate::units::Dimensionless;
     use crate::units::{ActivityPerCapacity, Capacity, Flow, FlowPerActivity, MoneyPerFlow};
     use indexmap::{IndexSet, indexmap};
@@ -1020,6 +1072,68 @@ mod tests {
         assert_eq!(result, Capacity(20.0));
     }
 
+    #[rstest]
+    fn get_demand_limiting_capacity_uses_coarser_limits(
+        time_slice_info2: TimeSliceInfo,
+        svd_commodity: Commodity,
+        mut process: Process,
+    ) {
+        let (time_slice1, time_slice2) =
+            time_slice_info2.time_slices.keys().collect_tuple().unwrap();
+
+        // Configure a 1:1 activity-to-flow relationship.
+        let commodity_rc = Rc::new(svd_commodity);
+        let process_flow = ProcessFlow {
+            commodity: Rc::clone(&commodity_rc),
+            coeff: FlowPerActivity(1.0),
+            kind: FlowType::Fixed,
+            cost: MoneyPerFlow(0.0),
+        };
+
+        let process_flows = indexmap! { commodity_rc.id.clone() => process_flow.clone() };
+        process.flows = process_flows_map(process.regions.clone(), Rc::new(process_flows));
+
+        // Fine-grained limits imply a capacity requirement of 5:
+        //   TS1: 5 / 1 = 5
+        //   TS2: 5 / 1 = 5
+        //
+        // The annual limit implies:
+        //   (5 + 5) / 0.5 = 20
+        //
+        // The function should return the larger value.
+        let limits = HashMap::from([
+            (
+                TimeSliceSelection::Single(time_slice1.clone()),
+                Dimensionless(0.0)..=Dimensionless(1.0),
+            ),
+            (
+                TimeSliceSelection::Single(time_slice2.clone()),
+                Dimensionless(0.0)..=Dimensionless(1.0),
+            ),
+            (
+                TimeSliceSelection::Annual,
+                Dimensionless(0.0)..=Dimensionless(0.5),
+            ),
+        ]);
+
+        process.activity_limits = process_activity_limits_map(
+            process.regions.clone(),
+            ActivityLimits::new_from_limits(&limits, &time_slice_info2).unwrap(),
+        );
+
+        let asset = asset(process);
+
+        let demand = indexmap! {
+            time_slice1.clone() => Flow(5.0),
+            time_slice2.clone() => Flow(5.0),
+        };
+
+        let result =
+            get_demand_limiting_capacity(&time_slice_info2, &asset, &commodity_rc, &demand);
+
+        assert_eq!(result, Capacity(20.0));
+    }
+
     #[rstest]
     fn calculate_investment_limits_for_candidates_empty_list() {
         // Test with empty list of assets
diff --git a/src/time_slice.rs b/src/time_slice.rs
index aaefabe7d..dc3f3fb3d 100644
--- a/src/time_slice.rs
+++ b/src/time_slice.rs
@@ -94,6 +94,29 @@ impl TimeSliceSelection {
         }
     }
 
+    /// Get the [`TimeSliceSelection`] containing this selection at the specified level.
+    pub fn containing_selection_at_level(
+        &self,
+        level: TimeSliceLevel,
+    ) -> Option<TimeSliceSelection> {
+        if level < self.level() {
+            return None;
+        }
+
+        let mut selection = self.clone();
+        while selection.level() < level {
+            selection = match selection {
+                TimeSliceSelection::Single(time_slice_id) => {
+                    TimeSliceSelection::Season(time_slice_id.season.clone())
+                }
+                TimeSliceSelection::Season(_) => TimeSliceSelection::Annual,
+                TimeSliceSelection::Annual => unreachable!(),
+            };
+        }
+
+        Some(selection)
+    }
+
     /// Iterate over the subset of time slices in this selection
     pub fn iter<'a>(
         &'a self,
@@ -192,7 +215,15 @@ impl Display for TimeSliceSelection {
 
 /// The time granularity for a particular operation
 #[derive(
-    PartialEq, PartialOrd, Copy, Clone, Debug, DeserializeLabeledStringEnum, strum::EnumIter,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Copy,
+    Clone,
+    Debug,
+    DeserializeLabeledStringEnum,
+    strum::EnumIter,
 )]
 pub enum TimeSliceLevel {
     /// Treat individual time slices separately
diff --git a/tests/data/muse1_default/asset_capacities.csv b/tests/data/muse1_default/asset_capacities.csv
index 002065ff5..8efd7955c 100644
--- a/tests/data/muse1_default/asset_capacities.csv
+++ b/tests/data/muse1_default/asset_capacities.csv
@@ -1,50 +1,47 @@
 milestone_year,asset_id,group_id,capacity,num_units
 2020,0,,24.0,
 2020,1,,19.0,
-2025,0,,24.0,
 2025,2,,23.939952120095757,
-2025,3,,9.575980848038302,
-2025,4,,5.107189785620431,
-2030,0,,24.0,
+2025,3,,13.299973400053199,
+2025,4,,1.3299973400053235,
 2030,2,,23.939952120095757,
-2030,3,,9.575980848038302,
-2030,4,,5.107189785620431,
+2030,3,,13.299973400053199,
+2030,4,,1.3299973400053235,
 2030,5,,5.939988120023763,
-2030,6,,5.975988048023905,
+2030,6,,12.73337453325093,
 2035,2,,23.939952120095757,
-2035,3,,9.575980848038302,
+2035,3,,13.299973400053199,
 2035,5,,5.939988120023763,
-2035,6,,5.975988048023905,
+2035,6,,12.73337453325093,
 2035,7,,6.119987760024477,
-2035,8,,5.875188249623504,
+2035,8,,11.679816640366745,
 2040,2,,23.939952120095757,
-2040,3,,9.575980848038302,
+2040,3,,13.299973400053199,
 2040,5,,5.939988120023763,
-2040,6,,5.975988048023905,
+2040,6,,12.73337453325093,
 2040,7,,6.119987760024477,
-2040,8,,5.875188249623504,
-2040,9,,5.939988120023762,
-2040,10,,16.775966448067106,
-2040,11,,2.6567946864106284,
+2040,8,,11.679816640366745,
+2040,9,,5.939988120023761,
+2040,10,,1.0999978000044013,
 2045,2,,23.939952120095757,
-2045,3,,9.575980848038302,
+2045,3,,13.299973400053199,
 2045,5,,5.939988120023763,
-2045,6,,5.975988048023905,
+2045,6,,12.73337453325093,
 2045,7,,6.119987760024477,
-2045,8,,5.875188249623504,
-2045,9,,5.939988120023762,
-2045,10,,16.775966448067106,
-2045,12,,5.939988120023759,
-2045,13,,8.320303359393275,
+2045,8,,11.679816640366745,
+2045,9,,5.939988120023761,
+2045,10,,1.0999978000044013,
+2045,11,,5.939988120023761,
+2045,12,,6.4042111915775575,
 2050,2,,23.939952120095757,
-2050,3,,9.575980848038302,
+2050,3,,13.299973400053199,
 2050,5,,5.939988120023763,
-2050,6,,5.975988048023905,
+2050,6,,12.73337453325093,
 2050,7,,6.119987760024477,
-2050,8,,5.875188249623504,
-2050,9,,5.939988120023762,
-2050,10,,16.775966448067106,
-2050,12,,5.939988120023759,
-2050,13,,8.320303359393275,
-2050,14,,6.1199877600244745,
-2050,15,,5.703540592918827,
+2050,8,,11.679816640366745,
+2050,9,,5.939988120023761,
+2050,10,,1.0999978000044013,
+2050,11,,5.939988120023761,
+2050,12,,6.4042111915775575,
+2050,13,,6.11998776002448,
+2050,14,,6.950586098827813,
diff --git a/tests/data/muse1_default/assets.csv b/tests/data/muse1_default/assets.csv
index bf968c076..868bfc901 100644
--- a/tests/data/muse1_default/assets.csv
+++ b/tests/data/muse1_default/assets.csv
@@ -10,8 +10,7 @@ asset_id,group_id,process_id,region_id,agent_id,commission_year
 8,,windturbine,R1,A1_PWR,2035
 9,,heatpump,R1,A1_RES,2040
 10,,windturbine,R1,A1_PWR,2040
-11,,gasCCGT,R1,A1_PWR,2040
-12,,heatpump,R1,A1_RES,2045
-13,,windturbine,R1,A1_PWR,2045
-14,,heatpump,R1,A1_RES,2050
-15,,windturbine,R1,A1_PWR,2050
+11,,heatpump,R1,A1_RES,2045
+12,,windturbine,R1,A1_PWR,2045
+13,,heatpump,R1,A1_RES,2050
+14,,windturbine,R1,A1_PWR,2050
diff --git a/tests/data/muse1_default/commodity_flows.csv b/tests/data/muse1_default/commodity_flows.csv
index 30bd3a173..d07534e06 100644
--- a/tests/data/muse1_default/commodity_flows.csv
+++ b/tests/data/muse1_default/commodity_flows.csv
@@ -23,12 +23,6 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2020,1,,gas,all-year.evening,-2.32
 2020,1,,heat,all-year.evening,2.0
 2020,1,,CO2f,all-year.evening,129.42
-2025,0,,gas,all-year.night,0.0
-2025,0,,gas,all-year.morning,1.154972000000001
-2025,0,,gas,all-year.afternoon,0.0
-2025,0,,gas,all-year.early-peak,1.33266
-2025,0,,gas,all-year.late-peak,0.0
-2025,0,,gas,all-year.evening,0.0
 2025,2,,electricity,all-year.night,-0.532
 2025,2,,heat,all-year.night,1.33
 2025,2,,electricity,all-year.morning,-0.798
@@ -43,40 +37,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2025,2,,heat,all-year.evening,2.66
 2025,3,,wind,all-year.night,-0.532
 2025,3,,electricity,all-year.night,0.532
-2025,3,,wind,all-year.morning,-0.10639999999999938
-2025,3,,electricity,all-year.morning,0.10639999999999938
+2025,3,,wind,all-year.morning,-0.798
+2025,3,,electricity,all-year.morning,0.798
 2025,3,,wind,all-year.afternoon,-0.532
 2025,3,,electricity,all-year.afternoon,0.532
-2025,3,,wind,all-year.early-peak,-0.0
-2025,3,,electricity,all-year.early-peak,0.0
+2025,3,,wind,all-year.early-peak,-0.798
+2025,3,,electricity,all-year.early-peak,0.798
 2025,3,,wind,all-year.late-peak,-1.596
 2025,3,,electricity,all-year.late-peak,1.596
 2025,3,,wind,all-year.evening,-1.064
 2025,3,,electricity,all-year.evening,1.064
-2025,4,,gas,all-year.night,0.0
-2025,4,,electricity,all-year.night,-0.0
-2025,4,,CO2f,all-year.night,-0.0
-2025,4,,gas,all-year.morning,-1.154972000000001
-2025,4,,electricity,all-year.morning,0.6916000000000007
-2025,4,,CO2f,all-year.morning,63.398972000000064
-2025,4,,gas,all-year.afternoon,0.0
-2025,4,,electricity,all-year.afternoon,-0.0
-2025,4,,CO2f,all-year.afternoon,-0.0
-2025,4,,gas,all-year.early-peak,-1.33266
-2025,4,,electricity,all-year.early-peak,0.798
-2025,4,,CO2f,all-year.early-peak,73.15266000000001
-2025,4,,gas,all-year.late-peak,0.0
-2025,4,,electricity,all-year.late-peak,-0.0
-2025,4,,CO2f,all-year.late-peak,-0.0
-2025,4,,gas,all-year.evening,0.0
-2025,4,,electricity,all-year.evening,-0.0
-2025,4,,CO2f,all-year.evening,-0.0
-2030,0,,gas,all-year.night,0.0
-2030,0,,gas,all-year.morning,0.0
-2030,0,,gas,all-year.afternoon,0.0
-2030,0,,gas,all-year.early-peak,0.7000640000000007
-2030,0,,gas,all-year.late-peak,0.0
-2030,0,,gas,all-year.evening,0.0
+2025,4,,gas,all-year.night,-0.0
+2025,4,,electricity,all-year.night,0.0
+2025,4,,CO2f,all-year.night,0.0
+2025,4,,gas,all-year.morning,-0.0
+2025,4,,electricity,all-year.morning,0.0
+2025,4,,CO2f,all-year.morning,0.0
+2025,4,,gas,all-year.afternoon,-0.0
+2025,4,,electricity,all-year.afternoon,0.0
+2025,4,,CO2f,all-year.afternoon,0.0
+2025,4,,gas,all-year.early-peak,-0.0
+2025,4,,electricity,all-year.early-peak,0.0
+2025,4,,CO2f,all-year.early-peak,0.0
+2025,4,,gas,all-year.late-peak,-0.0
+2025,4,,electricity,all-year.late-peak,0.0
+2025,4,,CO2f,all-year.late-peak,0.0
+2025,4,,gas,all-year.evening,-0.0
+2025,4,,electricity,all-year.evening,0.0
+2025,4,,CO2f,all-year.evening,0.0
 2030,2,,electricity,all-year.night,-0.26799999999999985
 2030,2,,heat,all-year.night,0.6699999999999996
 2030,2,,electricity,all-year.morning,-0.5999999999999999
@@ -89,36 +77,36 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2030,2,,heat,all-year.late-peak,3.9899999999999998
 2030,2,,electricity,all-year.evening,-0.9319999999999999
 2030,2,,heat,all-year.evening,2.3299999999999996
-2030,3,,wind,all-year.night,-0.32960000000000034
-2030,3,,electricity,all-year.night,0.32960000000000034
+2030,3,,wind,all-year.night,-0.664
+2030,3,,electricity,all-year.night,0.664
 2030,3,,wind,all-year.morning,-0.9960000000000001
 2030,3,,electricity,all-year.morning,0.9960000000000001
-2030,3,,wind,all-year.afternoon,-0.0
-2030,3,,electricity,all-year.afternoon,0.0
-2030,3,,wind,all-year.early-peak,-0.5767999999999996
-2030,3,,electricity,all-year.early-peak,0.5767999999999996
-2030,3,,wind,all-year.late-peak,-1.5959999999999999
-2030,3,,electricity,all-year.late-peak,1.5959999999999999
-2030,3,,wind,all-year.evening,-0.33199999999999996
-2030,3,,electricity,all-year.evening,0.33199999999999996
-2030,4,,gas,all-year.night,0.0
-2030,4,,electricity,all-year.night,-0.0
-2030,4,,CO2f,all-year.night,-0.0
-2030,4,,gas,all-year.morning,0.0
-2030,4,,electricity,all-year.morning,-0.0
-2030,4,,CO2f,all-year.morning,-0.0
-2030,4,,gas,all-year.afternoon,0.0
-2030,4,,electricity,all-year.afternoon,-0.0
-2030,4,,CO2f,all-year.afternoon,-0.0
-2030,4,,gas,all-year.early-peak,-0.7000640000000007
-2030,4,,electricity,all-year.early-peak,0.41920000000000046
-2030,4,,CO2f,all-year.early-peak,38.42806400000004
-2030,4,,gas,all-year.late-peak,0.0
-2030,4,,electricity,all-year.late-peak,-0.0
-2030,4,,CO2f,all-year.late-peak,-0.0
-2030,4,,gas,all-year.evening,0.0
-2030,4,,electricity,all-year.evening,-0.0
-2030,4,,CO2f,all-year.evening,-0.0
+2030,3,,wind,all-year.afternoon,-0.664
+2030,3,,electricity,all-year.afternoon,0.664
+2030,3,,wind,all-year.early-peak,-0.0
+2030,3,,electricity,all-year.early-peak,0.0
+2030,3,,wind,all-year.late-peak,-0.0
+2030,3,,electricity,all-year.late-peak,0.0
+2030,3,,wind,all-year.evening,-1.328
+2030,3,,electricity,all-year.evening,1.328
+2030,4,,gas,all-year.night,-0.0
+2030,4,,electricity,all-year.night,0.0
+2030,4,,CO2f,all-year.night,0.0
+2030,4,,gas,all-year.morning,-0.0
+2030,4,,electricity,all-year.morning,0.0
+2030,4,,CO2f,all-year.morning,0.0
+2030,4,,gas,all-year.afternoon,-0.0
+2030,4,,electricity,all-year.afternoon,0.0
+2030,4,,CO2f,all-year.afternoon,0.0
+2030,4,,gas,all-year.early-peak,-0.0
+2030,4,,electricity,all-year.early-peak,0.0
+2030,4,,CO2f,all-year.early-peak,0.0
+2030,4,,gas,all-year.late-peak,-0.0
+2030,4,,electricity,all-year.late-peak,0.0
+2030,4,,CO2f,all-year.late-peak,0.0
+2030,4,,gas,all-year.evening,-0.0
+2030,4,,electricity,all-year.evening,0.0
+2030,4,,CO2f,all-year.evening,0.0
 2030,5,,electricity,all-year.night,-0.39600000000000024
 2030,5,,heat,all-year.night,0.9900000000000005
 2030,5,,electricity,all-year.morning,-0.39600000000000024
@@ -131,18 +119,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2030,5,,heat,all-year.late-peak,0.9900000000000005
 2030,5,,electricity,all-year.evening,-0.39600000000000024
 2030,5,,heat,all-year.evening,0.9900000000000005
-2030,6,,wind,all-year.night,-0.3343999999999998
-2030,6,,electricity,all-year.night,0.3343999999999998
+2030,6,,wind,all-year.night,-0.0
+2030,6,,electricity,all-year.night,0.0
 2030,6,,wind,all-year.morning,-0.0
 2030,6,,electricity,all-year.morning,0.0
-2030,6,,wind,all-year.afternoon,-0.6640000000000001
-2030,6,,electricity,all-year.afternoon,0.6640000000000001
-2030,6,,wind,all-year.early-peak,-0.0
-2030,6,,electricity,all-year.early-peak,0.0
-2030,6,,wind,all-year.late-peak,-0.39600000000000035
-2030,6,,electricity,all-year.late-peak,0.39600000000000035
-2030,6,,wind,all-year.evening,-0.9960000000000002
-2030,6,,electricity,all-year.evening,0.9960000000000002
+2030,6,,wind,all-year.afternoon,-0.0
+2030,6,,electricity,all-year.afternoon,0.0
+2030,6,,wind,all-year.early-peak,-0.9960000000000001
+2030,6,,electricity,all-year.early-peak,0.9960000000000001
+2030,6,,wind,all-year.late-peak,-1.9920000000000002
+2030,6,,electricity,all-year.late-peak,1.9920000000000002
+2030,6,,wind,all-year.evening,-0.0
+2030,6,,electricity,all-year.evening,0.0
 2035,2,,electricity,all-year.night,-0.0
 2035,2,,heat,all-year.night,0.0
 2035,2,,electricity,all-year.morning,-0.3959999999999999
@@ -157,16 +145,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,2,,heat,all-year.evening,1.9899999999999998
 2035,3,,wind,all-year.night,-0.0
 2035,3,,electricity,all-year.night,0.0
-2035,3,,wind,all-year.morning,-0.37648000000000104
-2035,3,,electricity,all-year.morning,0.37648000000000104
+2035,3,,wind,all-year.morning,-1.2
+2035,3,,electricity,all-year.morning,1.2
 2035,3,,wind,all-year.afternoon,-0.0
 2035,3,,electricity,all-year.afternoon,0.0
 2035,3,,wind,all-year.early-peak,-1.2
 2035,3,,electricity,all-year.early-peak,1.2
-2035,3,,wind,all-year.late-peak,-0.6579199999999988
-2035,3,,electricity,all-year.late-peak,0.6579199999999988
-2035,3,,wind,all-year.evening,-1.5959999999999999
-2035,3,,electricity,all-year.evening,1.5959999999999999
+2035,3,,wind,all-year.late-peak,-0.0
+2035,3,,electricity,all-year.late-peak,0.0
+2035,3,,wind,all-year.evening,-0.0
+2035,3,,electricity,all-year.evening,0.0
 2035,5,,electricity,all-year.night,-0.3920000000000002
 2035,5,,heat,all-year.night,0.9800000000000004
 2035,5,,electricity,all-year.morning,-0.39600000000000024
@@ -181,14 +169,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,5,,heat,all-year.evening,0.9900000000000005
 2035,6,,wind,all-year.night,-0.0
 2035,6,,electricity,all-year.night,0.0
-2035,6,,wind,all-year.morning,-0.8235199999999989
-2035,6,,electricity,all-year.morning,0.8235199999999989
+2035,6,,wind,all-year.morning,-0.0
+2035,6,,electricity,all-year.morning,0.0
 2035,6,,wind,all-year.afternoon,-0.0
 2035,6,,electricity,all-year.afternoon,0.0
 2035,6,,wind,all-year.early-peak,-0.0
 2035,6,,electricity,all-year.early-peak,0.0
-2035,6,,wind,all-year.late-peak,-0.9960000000000002
-2035,6,,electricity,all-year.late-peak,0.9960000000000002
+2035,6,,wind,all-year.late-peak,-2.1222333333333325
+2035,6,,electricity,all-year.late-peak,2.1222333333333325
 2035,6,,wind,all-year.evening,-0.0
 2035,6,,electricity,all-year.evening,0.0
 2035,7,,electricity,all-year.night,-0.40799999999999986
@@ -211,22 +199,22 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,8,,electricity,all-year.afternoon,0.8
 2035,8,,wind,all-year.early-peak,-0.0
 2035,8,,electricity,all-year.early-peak,0.0
-2035,8,,wind,all-year.late-peak,-0.7460800000000013
-2035,8,,electricity,all-year.late-peak,0.7460800000000013
-2035,8,,wind,all-year.evening,-0.004000000000000115
-2035,8,,electricity,all-year.evening,0.004000000000000115
+2035,8,,wind,all-year.late-peak,-0.27776666666666755
+2035,8,,electricity,all-year.late-peak,0.27776666666666755
+2035,8,,wind,all-year.evening,-1.6
+2035,8,,electricity,all-year.evening,1.6
 2040,2,,electricity,all-year.night,-0.0
 2040,2,,heat,all-year.night,0.0
-2040,2,,electricity,all-year.morning,-0.1979999999999998
-2040,2,,heat,all-year.morning,0.49499999999999944
+2040,2,,electricity,all-year.morning,-0.19799999999999987
+2040,2,,heat,all-year.morning,0.49499999999999966
 2040,2,,electricity,all-year.afternoon,-0.0
 2040,2,,heat,all-year.afternoon,0.0
-2040,2,,electricity,all-year.early-peak,-0.1979999999999998
-2040,2,,heat,all-year.early-peak,0.49499999999999944
+2040,2,,electricity,all-year.early-peak,-0.19799999999999987
+2040,2,,heat,all-year.early-peak,0.49499999999999966
 2040,2,,electricity,all-year.late-peak,-1.596
 2040,2,,heat,all-year.late-peak,3.9899999999999998
-2040,2,,electricity,all-year.evening,-0.6639999999999998
-2040,2,,heat,all-year.evening,1.6599999999999995
+2040,2,,electricity,all-year.evening,-0.6639999999999999
+2040,2,,heat,all-year.evening,1.6599999999999997
 2040,3,,wind,all-year.night,-0.0
 2040,3,,electricity,all-year.night,0.0
 2040,3,,wind,all-year.morning,-0.0
@@ -235,16 +223,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,3,,electricity,all-year.afternoon,0.0
 2040,3,,wind,all-year.early-peak,-0.0
 2040,3,,electricity,all-year.early-peak,0.0
-2040,3,,wind,all-year.late-peak,-1.5959999999999999
-2040,3,,electricity,all-year.late-peak,1.5959999999999999
-2040,3,,wind,all-year.evening,-1.4016000000000002
-2040,3,,electricity,all-year.evening,1.4016000000000002
-2040,5,,electricity,all-year.night,-0.12800000000000003
-2040,5,,heat,all-year.night,0.32000000000000006
+2040,3,,wind,all-year.late-peak,-0.8493599999999959
+2040,3,,electricity,all-year.late-peak,0.8493599999999959
+2040,3,,wind,all-year.evening,-0.31530666666666807
+2040,3,,electricity,all-year.evening,0.31530666666666807
+2040,5,,electricity,all-year.night,-0.1280000000000001
+2040,5,,heat,all-year.night,0.3200000000000003
 2040,5,,electricity,all-year.morning,-0.39600000000000024
 2040,5,,heat,all-year.morning,0.9900000000000005
-2040,5,,electricity,all-year.afternoon,-0.12800000000000003
-2040,5,,heat,all-year.afternoon,0.32000000000000006
+2040,5,,electricity,all-year.afternoon,-0.1280000000000001
+2040,5,,heat,all-year.afternoon,0.3200000000000003
 2040,5,,electricity,all-year.early-peak,-0.39600000000000024
 2040,5,,heat,all-year.early-peak,0.9900000000000005
 2040,5,,electricity,all-year.late-peak,-0.39600000000000024
@@ -253,16 +241,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,5,,heat,all-year.evening,0.9900000000000005
 2040,6,,wind,all-year.night,-0.932
 2040,6,,electricity,all-year.night,0.932
-2040,6,,wind,all-year.morning,-0.9960000000000002
-2040,6,,electricity,all-year.morning,0.9960000000000002
+2040,6,,wind,all-year.morning,-1.3980000000000001
+2040,6,,electricity,all-year.morning,1.3980000000000001
 2040,6,,wind,all-year.afternoon,-0.0
 2040,6,,electricity,all-year.afternoon,0.0
-2040,6,,wind,all-year.early-peak,-0.0
-2040,6,,electricity,all-year.early-peak,0.0
+2040,6,,wind,all-year.early-peak,-1.2146666666666666
+2040,6,,electricity,all-year.early-peak,1.2146666666666666
 2040,6,,wind,all-year.late-peak,-0.0
 2040,6,,electricity,all-year.late-peak,0.0
-2040,6,,wind,all-year.evening,-0.46240000000000026
-2040,6,,electricity,all-year.evening,0.46240000000000026
+2040,6,,wind,all-year.evening,-1.5486933333333321
+2040,6,,electricity,all-year.evening,1.5486933333333321
 2040,7,,electricity,all-year.night,-0.40799999999999986
 2040,7,,heat,all-year.night,1.0199999999999996
 2040,7,,electricity,all-year.morning,-0.40799999999999986
@@ -283,52 +271,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,8,,electricity,all-year.afternoon,0.9320000000000002
 2040,8,,wind,all-year.early-peak,-0.0
 2040,8,,electricity,all-year.early-peak,0.0
-2040,8,,wind,all-year.late-peak,-0.9792000000000005
-2040,8,,electricity,all-year.late-peak,0.9792000000000005
+2040,8,,wind,all-year.late-peak,-1.9466400000000044
+2040,8,,electricity,all-year.late-peak,1.9466400000000044
 2040,8,,wind,all-year.evening,-0.0
 2040,8,,electricity,all-year.evening,0.0
-2040,9,,electricity,all-year.night,-0.3960000000000002
-2040,9,,heat,all-year.night,0.9900000000000004
-2040,9,,electricity,all-year.morning,-0.3960000000000002
-2040,9,,heat,all-year.morning,0.9900000000000004
-2040,9,,electricity,all-year.afternoon,-0.3960000000000002
-2040,9,,heat,all-year.afternoon,0.9900000000000004
-2040,9,,electricity,all-year.early-peak,-0.3960000000000002
-2040,9,,heat,all-year.early-peak,0.9900000000000004
-2040,9,,electricity,all-year.late-peak,-0.3960000000000002
-2040,9,,heat,all-year.late-peak,0.9900000000000004
-2040,9,,electricity,all-year.evening,-0.3960000000000002
-2040,9,,heat,all-year.evening,0.9900000000000004
+2040,9,,electricity,all-year.night,-0.39600000000000013
+2040,9,,heat,all-year.night,0.9900000000000002
+2040,9,,electricity,all-year.morning,-0.39600000000000013
+2040,9,,heat,all-year.morning,0.9900000000000002
+2040,9,,electricity,all-year.afternoon,-0.39600000000000013
+2040,9,,heat,all-year.afternoon,0.9900000000000002
+2040,9,,electricity,all-year.early-peak,-0.39600000000000013
+2040,9,,heat,all-year.early-peak,0.9900000000000002
+2040,9,,electricity,all-year.late-peak,-0.39600000000000013
+2040,9,,heat,all-year.late-peak,0.9900000000000002
+2040,9,,electricity,all-year.evening,-0.39600000000000013
+2040,9,,heat,all-year.evening,0.9900000000000002
 2040,10,,wind,all-year.night,-0.0
 2040,10,,electricity,all-year.night,0.0
-2040,10,,wind,all-year.morning,-0.40199999999999986
-2040,10,,electricity,all-year.morning,0.40199999999999986
+2040,10,,wind,all-year.morning,-0.0
+2040,10,,electricity,all-year.morning,0.0
 2040,10,,wind,all-year.afternoon,-0.0
 2040,10,,electricity,all-year.afternoon,0.0
-2040,10,,wind,all-year.early-peak,-1.398
-2040,10,,electricity,all-year.early-peak,1.398
-2040,10,,wind,all-year.late-peak,-0.22079999999999994
-2040,10,,electricity,all-year.late-peak,0.22079999999999994
+2040,10,,wind,all-year.early-peak,-0.18333333333333357
+2040,10,,electricity,all-year.early-peak,0.18333333333333357
+2040,10,,wind,all-year.late-peak,-0.0
+2040,10,,electricity,all-year.late-peak,0.0
 2040,10,,wind,all-year.evening,-0.0
 2040,10,,electricity,all-year.evening,0.0
-2040,11,,gas,all-year.night,-0.0
-2040,11,,electricity,all-year.night,0.0
-2040,11,,CO2f,all-year.night,0.0
-2040,11,,gas,all-year.morning,-0.0
-2040,11,,electricity,all-year.morning,0.0
-2040,11,,CO2f,all-year.morning,0.0
-2040,11,,gas,all-year.afternoon,-0.0
-2040,11,,electricity,all-year.afternoon,0.0
-2040,11,,CO2f,all-year.afternoon,0.0
-2040,11,,gas,all-year.early-peak,-0.0
-2040,11,,electricity,all-year.early-peak,0.0
-2040,11,,CO2f,all-year.early-peak,0.0
-2040,11,,gas,all-year.late-peak,-0.0
-2040,11,,electricity,all-year.late-peak,0.0
-2040,11,,CO2f,all-year.late-peak,0.0
-2040,11,,gas,all-year.evening,-0.0
-2040,11,,electricity,all-year.evening,0.0
-2040,11,,CO2f,all-year.evening,0.0
 2045,2,,electricity,all-year.night,-0.0
 2045,2,,heat,all-year.night,0.0
 2045,2,,electricity,all-year.morning,-0.0
@@ -339,20 +309,20 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,2,,heat,all-year.early-peak,0.0
 2045,2,,electricity,all-year.late-peak,-1.596
 2045,2,,heat,all-year.late-peak,3.9899999999999998
-2045,2,,electricity,all-year.evening,-0.5320000000000001
-2045,2,,heat,all-year.evening,1.3300000000000003
+2045,2,,electricity,all-year.evening,-0.532
+2045,2,,heat,all-year.evening,1.33
 2045,3,,wind,all-year.night,-0.0
 2045,3,,electricity,all-year.night,0.0
-2045,3,,wind,all-year.morning,-1.4841279999999972
-2045,3,,electricity,all-year.morning,1.4841279999999972
+2045,3,,wind,all-year.morning,-1.5960000000000003
+2045,3,,electricity,all-year.morning,1.5960000000000003
 2045,3,,wind,all-year.afternoon,-0.0
 2045,3,,electricity,all-year.afternoon,0.0
-2045,3,,wind,all-year.early-peak,-0.7502720000000027
-2045,3,,electricity,all-year.early-peak,0.7502720000000027
+2045,3,,wind,all-year.early-peak,-1.5960000000000003
+2045,3,,electricity,all-year.early-peak,1.5960000000000003
 2045,3,,wind,all-year.late-peak,-0.0
 2045,3,,electricity,all-year.late-peak,0.0
-2045,3,,wind,all-year.evening,-1.5959999999999999
-2045,3,,electricity,all-year.evening,1.5959999999999999
+2045,3,,wind,all-year.evening,-2.1280000000000006
+2045,3,,electricity,all-year.evening,2.1280000000000006
 2045,5,,electricity,all-year.night,-0.0
 2045,5,,heat,all-year.night,0.0
 2045,5,,electricity,all-year.morning,-0.39600000000000013
@@ -365,16 +335,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,5,,heat,all-year.late-peak,0.9900000000000005
 2045,5,,electricity,all-year.evening,-0.39600000000000024
 2045,5,,heat,all-year.evening,0.9900000000000005
-2045,6,,wind,all-year.night,-0.7185920000000019
-2045,6,,electricity,all-year.night,0.7185920000000019
+2045,6,,wind,all-year.night,-0.6336810666666803
+2045,6,,electricity,all-year.night,0.6336810666666803
 2045,6,,wind,all-year.morning,-0.0
 2045,6,,electricity,all-year.morning,0.0
 2045,6,,wind,all-year.afternoon,-0.0
 2045,6,,electricity,all-year.afternoon,0.0
-2045,6,,wind,all-year.early-peak,-0.8457279999999976
-2045,6,,electricity,all-year.early-peak,0.8457279999999976
-2045,6,,wind,all-year.late-peak,-0.826080000000001
-2045,6,,electricity,all-year.late-peak,0.826080000000001
+2045,6,,wind,all-year.early-peak,-0.0
+2045,6,,electricity,all-year.early-peak,0.0
+2045,6,,wind,all-year.late-peak,-0.17798933333333905
+2045,6,,electricity,all-year.late-peak,0.17798933333333905
 2045,6,,wind,all-year.evening,-0.0
 2045,6,,electricity,all-year.evening,0.0
 2045,7,,electricity,all-year.night,-0.2719999999999999
@@ -391,28 +361,28 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,7,,heat,all-year.evening,1.0199999999999996
 2045,8,,wind,all-year.night,-0.0
 2045,8,,electricity,all-year.night,0.0
-2045,8,,wind,all-year.morning,-0.11187200000000302
-2045,8,,electricity,all-year.morning,0.11187200000000302
+2045,8,,wind,all-year.morning,-0.0
+2045,8,,electricity,all-year.morning,0.0
 2045,8,,wind,all-year.afternoon,-0.0
 2045,8,,electricity,all-year.afternoon,0.0
 2045,8,,wind,all-year.early-peak,-0.0
 2045,8,,electricity,all-year.early-peak,0.0
-2045,8,,wind,all-year.late-peak,-0.9792000000000005
-2045,8,,electricity,all-year.late-peak,0.9792000000000005
+2045,8,,wind,all-year.late-peak,-1.9466400000000044
+2045,8,,electricity,all-year.late-peak,1.9466400000000044
 2045,8,,wind,all-year.evening,-0.0
 2045,8,,electricity,all-year.evening,0.0
-2045,9,,electricity,all-year.night,-0.3960000000000002
-2045,9,,heat,all-year.night,0.9900000000000004
-2045,9,,electricity,all-year.morning,-0.3960000000000002
-2045,9,,heat,all-year.morning,0.9900000000000004
-2045,9,,electricity,all-year.afternoon,-0.3960000000000002
-2045,9,,heat,all-year.afternoon,0.9900000000000004
-2045,9,,electricity,all-year.early-peak,-0.3960000000000002
-2045,9,,heat,all-year.early-peak,0.9900000000000004
-2045,9,,electricity,all-year.late-peak,-0.3960000000000002
-2045,9,,heat,all-year.late-peak,0.9900000000000004
-2045,9,,electricity,all-year.evening,-0.3960000000000002
-2045,9,,heat,all-year.evening,0.9900000000000004
+2045,9,,electricity,all-year.night,-0.39600000000000013
+2045,9,,heat,all-year.night,0.9900000000000002
+2045,9,,electricity,all-year.morning,-0.39600000000000013
+2045,9,,heat,all-year.morning,0.9900000000000002
+2045,9,,electricity,all-year.afternoon,-0.39600000000000013
+2045,9,,heat,all-year.afternoon,0.9900000000000002
+2045,9,,electricity,all-year.early-peak,-0.39600000000000013
+2045,9,,heat,all-year.early-peak,0.9900000000000002
+2045,9,,electricity,all-year.late-peak,-0.39600000000000013
+2045,9,,heat,all-year.late-peak,0.9900000000000002
+2045,9,,electricity,all-year.evening,-0.39600000000000013
+2045,9,,heat,all-year.evening,0.9900000000000002
 2045,10,,wind,all-year.night,-0.0
 2045,10,,electricity,all-year.night,0.0
 2045,10,,wind,all-year.morning,-0.0
@@ -425,30 +395,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,10,,electricity,all-year.late-peak,0.0
 2045,10,,wind,all-year.evening,-0.0
 2045,10,,electricity,all-year.evening,0.0
-2045,12,,electricity,all-year.night,-0.396
-2045,12,,heat,all-year.night,0.99
-2045,12,,electricity,all-year.morning,-0.396
-2045,12,,heat,all-year.morning,0.99
-2045,12,,electricity,all-year.afternoon,-0.396
-2045,12,,heat,all-year.afternoon,0.99
-2045,12,,electricity,all-year.early-peak,-0.396
-2045,12,,heat,all-year.early-peak,0.99
-2045,12,,electricity,all-year.late-peak,-0.396
-2045,12,,heat,all-year.late-peak,0.99
-2045,12,,electricity,all-year.evening,-0.396
-2045,12,,heat,all-year.evening,0.99
-2045,13,,wind,all-year.night,-0.34540799999999816
-2045,13,,electricity,all-year.night,0.34540799999999816
-2045,13,,wind,all-year.morning,-0.0
-2045,13,,electricity,all-year.morning,0.0
-2045,13,,wind,all-year.afternoon,-1.064
-2045,13,,electricity,all-year.afternoon,1.064
-2045,13,,wind,all-year.early-peak,-0.0
-2045,13,,electricity,all-year.early-peak,0.0
-2045,13,,wind,all-year.late-peak,-1.386719999999999
-2045,13,,electricity,all-year.late-peak,1.386719999999999
-2045,13,,wind,all-year.evening,-0.5320000000000005
-2045,13,,electricity,all-year.evening,0.5320000000000005
+2045,11,,electricity,all-year.night,-0.39600000000000013
+2045,11,,heat,all-year.night,0.9900000000000002
+2045,11,,electricity,all-year.morning,-0.39600000000000013
+2045,11,,heat,all-year.morning,0.9900000000000002
+2045,11,,electricity,all-year.afternoon,-0.39600000000000013
+2045,11,,heat,all-year.afternoon,0.9900000000000002
+2045,11,,electricity,all-year.early-peak,-0.39600000000000013
+2045,11,,heat,all-year.early-peak,0.9900000000000002
+2045,11,,electricity,all-year.late-peak,-0.39600000000000013
+2045,11,,heat,all-year.late-peak,0.9900000000000002
+2045,11,,electricity,all-year.evening,-0.39600000000000013
+2045,11,,heat,all-year.evening,0.9900000000000002
+2045,12,,wind,all-year.night,-0.4303189333333197
+2045,12,,electricity,all-year.night,0.4303189333333197
+2045,12,,wind,all-year.morning,-0.0
+2045,12,,electricity,all-year.morning,0.0
+2045,12,,wind,all-year.afternoon,-1.064
+2045,12,,electricity,all-year.afternoon,1.064
+2045,12,,wind,all-year.early-peak,-0.0
+2045,12,,electricity,all-year.early-peak,0.0
+2045,12,,wind,all-year.late-peak,-1.067370666666657
+2045,12,,electricity,all-year.late-peak,1.067370666666657
+2045,12,,wind,all-year.evening,-0.0
+2045,12,,electricity,all-year.evening,0.0
 2050,2,,electricity,all-year.night,-0.0
 2050,2,,heat,all-year.night,0.0
 2050,2,,electricity,all-year.morning,-0.0
@@ -459,8 +429,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,2,,heat,all-year.early-peak,0.0
 2050,2,,electricity,all-year.late-peak,-1.596
 2050,2,,heat,all-year.late-peak,3.9899999999999998
-2050,2,,electricity,all-year.evening,-0.3960000000000003
-2050,2,,heat,all-year.evening,0.9900000000000007
+2050,2,,electricity,all-year.evening,-0.3959999999999999
+2050,2,,heat,all-year.evening,0.9899999999999998
 2050,3,,wind,all-year.night,-0.0
 2050,3,,electricity,all-year.night,0.0
 2050,3,,wind,all-year.morning,-0.0
@@ -475,34 +445,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,3,,electricity,all-year.evening,0.0
 2050,5,,electricity,all-year.night,-0.0
 2050,5,,heat,all-year.night,0.0
-2050,5,,electricity,all-year.morning,-0.19200000000000045
-2050,5,,heat,all-year.morning,0.4800000000000011
+2050,5,,electricity,all-year.morning,-0.192
+2050,5,,heat,all-year.morning,0.48
 2050,5,,electricity,all-year.afternoon,-0.0
 2050,5,,heat,all-year.afternoon,0.0
-2050,5,,electricity,all-year.early-peak,-0.19200000000000045
-2050,5,,heat,all-year.early-peak,0.4800000000000011
+2050,5,,electricity,all-year.early-peak,-0.192
+2050,5,,heat,all-year.early-peak,0.48
 2050,5,,electricity,all-year.late-peak,-0.39600000000000024
 2050,5,,heat,all-year.late-peak,0.9900000000000005
 2050,5,,electricity,all-year.evening,-0.39600000000000024
 2050,5,,heat,all-year.evening,0.9900000000000005
-2050,6,,wind,all-year.night,-0.6453120000000003
-2050,6,,electricity,all-year.night,0.6453120000000003
+2050,6,,wind,all-year.night,-0.7730517333333372
+2050,6,,electricity,all-year.night,0.7730517333333372
 2050,6,,wind,all-year.morning,-0.0
 2050,6,,electricity,all-year.morning,0.0
-2050,6,,wind,all-year.afternoon,-0.599059199999995
-2050,6,,electricity,all-year.afternoon,0.599059199999995
+2050,6,,wind,all-year.afternoon,-0.0
+2050,6,,electricity,all-year.afternoon,0.0
 2050,6,,wind,all-year.early-peak,-0.0
 2050,6,,electricity,all-year.early-peak,0.0
-2050,6,,wind,all-year.late-peak,-0.9960000000000002
-2050,6,,electricity,all-year.late-peak,0.9960000000000002
+2050,6,,wind,all-year.late-peak,-1.0297493333333374
+2050,6,,electricity,all-year.late-peak,1.0297493333333374
 2050,6,,wind,all-year.evening,-0.0
 2050,6,,electricity,all-year.evening,0.0
-2050,7,,electricity,all-year.night,0.0
-2050,7,,heat,all-year.night,-0.0
+2050,7,,electricity,all-year.night,-0.0
+2050,7,,heat,all-year.night,0.0
 2050,7,,electricity,all-year.morning,-0.40799999999999986
 2050,7,,heat,all-year.morning,1.0199999999999996
-2050,7,,electricity,all-year.afternoon,0.0
-2050,7,,heat,all-year.afternoon,-0.0
+2050,7,,electricity,all-year.afternoon,-0.0
+2050,7,,heat,all-year.afternoon,0.0
 2050,7,,electricity,all-year.early-peak,-0.40799999999999986
 2050,7,,heat,all-year.early-peak,1.0199999999999996
 2050,7,,electricity,all-year.late-peak,-0.40799999999999986
@@ -513,30 +483,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,8,,electricity,all-year.night,0.0
 2050,8,,wind,all-year.morning,-0.0
 2050,8,,electricity,all-year.morning,0.0
-2050,8,,wind,all-year.afternoon,-0.6009408000000049
-2050,8,,electricity,all-year.afternoon,0.6009408000000049
-2050,8,,wind,all-year.early-peak,-0.8494079999999979
-2050,8,,electricity,all-year.early-peak,0.8494079999999979
-2050,8,,wind,all-year.late-peak,-0.26668799999999876
-2050,8,,electricity,all-year.late-peak,0.26668799999999876
-2050,8,,wind,all-year.evening,-0.6330431999999999
-2050,8,,electricity,all-year.evening,0.6330431999999999
-2050,9,,electricity,all-year.night,-0.3960000000000002
-2050,9,,heat,all-year.night,0.9900000000000004
-2050,9,,electricity,all-year.morning,-0.3960000000000002
-2050,9,,heat,all-year.morning,0.9900000000000004
-2050,9,,electricity,all-year.afternoon,-0.3960000000000002
-2050,9,,heat,all-year.afternoon,0.9900000000000004
-2050,9,,electricity,all-year.early-peak,-0.3960000000000002
-2050,9,,heat,all-year.early-peak,0.9900000000000004
-2050,9,,electricity,all-year.late-peak,-0.3960000000000002
-2050,9,,heat,all-year.late-peak,0.9900000000000004
-2050,9,,electricity,all-year.evening,-0.3960000000000002
-2050,9,,heat,all-year.evening,0.9900000000000004
+2050,8,,wind,all-year.afternoon,-1.2000000000000002
+2050,8,,electricity,all-year.afternoon,1.2000000000000002
+2050,8,,wind,all-year.early-peak,-0.7274893333333401
+2050,8,,electricity,all-year.early-peak,0.7274893333333401
+2050,8,,wind,all-year.late-peak,-1.5028800000000062
+2050,8,,electricity,all-year.late-peak,1.5028800000000062
+2050,8,,wind,all-year.evening,-1.241566666666665
+2050,8,,electricity,all-year.evening,1.241566666666665
+2050,9,,electricity,all-year.night,-0.3959999999999999
+2050,9,,heat,all-year.night,0.9899999999999998
+2050,9,,electricity,all-year.morning,-0.39600000000000013
+2050,9,,heat,all-year.morning,0.9900000000000002
+2050,9,,electricity,all-year.afternoon,-0.3959999999999999
+2050,9,,heat,all-year.afternoon,0.9899999999999998
+2050,9,,electricity,all-year.early-peak,-0.39600000000000013
+2050,9,,heat,all-year.early-peak,0.9900000000000002
+2050,9,,electricity,all-year.late-peak,-0.39600000000000013
+2050,9,,heat,all-year.late-peak,0.9900000000000002
+2050,9,,electricity,all-year.evening,-0.39600000000000013
+2050,9,,heat,all-year.evening,0.9900000000000002
 2050,10,,wind,all-year.night,-0.0
 2050,10,,electricity,all-year.night,0.0
-2050,10,,wind,all-year.morning,-1.8000000000000003
-2050,10,,electricity,all-year.morning,1.8000000000000003
+2050,10,,wind,all-year.morning,-0.18333333333333357
+2050,10,,electricity,all-year.morning,0.18333333333333357
 2050,10,,wind,all-year.afternoon,-0.0
 2050,10,,electricity,all-year.afternoon,0.0
 2050,10,,wind,all-year.early-peak,-0.0
@@ -545,51 +515,51 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,10,,electricity,all-year.late-peak,0.0
 2050,10,,wind,all-year.evening,-0.0
 2050,10,,electricity,all-year.evening,0.0
-2050,12,,electricity,all-year.night,-0.396
-2050,12,,heat,all-year.night,0.99
-2050,12,,electricity,all-year.morning,-0.396
-2050,12,,heat,all-year.morning,0.99
-2050,12,,electricity,all-year.afternoon,-0.396
-2050,12,,heat,all-year.afternoon,0.99
-2050,12,,electricity,all-year.early-peak,-0.396
-2050,12,,heat,all-year.early-peak,0.99
-2050,12,,electricity,all-year.late-peak,-0.396
-2050,12,,heat,all-year.late-peak,0.99
-2050,12,,electricity,all-year.evening,-0.396
-2050,12,,heat,all-year.evening,0.99
-2050,13,,wind,all-year.night,-0.5546879999999996
-2050,13,,electricity,all-year.night,0.5546879999999996
-2050,13,,wind,all-year.morning,-0.0
-2050,13,,electricity,all-year.morning,0.0
-2050,13,,wind,all-year.afternoon,-0.0
-2050,13,,electricity,all-year.afternoon,0.0
-2050,13,,wind,all-year.early-peak,-0.0
-2050,13,,electricity,all-year.early-peak,0.0
-2050,13,,wind,all-year.late-peak,-1.386719999999999
-2050,13,,electricity,all-year.late-peak,1.386719999999999
-2050,13,,wind,all-year.evening,-1.386719999999999
-2050,13,,electricity,all-year.evening,1.386719999999999
-2050,14,,electricity,all-year.night,-0.4079999999999997
-2050,14,,heat,all-year.night,1.0199999999999991
-2050,14,,electricity,all-year.morning,-0.4079999999999997
-2050,14,,heat,all-year.morning,1.0199999999999991
-2050,14,,electricity,all-year.afternoon,-0.4079999999999997
-2050,14,,heat,all-year.afternoon,1.0199999999999991
-2050,14,,electricity,all-year.early-peak,-0.4079999999999997
-2050,14,,heat,all-year.early-peak,1.0199999999999991
-2050,14,,electricity,all-year.late-peak,-0.4079999999999997
-2050,14,,heat,all-year.late-peak,1.0199999999999991
-2050,14,,electricity,all-year.evening,-0.4079999999999997
-2050,14,,heat,all-year.evening,1.0199999999999991
-2050,15,,wind,all-year.night,-0.0
-2050,15,,electricity,all-year.night,0.0
-2050,15,,wind,all-year.morning,-0.0
-2050,15,,electricity,all-year.morning,0.0
-2050,15,,wind,all-year.afternoon,-0.0
-2050,15,,electricity,all-year.afternoon,0.0
-2050,15,,wind,all-year.early-peak,-0.9505920000000022
-2050,15,,electricity,all-year.early-peak,0.9505920000000022
-2050,15,,wind,all-year.late-peak,-0.9505920000000022
-2050,15,,electricity,all-year.late-peak,0.9505920000000022
-2050,15,,wind,all-year.evening,-0.38023680000000126
-2050,15,,electricity,all-year.evening,0.38023680000000126
+2050,11,,electricity,all-year.night,-0.39600000000000013
+2050,11,,heat,all-year.night,0.9900000000000002
+2050,11,,electricity,all-year.morning,-0.39600000000000013
+2050,11,,heat,all-year.morning,0.9900000000000002
+2050,11,,electricity,all-year.afternoon,-0.39600000000000013
+2050,11,,heat,all-year.afternoon,0.9900000000000002
+2050,11,,electricity,all-year.early-peak,-0.39600000000000013
+2050,11,,heat,all-year.early-peak,0.9900000000000002
+2050,11,,electricity,all-year.late-peak,-0.39600000000000013
+2050,11,,heat,all-year.late-peak,0.9900000000000002
+2050,11,,electricity,all-year.evening,-0.39600000000000013
+2050,11,,heat,all-year.evening,0.9900000000000002
+2050,12,,wind,all-year.night,-0.42694826666666286
+2050,12,,electricity,all-year.night,0.42694826666666286
+2050,12,,wind,all-year.morning,-1.067370666666657
+2050,12,,electricity,all-year.morning,1.067370666666657
+2050,12,,wind,all-year.afternoon,-0.0
+2050,12,,electricity,all-year.afternoon,0.0
+2050,12,,wind,all-year.early-peak,-0.0
+2050,12,,electricity,all-year.early-peak,0.0
+2050,12,,wind,all-year.late-peak,-1.067370666666657
+2050,12,,electricity,all-year.late-peak,1.067370666666657
+2050,12,,wind,all-year.evening,-0.0
+2050,12,,electricity,all-year.evening,0.0
+2050,13,,electricity,all-year.night,-0.40800000000000003
+2050,13,,heat,all-year.night,1.02
+2050,13,,electricity,all-year.morning,-0.40800000000000003
+2050,13,,heat,all-year.morning,1.02
+2050,13,,electricity,all-year.afternoon,-0.40800000000000003
+2050,13,,heat,all-year.afternoon,1.02
+2050,13,,electricity,all-year.early-peak,-0.40800000000000003
+2050,13,,heat,all-year.early-peak,1.02
+2050,13,,electricity,all-year.late-peak,-0.40800000000000003
+2050,13,,heat,all-year.late-peak,1.02
+2050,13,,electricity,all-year.evening,-0.40800000000000003
+2050,13,,heat,all-year.evening,1.02
+2050,14,,wind,all-year.night,-0.0
+2050,14,,electricity,all-year.night,0.0
+2050,14,,wind,all-year.morning,-0.5492960000000094
+2050,14,,electricity,all-year.morning,0.5492960000000094
+2050,14,,wind,all-year.afternoon,-0.0
+2050,14,,electricity,all-year.afternoon,0.0
+2050,14,,wind,all-year.early-peak,-1.07251066666666
+2050,14,,electricity,all-year.early-peak,1.07251066666666
+2050,14,,wind,all-year.late-peak,-0.0
+2050,14,,electricity,all-year.late-peak,0.0
+2050,14,,wind,all-year.evening,-1.1584333333333352
+2050,14,,electricity,all-year.evening,1.1584333333333352
diff --git a/tests/data/muse1_default/commodity_prices.csv b/tests/data/muse1_default/commodity_prices.csv
index f9da023aa..76a329d43 100644
--- a/tests/data/muse1_default/commodity_prices.csv
+++ b/tests/data/muse1_default/commodity_prices.csv
@@ -3,7 +3,7 @@ milestone_year,commodity_id,region_id,time_slice,price
 2020,gas,R1,all-year.morning,2.55
 2020,gas,R1,all-year.afternoon,2.55
 2020,gas,R1,all-year.early-peak,2.55
-2020,gas,R1,all-year.late-peak,2.5499999999999994
+2020,gas,R1,all-year.late-peak,2.55
 2020,gas,R1,all-year.evening,2.55
 2020,electricity,R1,all-year.night,9.10681905636597
 2020,electricity,R1,all-year.morning,9.10681905636597
@@ -23,36 +23,36 @@ milestone_year,commodity_id,region_id,time_slice,price
 2025,gas,R1,all-year.early-peak,2.55
 2025,gas,R1,all-year.late-peak,2.55
 2025,gas,R1,all-year.evening,2.55
-2025,electricity,R1,all-year.night,9.10681905636597
-2025,electricity,R1,all-year.morning,9.10681905636597
-2025,electricity,R1,all-year.afternoon,9.10681905636597
-2025,electricity,R1,all-year.early-peak,9.10681905636597
-2025,electricity,R1,all-year.late-peak,16.754631497699798
-2025,electricity,R1,all-year.evening,17.709808412414002
-2025,heat,R1,all-year.night,5.243995487103572
-2025,heat,R1,all-year.morning,5.243995487103572
-2025,heat,R1,all-year.afternoon,5.243995487103572
-2025,heat,R1,all-year.early-peak,5.243995487103572
-2025,heat,R1,all-year.late-peak,8.303120463637104
-2025,heat,R1,all-year.evening,8.685191229522784
+2025,electricity,R1,all-year.night,9.10688752934148
+2025,electricity,R1,all-year.morning,9.10688752934148
+2025,electricity,R1,all-year.afternoon,9.10688752934148
+2025,electricity,R1,all-year.early-peak,9.10688752934148
+2025,electricity,R1,all-year.late-peak,9.10688752934148
+2025,electricity,R1,all-year.evening,9.10688752934148
+2025,heat,R1,all-year.night,5.2440228762937755
+2025,heat,R1,all-year.morning,5.2440228762937755
+2025,heat,R1,all-year.afternoon,5.2440228762937755
+2025,heat,R1,all-year.early-peak,5.2440228762937755
+2025,heat,R1,all-year.late-peak,5.2440228762937755
+2025,heat,R1,all-year.evening,5.2440228762937755
 2030,gas,R1,all-year.night,2.55
 2030,gas,R1,all-year.morning,2.55
 2030,gas,R1,all-year.afternoon,2.55
 2030,gas,R1,all-year.early-peak,2.55
 2030,gas,R1,all-year.late-peak,2.55
 2030,gas,R1,all-year.evening,2.55
-2030,electricity,R1,all-year.night,33.48384775173438
-2030,electricity,R1,all-year.morning,9.10681905636597
-2030,electricity,R1,all-year.afternoon,9.10681905636597
-2030,electricity,R1,all-year.early-peak,9.107206016514224
-2030,electricity,R1,all-year.late-peak,9.10701253320247
-2030,electricity,R1,all-year.evening,9.10681905636597
-2030,heat,R1,all-year.night,14.730423409997243
-2030,heat,R1,all-year.morning,5.199929714168157
-2030,heat,R1,all-year.afternoon,4.97961193184988
-2030,heat,R1,all-year.early-peak,5.200084498227458
-2030,heat,R1,all-year.late-peak,5.420323412529197
-2030,heat,R1,all-year.evening,5.310088052316931
+2030,electricity,R1,all-year.night,19.958967538320323
+2030,electricity,R1,all-year.morning,11.225272794223113
+2030,electricity,R1,all-year.afternoon,19.958967538320323
+2030,electricity,R1,all-year.early-peak,19.958967538320323
+2030,electricity,R1,all-year.late-peak,11.225272794223113
+2030,electricity,R1,all-year.evening,11.225272794223113
+2030,heat,R1,all-year.night,9.320471324631622
+2030,heat,R1,all-year.morning,6.0473112093110135
+2030,heat,R1,all-year.afternoon,9.320471324631622
+2030,heat,R1,all-year.early-peak,9.5407891069499
+2030,heat,R1,all-year.late-peak,6.267627516937455
+2030,heat,R1,all-year.evening,6.157469547459788
 2035,gas,R1,all-year.night,2.55
 2035,gas,R1,all-year.morning,2.55
 2035,gas,R1,all-year.afternoon,2.55
@@ -60,62 +60,62 @@ milestone_year,commodity_id,region_id,time_slice,price
 2035,gas,R1,all-year.late-peak,2.55
 2035,gas,R1,all-year.evening,2.55
 2035,electricity,R1,all-year.night,9.10681905636597
-2035,electricity,R1,all-year.morning,9.377989633638363
-2035,electricity,R1,all-year.afternoon,10.701940099144764
-2035,electricity,R1,all-year.early-peak,9.4187980490792
-2035,electricity,R1,all-year.late-peak,9.389146364296424
-2035,electricity,R1,all-year.evening,10.697952296537817
+2035,electricity,R1,all-year.morning,18.348000489770783
+2035,electricity,R1,all-year.afternoon,60.56034672483369
+2035,electricity,R1,all-year.early-peak,15.842866233202423
+2035,electricity,R1,all-year.late-peak,10.85242617643262
+2035,electricity,R1,all-year.evening,9.10681905636597
 2035,heat,R1,all-year.night,4.533789268258482
-2035,heat,R1,all-year.morning,5.231116529259242
-2035,heat,R1,all-year.afternoon,5.171837685369999
-2035,heat,R1,all-year.early-peak,5.247439895435577
-2035,heat,R1,all-year.late-peak,5.833364315350094
-2035,heat,R1,all-year.evening,6.057994556463936
+2035,heat,R1,all-year.morning,8.81912087171221
+2035,heat,R1,all-year.afternoon,25.11520033564557
+2035,heat,R1,all-year.early-peak,7.817067169084866
+2035,heat,R1,all-year.late-peak,6.418676240204573
+2035,heat,R1,all-year.evening,5.4215412603951965
 2040,gas,R1,all-year.night,2.55
 2040,gas,R1,all-year.morning,2.55
 2040,gas,R1,all-year.afternoon,2.55
 2040,gas,R1,all-year.early-peak,2.55
 2040,gas,R1,all-year.late-peak,2.55
 2040,gas,R1,all-year.evening,2.55
-2040,electricity,R1,all-year.night,26.149321991311126
-2040,electricity,R1,all-year.morning,10.087553416282304
-2040,electricity,R1,all-year.afternoon,22.963254643760244
-2040,electricity,R1,all-year.early-peak,23.090784504375932
-2040,electricity,R1,all-year.late-peak,10.087553416282304
-2040,electricity,R1,all-year.evening,10.087553416282304
-2040,heat,R1,all-year.night,11.384905012745255
-2040,heat,R1,all-year.morning,5.3262750622043935
-2040,heat,R1,all-year.afternoon,10.110478073724902
-2040,heat,R1,all-year.early-peak,10.527567497441847
-2040,heat,R1,all-year.late-peak,6.28433395477283
-2040,heat,R1,all-year.evening,5.805305079580787
+2040,electricity,R1,all-year.night,11.551806719090834
+2040,electricity,R1,all-year.morning,11.551806719090834
+2040,electricity,R1,all-year.afternoon,28.487591324388276
+2040,electricity,R1,all-year.early-peak,12.720793805887105
+2040,electricity,R1,all-year.late-peak,17.38329014080667
+2040,electricity,R1,all-year.evening,11.551806719090834
+2040,heat,R1,all-year.night,5.54589890385714
+2040,heat,R1,all-year.morning,5.911976383327803
+2040,heat,R1,all-year.afternoon,12.320212745976118
+2040,heat,R1,all-year.early-peak,6.379571218046313
+2040,heat,R1,all-year.late-peak,9.202628644582576
+2040,heat,R1,all-year.evening,6.3910064007042
 2045,gas,R1,all-year.night,2.55
 2045,gas,R1,all-year.morning,2.55
 2045,gas,R1,all-year.afternoon,2.55
 2045,gas,R1,all-year.early-peak,2.55
 2045,gas,R1,all-year.late-peak,2.55
 2045,gas,R1,all-year.evening,2.55
-2045,electricity,R1,all-year.night,25.863492633821636
-2045,electricity,R1,all-year.morning,22.837805527218194
-2045,electricity,R1,all-year.afternoon,9.10681905636597
-2045,electricity,R1,all-year.early-peak,21.856593979197413
-2045,electricity,R1,all-year.late-peak,13.017958187942094
-2045,electricity,R1,all-year.evening,9.10681905636597
-2045,heat,R1,all-year.night,11.263411310433236
-2045,heat,R1,all-year.morning,10.163500738720717
-2045,heat,R1,all-year.afternoon,4.560741879450969
-2045,heat,R1,all-year.early-peak,9.771016119512407
-2045,heat,R1,all-year.late-peak,7.722952394129729
-2045,heat,R1,all-year.evening,5.414796648659476
-2050,electricity,R1,all-year.night,9.43477073424577
-2050,electricity,R1,all-year.morning,33.95022144213234
-2050,electricity,R1,all-year.afternoon,9.411264766021654
+2045,electricity,R1,all-year.night,14.557724766631083
+2045,electricity,R1,all-year.morning,12.40493968492205
+2045,electricity,R1,all-year.afternoon,15.271208896710661
+2045,electricity,R1,all-year.early-peak,16.554484601551533
+2045,electricity,R1,all-year.late-peak,17.481353431840333
+2045,electricity,R1,all-year.evening,14.54783809854323
+2045,heat,R1,all-year.night,6.741104163557016
+2045,heat,R1,all-year.morning,5.99035440180226
+2045,heat,R1,all-year.afternoon,7.026497815588847
+2045,heat,R1,all-year.early-peak,7.6501723684540535
+2045,heat,R1,all-year.late-peak,9.508310491689025
+2045,heat,R1,all-year.evening,7.591204265530382
+2050,electricity,R1,all-year.night,19.815004579013287
+2050,electricity,R1,all-year.morning,10.405383995884822
+2050,electricity,R1,all-year.afternoon,9.10681905636597
 2050,electricity,R1,all-year.early-peak,9.10681905636597
-2050,electricity,R1,all-year.late-peak,9.275543575755187
-2050,electricity,R1,all-year.evening,9.10681905636597
-2050,heat,R1,all-year.night,4.663494863101142
-2050,heat,R1,all-year.morning,14.667320706505409
-2050,heat,R1,all-year.afternoon,4.654092475811495
-2050,heat,R1,all-year.early-peak,4.729959752198858
-2050,heat,R1,all-year.late-peak,6.251573263786468
+2050,electricity,R1,all-year.late-peak,13.86145854886553
+2050,electricity,R1,all-year.evening,9.106819056365968
+2050,heat,R1,all-year.night,8.81558840100815
+2050,heat,R1,all-year.morning,5.2493857280063985
+2050,heat,R1,all-year.afternoon,4.532314191949222
+2050,heat,R1,all-year.early-peak,4.729959752198859
+2050,heat,R1,all-year.late-peak,8.08593925303061
 2050,heat,R1,all-year.evening,5.316538233063759
diff --git a/tests/data/two_regions/asset_capacities.csv b/tests/data/two_regions/asset_capacities.csv
index 0f3cddd37..bdc508d5f 100644
--- a/tests/data/two_regions/asset_capacities.csv
+++ b/tests/data/two_regions/asset_capacities.csv
@@ -3,104 +3,101 @@ milestone_year,asset_id,group_id,capacity,num_units
 2020,1,,19.0,
 2020,2,,24.0,
 2020,3,,19.0,
-2025,0,,24.0,
 2025,2,,24.0,
 2025,3,,19.0,
 2025,4,,23.939952120095757,
 2025,5,,4.939952120095759,
-2025,6,,9.575980848038302,
-2025,7,,5.107189785620431,
+2025,6,,13.299973400053199,
+2025,7,,1.3299973400053235,
 2025,8,,3.77034445931108,
-2030,0,,24.0,
 2030,2,,24.0,
 2030,3,,19.0,
 2030,4,,23.939952120095757,
 2030,5,,4.939952120095759,
-2030,6,,9.575980848038302,
-2030,7,,5.107189785620431,
+2030,6,,13.299973400053199,
+2030,7,,1.3299973400053235,
 2030,8,,3.77034445931108,
 2030,9,,5.939988120023763,
 2030,10,,5.939988120023761,
-2030,11,,5.975988048023905,
+2030,11,,12.73337453325093,
 2030,12,,6.890386219227559,
 2035,2,,24.0,
 2035,3,,19.0,
 2035,4,,23.939952120095757,
 2035,5,,4.939952120095759,
-2035,6,,9.575980848038302,
+2035,6,,13.299973400053199,
 2035,8,,3.77034445931108,
 2035,9,,5.939988120023763,
 2035,10,,5.939988120023761,
-2035,11,,5.975988048023905,
+2035,11,,12.73337453325093,
 2035,12,,6.890386219227559,
-2035,13,,6.11998776002448,
+2035,13,,6.119987760024477,
 2035,14,,6.119987760024477,
-2035,15,,5.875188249623504,
+2035,15,,11.679816640366745,
 2035,16,,7.099185801628392,
 2040,2,,24.0,
 2040,3,,19.0,
 2040,4,,23.939952120095757,
 2040,5,,4.939952120095759,
-2040,6,,9.575980848038302,
+2040,6,,13.299973400053199,
 2040,8,,3.77034445931108,
 2040,9,,5.939988120023763,
 2040,10,,5.939988120023761,
-2040,11,,5.975988048023905,
+2040,11,,12.73337453325093,
 2040,12,,6.890386219227559,
-2040,13,,6.11998776002448,
+2040,13,,6.119987760024477,
 2040,14,,6.119987760024477,
-2040,15,,5.875188249623504,
+2040,15,,11.679816640366745,
 2040,16,,7.099185801628392,
-2040,17,,5.9399881200237585,
+2040,17,,5.939988120023762,
 2040,18,,5.939988120023761,
-2040,19,,16.775966448067106,
-2040,20,,2.6567946864106284,
-2040,21,,6.8903862192275644,
+2040,19,,1.0999978000044013,
+2040,20,,6.8903862192275644,
 2045,2,,24.0,
 2045,3,,19.0,
 2045,4,,23.939952120095757,
 2045,5,,4.939952120095759,
-2045,6,,9.575980848038302,
+2045,6,,13.299973400053199,
 2045,8,,3.77034445931108,
 2045,9,,5.939988120023763,
 2045,10,,5.939988120023761,
-2045,11,,5.975988048023905,
+2045,11,,12.73337453325093,
 2045,12,,6.890386219227559,
-2045,13,,6.11998776002448,
+2045,13,,6.119987760024477,
 2045,14,,6.119987760024477,
-2045,15,,5.875188249623504,
+2045,15,,11.679816640366745,
 2045,16,,7.099185801628392,
-2045,17,,5.9399881200237585,
+2045,17,,5.939988120023762,
 2045,18,,5.939988120023761,
-2045,19,,16.775966448067106,
-2045,21,,6.8903862192275644,
+2045,19,,1.0999978000044013,
+2045,20,,6.8903862192275644,
+2045,21,,5.939988120023761,
 2045,22,,5.939988120023761,
-2045,23,,5.939988120023761,
-2045,24,,8.320303359393275,
-2045,25,,6.8903862192275644,
+2045,23,,6.404211191577577,
+2045,24,,6.8903862192275644,
 2050,2,,24.0,
 2050,3,,19.0,
 2050,4,,23.939952120095757,
 2050,5,,4.939952120095759,
-2050,6,,9.575980848038302,
+2050,6,,13.299973400053199,
 2050,8,,3.77034445931108,
 2050,9,,5.939988120023763,
 2050,10,,5.939988120023761,
-2050,11,,5.975988048023905,
+2050,11,,12.73337453325093,
 2050,12,,6.890386219227559,
-2050,13,,6.11998776002448,
+2050,13,,6.119987760024477,
 2050,14,,6.119987760024477,
-2050,15,,5.875188249623504,
+2050,15,,11.679816640366745,
 2050,16,,7.099185801628392,
-2050,17,,5.9399881200237585,
+2050,17,,5.939988120023762,
 2050,18,,5.939988120023761,
-2050,19,,16.775966448067106,
-2050,21,,6.8903862192275644,
+2050,19,,1.0999978000044013,
+2050,20,,6.8903862192275644,
+2050,21,,5.939988120023761,
 2050,22,,5.939988120023761,
-2050,23,,5.939988120023761,
-2050,24,,8.320303359393275,
-2050,25,,6.8903862192275644,
-2050,26,,6.1199877600244745,
-2050,27,,6.119987760024477,
-2050,28,,5.703540592918812,
-2050,29,,7.099185801628382,
+2050,23,,6.404211191577577,
+2050,24,,6.8903862192275644,
+2050,25,,6.1199877600244745,
+2050,26,,6.119987760024477,
+2050,27,,6.950586098827816,
+2050,28,,7.099185801628382,
diff --git a/tests/data/two_regions/assets.csv b/tests/data/two_regions/assets.csv
index 4889f5a3f..00261c70d 100644
--- a/tests/data/two_regions/assets.csv
+++ b/tests/data/two_regions/assets.csv
@@ -19,13 +19,12 @@ asset_id,group_id,process_id,region_id,agent_id,commission_year
 17,,heatpump,R1,A1_RES,2040
 18,,gasboiler,R2,A1_RES,2040
 19,,windturbine,R1,A1_PWR,2040
-20,,gasCCGT,R1,A1_PWR,2040
-21,,gassupply1,R2,A1_GAS,2040
-22,,heatpump,R1,A1_RES,2045
-23,,gasboiler,R2,A1_RES,2045
-24,,windturbine,R1,A1_PWR,2045
-25,,gassupply1,R2,A1_GAS,2045
-26,,heatpump,R1,A1_RES,2050
-27,,gasboiler,R2,A1_RES,2050
-28,,windturbine,R1,A1_PWR,2050
-29,,gassupply1,R2,A1_GAS,2050
+20,,gassupply1,R2,A1_GAS,2040
+21,,heatpump,R1,A1_RES,2045
+22,,gasboiler,R2,A1_RES,2045
+23,,windturbine,R1,A1_PWR,2045
+24,,gassupply1,R2,A1_GAS,2045
+25,,heatpump,R1,A1_RES,2050
+26,,gasboiler,R2,A1_RES,2050
+27,,windturbine,R1,A1_PWR,2050
+28,,gassupply1,R2,A1_GAS,2050
diff --git a/tests/data/two_regions/commodity_flows.csv b/tests/data/two_regions/commodity_flows.csv
index f74330644..25712f3d9 100644
--- a/tests/data/two_regions/commodity_flows.csv
+++ b/tests/data/two_regions/commodity_flows.csv
@@ -47,18 +47,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2020,3,,gas,all-year.evening,-2.32
 2020,3,,heat,all-year.evening,2.0
 2020,3,,CO2f,all-year.evening,129.42
-2025,0,,gas,all-year.night,0.0
-2025,0,,gas,all-year.morning,0.0
-2025,0,,gas,all-year.afternoon,0.0
-2025,0,,gas,all-year.early-peak,1.0661280000000004
-2025,0,,gas,all-year.late-peak,0.0
-2025,0,,gas,all-year.evening,1.4215040000000005
 2025,2,,gas,all-year.night,1.5428
 2025,2,,gas,all-year.morning,1.6858080000000002
-2025,2,,gas,all-year.afternoon,0.9144080000000001
+2025,2,,gas,all-year.afternoon,1.5428
 2025,2,,gas,all-year.early-peak,1.6858080000000002
 2025,2,,gas,all-year.late-peak,4.000008
-2025,2,,gas,all-year.evening,2.457208
+2025,2,,gas,all-year.evening,3.0856
 2025,3,,gas,all-year.night,-0.5877406800000001
 2025,3,,heat,all-year.night,0.5066730000000002
 2025,3,,CO2f,all-year.night,32.78680983000001
@@ -113,48 +107,42 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2025,6,,electricity,all-year.morning,0.798
 2025,6,,wind,all-year.afternoon,-0.532
 2025,6,,electricity,all-year.afternoon,0.532
-2025,6,,wind,all-year.early-peak,-0.15959999999999974
-2025,6,,electricity,all-year.early-peak,0.15959999999999974
+2025,6,,wind,all-year.early-peak,-0.798
+2025,6,,electricity,all-year.early-peak,0.798
 2025,6,,wind,all-year.late-peak,-1.596
 2025,6,,electricity,all-year.late-peak,1.596
-2025,6,,wind,all-year.evening,-0.21279999999999966
-2025,6,,electricity,all-year.evening,0.21279999999999966
-2025,7,,gas,all-year.night,0.0
-2025,7,,electricity,all-year.night,-0.0
-2025,7,,CO2f,all-year.night,-0.0
-2025,7,,gas,all-year.morning,0.0
-2025,7,,electricity,all-year.morning,-0.0
-2025,7,,CO2f,all-year.morning,-0.0
-2025,7,,gas,all-year.afternoon,0.0
-2025,7,,electricity,all-year.afternoon,-0.0
-2025,7,,CO2f,all-year.afternoon,-0.0
-2025,7,,gas,all-year.early-peak,-1.0661280000000004
-2025,7,,electricity,all-year.early-peak,0.6384000000000003
-2025,7,,CO2f,all-year.early-peak,58.52212800000003
-2025,7,,gas,all-year.late-peak,0.0
-2025,7,,electricity,all-year.late-peak,-0.0
-2025,7,,CO2f,all-year.late-peak,-0.0
-2025,7,,gas,all-year.evening,-1.4215040000000005
-2025,7,,electricity,all-year.evening,0.8512000000000004
-2025,7,,CO2f,all-year.evening,78.02950400000003
+2025,6,,wind,all-year.evening,-1.064
+2025,6,,electricity,all-year.evening,1.064
+2025,7,,gas,all-year.night,-0.0
+2025,7,,electricity,all-year.night,0.0
+2025,7,,CO2f,all-year.night,0.0
+2025,7,,gas,all-year.morning,-0.0
+2025,7,,electricity,all-year.morning,0.0
+2025,7,,CO2f,all-year.morning,0.0
+2025,7,,gas,all-year.afternoon,-0.0
+2025,7,,electricity,all-year.afternoon,0.0
+2025,7,,CO2f,all-year.afternoon,0.0
+2025,7,,gas,all-year.early-peak,-0.0
+2025,7,,electricity,all-year.early-peak,0.0
+2025,7,,CO2f,all-year.early-peak,0.0
+2025,7,,gas,all-year.late-peak,-0.0
+2025,7,,electricity,all-year.late-peak,0.0
+2025,7,,CO2f,all-year.late-peak,0.0
+2025,7,,gas,all-year.evening,-0.0
+2025,7,,electricity,all-year.evening,0.0
+2025,7,,CO2f,all-year.evening,0.0
 2025,8,,gas,all-year.night,0.0
 2025,8,,gas,all-year.morning,0.6283919999999998
-2025,8,,gas,all-year.afternoon,0.6283919999999998
+2025,8,,gas,all-year.afternoon,0.0
 2025,8,,gas,all-year.early-peak,0.6283919999999998
 2025,8,,gas,all-year.late-peak,0.6283919999999998
-2025,8,,gas,all-year.evening,0.6283919999999998
-2030,0,,gas,all-year.night,0.0
-2030,0,,gas,all-year.morning,0.0
-2030,0,,gas,all-year.afternoon,0.0
-2030,0,,gas,all-year.early-peak,0.0
-2030,0,,gas,all-year.late-peak,0.0
-2030,0,,gas,all-year.evening,0.7000640000000007
-2030,2,,gas,all-year.night,0.1488080000000005
-2030,2,,gas,all-year.morning,2.8884
+2025,8,,gas,all-year.evening,0.0
+2030,2,,gas,all-year.night,1.9256
+2030,2,,gas,all-year.morning,2.260008
 2030,2,,gas,all-year.afternoon,1.9256
-2030,2,,gas,all-year.early-peak,1.1116080000000004
+2030,2,,gas,all-year.early-peak,1.7400000000000004
 2030,2,,gas,all-year.late-peak,4.000008
-2030,2,,gas,all-year.evening,2.0744080000000005
+2030,2,,gas,all-year.evening,3.222808
 2030,3,,gas,all-year.night,-0.0
 2030,3,,heat,all-year.night,0.0
 2030,3,,CO2f,all-year.night,0.0
@@ -203,40 +191,40 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2030,5,,gas,all-year.evening,-0.9550593199999998
 2030,5,,heat,all-year.evening,0.8233269999999999
 2030,5,,CO2f,all-year.evening,53.27749016999999
-2030,6,,wind,all-year.night,-0.0
-2030,6,,electricity,all-year.night,0.0
-2030,6,,wind,all-year.morning,-0.9960000000000001
-2030,6,,electricity,all-year.morning,0.9960000000000001
-2030,6,,wind,all-year.afternoon,-0.6640000000000001
-2030,6,,electricity,all-year.afternoon,0.6640000000000001
+2030,6,,wind,all-year.night,-0.664
+2030,6,,electricity,all-year.night,0.664
+2030,6,,wind,all-year.morning,-0.0
+2030,6,,electricity,all-year.morning,0.0
+2030,6,,wind,all-year.afternoon,-0.0
+2030,6,,electricity,all-year.afternoon,0.0
 2030,6,,wind,all-year.early-peak,-0.0
 2030,6,,electricity,all-year.early-peak,0.0
-2030,6,,wind,all-year.late-peak,-1.5959999999999999
-2030,6,,electricity,all-year.late-peak,1.5959999999999999
-2030,6,,wind,all-year.evening,-0.5743999999999998
-2030,6,,electricity,all-year.evening,0.5743999999999998
-2030,7,,gas,all-year.night,0.0
-2030,7,,electricity,all-year.night,-0.0
-2030,7,,CO2f,all-year.night,-0.0
-2030,7,,gas,all-year.morning,0.0
-2030,7,,electricity,all-year.morning,-0.0
-2030,7,,CO2f,all-year.morning,-0.0
-2030,7,,gas,all-year.afternoon,0.0
-2030,7,,electricity,all-year.afternoon,-0.0
-2030,7,,CO2f,all-year.afternoon,-0.0
-2030,7,,gas,all-year.early-peak,0.0
-2030,7,,electricity,all-year.early-peak,-0.0
-2030,7,,CO2f,all-year.early-peak,-0.0
-2030,7,,gas,all-year.late-peak,0.0
-2030,7,,electricity,all-year.late-peak,-0.0
-2030,7,,CO2f,all-year.late-peak,-0.0
-2030,7,,gas,all-year.evening,-0.7000640000000007
-2030,7,,electricity,all-year.evening,0.41920000000000046
-2030,7,,CO2f,all-year.evening,38.42806400000004
-2030,8,,gas,all-year.night,0.6283919999999998
-2030,8,,gas,all-year.morning,0.0
+2030,6,,wind,all-year.late-peak,-1.9920000000000002
+2030,6,,electricity,all-year.late-peak,1.9920000000000002
+2030,6,,wind,all-year.evening,-1.328
+2030,6,,electricity,all-year.evening,1.328
+2030,7,,gas,all-year.night,-0.0
+2030,7,,electricity,all-year.night,0.0
+2030,7,,CO2f,all-year.night,0.0
+2030,7,,gas,all-year.morning,-0.0
+2030,7,,electricity,all-year.morning,0.0
+2030,7,,CO2f,all-year.morning,0.0
+2030,7,,gas,all-year.afternoon,-0.0
+2030,7,,electricity,all-year.afternoon,0.0
+2030,7,,CO2f,all-year.afternoon,0.0
+2030,7,,gas,all-year.early-peak,-0.0
+2030,7,,electricity,all-year.early-peak,0.0
+2030,7,,CO2f,all-year.early-peak,0.0
+2030,7,,gas,all-year.late-peak,-0.0
+2030,7,,electricity,all-year.late-peak,0.0
+2030,7,,CO2f,all-year.late-peak,0.0
+2030,7,,gas,all-year.evening,-0.0
+2030,7,,electricity,all-year.evening,0.0
+2030,7,,CO2f,all-year.evening,0.0
+2030,8,,gas,all-year.night,0.0
+2030,8,,gas,all-year.morning,0.6283919999999998
 2030,8,,gas,all-year.afternoon,0.0
-2030,8,,gas,all-year.early-peak,0.6283919999999998
+2030,8,,gas,all-year.early-peak,0.0
 2030,8,,gas,all-year.late-peak,0.6283919999999998
 2030,8,,gas,all-year.evening,0.6283919999999998
 2030,9,,electricity,all-year.night,-0.39600000000000024
@@ -269,28 +257,28 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2030,10,,gas,all-year.evening,-1.1484
 2030,10,,heat,all-year.evening,0.9900000000000002
 2030,10,,CO2f,all-year.evening,64.06290000000001
-2030,11,,wind,all-year.night,-0.6640000000000001
-2030,11,,electricity,all-year.night,0.6640000000000001
-2030,11,,wind,all-year.morning,-0.0
-2030,11,,electricity,all-year.morning,0.0
-2030,11,,wind,all-year.afternoon,-0.0
-2030,11,,electricity,all-year.afternoon,0.0
+2030,11,,wind,all-year.night,-0.0
+2030,11,,electricity,all-year.night,0.0
+2030,11,,wind,all-year.morning,-0.9960000000000001
+2030,11,,electricity,all-year.morning,0.9960000000000001
+2030,11,,wind,all-year.afternoon,-0.6640000000000001
+2030,11,,electricity,all-year.afternoon,0.6640000000000001
 2030,11,,wind,all-year.early-peak,-0.9960000000000001
 2030,11,,electricity,all-year.early-peak,0.9960000000000001
-2030,11,,wind,all-year.late-peak,-0.39600000000000035
-2030,11,,electricity,all-year.late-peak,0.39600000000000035
-2030,11,,wind,all-year.evening,-0.3343999999999999
-2030,11,,electricity,all-year.evening,0.3343999999999999
-2030,12,,gas,all-year.night,1.1483999999999996
+2030,11,,wind,all-year.late-peak,-0.0
+2030,11,,electricity,all-year.late-peak,0.0
+2030,11,,wind,all-year.evening,-0.0
+2030,11,,electricity,all-year.evening,0.0
+2030,12,,gas,all-year.night,0.0
 2030,12,,gas,all-year.morning,0.0
 2030,12,,gas,all-year.afternoon,0.0
 2030,12,,gas,all-year.early-peak,1.1483999999999996
 2030,12,,gas,all-year.late-peak,1.1483999999999996
-2030,12,,gas,all-year.evening,1.1483999999999996
+2030,12,,gas,all-year.evening,0.0
 2035,2,,gas,all-year.night,0.5432080000000004
-2035,2,,gas,all-year.morning,0.5200080000000007
+2035,2,,gas,all-year.morning,0.5200080000000009
 2035,2,,gas,all-year.afternoon,2.32
-2035,2,,gas,all-year.early-peak,0.5200080000000007
+2035,2,,gas,all-year.early-peak,0.5200080000000009
 2035,2,,gas,all-year.late-peak,4.000008
 2035,2,,gas,all-year.evening,1.6800080000000008
 2035,3,,gas,all-year.night,-0.0
@@ -313,16 +301,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,3,,CO2f,all-year.evening,75.49540983000001
 2035,4,,electricity,all-year.night,-0.0
 2035,4,,heat,all-year.night,0.0
-2035,4,,electricity,all-year.morning,-0.39599999999999974
-2035,4,,heat,all-year.morning,0.9899999999999993
+2035,4,,electricity,all-year.morning,-0.3959999999999999
+2035,4,,heat,all-year.morning,0.9899999999999998
 2035,4,,electricity,all-year.afternoon,-0.0
 2035,4,,heat,all-year.afternoon,0.0
-2035,4,,electricity,all-year.early-peak,-0.39599999999999974
-2035,4,,heat,all-year.early-peak,0.9899999999999993
+2035,4,,electricity,all-year.early-peak,-0.3959999999999999
+2035,4,,heat,all-year.early-peak,0.9899999999999998
 2035,4,,electricity,all-year.late-peak,-1.596
 2035,4,,heat,all-year.late-peak,3.9899999999999998
-2035,4,,electricity,all-year.evening,-0.7959999999999998
-2035,4,,heat,all-year.evening,1.9899999999999993
+2035,4,,electricity,all-year.evening,-0.7959999999999999
+2035,4,,heat,all-year.evening,1.9899999999999998
 2035,5,,gas,all-year.night,-0.0
 2035,5,,heat,all-year.night,0.0
 2035,5,,CO2f,all-year.night,0.0
@@ -343,28 +331,28 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,5,,CO2f,all-year.evening,53.27749016999999
 2035,6,,wind,all-year.night,-0.0
 2035,6,,electricity,all-year.night,0.0
-2035,6,,wind,all-year.morning,-0.20399999999999985
-2035,6,,electricity,all-year.morning,0.20399999999999985
+2035,6,,wind,all-year.morning,-0.0
+2035,6,,electricity,all-year.morning,0.0
 2035,6,,wind,all-year.afternoon,-0.0
 2035,6,,electricity,all-year.afternoon,0.0
-2035,6,,wind,all-year.early-peak,-0.22079999999999944
-2035,6,,electricity,all-year.early-peak,0.22079999999999944
-2035,6,,wind,all-year.late-peak,-1.5959999999999999
-2035,6,,electricity,all-year.late-peak,1.5959999999999999
-2035,6,,wind,all-year.evening,-1.5959999999999999
-2035,6,,electricity,all-year.evening,1.5959999999999999
+2035,6,,wind,all-year.early-peak,-0.0
+2035,6,,electricity,all-year.early-peak,0.0
+2035,6,,wind,all-year.late-peak,-0.2777666666666677
+2035,6,,electricity,all-year.late-peak,0.2777666666666677
+2035,6,,wind,all-year.evening,-1.5999999999999999
+2035,6,,electricity,all-year.evening,1.5999999999999999
 2035,8,,gas,all-year.night,0.6283919999999998
 2035,8,,gas,all-year.morning,0.6283919999999998
 2035,8,,gas,all-year.afternoon,0.0
 2035,8,,gas,all-year.early-peak,0.6283919999999998
 2035,8,,gas,all-year.late-peak,0.6283919999999998
 2035,8,,gas,all-year.evening,0.6283919999999998
-2035,9,,electricity,all-year.night,-0.392
-2035,9,,heat,all-year.night,0.98
+2035,9,,electricity,all-year.night,-0.3920000000000002
+2035,9,,heat,all-year.night,0.9800000000000004
 2035,9,,electricity,all-year.morning,-0.39600000000000024
 2035,9,,heat,all-year.morning,0.9900000000000005
-2035,9,,electricity,all-year.afternoon,-0.392
-2035,9,,heat,all-year.afternoon,0.98
+2035,9,,electricity,all-year.afternoon,-0.3920000000000002
+2035,9,,heat,all-year.afternoon,0.9800000000000004
 2035,9,,electricity,all-year.early-peak,-0.39600000000000024
 2035,9,,heat,all-year.early-peak,0.9900000000000005
 2035,9,,electricity,all-year.late-peak,-0.39600000000000024
@@ -389,16 +377,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,10,,gas,all-year.evening,-1.1484
 2035,10,,heat,all-year.evening,0.9900000000000002
 2035,10,,CO2f,all-year.evening,64.06290000000001
-2035,11,,wind,all-year.night,-0.0
-2035,11,,electricity,all-year.night,0.0
-2035,11,,wind,all-year.morning,-0.9960000000000002
-2035,11,,electricity,all-year.morning,0.9960000000000002
-2035,11,,wind,all-year.afternoon,-0.5903999999999998
-2035,11,,electricity,all-year.afternoon,0.5903999999999998
+2035,11,,wind,all-year.night,-0.8
+2035,11,,electricity,all-year.night,0.8
+2035,11,,wind,all-year.morning,-1.2
+2035,11,,electricity,all-year.morning,1.2
+2035,11,,wind,all-year.afternoon,-0.8
+2035,11,,electricity,all-year.afternoon,0.8
 2035,11,,wind,all-year.early-peak,-0.0
 2035,11,,electricity,all-year.early-peak,0.0
-2035,11,,wind,all-year.late-peak,-0.8040000000000005
-2035,11,,electricity,all-year.late-peak,0.8040000000000005
+2035,11,,wind,all-year.late-peak,-2.1222333333333325
+2035,11,,electricity,all-year.late-peak,2.1222333333333325
 2035,11,,wind,all-year.evening,-0.0
 2035,11,,electricity,all-year.evening,0.0
 2035,12,,gas,all-year.night,1.1483999999999996
@@ -407,18 +395,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,12,,gas,all-year.early-peak,1.1483999999999996
 2035,12,,gas,all-year.late-peak,1.1483999999999996
 2035,12,,gas,all-year.evening,1.1483999999999996
-2035,13,,electricity,all-year.night,-0.40800000000000003
-2035,13,,heat,all-year.night,1.02
-2035,13,,electricity,all-year.morning,-0.40800000000000003
-2035,13,,heat,all-year.morning,1.02
-2035,13,,electricity,all-year.afternoon,-0.40800000000000003
-2035,13,,heat,all-year.afternoon,1.02
-2035,13,,electricity,all-year.early-peak,-0.40800000000000003
-2035,13,,heat,all-year.early-peak,1.02
-2035,13,,electricity,all-year.late-peak,-0.40800000000000003
-2035,13,,heat,all-year.late-peak,1.02
-2035,13,,electricity,all-year.evening,-0.40800000000000003
-2035,13,,heat,all-year.evening,1.02
+2035,13,,electricity,all-year.night,-0.40799999999999986
+2035,13,,heat,all-year.night,1.0199999999999996
+2035,13,,electricity,all-year.morning,-0.40799999999999986
+2035,13,,heat,all-year.morning,1.0199999999999996
+2035,13,,electricity,all-year.afternoon,-0.40799999999999986
+2035,13,,heat,all-year.afternoon,1.0199999999999996
+2035,13,,electricity,all-year.early-peak,-0.40799999999999986
+2035,13,,heat,all-year.early-peak,1.0199999999999996
+2035,13,,electricity,all-year.late-peak,-0.40799999999999986
+2035,13,,heat,all-year.late-peak,1.0199999999999996
+2035,13,,electricity,all-year.evening,-0.40799999999999986
+2035,13,,heat,all-year.evening,1.0199999999999996
 2035,14,,gas,all-year.night,-1.1831999999999994
 2035,14,,heat,all-year.night,1.0199999999999996
 2035,14,,CO2f,all-year.night,66.00419999999997
@@ -437,30 +425,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,14,,gas,all-year.evening,-1.1831999999999994
 2035,14,,heat,all-year.evening,1.0199999999999996
 2035,14,,CO2f,all-year.evening,66.00419999999997
-2035,15,,wind,all-year.night,-0.8
-2035,15,,electricity,all-year.night,0.8
+2035,15,,wind,all-year.night,-0.0
+2035,15,,electricity,all-year.night,0.0
 2035,15,,wind,all-year.morning,-0.0
 2035,15,,electricity,all-year.morning,0.0
-2035,15,,wind,all-year.afternoon,-0.20960000000000023
-2035,15,,electricity,all-year.afternoon,0.20960000000000023
-2035,15,,wind,all-year.early-peak,-0.9792000000000005
-2035,15,,electricity,all-year.early-peak,0.9792000000000005
+2035,15,,wind,all-year.afternoon,-0.0
+2035,15,,electricity,all-year.afternoon,0.0
+2035,15,,wind,all-year.early-peak,-1.2
+2035,15,,electricity,all-year.early-peak,1.2
 2035,15,,wind,all-year.late-peak,-0.0
 2035,15,,electricity,all-year.late-peak,0.0
-2035,15,,wind,all-year.evening,-0.004000000000000115
-2035,15,,electricity,all-year.evening,0.004000000000000115
+2035,15,,wind,all-year.evening,-0.0
+2035,15,,electricity,all-year.evening,0.0
 2035,16,,gas,all-year.night,0.0
 2035,16,,gas,all-year.morning,1.1831999999999994
 2035,16,,gas,all-year.afternoon,0.0
 2035,16,,gas,all-year.early-peak,1.1831999999999994
 2035,16,,gas,all-year.late-peak,1.1831999999999994
 2035,16,,gas,all-year.evening,1.1831999999999994
-2040,2,,gas,all-year.night,0.8912080000000007
+2040,2,,gas,all-year.night,0.8912080000000004
 2040,2,,gas,all-year.morning,0.0
 2040,2,,gas,all-year.afternoon,1.5543999999999993
-2040,2,,gas,all-year.early-peak,0.5742
+2040,2,,gas,all-year.early-peak,0.5742000000000002
 2040,2,,gas,all-year.late-peak,4.000008
-2040,2,,gas,all-year.evening,2.4456079999999996
+2040,2,,gas,all-year.evening,2.445608
 2040,3,,gas,all-year.night,-0.0
 2040,3,,heat,all-year.night,0.0
 2040,3,,CO2f,all-year.night,0.0
@@ -481,16 +469,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,3,,CO2f,all-year.evening,54.14110983000001
 2040,4,,electricity,all-year.night,-0.0
 2040,4,,heat,all-year.night,0.0
-2040,4,,electricity,all-year.morning,-0.19799999999999987
-2040,4,,heat,all-year.morning,0.49499999999999966
+2040,4,,electricity,all-year.morning,-0.1979999999999998
+2040,4,,heat,all-year.morning,0.49499999999999944
 2040,4,,electricity,all-year.afternoon,-0.0
 2040,4,,heat,all-year.afternoon,0.0
-2040,4,,electricity,all-year.early-peak,-0.19799999999999987
-2040,4,,heat,all-year.early-peak,0.49499999999999966
+2040,4,,electricity,all-year.early-peak,-0.1979999999999998
+2040,4,,heat,all-year.early-peak,0.49499999999999944
 2040,4,,electricity,all-year.late-peak,-1.596
 2040,4,,heat,all-year.late-peak,3.9899999999999998
-2040,4,,electricity,all-year.evening,-0.6639999999999999
-2040,4,,heat,all-year.evening,1.6599999999999997
+2040,4,,electricity,all-year.evening,-0.6639999999999998
+2040,4,,heat,all-year.evening,1.6599999999999995
 2040,5,,gas,all-year.night,-0.0
 2040,5,,heat,all-year.night,0.0
 2040,5,,CO2f,all-year.night,0.0
@@ -511,12 +499,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,5,,CO2f,all-year.evening,53.27749016999999
 2040,6,,wind,all-year.night,-0.0
 2040,6,,electricity,all-year.night,0.0
-2040,6,,wind,all-year.morning,-1.3980000000000001
-2040,6,,electricity,all-year.morning,1.3980000000000001
+2040,6,,wind,all-year.morning,-1.398
+2040,6,,electricity,all-year.morning,1.398
 2040,6,,wind,all-year.afternoon,-0.932
 2040,6,,electricity,all-year.afternoon,0.932
-2040,6,,wind,all-year.early-peak,-0.4187999999999995
-2040,6,,electricity,all-year.early-peak,0.4187999999999995
+2040,6,,wind,all-year.early-peak,-0.0
+2040,6,,electricity,all-year.early-peak,0.0
 2040,6,,wind,all-year.late-peak,-0.0
 2040,6,,electricity,all-year.late-peak,0.0
 2040,6,,wind,all-year.evening,-0.0
@@ -527,12 +515,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,8,,gas,all-year.early-peak,0.0
 2040,8,,gas,all-year.late-peak,0.6283919999999998
 2040,8,,gas,all-year.evening,0.6283919999999998
-2040,9,,electricity,all-year.night,-0.1280000000000001
-2040,9,,heat,all-year.night,0.3200000000000003
+2040,9,,electricity,all-year.night,-0.12800000000000003
+2040,9,,heat,all-year.night,0.32000000000000006
 2040,9,,electricity,all-year.morning,-0.39600000000000024
 2040,9,,heat,all-year.morning,0.9900000000000005
-2040,9,,electricity,all-year.afternoon,-0.1280000000000001
-2040,9,,heat,all-year.afternoon,0.3200000000000003
+2040,9,,electricity,all-year.afternoon,-0.12800000000000003
+2040,9,,heat,all-year.afternoon,0.32000000000000006
 2040,9,,electricity,all-year.early-peak,-0.39600000000000024
 2040,9,,heat,all-year.early-peak,0.9900000000000005
 2040,9,,electricity,all-year.late-peak,-0.39600000000000024
@@ -565,8 +553,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,11,,electricity,all-year.afternoon,0.0
 2040,11,,wind,all-year.early-peak,-0.0
 2040,11,,electricity,all-year.early-peak,0.0
-2040,11,,wind,all-year.late-peak,-0.9960000000000002
-2040,11,,electricity,all-year.late-peak,0.9960000000000002
+2040,11,,wind,all-year.late-peak,-2.1222333333333325
+2040,11,,electricity,all-year.late-peak,2.1222333333333325
 2040,11,,wind,all-year.evening,-0.0
 2040,11,,electricity,all-year.evening,0.0
 2040,12,,gas,all-year.night,0.0
@@ -575,18 +563,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,12,,gas,all-year.early-peak,1.1483999999999996
 2040,12,,gas,all-year.late-peak,1.1483999999999996
 2040,12,,gas,all-year.evening,0.0
-2040,13,,electricity,all-year.night,-0.40800000000000003
-2040,13,,heat,all-year.night,1.02
-2040,13,,electricity,all-year.morning,-0.40800000000000003
-2040,13,,heat,all-year.morning,1.02
-2040,13,,electricity,all-year.afternoon,-0.40800000000000003
-2040,13,,heat,all-year.afternoon,1.02
-2040,13,,electricity,all-year.early-peak,-0.40800000000000003
-2040,13,,heat,all-year.early-peak,1.02
-2040,13,,electricity,all-year.late-peak,-0.40800000000000003
-2040,13,,heat,all-year.late-peak,1.02
-2040,13,,electricity,all-year.evening,-0.40800000000000003
-2040,13,,heat,all-year.evening,1.02
+2040,13,,electricity,all-year.night,-0.40799999999999986
+2040,13,,heat,all-year.night,1.0199999999999996
+2040,13,,electricity,all-year.morning,-0.40799999999999986
+2040,13,,heat,all-year.morning,1.0199999999999996
+2040,13,,electricity,all-year.afternoon,-0.40799999999999986
+2040,13,,heat,all-year.afternoon,1.0199999999999996
+2040,13,,electricity,all-year.early-peak,-0.40799999999999986
+2040,13,,heat,all-year.early-peak,1.0199999999999996
+2040,13,,electricity,all-year.late-peak,-0.40799999999999986
+2040,13,,heat,all-year.late-peak,1.0199999999999996
+2040,13,,electricity,all-year.evening,-0.40799999999999986
+2040,13,,heat,all-year.evening,1.0199999999999996
 2040,14,,gas,all-year.night,-1.1831999999999994
 2040,14,,heat,all-year.night,1.0199999999999996
 2040,14,,CO2f,all-year.night,66.00419999999997
@@ -605,36 +593,36 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,14,,gas,all-year.evening,-1.1831999999999994
 2040,14,,heat,all-year.evening,1.0199999999999996
 2040,14,,CO2f,all-year.evening,66.00419999999997
-2040,15,,wind,all-year.night,-0.0
-2040,15,,electricity,all-year.night,0.0
+2040,15,,wind,all-year.night,-0.7486666666666666
+2040,15,,electricity,all-year.night,0.7486666666666666
 2040,15,,wind,all-year.morning,-0.0
 2040,15,,electricity,all-year.morning,0.0
 2040,15,,wind,all-year.afternoon,-0.0
 2040,15,,electricity,all-year.afternoon,0.0
-2040,15,,wind,all-year.early-peak,-0.9792000000000005
-2040,15,,electricity,all-year.early-peak,0.9792000000000005
-2040,15,,wind,all-year.late-peak,-0.0
-2040,15,,electricity,all-year.late-peak,0.0
-2040,15,,wind,all-year.evening,-0.9792000000000005
-2040,15,,electricity,all-year.evening,0.9792000000000005
+2040,15,,wind,all-year.early-peak,-1.398
+2040,15,,electricity,all-year.early-peak,1.398
+2040,15,,wind,all-year.late-peak,-0.49043333333333416
+2040,15,,electricity,all-year.late-peak,0.49043333333333416
+2040,15,,wind,all-year.evening,-1.864
+2040,15,,electricity,all-year.evening,1.864
 2040,16,,gas,all-year.night,1.1831999999999994
-2040,16,,gas,all-year.morning,1.1290079999999996
+2040,16,,gas,all-year.morning,1.1290079999999998
 2040,16,,gas,all-year.afternoon,0.0
 2040,16,,gas,all-year.early-peak,1.1831999999999994
 2040,16,,gas,all-year.late-peak,1.1831999999999994
 2040,16,,gas,all-year.evening,1.1831999999999994
-2040,17,,electricity,all-year.night,-0.3959999999999999
-2040,17,,heat,all-year.night,0.9899999999999998
-2040,17,,electricity,all-year.morning,-0.3959999999999999
-2040,17,,heat,all-year.morning,0.9899999999999998
-2040,17,,electricity,all-year.afternoon,-0.3959999999999999
-2040,17,,heat,all-year.afternoon,0.9899999999999998
-2040,17,,electricity,all-year.early-peak,-0.3959999999999999
-2040,17,,heat,all-year.early-peak,0.9899999999999998
-2040,17,,electricity,all-year.late-peak,-0.3959999999999999
-2040,17,,heat,all-year.late-peak,0.9899999999999998
-2040,17,,electricity,all-year.evening,-0.3959999999999999
-2040,17,,heat,all-year.evening,0.9899999999999998
+2040,17,,electricity,all-year.night,-0.3960000000000002
+2040,17,,heat,all-year.night,0.9900000000000004
+2040,17,,electricity,all-year.morning,-0.3960000000000002
+2040,17,,heat,all-year.morning,0.9900000000000004
+2040,17,,electricity,all-year.afternoon,-0.3960000000000002
+2040,17,,heat,all-year.afternoon,0.9900000000000004
+2040,17,,electricity,all-year.early-peak,-0.3960000000000002
+2040,17,,heat,all-year.early-peak,0.9900000000000004
+2040,17,,electricity,all-year.late-peak,-0.3960000000000002
+2040,17,,heat,all-year.late-peak,0.9900000000000004
+2040,17,,electricity,all-year.evening,-0.3960000000000002
+2040,17,,heat,all-year.evening,0.9900000000000004
 2040,18,,gas,all-year.night,-1.1484
 2040,18,,heat,all-year.night,0.9900000000000002
 2040,18,,CO2f,all-year.night,64.06290000000001
@@ -653,48 +641,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,18,,gas,all-year.evening,-1.1484
 2040,18,,heat,all-year.evening,0.9900000000000002
 2040,18,,CO2f,all-year.evening,64.06290000000001
-2040,19,,wind,all-year.night,-0.932
-2040,19,,electricity,all-year.night,0.932
+2040,19,,wind,all-year.night,-0.18333333333333357
+2040,19,,electricity,all-year.night,0.18333333333333357
 2040,19,,wind,all-year.morning,-0.0
 2040,19,,electricity,all-year.morning,0.0
 2040,19,,wind,all-year.afternoon,-0.0
 2040,19,,electricity,all-year.afternoon,0.0
 2040,19,,wind,all-year.early-peak,-0.0
 2040,19,,electricity,all-year.early-peak,0.0
-2040,19,,wind,all-year.late-peak,-1.8000000000000003
-2040,19,,electricity,all-year.late-peak,1.8000000000000003
-2040,19,,wind,all-year.evening,-0.8847999999999996
-2040,19,,electricity,all-year.evening,0.8847999999999996
-2040,20,,gas,all-year.night,-0.0
-2040,20,,electricity,all-year.night,0.0
-2040,20,,CO2f,all-year.night,0.0
-2040,20,,gas,all-year.morning,-0.0
-2040,20,,electricity,all-year.morning,0.0
-2040,20,,CO2f,all-year.morning,0.0
-2040,20,,gas,all-year.afternoon,-0.0
-2040,20,,electricity,all-year.afternoon,0.0
-2040,20,,CO2f,all-year.afternoon,0.0
-2040,20,,gas,all-year.early-peak,-0.0
-2040,20,,electricity,all-year.early-peak,0.0
-2040,20,,CO2f,all-year.early-peak,0.0
-2040,20,,gas,all-year.late-peak,-0.0
-2040,20,,electricity,all-year.late-peak,0.0
-2040,20,,CO2f,all-year.late-peak,0.0
-2040,20,,gas,all-year.evening,-0.0
-2040,20,,electricity,all-year.evening,0.0
-2040,20,,CO2f,all-year.evening,0.0
-2040,21,,gas,all-year.night,0.0
-2040,21,,gas,all-year.morning,1.1484000000000005
-2040,21,,gas,all-year.afternoon,1.1484000000000005
-2040,21,,gas,all-year.early-peak,1.1484000000000005
-2040,21,,gas,all-year.late-peak,1.1484000000000005
-2040,21,,gas,all-year.evening,1.1484000000000005
+2040,19,,wind,all-year.late-peak,-0.18333333333333357
+2040,19,,electricity,all-year.late-peak,0.18333333333333357
+2040,19,,wind,all-year.evening,-0.0
+2040,19,,electricity,all-year.evening,0.0
+2040,20,,gas,all-year.night,0.0
+2040,20,,gas,all-year.morning,1.1484000000000005
+2040,20,,gas,all-year.afternoon,1.1484000000000005
+2040,20,,gas,all-year.early-peak,1.1484000000000005
+2040,20,,gas,all-year.late-peak,1.1484000000000005
+2040,20,,gas,all-year.evening,1.1484000000000005
 2045,2,,gas,all-year.night,3.0856
 2045,2,,gas,all-year.morning,4.000008
 2045,2,,gas,all-year.afternoon,0.0
 2045,2,,gas,all-year.early-peak,4.000008
 2045,2,,gas,all-year.late-peak,4.000007999999999
-2045,2,,gas,all-year.evening,2.062807999999999
+2045,2,,gas,all-year.evening,2.0628079999999995
 2045,3,,gas,all-year.night,-0.0
 2045,3,,heat,all-year.night,0.0
 2045,3,,CO2f,all-year.night,0.0
@@ -743,16 +713,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,5,,gas,all-year.evening,-0.9550593199999998
 2045,5,,heat,all-year.evening,0.8233269999999999
 2045,5,,CO2f,all-year.evening,53.27749016999999
-2045,6,,wind,all-year.night,-1.064
-2045,6,,electricity,all-year.night,1.064
-2045,6,,wind,all-year.morning,-0.0
-2045,6,,electricity,all-year.morning,0.0
+2045,6,,wind,all-year.night,-1.0640000000000003
+2045,6,,electricity,all-year.night,1.0640000000000003
+2045,6,,wind,all-year.morning,-1.4126666666666667
+2045,6,,electricity,all-year.morning,1.4126666666666667
 2045,6,,wind,all-year.afternoon,-0.0
 2045,6,,electricity,all-year.afternoon,0.0
 2045,6,,wind,all-year.early-peak,-0.0
 2045,6,,electricity,all-year.early-peak,0.0
-2045,6,,wind,all-year.late-peak,-1.5959999999999999
-2045,6,,electricity,all-year.late-peak,1.5959999999999999
+2045,6,,wind,all-year.late-peak,-2.216666666666667
+2045,6,,electricity,all-year.late-peak,2.216666666666667
 2045,6,,wind,all-year.evening,-0.0
 2045,6,,electricity,all-year.evening,0.0
 2045,8,,gas,all-year.night,0.0
@@ -767,8 +737,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,9,,heat,all-year.morning,0.9900000000000002
 2045,9,,electricity,all-year.afternoon,-0.0
 2045,9,,heat,all-year.afternoon,0.0
-2045,9,,electricity,all-year.early-peak,-0.39600000000000013
-2045,9,,heat,all-year.early-peak,0.9900000000000002
+2045,9,,electricity,all-year.early-peak,-0.396
+2045,9,,heat,all-year.early-peak,0.99
 2045,9,,electricity,all-year.late-peak,-0.39600000000000024
 2045,9,,heat,all-year.late-peak,0.9900000000000005
 2045,9,,electricity,all-year.evening,-0.39600000000000024
@@ -797,30 +767,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,11,,electricity,all-year.morning,0.0
 2045,11,,wind,all-year.afternoon,-0.0
 2045,11,,electricity,all-year.afternoon,0.0
-2045,11,,wind,all-year.early-peak,-0.0
-2045,11,,electricity,all-year.early-peak,0.0
+2045,11,,wind,all-year.early-peak,-1.4126666666666667
+2045,11,,electricity,all-year.early-peak,1.4126666666666667
 2045,11,,wind,all-year.late-peak,-0.0
 2045,11,,electricity,all-year.late-peak,0.0
-2045,11,,wind,all-year.evening,-0.0
-2045,11,,electricity,all-year.evening,0.0
+2045,11,,wind,all-year.evening,-1.0606293333333405
+2045,11,,electricity,all-year.evening,1.0606293333333405
 2045,12,,gas,all-year.night,0.0
 2045,12,,gas,all-year.morning,0.0
 2045,12,,gas,all-year.afternoon,1.1483999999999996
 2045,12,,gas,all-year.early-peak,0.0
 2045,12,,gas,all-year.late-peak,1.1483999999999996
 2045,12,,gas,all-year.evening,0.0
-2045,13,,electricity,all-year.night,-0.2720000000000001
-2045,13,,heat,all-year.night,0.6800000000000002
-2045,13,,electricity,all-year.morning,-0.40800000000000003
-2045,13,,heat,all-year.morning,1.02
-2045,13,,electricity,all-year.afternoon,-0.2720000000000001
-2045,13,,heat,all-year.afternoon,0.6800000000000002
-2045,13,,electricity,all-year.early-peak,-0.40800000000000003
-2045,13,,heat,all-year.early-peak,1.02
-2045,13,,electricity,all-year.late-peak,-0.40800000000000003
-2045,13,,heat,all-year.late-peak,1.02
-2045,13,,electricity,all-year.evening,-0.40800000000000003
-2045,13,,heat,all-year.evening,1.02
+2045,13,,electricity,all-year.night,-0.2719999999999998
+2045,13,,heat,all-year.night,0.6799999999999995
+2045,13,,electricity,all-year.morning,-0.40799999999999986
+2045,13,,heat,all-year.morning,1.0199999999999996
+2045,13,,electricity,all-year.afternoon,-0.2719999999999998
+2045,13,,heat,all-year.afternoon,0.6799999999999995
+2045,13,,electricity,all-year.early-peak,-0.40799999999999986
+2045,13,,heat,all-year.early-peak,1.0199999999999996
+2045,13,,electricity,all-year.late-peak,-0.40799999999999986
+2045,13,,heat,all-year.late-peak,1.0199999999999996
+2045,13,,electricity,all-year.evening,-0.40799999999999986
+2045,13,,heat,all-year.evening,1.0199999999999996
 2045,14,,gas,all-year.night,-0.7887999999999996
 2045,14,,heat,all-year.night,0.6799999999999997
 2045,14,,CO2f,all-year.night,44.00279999999998
@@ -843,8 +813,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,15,,electricity,all-year.night,0.0
 2045,15,,wind,all-year.morning,-0.0
 2045,15,,electricity,all-year.morning,0.0
-2045,15,,wind,all-year.afternoon,-0.9792000000000005
-2045,15,,electricity,all-year.afternoon,0.9792000000000005
+2045,15,,wind,all-year.afternoon,-1.064
+2045,15,,electricity,all-year.afternoon,1.064
 2045,15,,wind,all-year.early-peak,-0.0
 2045,15,,electricity,all-year.early-peak,0.0
 2045,15,,wind,all-year.late-peak,-0.0
@@ -852,23 +822,23 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,15,,wind,all-year.evening,-0.0
 2045,15,,electricity,all-year.evening,0.0
 2045,16,,gas,all-year.night,0.0
-2045,16,,gas,all-year.morning,0.6283919999999994
+2045,16,,gas,all-year.morning,0.6283919999999996
 2045,16,,gas,all-year.afternoon,0.0
 2045,16,,gas,all-year.early-peak,0.0
 2045,16,,gas,all-year.late-peak,1.1831999999999994
 2045,16,,gas,all-year.evening,1.1831999999999994
-2045,17,,electricity,all-year.night,-0.3959999999999999
-2045,17,,heat,all-year.night,0.9899999999999998
-2045,17,,electricity,all-year.morning,-0.3959999999999999
-2045,17,,heat,all-year.morning,0.9899999999999998
-2045,17,,electricity,all-year.afternoon,-0.3959999999999999
-2045,17,,heat,all-year.afternoon,0.9899999999999998
-2045,17,,electricity,all-year.early-peak,-0.3959999999999999
-2045,17,,heat,all-year.early-peak,0.9899999999999998
-2045,17,,electricity,all-year.late-peak,-0.3959999999999999
-2045,17,,heat,all-year.late-peak,0.9899999999999998
-2045,17,,electricity,all-year.evening,-0.3959999999999999
-2045,17,,heat,all-year.evening,0.9899999999999998
+2045,17,,electricity,all-year.night,-0.3960000000000002
+2045,17,,heat,all-year.night,0.9900000000000004
+2045,17,,electricity,all-year.morning,-0.3960000000000002
+2045,17,,heat,all-year.morning,0.9900000000000004
+2045,17,,electricity,all-year.afternoon,-0.3960000000000002
+2045,17,,heat,all-year.afternoon,0.9900000000000004
+2045,17,,electricity,all-year.early-peak,-0.3960000000000002
+2045,17,,heat,all-year.early-peak,0.9900000000000004
+2045,17,,electricity,all-year.late-peak,-0.3960000000000002
+2045,17,,heat,all-year.late-peak,0.9900000000000004
+2045,17,,electricity,all-year.evening,-0.3960000000000002
+2045,17,,heat,all-year.evening,0.9900000000000004
 2045,18,,gas,all-year.night,-1.1484
 2045,18,,heat,all-year.night,0.9900000000000002
 2045,18,,CO2f,all-year.night,64.06290000000001
@@ -889,73 +859,73 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,18,,CO2f,all-year.evening,64.06290000000001
 2045,19,,wind,all-year.night,-0.0
 2045,19,,electricity,all-year.night,0.0
-2045,19,,wind,all-year.morning,-1.5960000000000003
-2045,19,,electricity,all-year.morning,1.5960000000000003
-2045,19,,wind,all-year.afternoon,-0.0847999999999996
-2045,19,,electricity,all-year.afternoon,0.0847999999999996
-2045,19,,wind,all-year.early-peak,-1.5960000000000003
-2045,19,,electricity,all-year.early-peak,1.5960000000000003
-2045,19,,wind,all-year.late-peak,-1.5960000000000005
-2045,19,,electricity,all-year.late-peak,1.5960000000000005
-2045,19,,wind,all-year.evening,-0.7412800000000013
-2045,19,,electricity,all-year.evening,0.7412800000000013
-2045,21,,gas,all-year.night,0.0
-2045,21,,gas,all-year.morning,0.0
-2045,21,,gas,all-year.afternoon,0.16040799999999977
-2045,21,,gas,all-year.early-peak,0.6283919999999994
-2045,21,,gas,all-year.late-peak,1.1484000000000005
-2045,21,,gas,all-year.evening,1.1484000000000005
-2045,22,,electricity,all-year.night,-0.39600000000000013
+2045,19,,wind,all-year.morning,-0.18333333333333357
+2045,19,,electricity,all-year.morning,0.18333333333333357
+2045,19,,wind,all-year.afternoon,-0.0
+2045,19,,electricity,all-year.afternoon,0.0
+2045,19,,wind,all-year.early-peak,-0.18333333333333357
+2045,19,,electricity,all-year.early-peak,0.18333333333333357
+2045,19,,wind,all-year.late-peak,-0.07333333333333342
+2045,19,,electricity,all-year.late-peak,0.07333333333333342
+2045,19,,wind,all-year.evening,-0.0
+2045,19,,electricity,all-year.evening,0.0
+2045,20,,gas,all-year.night,0.0
+2045,20,,gas,all-year.morning,0.0
+2045,20,,gas,all-year.afternoon,0.16040799999999997
+2045,20,,gas,all-year.early-peak,0.6283919999999996
+2045,20,,gas,all-year.late-peak,1.1484000000000005
+2045,20,,gas,all-year.evening,1.1484000000000005
+2045,21,,electricity,all-year.night,-0.39600000000000013
+2045,21,,heat,all-year.night,0.9900000000000002
+2045,21,,electricity,all-year.morning,-0.39600000000000013
+2045,21,,heat,all-year.morning,0.9900000000000002
+2045,21,,electricity,all-year.afternoon,-0.39600000000000013
+2045,21,,heat,all-year.afternoon,0.9900000000000002
+2045,21,,electricity,all-year.early-peak,-0.39600000000000013
+2045,21,,heat,all-year.early-peak,0.9900000000000002
+2045,21,,electricity,all-year.late-peak,-0.39600000000000013
+2045,21,,heat,all-year.late-peak,0.9900000000000002
+2045,21,,electricity,all-year.evening,-0.39600000000000013
+2045,21,,heat,all-year.evening,0.9900000000000002
+2045,22,,gas,all-year.night,-1.1484
 2045,22,,heat,all-year.night,0.9900000000000002
-2045,22,,electricity,all-year.morning,-0.39600000000000013
+2045,22,,CO2f,all-year.night,64.06290000000001
+2045,22,,gas,all-year.morning,-1.1484
 2045,22,,heat,all-year.morning,0.9900000000000002
-2045,22,,electricity,all-year.afternoon,-0.39600000000000013
+2045,22,,CO2f,all-year.morning,64.06290000000001
+2045,22,,gas,all-year.afternoon,-1.1484
 2045,22,,heat,all-year.afternoon,0.9900000000000002
-2045,22,,electricity,all-year.early-peak,-0.39600000000000013
+2045,22,,CO2f,all-year.afternoon,64.06290000000001
+2045,22,,gas,all-year.early-peak,-1.1484
 2045,22,,heat,all-year.early-peak,0.9900000000000002
-2045,22,,electricity,all-year.late-peak,-0.39600000000000013
+2045,22,,CO2f,all-year.early-peak,64.06290000000001
+2045,22,,gas,all-year.late-peak,-1.1484
 2045,22,,heat,all-year.late-peak,0.9900000000000002
-2045,22,,electricity,all-year.evening,-0.39600000000000013
+2045,22,,CO2f,all-year.late-peak,64.06290000000001
+2045,22,,gas,all-year.evening,-1.1484
 2045,22,,heat,all-year.evening,0.9900000000000002
-2045,23,,gas,all-year.night,-1.1484
-2045,23,,heat,all-year.night,0.9900000000000002
-2045,23,,CO2f,all-year.night,64.06290000000001
-2045,23,,gas,all-year.morning,-1.1484
-2045,23,,heat,all-year.morning,0.9900000000000002
-2045,23,,CO2f,all-year.morning,64.06290000000001
-2045,23,,gas,all-year.afternoon,-1.1484
-2045,23,,heat,all-year.afternoon,0.9900000000000002
-2045,23,,CO2f,all-year.afternoon,64.06290000000001
-2045,23,,gas,all-year.early-peak,-1.1484
-2045,23,,heat,all-year.early-peak,0.9900000000000002
-2045,23,,CO2f,all-year.early-peak,64.06290000000001
-2045,23,,gas,all-year.late-peak,-1.1484
-2045,23,,heat,all-year.late-peak,0.9900000000000002
-2045,23,,CO2f,all-year.late-peak,64.06290000000001
-2045,23,,gas,all-year.evening,-1.1484
-2045,23,,heat,all-year.evening,0.9900000000000002
-2045,23,,CO2f,all-year.evening,64.06290000000001
-2045,24,,wind,all-year.night,-0.0
-2045,24,,electricity,all-year.night,0.0
-2045,24,,wind,all-year.morning,-0.0
-2045,24,,electricity,all-year.morning,0.0
-2045,24,,wind,all-year.afternoon,-0.0
-2045,24,,electricity,all-year.afternoon,0.0
-2045,24,,wind,all-year.early-peak,-0.0
-2045,24,,electricity,all-year.early-peak,0.0
-2045,24,,wind,all-year.late-peak,-0.0
-2045,24,,electricity,all-year.late-peak,0.0
-2045,24,,wind,all-year.evening,-1.386719999999999
-2045,24,,electricity,all-year.evening,1.386719999999999
-2045,25,,gas,all-year.night,0.0
-2045,25,,gas,all-year.morning,0.0
-2045,25,,gas,all-year.afternoon,1.1484000000000005
-2045,25,,gas,all-year.early-peak,0.0
-2045,25,,gas,all-year.late-peak,1.1484000000000005
-2045,25,,gas,all-year.evening,1.1484000000000005
+2045,22,,CO2f,all-year.evening,64.06290000000001
+2045,23,,wind,all-year.night,-0.0
+2045,23,,electricity,all-year.night,0.0
+2045,23,,wind,all-year.morning,-0.0
+2045,23,,electricity,all-year.morning,0.0
+2045,23,,wind,all-year.afternoon,-0.0
+2045,23,,electricity,all-year.afternoon,0.0
+2045,23,,wind,all-year.early-peak,-0.0
+2045,23,,electricity,all-year.early-peak,0.0
+2045,23,,wind,all-year.late-peak,-0.9020000000000004
+2045,23,,electricity,all-year.late-peak,0.9020000000000004
+2045,23,,wind,all-year.evening,-1.06737066666666
+2045,23,,electricity,all-year.evening,1.06737066666666
+2045,24,,gas,all-year.night,0.0
+2045,24,,gas,all-year.morning,0.0
+2045,24,,gas,all-year.afternoon,1.1484000000000005
+2045,24,,gas,all-year.early-peak,0.0
+2045,24,,gas,all-year.late-peak,1.1484000000000005
+2045,24,,gas,all-year.evening,1.1484000000000005
 2050,2,,gas,all-year.night,1.703208
-2050,2,,gas,all-year.morning,1.1116080000000008
-2050,2,,gas,all-year.afternoon,2.296800000000002
+2050,2,,gas,all-year.morning,1.111608000000001
+2050,2,,gas,all-year.afternoon,2.2968000000000024
 2050,2,,gas,all-year.early-peak,0.0
 2050,2,,gas,all-year.late-peak,4.000008000000001
 2050,2,,gas,all-year.evening,4.000008
@@ -1007,16 +977,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,5,,gas,all-year.evening,-0.9550593199999998
 2050,5,,heat,all-year.evening,0.8233269999999999
 2050,5,,CO2f,all-year.evening,53.27749016999999
-2050,6,,wind,all-year.night,-1.1999999999999997
-2050,6,,electricity,all-year.night,1.1999999999999997
+2050,6,,wind,all-year.night,-1.2
+2050,6,,electricity,all-year.night,1.2
 2050,6,,wind,all-year.morning,-0.0
 2050,6,,electricity,all-year.morning,0.0
 2050,6,,wind,all-year.afternoon,-0.0
 2050,6,,electricity,all-year.afternoon,0.0
 2050,6,,wind,all-year.early-peak,-0.0
 2050,6,,electricity,all-year.early-peak,0.0
-2050,6,,wind,all-year.late-peak,-1.5959999999999999
-2050,6,,electricity,all-year.late-peak,1.5959999999999999
+2050,6,,wind,all-year.late-peak,-2.216666666666667
+2050,6,,electricity,all-year.late-peak,2.216666666666667
 2050,6,,wind,all-year.evening,-0.0
 2050,6,,electricity,all-year.evening,0.0
 2050,8,,gas,all-year.night,0.6283919999999998
@@ -1063,28 +1033,28 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,11,,electricity,all-year.afternoon,0.0
 2050,11,,wind,all-year.early-peak,-0.0
 2050,11,,electricity,all-year.early-peak,0.0
-2050,11,,wind,all-year.late-peak,-0.6172800000000012
-2050,11,,electricity,all-year.late-peak,0.6172800000000012
-2050,11,,wind,all-year.evening,-0.9960000000000002
-2050,11,,electricity,all-year.evening,0.9960000000000002
+2050,11,,wind,all-year.late-peak,-0.3159626666666734
+2050,11,,electricity,all-year.late-peak,0.3159626666666734
+2050,11,,wind,all-year.evening,-1.2415666666666647
+2050,11,,electricity,all-year.evening,1.2415666666666647
 2050,12,,gas,all-year.night,1.1483999999999996
 2050,12,,gas,all-year.morning,0.0
 2050,12,,gas,all-year.afternoon,0.0
 2050,12,,gas,all-year.early-peak,1.1483999999999996
 2050,12,,gas,all-year.late-peak,1.1483999999999996
-2050,12,,gas,all-year.evening,0.628391999999999
+2050,12,,gas,all-year.evening,0.6283919999999993
 2050,13,,electricity,all-year.night,0.0
 2050,13,,heat,all-year.night,-0.0
-2050,13,,electricity,all-year.morning,-0.40800000000000003
-2050,13,,heat,all-year.morning,1.02
+2050,13,,electricity,all-year.morning,-0.40799999999999986
+2050,13,,heat,all-year.morning,1.0199999999999996
 2050,13,,electricity,all-year.afternoon,0.0
 2050,13,,heat,all-year.afternoon,-0.0
-2050,13,,electricity,all-year.early-peak,-0.40800000000000003
-2050,13,,heat,all-year.early-peak,1.02
-2050,13,,electricity,all-year.late-peak,-0.40800000000000003
-2050,13,,heat,all-year.late-peak,1.02
-2050,13,,electricity,all-year.evening,-0.40800000000000003
-2050,13,,heat,all-year.evening,1.02
+2050,13,,electricity,all-year.early-peak,-0.40799999999999986
+2050,13,,heat,all-year.early-peak,1.0199999999999996
+2050,13,,electricity,all-year.late-peak,-0.40799999999999986
+2050,13,,heat,all-year.late-peak,1.0199999999999996
+2050,13,,electricity,all-year.evening,-0.40799999999999986
+2050,13,,heat,all-year.evening,1.0199999999999996
 2050,14,,gas,all-year.night,-0.0
 2050,14,,heat,all-year.night,0.0
 2050,14,,CO2f,all-year.night,0.0
@@ -1105,34 +1075,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,14,,CO2f,all-year.evening,66.00419999999997
 2050,15,,wind,all-year.night,-0.0
 2050,15,,electricity,all-year.night,0.0
-2050,15,,wind,all-year.morning,-0.0
-2050,15,,electricity,all-year.morning,0.0
+2050,15,,wind,all-year.morning,-1.6166666666666665
+2050,15,,electricity,all-year.morning,1.6166666666666665
 2050,15,,wind,all-year.afternoon,-0.0
 2050,15,,electricity,all-year.afternoon,0.0
-2050,15,,wind,all-year.early-peak,-0.9792000000000005
-2050,15,,electricity,all-year.early-peak,0.9792000000000005
+2050,15,,wind,all-year.early-peak,-1.8
+2050,15,,electricity,all-year.early-peak,1.8
 2050,15,,wind,all-year.late-peak,-0.0
 2050,15,,electricity,all-year.late-peak,0.0
-2050,15,,wind,all-year.evening,-0.4534080000000005
-2050,15,,electricity,all-year.evening,0.4534080000000005
+2050,15,,wind,all-year.evening,-0.0
+2050,15,,electricity,all-year.evening,0.0
 2050,16,,gas,all-year.night,0.0
 2050,16,,gas,all-year.morning,0.0
 2050,16,,gas,all-year.afternoon,0.0
 2050,16,,gas,all-year.early-peak,0.0
 2050,16,,gas,all-year.late-peak,1.1831999999999994
 2050,16,,gas,all-year.evening,1.1831999999999994
-2050,17,,electricity,all-year.night,-0.3959999999999999
-2050,17,,heat,all-year.night,0.9899999999999998
-2050,17,,electricity,all-year.morning,-0.3959999999999999
-2050,17,,heat,all-year.morning,0.9899999999999998
-2050,17,,electricity,all-year.afternoon,-0.3959999999999999
-2050,17,,heat,all-year.afternoon,0.9899999999999998
-2050,17,,electricity,all-year.early-peak,-0.3959999999999999
-2050,17,,heat,all-year.early-peak,0.9899999999999998
-2050,17,,electricity,all-year.late-peak,-0.3959999999999999
-2050,17,,heat,all-year.late-peak,0.9899999999999998
-2050,17,,electricity,all-year.evening,-0.3959999999999999
-2050,17,,heat,all-year.evening,0.9899999999999998
+2050,17,,electricity,all-year.night,-0.3960000000000002
+2050,17,,heat,all-year.night,0.9900000000000004
+2050,17,,electricity,all-year.morning,-0.3960000000000002
+2050,17,,heat,all-year.morning,0.9900000000000004
+2050,17,,electricity,all-year.afternoon,-0.3960000000000002
+2050,17,,heat,all-year.afternoon,0.9900000000000004
+2050,17,,electricity,all-year.early-peak,-0.3960000000000002
+2050,17,,heat,all-year.early-peak,0.9900000000000004
+2050,17,,electricity,all-year.late-peak,-0.3960000000000002
+2050,17,,heat,all-year.late-peak,0.9900000000000004
+2050,17,,electricity,all-year.evening,-0.3960000000000002
+2050,17,,heat,all-year.evening,0.9900000000000004
 2050,18,,gas,all-year.night,-1.1484
 2050,18,,heat,all-year.night,0.9900000000000002
 2050,18,,CO2f,all-year.night,64.06290000000001
@@ -1153,115 +1123,115 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,18,,CO2f,all-year.evening,64.06290000000001
 2050,19,,wind,all-year.night,-0.0
 2050,19,,electricity,all-year.night,0.0
-2050,19,,wind,all-year.morning,-1.8
-2050,19,,electricity,all-year.morning,1.8
-2050,19,,wind,all-year.afternoon,-0.0
-2050,19,,electricity,all-year.afternoon,0.0
-2050,19,,wind,all-year.early-peak,-0.8207999999999996
-2050,19,,electricity,all-year.early-peak,0.8207999999999996
+2050,19,,wind,all-year.morning,-0.18333333333333357
+2050,19,,electricity,all-year.morning,0.18333333333333357
+2050,19,,wind,all-year.afternoon,-0.1326293333333399
+2050,19,,electricity,all-year.afternoon,0.1326293333333399
+2050,19,,wind,all-year.early-peak,-0.0
+2050,19,,electricity,all-year.early-peak,0.0
 2050,19,,wind,all-year.late-peak,-0.0
 2050,19,,electricity,all-year.late-peak,0.0
 2050,19,,wind,all-year.evening,-0.0
 2050,19,,electricity,all-year.evening,0.0
-2050,21,,gas,all-year.night,0.0
-2050,21,,gas,all-year.morning,1.1484000000000005
-2050,21,,gas,all-year.afternoon,0.0
-2050,21,,gas,all-year.early-peak,1.1484000000000005
-2050,21,,gas,all-year.late-peak,1.1484000000000005
-2050,21,,gas,all-year.evening,0.0
-2050,22,,electricity,all-year.night,-0.39600000000000013
+2050,20,,gas,all-year.night,0.0
+2050,20,,gas,all-year.morning,1.1484000000000005
+2050,20,,gas,all-year.afternoon,0.0
+2050,20,,gas,all-year.early-peak,1.1484000000000005
+2050,20,,gas,all-year.late-peak,1.1484000000000005
+2050,20,,gas,all-year.evening,0.0
+2050,21,,electricity,all-year.night,-0.39600000000000013
+2050,21,,heat,all-year.night,0.9900000000000002
+2050,21,,electricity,all-year.morning,-0.39600000000000013
+2050,21,,heat,all-year.morning,0.9900000000000002
+2050,21,,electricity,all-year.afternoon,-0.39600000000000013
+2050,21,,heat,all-year.afternoon,0.9900000000000002
+2050,21,,electricity,all-year.early-peak,-0.39600000000000013
+2050,21,,heat,all-year.early-peak,0.9900000000000002
+2050,21,,electricity,all-year.late-peak,-0.39600000000000013
+2050,21,,heat,all-year.late-peak,0.9900000000000002
+2050,21,,electricity,all-year.evening,-0.39600000000000013
+2050,21,,heat,all-year.evening,0.9900000000000002
+2050,22,,gas,all-year.night,-1.1484
 2050,22,,heat,all-year.night,0.9900000000000002
-2050,22,,electricity,all-year.morning,-0.39600000000000013
+2050,22,,CO2f,all-year.night,64.06290000000001
+2050,22,,gas,all-year.morning,-1.1484
 2050,22,,heat,all-year.morning,0.9900000000000002
-2050,22,,electricity,all-year.afternoon,-0.39600000000000013
+2050,22,,CO2f,all-year.morning,64.06290000000001
+2050,22,,gas,all-year.afternoon,-1.1484
 2050,22,,heat,all-year.afternoon,0.9900000000000002
-2050,22,,electricity,all-year.early-peak,-0.39600000000000013
+2050,22,,CO2f,all-year.afternoon,64.06290000000001
+2050,22,,gas,all-year.early-peak,-1.1484
 2050,22,,heat,all-year.early-peak,0.9900000000000002
-2050,22,,electricity,all-year.late-peak,-0.39600000000000013
+2050,22,,CO2f,all-year.early-peak,64.06290000000001
+2050,22,,gas,all-year.late-peak,-1.1484
 2050,22,,heat,all-year.late-peak,0.9900000000000002
-2050,22,,electricity,all-year.evening,-0.39600000000000013
+2050,22,,CO2f,all-year.late-peak,64.06290000000001
+2050,22,,gas,all-year.evening,-1.1484
 2050,22,,heat,all-year.evening,0.9900000000000002
-2050,23,,gas,all-year.night,-1.1484
-2050,23,,heat,all-year.night,0.9900000000000002
-2050,23,,CO2f,all-year.night,64.06290000000001
-2050,23,,gas,all-year.morning,-1.1484
-2050,23,,heat,all-year.morning,0.9900000000000002
-2050,23,,CO2f,all-year.morning,64.06290000000001
-2050,23,,gas,all-year.afternoon,-1.1484
-2050,23,,heat,all-year.afternoon,0.9900000000000002
-2050,23,,CO2f,all-year.afternoon,64.06290000000001
-2050,23,,gas,all-year.early-peak,-1.1484
-2050,23,,heat,all-year.early-peak,0.9900000000000002
-2050,23,,CO2f,all-year.early-peak,64.06290000000001
-2050,23,,gas,all-year.late-peak,-1.1484
-2050,23,,heat,all-year.late-peak,0.9900000000000002
-2050,23,,CO2f,all-year.late-peak,64.06290000000001
-2050,23,,gas,all-year.evening,-1.1484
-2050,23,,heat,all-year.evening,0.9900000000000002
-2050,23,,CO2f,all-year.evening,64.06290000000001
-2050,24,,wind,all-year.night,-0.0
-2050,24,,electricity,all-year.night,0.0
-2050,24,,wind,all-year.morning,-0.0
-2050,24,,electricity,all-year.morning,0.0
-2050,24,,wind,all-year.afternoon,-1.1999999999999997
-2050,24,,electricity,all-year.afternoon,1.1999999999999997
-2050,24,,wind,all-year.early-peak,-0.0
-2050,24,,electricity,all-year.early-peak,0.0
-2050,24,,wind,all-year.late-peak,-1.386719999999999
-2050,24,,electricity,all-year.late-peak,1.386719999999999
-2050,24,,wind,all-year.evening,-0.0
-2050,24,,electricity,all-year.evening,0.0
-2050,25,,gas,all-year.night,0.0
-2050,25,,gas,all-year.morning,1.1484000000000005
-2050,25,,gas,all-year.afternoon,0.0
-2050,25,,gas,all-year.early-peak,1.1116080000000017
-2050,25,,gas,all-year.late-peak,1.1484000000000005
-2050,25,,gas,all-year.evening,1.1484000000000005
-2050,26,,electricity,all-year.night,-0.4079999999999997
-2050,26,,heat,all-year.night,1.0199999999999991
-2050,26,,electricity,all-year.morning,-0.4079999999999997
-2050,26,,heat,all-year.morning,1.0199999999999991
-2050,26,,electricity,all-year.afternoon,-0.4079999999999997
-2050,26,,heat,all-year.afternoon,1.0199999999999991
-2050,26,,electricity,all-year.early-peak,-0.4079999999999997
-2050,26,,heat,all-year.early-peak,1.0199999999999991
-2050,26,,electricity,all-year.late-peak,-0.4079999999999997
-2050,26,,heat,all-year.late-peak,1.0199999999999991
-2050,26,,electricity,all-year.evening,-0.4079999999999997
-2050,26,,heat,all-year.evening,1.0199999999999991
-2050,27,,gas,all-year.night,-1.1831999999999994
-2050,27,,heat,all-year.night,1.0199999999999996
-2050,27,,CO2f,all-year.night,66.00419999999997
-2050,27,,gas,all-year.morning,-1.1831999999999994
-2050,27,,heat,all-year.morning,1.0199999999999996
-2050,27,,CO2f,all-year.morning,66.00419999999997
-2050,27,,gas,all-year.afternoon,-1.1831999999999994
-2050,27,,heat,all-year.afternoon,1.0199999999999996
-2050,27,,CO2f,all-year.afternoon,66.00419999999997
-2050,27,,gas,all-year.early-peak,-1.1831999999999994
-2050,27,,heat,all-year.early-peak,1.0199999999999996
-2050,27,,CO2f,all-year.early-peak,66.00419999999997
-2050,27,,gas,all-year.late-peak,-1.1831999999999994
-2050,27,,heat,all-year.late-peak,1.0199999999999996
-2050,27,,CO2f,all-year.late-peak,66.00419999999997
-2050,27,,gas,all-year.evening,-1.1831999999999994
-2050,27,,heat,all-year.evening,1.0199999999999996
-2050,27,,CO2f,all-year.evening,66.00419999999997
-2050,28,,wind,all-year.night,-0.0
-2050,28,,electricity,all-year.night,0.0
-2050,28,,wind,all-year.morning,-0.0
-2050,28,,electricity,all-year.morning,0.0
-2050,28,,wind,all-year.afternoon,-0.0
-2050,28,,electricity,all-year.afternoon,0.0
-2050,28,,wind,all-year.early-peak,-0.0
-2050,28,,electricity,all-year.early-peak,0.0
-2050,28,,wind,all-year.late-peak,-0.0
-2050,28,,electricity,all-year.late-peak,0.0
-2050,28,,wind,all-year.evening,-0.9505919999999997
-2050,28,,electricity,all-year.evening,0.9505919999999997
-2050,29,,gas,all-year.night,0.0
-2050,29,,gas,all-year.morning,1.1831999999999976
-2050,29,,gas,all-year.afternoon,1.1831999999999976
-2050,29,,gas,all-year.early-peak,1.1831999999999976
-2050,29,,gas,all-year.late-peak,1.1831999999999976
-2050,29,,gas,all-year.evening,0.0
+2050,22,,CO2f,all-year.evening,64.06290000000001
+2050,23,,wind,all-year.night,-0.0
+2050,23,,electricity,all-year.night,0.0
+2050,23,,wind,all-year.morning,-0.0
+2050,23,,electricity,all-year.morning,0.0
+2050,23,,wind,all-year.afternoon,-1.06737066666666
+2050,23,,electricity,all-year.afternoon,1.06737066666666
+2050,23,,wind,all-year.early-peak,-0.0
+2050,23,,electricity,all-year.early-peak,0.0
+2050,23,,wind,all-year.late-peak,-1.06737066666666
+2050,23,,electricity,all-year.late-peak,1.06737066666666
+2050,23,,wind,all-year.evening,-0.0
+2050,23,,electricity,all-year.evening,0.0
+2050,24,,gas,all-year.night,0.0
+2050,24,,gas,all-year.morning,1.1484000000000005
+2050,24,,gas,all-year.afternoon,0.0
+2050,24,,gas,all-year.early-peak,1.1116080000000021
+2050,24,,gas,all-year.late-peak,1.1484000000000005
+2050,24,,gas,all-year.evening,1.1484000000000005
+2050,25,,electricity,all-year.night,-0.4079999999999997
+2050,25,,heat,all-year.night,1.0199999999999991
+2050,25,,electricity,all-year.morning,-0.4079999999999997
+2050,25,,heat,all-year.morning,1.0199999999999991
+2050,25,,electricity,all-year.afternoon,-0.4079999999999997
+2050,25,,heat,all-year.afternoon,1.0199999999999991
+2050,25,,electricity,all-year.early-peak,-0.4079999999999997
+2050,25,,heat,all-year.early-peak,1.0199999999999991
+2050,25,,electricity,all-year.late-peak,-0.4079999999999997
+2050,25,,heat,all-year.late-peak,1.0199999999999991
+2050,25,,electricity,all-year.evening,-0.4079999999999997
+2050,25,,heat,all-year.evening,1.0199999999999991
+2050,26,,gas,all-year.night,-1.1831999999999994
+2050,26,,heat,all-year.night,1.0199999999999996
+2050,26,,CO2f,all-year.night,66.00419999999997
+2050,26,,gas,all-year.morning,-1.1831999999999994
+2050,26,,heat,all-year.morning,1.0199999999999996
+2050,26,,CO2f,all-year.morning,66.00419999999997
+2050,26,,gas,all-year.afternoon,-1.1831999999999994
+2050,26,,heat,all-year.afternoon,1.0199999999999996
+2050,26,,CO2f,all-year.afternoon,66.00419999999997
+2050,26,,gas,all-year.early-peak,-1.1831999999999994
+2050,26,,heat,all-year.early-peak,1.0199999999999996
+2050,26,,CO2f,all-year.early-peak,66.00419999999997
+2050,26,,gas,all-year.late-peak,-1.1831999999999994
+2050,26,,heat,all-year.late-peak,1.0199999999999996
+2050,26,,CO2f,all-year.late-peak,66.00419999999997
+2050,26,,gas,all-year.evening,-1.1831999999999994
+2050,26,,heat,all-year.evening,1.0199999999999996
+2050,26,,CO2f,all-year.evening,66.00419999999997
+2050,27,,wind,all-year.night,-0.0
+2050,27,,electricity,all-year.night,0.0
+2050,27,,wind,all-year.morning,-0.0
+2050,27,,electricity,all-year.morning,0.0
+2050,27,,wind,all-year.afternoon,-0.0
+2050,27,,electricity,all-year.afternoon,0.0
+2050,27,,wind,all-year.early-peak,-0.0
+2050,27,,electricity,all-year.early-peak,0.0
+2050,27,,wind,all-year.late-peak,-0.0
+2050,27,,electricity,all-year.late-peak,0.0
+2050,27,,wind,all-year.evening,-1.1584333333333356
+2050,27,,electricity,all-year.evening,1.1584333333333356
+2050,28,,gas,all-year.night,0.0
+2050,28,,gas,all-year.morning,1.1831999999999976
+2050,28,,gas,all-year.afternoon,1.1831999999999976
+2050,28,,gas,all-year.early-peak,1.1831999999999976
+2050,28,,gas,all-year.late-peak,1.1831999999999976
+2050,28,,gas,all-year.evening,0.0
diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv
index 16ff329c1..0ffe41749 100644
--- a/tests/data/two_regions/commodity_prices.csv
+++ b/tests/data/two_regions/commodity_prices.csv
@@ -41,33 +41,33 @@ milestone_year,commodity_id,region_id,time_slice,price
 2025,gas,R1,all-year.early-peak,2.55
 2025,gas,R1,all-year.late-peak,2.55
 2025,gas,R1,all-year.evening,2.55
-2025,gas,R2,all-year.night,2.5499999999999994
-2025,gas,R2,all-year.morning,2.5499999999999994
-2025,gas,R2,all-year.afternoon,2.55
+2025,gas,R2,all-year.night,2.55
+2025,gas,R2,all-year.morning,2.55
+2025,gas,R2,all-year.afternoon,2.5499999999999994
 2025,gas,R2,all-year.early-peak,2.55
 2025,gas,R2,all-year.late-peak,2.55
 2025,gas,R2,all-year.evening,2.55
-2025,electricity,R1,all-year.night,11.97245552197109
-2025,electricity,R1,all-year.morning,9.10681905636597
-2025,electricity,R1,all-year.afternoon,23.44668211327329
-2025,electricity,R1,all-year.early-peak,9.10681905636597
-2025,electricity,R1,all-year.late-peak,16.754905754845087
-2025,electricity,R1,all-year.evening,9.10681905636597
-2025,electricity,R2,all-year.night,6.909684587351731
-2025,electricity,R2,all-year.morning,6.909684587351731
-2025,electricity,R2,all-year.afternoon,6.909684587351732
+2025,electricity,R1,all-year.night,9.10687611710739
+2025,electricity,R1,all-year.morning,9.10687611710739
+2025,electricity,R1,all-year.afternoon,9.10687611710739
+2025,electricity,R1,all-year.early-peak,9.10687611710739
+2025,electricity,R1,all-year.late-peak,9.10687611710739
+2025,electricity,R1,all-year.evening,9.10687611710739
+2025,electricity,R2,all-year.night,6.909684587351732
+2025,electricity,R2,all-year.morning,6.909684587351732
+2025,electricity,R2,all-year.afternoon,6.909684587351731
 2025,electricity,R2,all-year.early-peak,6.909684587351732
 2025,electricity,R2,all-year.late-peak,6.909684587351732
 2025,electricity,R2,all-year.evening,6.909684587351732
-2025,heat,R1,all-year.night,6.3902500733456185
-2025,heat,R1,all-year.morning,5.243995487103572
-2025,heat,R1,all-year.afternoon,10.979940709866499
-2025,heat,R1,all-year.early-peak,5.243995487103572
-2025,heat,R1,all-year.late-peak,8.303230166495219
-2025,heat,R1,all-year.evening,5.243995487103572
-2025,heat,R2,all-year.night,3.524102361600987
-2025,heat,R2,all-year.morning,3.6242362195438433
-2025,heat,R2,all-year.afternoon,3.5241023616009874
+2025,heat,R1,all-year.night,5.24401831140014
+2025,heat,R1,all-year.morning,5.24401831140014
+2025,heat,R1,all-year.afternoon,5.24401831140014
+2025,heat,R1,all-year.early-peak,5.24401831140014
+2025,heat,R1,all-year.late-peak,5.24401831140014
+2025,heat,R1,all-year.evening,5.24401831140014
+2025,heat,R2,all-year.night,3.5241023616009874
+2025,heat,R2,all-year.morning,3.624236219543844
+2025,heat,R2,all-year.afternoon,3.524102361600987
 2025,heat,R2,all-year.early-peak,3.624236219543844
 2025,heat,R2,all-year.late-peak,3.7243684043890433
 2025,heat,R2,all-year.evening,3.67430252110103
@@ -77,32 +77,32 @@ milestone_year,commodity_id,region_id,time_slice,price
 2030,gas,R1,all-year.early-peak,2.55
 2030,gas,R1,all-year.late-peak,2.55
 2030,gas,R1,all-year.evening,2.55
-2030,gas,R2,all-year.night,2.5499999999999994
-2030,gas,R2,all-year.morning,2.5499999999999994
+2030,gas,R2,all-year.night,2.55
+2030,gas,R2,all-year.morning,2.5500000000000003
 2030,gas,R2,all-year.afternoon,2.55
 2030,gas,R2,all-year.early-peak,2.55
 2030,gas,R2,all-year.late-peak,2.55
 2030,gas,R2,all-year.evening,2.55
-2030,electricity,R1,all-year.night,9.106819056365971
-2030,electricity,R1,all-year.morning,9.10681905636597
-2030,electricity,R1,all-year.afternoon,9.106819056365971
-2030,electricity,R1,all-year.early-peak,9.106819056365971
-2030,electricity,R1,all-year.late-peak,9.10681905636597
-2030,electricity,R1,all-year.evening,21.295607904232778
-2030,electricity,R2,all-year.night,6.909684587351731
-2030,electricity,R2,all-year.morning,6.909684587351731
+2030,electricity,R1,all-year.night,34.92794270250915
+2030,electricity,R1,all-year.morning,9.120562761587035
+2030,electricity,R1,all-year.afternoon,34.92794270250915
+2030,electricity,R1,all-year.early-peak,9.120562761587035
+2030,electricity,R1,all-year.late-peak,9.120562761587035
+2030,electricity,R1,all-year.evening,9.120562761587035
+2030,electricity,R2,all-year.night,6.909684587351732
+2030,electricity,R2,all-year.morning,6.909684587351733
 2030,electricity,R2,all-year.afternoon,6.909684587351732
 2030,electricity,R2,all-year.early-peak,6.909684587351732
 2030,electricity,R2,all-year.late-peak,6.909684587351732
 2030,electricity,R2,all-year.evening,6.909684587351732
-2030,heat,R1,all-year.night,4.97961193184988
-2030,heat,R1,all-year.morning,5.199929714168157
-2030,heat,R1,all-year.afternoon,4.97961193184988
-2030,heat,R1,all-year.early-peak,5.1999297141681575
-2030,heat,R1,all-year.late-peak,5.420246021794598
-2030,heat,R1,all-year.evening,10.185603591463655
-2030,heat,R2,all-year.night,3.349437834375127
-2030,heat,R2,all-year.morning,3.570626347726695
+2030,heat,R1,all-year.night,15.308061390307154
+2030,heat,R1,all-year.morning,5.205427196256583
+2030,heat,R1,all-year.afternoon,15.308061390307154
+2030,heat,R1,all-year.early-peak,5.205427196256583
+2030,heat,R1,all-year.late-peak,5.425743503883023
+2030,heat,R1,all-year.evening,5.315585534405357
+2030,heat,R2,all-year.night,3.3494378343751285
+2030,heat,R2,all-year.morning,3.570626347726696
 2030,heat,R2,all-year.afternoon,3.3494378343751285
 2030,heat,R2,all-year.early-peak,3.5706263477266953
 2030,heat,R2,all-year.late-peak,3.86530411585663
@@ -115,31 +115,31 @@ milestone_year,commodity_id,region_id,time_slice,price
 2035,gas,R1,all-year.evening,2.55
 2035,gas,R2,all-year.night,2.55
 2035,gas,R2,all-year.morning,2.5499999999999994
-2035,gas,R2,all-year.afternoon,2.55
+2035,gas,R2,all-year.afternoon,2.5499999999999994
 2035,gas,R2,all-year.early-peak,2.55
-2035,gas,R2,all-year.late-peak,2.5500000000000003
+2035,gas,R2,all-year.late-peak,2.55
 2035,gas,R2,all-year.evening,2.55
-2035,electricity,R1,all-year.night,9.10681905636597
-2035,electricity,R1,all-year.morning,9.10681905636597
-2035,electricity,R1,all-year.afternoon,10.701940099144766
-2035,electricity,R1,all-year.early-peak,9.377982278302428
-2035,electricity,R1,all-year.late-peak,10.16758191623735
-2035,electricity,R1,all-year.evening,9.764294718444532
+2035,electricity,R1,all-year.night,10.780475409429734
+2035,electricity,R1,all-year.morning,10.780475409429734
+2035,electricity,R1,all-year.afternoon,38.65523204428339
+2035,electricity,R1,all-year.early-peak,16.56582425319006
+2035,electricity,R1,all-year.late-peak,16.04585992791094
+2035,electricity,R1,all-year.evening,16.56582425319006
 2035,electricity,R2,all-year.night,6.909684587351732
 2035,electricity,R2,all-year.morning,6.909684587351731
-2035,electricity,R2,all-year.afternoon,6.909684587351732
+2035,electricity,R2,all-year.afternoon,6.909684587351731
 2035,electricity,R2,all-year.early-peak,6.909684587351732
-2035,electricity,R2,all-year.late-peak,6.909684587351733
+2035,electricity,R2,all-year.late-peak,6.909684587351732
 2035,electricity,R2,all-year.evening,6.909684587351732
-2035,heat,R1,all-year.night,4.533789268258482
-2035,heat,R1,all-year.morning,5.122648298350285
-2035,heat,R1,all-year.afternoon,5.17183768537
-2035,heat,R1,all-year.early-peak,5.231113587124868
-2035,heat,R1,all-year.late-peak,6.144738536126466
-2035,heat,R1,all-year.evening,5.684531525226622
+2035,heat,R1,all-year.night,5.203251809483987
+2035,heat,R1,all-year.morning,5.79211083957579
+2035,heat,R1,all-year.afternoon,16.353154463425447
+2035,heat,R1,all-year.early-peak,8.106250377079919
+2035,heat,R1,all-year.late-peak,8.4960497407959
+2035,heat,R1,all-year.evening,8.405143339124832
 2035,heat,R2,all-year.night,3.3398845980394016
 2035,heat,R2,all-year.morning,3.4570413315505375
-2035,heat,R2,all-year.afternoon,3.3398845980394016
+2035,heat,R2,all-year.afternoon,3.339884598039401
 2035,heat,R2,all-year.early-peak,3.4570413315505375
 2035,heat,R2,all-year.late-peak,3.9836619713497763
 2035,heat,R2,all-year.evening,3.7203523828752703
@@ -154,62 +154,62 @@ milestone_year,commodity_id,region_id,time_slice,price
 2040,gas,R2,all-year.afternoon,2.55
 2040,gas,R2,all-year.early-peak,2.55
 2040,gas,R2,all-year.late-peak,2.5500000000000003
-2040,gas,R2,all-year.evening,2.5500000000000003
-2040,electricity,R1,all-year.night,18.56906226561036
-2040,electricity,R1,all-year.morning,30.583790700236758
-2040,electricity,R1,all-year.afternoon,13.915465053879037
-2040,electricity,R1,all-year.early-peak,10.489562755221657
-2040,electricity,R1,all-year.late-peak,9.457637899794022
-2040,electricity,R1,all-year.evening,13.425187838270833
+2040,gas,R2,all-year.evening,2.55
+2040,electricity,R1,all-year.night,19.90757068774272
+2040,electricity,R1,all-year.morning,19.90757068774272
+2040,electricity,R1,all-year.afternoon,10.499205723640543
+2040,electricity,R1,all-year.early-peak,10.394157892296269
+2040,electricity,R1,all-year.late-peak,12.514703695112663
+2040,electricity,R1,all-year.evening,19.149441061697523
 2040,electricity,R2,all-year.night,6.909684587351732
 2040,electricity,R2,all-year.morning,6.909684587351732
 2040,electricity,R2,all-year.afternoon,6.909684587351732
 2040,electricity,R2,all-year.early-peak,6.909684587351732
 2040,electricity,R2,all-year.late-peak,6.909684587351733
-2040,electricity,R2,all-year.evening,6.909684587351733
-2040,heat,R1,all-year.night,8.35280112246495
-2040,heat,R1,all-year.morning,13.524769975786175
-2040,heat,R1,all-year.afternoon,6.491362237772422
-2040,heat,R1,all-year.early-peak,5.487078797780134
-2040,heat,R1,all-year.late-peak,6.032367748177517
-2040,heat,R1,all-year.evening,7.1403588483762
+2040,electricity,R2,all-year.evening,6.909684587351732
+2040,heat,R1,all-year.night,8.888204491317891
+2040,heat,R1,all-year.morning,9.25428197078856
+2040,heat,R1,all-year.afternoon,5.124858505677023
+2040,heat,R1,all-year.early-peak,5.44891685260998
+2040,heat,R1,all-year.late-peak,7.255194066304974
+2040,heat,R1,all-year.evening,9.430060137746873
 2040,heat,R2,all-year.night,3.354503882326303
 2040,heat,R2,all-year.morning,3.4178828966334622
-2040,heat,R2,all-year.afternoon,3.3545038823263034
+2040,heat,R2,all-year.afternoon,3.354503882326303
 2040,heat,R2,all-year.early-peak,3.4178828966334622
 2040,heat,R2,all-year.late-peak,4.041231321833798
-2040,heat,R2,all-year.evening,3.678112294063387
+2040,heat,R2,all-year.evening,3.6781122940633875
 2045,gas,R1,all-year.night,2.55
 2045,gas,R1,all-year.morning,2.55
 2045,gas,R1,all-year.afternoon,2.55
 2045,gas,R1,all-year.early-peak,2.55
 2045,gas,R1,all-year.late-peak,2.55
 2045,gas,R1,all-year.evening,2.55
-2045,gas,R2,all-year.night,2.5499999999999994
-2045,gas,R2,all-year.morning,2.55
+2045,gas,R2,all-year.night,2.55
+2045,gas,R2,all-year.morning,2.5499999999999994
 2045,gas,R2,all-year.afternoon,2.55
 2045,gas,R2,all-year.early-peak,2.55
 2045,gas,R2,all-year.late-peak,2.5500000000000003
 2045,gas,R2,all-year.evening,2.55
-2045,electricity,R1,all-year.night,32.78454860291749
-2045,electricity,R1,all-year.morning,12.637813222949802
-2045,electricity,R1,all-year.afternoon,9.10681905636597
-2045,electricity,R1,all-year.early-peak,9.10681905636597
-2045,electricity,R1,all-year.late-peak,11.419575987431179
-2045,electricity,R1,all-year.evening,11.013024929754835
-2045,electricity,R2,all-year.night,6.909684587351731
-2045,electricity,R2,all-year.morning,6.909684587351732
+2045,electricity,R1,all-year.night,45.53409528182985
+2045,electricity,R1,all-year.morning,9.764831659331685
+2045,electricity,R1,all-year.afternoon,9.699298356193168
+2045,electricity,R1,all-year.early-peak,9.699298356193168
+2045,electricity,R1,all-year.late-peak,9.66809068573254
+2045,electricity,R1,all-year.evening,9.72388800001411
+2045,electricity,R2,all-year.night,6.909684587351732
+2045,electricity,R2,all-year.morning,6.909684587351731
 2045,electricity,R2,all-year.afternoon,6.909684587351732
 2045,electricity,R2,all-year.early-peak,6.909684587351732
 2045,electricity,R2,all-year.late-peak,6.909684587351733
 2045,electricity,R2,all-year.evening,6.909684587351732
-2045,heat,R1,all-year.night,14.031833698071576
-2045,heat,R1,all-year.morning,6.083503817013361
-2045,heat,R1,all-year.afternoon,4.56074187945097
-2045,heat,R1,all-year.early-peak,4.671106150379829
-2045,heat,R1,all-year.late-peak,7.083599513925361
-2045,heat,R1,all-year.evening,6.177278998015024
-2045,heat,R2,all-year.night,3.3514351162945846
+2045,heat,R1,all-year.night,19.13165236963652
+2045,heat,R1,all-year.morning,4.934311191566113
+2045,heat,R1,all-year.afternoon,4.797733599381849
+2045,heat,R1,all-year.early-peak,4.908097870310707
+2045,heat,R1,all-year.late-peak,6.383005393245908
+2045,heat,R1,all-year.evening,5.661624226118733
+2045,heat,R2,all-year.night,3.3514351162945855
 2045,heat,R2,all-year.morning,3.3987349566568237
 2045,heat,R2,all-year.afternoon,3.3514351162945855
 2045,heat,R2,all-year.early-peak,3.3987349566568237
@@ -218,24 +218,24 @@ milestone_year,commodity_id,region_id,time_slice,price
 2050,gas,R2,all-year.night,2.5499999999999994
 2050,gas,R2,all-year.morning,2.55
 2050,gas,R2,all-year.afternoon,2.55
-2050,gas,R2,all-year.early-peak,2.5500000000000003
+2050,gas,R2,all-year.early-peak,2.55
 2050,gas,R2,all-year.late-peak,2.5500000000000003
 2050,gas,R2,all-year.evening,2.55
-2050,electricity,R1,all-year.night,12.475951256618103
-2050,electricity,R1,all-year.morning,23.317459781684303
-2050,electricity,R1,all-year.afternoon,11.717023679573034
-2050,electricity,R1,all-year.early-peak,18.75958617240357
-2050,electricity,R1,all-year.late-peak,12.358103625632928
-2050,electricity,R1,all-year.evening,17.078988385855393
-2050,heat,R1,all-year.night,5.879967072050076
-2050,heat,R1,all-year.morning,10.414216042326192
-2050,heat,R1,all-year.afternoon,5.576396041232047
-2050,heat,R1,all-year.early-peak,8.591066598613898
-2050,heat,R1,all-year.late-peak,7.484597283737567
-2050,heat,R1,all-year.evening,8.505405964859529
+2050,electricity,R1,all-year.night,14.179983623375694
+2050,electricity,R1,all-year.morning,12.475976821381828
+2050,electricity,R1,all-year.afternoon,11.122009185543305
+2050,electricity,R1,all-year.early-peak,12.452627061928478
+2050,electricity,R1,all-year.late-peak,14.585085292595465
+2050,electricity,R1,all-year.evening,25.955775972317817
+2050,heat,R1,all-year.night,6.561580018753112
+2050,heat,R1,all-year.morning,6.077622858205202
+2050,heat,R1,all-year.afternoon,5.3383902436201565
+2050,heat,R1,all-year.early-peak,6.068282954423862
+2050,heat,R1,all-year.late-peak,8.375389950522582
+2050,heat,R1,all-year.evening,12.056120999444502
 2050,heat,R2,all-year.night,3.3392513725541697
 2050,heat,R2,all-year.morning,3.42395660947675
 2050,heat,R2,all-year.afternoon,3.33925137255417
-2050,heat,R2,all-year.early-peak,3.4239566094767504
+2050,heat,R2,all-year.early-peak,3.42395660947675
 2050,heat,R2,all-year.late-peak,4.103880174061839
 2050,heat,R2,all-year.evening,3.59025580512548