diff --git a/src/asset.rs b/src/asset.rs
index 13f09b477..4119d5ce0 100644
--- a/src/asset.rs
+++ b/src/asset.rs
@@ -384,6 +384,16 @@ impl Asset {
         lb..=ub
     }
 
+    /// Get the activity limits 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 a7101df90..bbbfe364e 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::CommodityPrices;
-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;
@@ -579,23 +580,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.
+    // This is necessary because process availability limits at the seasonal/annual level may
+    // necessitate higher capacity that activity limits at the time slice level.
+    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);
+            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);
         }
     }
 
diff --git a/src/time_slice.rs b/src/time_slice.rs
index aaefabe7d..281fdd603 100644
--- a/src/time_slice.rs
+++ b/src/time_slice.rs
@@ -94,6 +94,28 @@ impl TimeSliceSelection {
         }
     }
 
+    /// Get the [`TimeSliceSelection`] containing this selection at the specified level.
+    pub fn containing_selection_at_level(&self, level: TimeSliceLevel) -> TimeSliceSelection {
+        assert!(
+            level >= self.level(),
+            "Cannot get containing selection at finer level"
+        );
+
+        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!(),
+            };
+        }
+
+        selection
+    }
+
     /// Iterate over the subset of time slices in this selection
     pub fn iter<'a>(
         &'a self,
@@ -192,18 +214,26 @@ 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
     #[string = "daynight"]
-    DayNight,
+    DayNight = 0,
     /// Whole seasons
     #[string = "season"]
-    Season,
+    Season = 1,
     /// The whole year
     #[string = "annual"]
-    Annual,
+    Annual = 2,
 }
 
 impl TimeSliceLevel {
diff --git a/tests/data/muse1_default/asset_capacities.csv b/tests/data/muse1_default/asset_capacities.csv
index a9be39009..e236a2697 100644
--- a/tests/data/muse1_default/asset_capacities.csv
+++ b/tests/data/muse1_default/asset_capacities.csv
@@ -1,49 +1,46 @@
 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,5,,5.939988120023763,
-2030,6,,5.975988048023905,
+2030,6,,3.9839920320159363,
 2035,2,,23.939952120095757,
-2035,3,,9.575980848038302,
+2035,3,,13.299973400053199,
 2035,5,,5.939988120023763,
-2035,6,,5.975988048023905,
-2035,7,,6.119987760024477,
-2035,8,,5.875188249623504,
+2035,6,,3.9839920320159363,
+2035,7,,6.11998776002448,
+2035,8,,4.799990400019199,
 2040,2,,23.939952120095757,
-2040,3,,9.575980848038302,
+2040,3,,13.299973400053199,
 2040,5,,5.939988120023763,
-2040,6,,5.975988048023905,
-2040,7,,6.119987760024477,
-2040,8,,5.875188249623504,
-2040,9,,5.939988120023762,
-2040,10,,4.4947110105779755,
+2040,6,,3.9839920320159363,
+2040,7,,6.11998776002448,
+2040,8,,4.799990400019199,
+2040,9,,5.939988120023764,
+2040,10,,2.91839416321168,
 2045,2,,23.939952120095757,
-2045,3,,9.575980848038302,
+2045,3,,13.299973400053199,
 2045,5,,5.939988120023763,
-2045,6,,5.975988048023905,
-2045,7,,6.119987760024477,
-2045,8,,5.875188249623504,
-2045,9,,5.939988120023762,
-2045,10,,4.4947110105779755,
-2045,11,,5.939988120023764,
-2045,12,,1.6273887452225102,
+2045,6,,3.9839920320159363,
+2045,7,,6.11998776002448,
+2045,8,,4.799990400019199,
+2045,9,,5.939988120023764,
+2045,10,,2.91839416321168,
+2045,11,,5.939988120023756,
+2045,12,,3.8342323315353237,
 2050,2,,23.939952120095757,
-2050,3,,9.575980848038302,
+2050,3,,13.299973400053199,
 2050,5,,5.939988120023763,
-2050,6,,5.975988048023905,
-2050,7,,6.119987760024477,
-2050,8,,5.875188249623504,
-2050,9,,5.939988120023762,
-2050,10,,4.4947110105779755,
-2050,11,,5.939988120023764,
-2050,12,,1.6273887452225102,
-2050,13,,6.1199877600244745,
-2050,14,,4.657641884716227,
+2050,6,,3.9839920320159363,
+2050,7,,6.11998776002448,
+2050,8,,4.799990400019199,
+2050,9,,5.939988120023764,
+2050,10,,2.91839416321168,
+2050,11,,5.939988120023756,
+2050,12,,3.8342323315353237,
+2050,13,,6.1199877600244905,
+2050,14,,2.792058415883189,
diff --git a/tests/data/muse1_default/commodity_flows.csv b/tests/data/muse1_default/commodity_flows.csv
index bab4dd206..7c0664a3a 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.7000640000000006
-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,18 @@ 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.3296000000000002
-2030,3,,electricity,all-year.night,0.3296000000000002
+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.5767999999999998
-2030,3,,electricity,all-year.early-peak,0.5767999999999998
-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.3319999999999999
-2030,3,,electricity,all-year.evening,0.3319999999999999
-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.7000640000000006
-2030,4,,electricity,all-year.early-peak,0.41920000000000035
-2030,4,,CO2f,all-year.early-peak,38.428064000000035
-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.33199999999999996
+2030,3,,electricity,all-year.early-peak,0.33199999999999996
+2030,3,,wind,all-year.late-peak,-1.328
+2030,3,,electricity,all-year.late-peak,1.328
+2030,3,,wind,all-year.evening,-1.328
+2030,3,,electricity,all-year.evening,1.328
 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,48 +101,48 @@ 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.3343999999999999
-2030,6,,electricity,all-year.night,0.3343999999999999
+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.39600000000000024
-2030,6,,electricity,all-year.late-peak,0.39600000000000024
-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.6640000000000001
+2030,6,,electricity,all-year.early-peak,0.6640000000000001
+2030,6,,wind,all-year.late-peak,-0.6640000000000001
+2030,6,,electricity,all-year.late-peak,0.6640000000000001
+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
-2035,2,,heat,all-year.morning,0.9899999999999998
+2035,2,,electricity,all-year.morning,-0.39599999999999974
+2035,2,,heat,all-year.morning,0.9899999999999993
 2035,2,,electricity,all-year.afternoon,-0.0
 2035,2,,heat,all-year.afternoon,0.0
-2035,2,,electricity,all-year.early-peak,-0.3959999999999999
-2035,2,,heat,all-year.early-peak,0.9899999999999998
+2035,2,,electricity,all-year.early-peak,-0.39599999999999974
+2035,2,,heat,all-year.early-peak,0.9899999999999993
 2035,2,,electricity,all-year.late-peak,-1.596
 2035,2,,heat,all-year.late-peak,3.9899999999999998
-2035,2,,electricity,all-year.evening,-0.7959999999999999
-2035,2,,heat,all-year.evening,1.9899999999999998
+2035,2,,electricity,all-year.evening,-0.7959999999999998
+2035,2,,heat,all-year.evening,1.9899999999999993
 2035,3,,wind,all-year.night,-0.0
 2035,3,,electricity,all-year.night,0.0
-2035,3,,wind,all-year.morning,-0.3764800000000015
-2035,3,,electricity,all-year.morning,0.3764800000000015
+2035,3,,wind,all-year.morning,-1.1039999999999999
+2035,3,,electricity,all-year.morning,1.1039999999999999
 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.6579199999999985
-2035,3,,electricity,all-year.late-peak,0.6579199999999985
-2035,3,,wind,all-year.evening,-1.5959999999999999
-2035,3,,electricity,all-year.evening,1.5959999999999999
-2035,5,,electricity,all-year.night,-0.3920000000000002
-2035,5,,heat,all-year.night,0.9800000000000004
+2035,3,,wind,all-year.late-peak,-1.4160000000000004
+2035,3,,electricity,all-year.late-peak,1.4160000000000004
+2035,3,,wind,all-year.evening,-1.6
+2035,3,,electricity,all-year.evening,1.6
+2035,5,,electricity,all-year.night,-0.392
+2035,5,,heat,all-year.night,0.98
 2035,5,,electricity,all-year.morning,-0.39600000000000024
 2035,5,,heat,all-year.morning,0.9900000000000005
-2035,5,,electricity,all-year.afternoon,-0.3920000000000002
-2035,5,,heat,all-year.afternoon,0.9800000000000004
+2035,5,,electricity,all-year.afternoon,-0.392
+2035,5,,heat,all-year.afternoon,0.98
 2035,5,,electricity,all-year.early-peak,-0.39600000000000024
 2035,5,,heat,all-year.early-peak,0.9900000000000005
 2035,5,,electricity,all-year.late-peak,-0.39600000000000024
@@ -181,28 +151,28 @@ 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.8235199999999985
-2035,6,,electricity,all-year.morning,0.8235199999999985
+2035,6,,wind,all-year.morning,-0.09600000000000014
+2035,6,,electricity,all-year.morning,0.09600000000000014
 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,-0.6640000000000001
+2035,6,,electricity,all-year.late-peak,0.6640000000000001
 2035,6,,wind,all-year.evening,-0.0
 2035,6,,electricity,all-year.evening,0.0
-2035,7,,electricity,all-year.night,-0.40799999999999986
-2035,7,,heat,all-year.night,1.0199999999999996
-2035,7,,electricity,all-year.morning,-0.40799999999999986
-2035,7,,heat,all-year.morning,1.0199999999999996
-2035,7,,electricity,all-year.afternoon,-0.40799999999999986
-2035,7,,heat,all-year.afternoon,1.0199999999999996
-2035,7,,electricity,all-year.early-peak,-0.40799999999999986
-2035,7,,heat,all-year.early-peak,1.0199999999999996
-2035,7,,electricity,all-year.late-peak,-0.40799999999999986
-2035,7,,heat,all-year.late-peak,1.0199999999999996
-2035,7,,electricity,all-year.evening,-0.40799999999999986
-2035,7,,heat,all-year.evening,1.0199999999999996
+2035,7,,electricity,all-year.night,-0.40800000000000003
+2035,7,,heat,all-year.night,1.02
+2035,7,,electricity,all-year.morning,-0.40800000000000003
+2035,7,,heat,all-year.morning,1.02
+2035,7,,electricity,all-year.afternoon,-0.40800000000000003
+2035,7,,heat,all-year.afternoon,1.02
+2035,7,,electricity,all-year.early-peak,-0.40800000000000003
+2035,7,,heat,all-year.early-peak,1.02
+2035,7,,electricity,all-year.late-peak,-0.40800000000000003
+2035,7,,heat,all-year.late-peak,1.02
+2035,7,,electricity,all-year.evening,-0.40800000000000003
+2035,7,,heat,all-year.evening,1.02
 2035,8,,wind,all-year.night,-0.8
 2035,8,,electricity,all-year.night,0.8
 2035,8,,wind,all-year.morning,-0.0
@@ -211,106 +181,106 @@ 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.7460800000000014
-2035,8,,electricity,all-year.late-peak,0.7460800000000014
-2035,8,,wind,all-year.evening,-0.004000000000000025
-2035,8,,electricity,all-year.evening,0.004000000000000025
+2035,8,,wind,all-year.late-peak,-0.31999999999999984
+2035,8,,electricity,all-year.late-peak,0.31999999999999984
+2035,8,,wind,all-year.evening,-0.0
+2035,8,,electricity,all-year.evening,0.0
 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.1979999999999995
+2040,2,,heat,all-year.morning,0.4949999999999988
 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.1979999999999995
+2040,2,,heat,all-year.early-peak,0.4949999999999988
 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.6639999999999996
+2040,2,,heat,all-year.evening,1.6599999999999988
 2040,3,,wind,all-year.night,-0.0
 2040,3,,electricity,all-year.night,0.0
 2040,3,,wind,all-year.morning,-0.0
 2040,3,,electricity,all-year.morning,0.0
 2040,3,,wind,all-year.afternoon,-0.0
 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.5959999999999999
-2040,3,,electricity,all-year.evening,1.5959999999999999
-2040,5,,electricity,all-year.night,-0.12800000000000003
-2040,5,,heat,all-year.night,0.32000000000000006
+2040,3,,wind,all-year.early-peak,-0.5583733333333313
+2040,3,,electricity,all-year.early-peak,0.5583733333333313
+2040,3,,wind,all-year.late-peak,-2.216666666666667
+2040,3,,electricity,all-year.late-peak,2.216666666666667
+2040,3,,wind,all-year.evening,-1.864
+2040,3,,electricity,all-year.evening,1.864
+2040,5,,electricity,all-year.night,-0.12799999999999975
+2040,5,,heat,all-year.night,0.3199999999999994
 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.12799999999999975
+2040,5,,heat,all-year.afternoon,0.3199999999999994
 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
 2040,5,,heat,all-year.late-peak,0.9900000000000005
 2040,5,,electricity,all-year.evening,-0.39600000000000024
 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.6203680000000001
-2040,6,,electricity,all-year.morning,0.6203680000000001
-2040,6,,wind,all-year.afternoon,-0.0
-2040,6,,electricity,all-year.afternoon,0.0
-2040,6,,wind,all-year.early-peak,-0.6488800000000005
-2040,6,,electricity,all-year.early-peak,0.6488800000000005
+2040,6,,wind,all-year.night,-0.6640000000000001
+2040,6,,electricity,all-year.night,0.6640000000000001
+2040,6,,wind,all-year.morning,-0.15253333333333174
+2040,6,,electricity,all-year.morning,0.15253333333333174
+2040,6,,wind,all-year.afternoon,-0.13200000000000014
+2040,6,,electricity,all-year.afternoon,0.13200000000000014
+2040,6,,wind,all-year.early-peak,-0.6450666666666683
+2040,6,,electricity,all-year.early-peak,0.6450666666666683
 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.18915200000000001
-2040,6,,electricity,all-year.evening,0.18915200000000001
-2040,7,,electricity,all-year.night,-0.40799999999999986
-2040,7,,heat,all-year.night,1.0199999999999996
-2040,7,,electricity,all-year.morning,-0.40799999999999986
-2040,7,,heat,all-year.morning,1.0199999999999996
-2040,7,,electricity,all-year.afternoon,-0.40799999999999986
-2040,7,,heat,all-year.afternoon,1.0199999999999996
-2040,7,,electricity,all-year.early-peak,-0.40799999999999986
-2040,7,,heat,all-year.early-peak,1.0199999999999996
-2040,7,,electricity,all-year.late-peak,-0.40799999999999986
-2040,7,,heat,all-year.late-peak,1.0199999999999996
-2040,7,,electricity,all-year.evening,-0.40799999999999986
-2040,7,,heat,all-year.evening,1.0199999999999996
-2040,8,,wind,all-year.night,-0.0
-2040,8,,electricity,all-year.night,0.0
-2040,8,,wind,all-year.morning,-0.028512000000000436
-2040,8,,electricity,all-year.morning,0.028512000000000436
-2040,8,,wind,all-year.afternoon,-0.9320000000000002
-2040,8,,electricity,all-year.afternoon,0.9320000000000002
+2040,6,,wind,all-year.evening,-0.0
+2040,6,,electricity,all-year.evening,0.0
+2040,7,,electricity,all-year.night,-0.40800000000000003
+2040,7,,heat,all-year.night,1.02
+2040,7,,electricity,all-year.morning,-0.40800000000000003
+2040,7,,heat,all-year.morning,1.02
+2040,7,,electricity,all-year.afternoon,-0.40800000000000003
+2040,7,,heat,all-year.afternoon,1.02
+2040,7,,electricity,all-year.early-peak,-0.40800000000000003
+2040,7,,heat,all-year.early-peak,1.02
+2040,7,,electricity,all-year.late-peak,-0.40800000000000003
+2040,7,,heat,all-year.late-peak,1.02
+2040,7,,electricity,all-year.evening,-0.40800000000000003
+2040,7,,heat,all-year.evening,1.02
+2040,8,,wind,all-year.night,-0.26799999999999996
+2040,8,,electricity,all-year.night,0.26799999999999996
+2040,8,,wind,all-year.morning,-0.7590666666666673
+2040,8,,electricity,all-year.morning,0.7590666666666673
+2040,8,,wind,all-year.afternoon,-0.7999999999999999
+2040,8,,electricity,all-year.afternoon,0.7999999999999999
 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,-0.09293333333333276
+2040,8,,electricity,all-year.late-peak,0.09293333333333276
 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.3960000000000003
+2040,9,,heat,all-year.night,0.9900000000000007
+2040,9,,electricity,all-year.morning,-0.3960000000000003
+2040,9,,heat,all-year.morning,0.9900000000000007
+2040,9,,electricity,all-year.afternoon,-0.3960000000000003
+2040,9,,heat,all-year.afternoon,0.9900000000000007
+2040,9,,electricity,all-year.early-peak,-0.3960000000000003
+2040,9,,heat,all-year.early-peak,0.9900000000000007
+2040,9,,electricity,all-year.late-peak,-0.3960000000000003
+2040,9,,heat,all-year.late-peak,0.9900000000000007
+2040,9,,electricity,all-year.evening,-0.3960000000000003
+2040,9,,heat,all-year.evening,0.9900000000000007
 2040,10,,wind,all-year.night,-0.0
 2040,10,,electricity,all-year.night,0.0
-2040,10,,wind,all-year.morning,-0.7491199999999995
-2040,10,,electricity,all-year.morning,0.7491199999999995
+2040,10,,wind,all-year.morning,-0.48640000000000105
+2040,10,,electricity,all-year.morning,0.48640000000000105
 2040,10,,wind,all-year.afternoon,-0.0
 2040,10,,electricity,all-year.afternoon,0.0
-2040,10,,wind,all-year.early-peak,-0.7491199999999995
-2040,10,,electricity,all-year.early-peak,0.7491199999999995
-2040,10,,wind,all-year.late-peak,-0.22079999999999994
-2040,10,,electricity,all-year.late-peak,0.22079999999999994
-2040,10,,wind,all-year.evening,-0.07884800000000008
-2040,10,,electricity,all-year.evening,0.07884800000000008
+2040,10,,wind,all-year.early-peak,-0.1945600000000005
+2040,10,,electricity,all-year.early-peak,0.1945600000000005
+2040,10,,wind,all-year.late-peak,-0.48640000000000105
+2040,10,,electricity,all-year.late-peak,0.48640000000000105
+2040,10,,wind,all-year.evening,-0.0
+2040,10,,electricity,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
@@ -321,116 +291,116 @@ 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.5319999999999999
-2045,2,,heat,all-year.evening,1.3299999999999996
+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,-0.6167999999999997
-2045,3,,electricity,all-year.morning,0.6167999999999997
-2045,3,,wind,all-year.afternoon,-0.9587839999999996
-2045,3,,electricity,all-year.afternoon,0.9587839999999996
-2045,3,,wind,all-year.early-peak,-0.5999999999999999
-2045,3,,electricity,all-year.early-peak,0.5999999999999999
-2045,3,,wind,all-year.late-peak,-0.19644800000000034
-2045,3,,electricity,all-year.late-peak,0.19644800000000034
-2045,3,,wind,all-year.evening,-1.458368
-2045,3,,electricity,all-year.evening,1.458368
+2045,3,,wind,all-year.morning,-0.7960000000000003
+2045,3,,electricity,all-year.morning,0.7960000000000003
+2045,3,,wind,all-year.afternoon,-0.8083840000000009
+2045,3,,electricity,all-year.afternoon,0.8083840000000009
+2045,3,,wind,all-year.early-peak,-0.9850559999999973
+2045,3,,electricity,all-year.early-peak,0.9850559999999973
+2045,3,,wind,all-year.late-peak,-0.6025600000000013
+2045,3,,electricity,all-year.late-peak,0.6025600000000013
+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.39599999999999985
-2045,5,,heat,all-year.morning,0.9899999999999995
+2045,5,,electricity,all-year.morning,-0.39600000000000013
+2045,5,,heat,all-year.morning,0.9900000000000002
 2045,5,,electricity,all-year.afternoon,-0.0
 2045,5,,heat,all-year.afternoon,0.0
-2045,5,,electricity,all-year.early-peak,-0.39599999999999985
-2045,5,,heat,all-year.early-peak,0.9899999999999995
+2045,5,,electricity,all-year.early-peak,-0.39600000000000013
+2045,5,,heat,all-year.early-peak,0.9900000000000002
 2045,5,,electricity,all-year.late-peak,-0.39600000000000024
 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.0
-2045,6,,electricity,all-year.night,0.0
+2045,6,,wind,all-year.night,-0.3186559999999974
+2045,6,,electricity,all-year.night,0.3186559999999974
 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.9960000000000002
-2045,6,,electricity,all-year.early-peak,0.9960000000000002
-2045,6,,wind,all-year.late-peak,-0.9960000000000002
-2045,6,,electricity,all-year.late-peak,0.9960000000000002
-2045,6,,wind,all-year.evening,-0.3984000000000001
-2045,6,,electricity,all-year.evening,0.3984000000000001
-2045,7,,electricity,all-year.night,-0.27199999999999963
-2045,7,,heat,all-year.night,0.679999999999999
-2045,7,,electricity,all-year.morning,-0.40799999999999986
-2045,7,,heat,all-year.morning,1.0199999999999996
-2045,7,,electricity,all-year.afternoon,-0.27199999999999963
-2045,7,,heat,all-year.afternoon,0.679999999999999
-2045,7,,electricity,all-year.early-peak,-0.40799999999999986
-2045,7,,heat,all-year.early-peak,1.0199999999999996
-2045,7,,electricity,all-year.late-peak,-0.40799999999999986
-2045,7,,heat,all-year.late-peak,1.0199999999999996
-2045,7,,electricity,all-year.evening,-0.40799999999999986
-2045,7,,heat,all-year.evening,1.0199999999999996
-2045,8,,wind,all-year.night,-0.311603200000001
-2045,8,,electricity,all-year.night,0.311603200000001
-2045,8,,wind,all-year.morning,-0.9792000000000005
-2045,8,,electricity,all-year.morning,0.9792000000000005
+2045,6,,wind,all-year.early-peak,-0.6109440000000028
+2045,6,,electricity,all-year.early-peak,0.6109440000000028
+2045,6,,wind,all-year.late-peak,-0.6640000000000001
+2045,6,,electricity,all-year.late-peak,0.6640000000000001
+2045,6,,wind,all-year.evening,-0.0
+2045,6,,electricity,all-year.evening,0.0
+2045,7,,electricity,all-year.night,-0.2720000000000001
+2045,7,,heat,all-year.night,0.6800000000000002
+2045,7,,electricity,all-year.morning,-0.40800000000000003
+2045,7,,heat,all-year.morning,1.02
+2045,7,,electricity,all-year.afternoon,-0.2720000000000001
+2045,7,,heat,all-year.afternoon,0.6800000000000002
+2045,7,,electricity,all-year.early-peak,-0.40800000000000003
+2045,7,,heat,all-year.early-peak,1.02
+2045,7,,electricity,all-year.late-peak,-0.40800000000000003
+2045,7,,heat,all-year.late-peak,1.02
+2045,7,,electricity,all-year.evening,-0.40800000000000003
+2045,7,,heat,all-year.evening,1.02
+2045,8,,wind,all-year.night,-0.0
+2045,8,,electricity,all-year.night,0.0
+2045,8,,wind,all-year.morning,-0.7999999999999999
+2045,8,,electricity,all-year.morning,0.7999999999999999
 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,-0.7999999999999999
+2045,8,,electricity,all-year.late-peak,0.7999999999999999
 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,10,,wind,all-year.night,-0.7491199999999995
-2045,10,,electricity,all-year.night,0.7491199999999995
+2045,9,,electricity,all-year.night,-0.3960000000000003
+2045,9,,heat,all-year.night,0.9900000000000007
+2045,9,,electricity,all-year.morning,-0.3960000000000003
+2045,9,,heat,all-year.morning,0.9900000000000007
+2045,9,,electricity,all-year.afternoon,-0.3960000000000003
+2045,9,,heat,all-year.afternoon,0.9900000000000007
+2045,9,,electricity,all-year.early-peak,-0.3960000000000003
+2045,9,,heat,all-year.early-peak,0.9900000000000007
+2045,9,,electricity,all-year.late-peak,-0.3960000000000003
+2045,9,,heat,all-year.late-peak,0.9900000000000007
+2045,9,,electricity,all-year.evening,-0.3960000000000003
+2045,9,,heat,all-year.evening,0.9900000000000007
+2045,10,,wind,all-year.night,-0.10630400000000491
+2045,10,,electricity,all-year.night,0.10630400000000491
 2045,10,,wind,all-year.morning,-0.0
 2045,10,,electricity,all-year.morning,0.0
 2045,10,,wind,all-year.afternoon,-0.0
 2045,10,,electricity,all-year.afternoon,0.0
 2045,10,,wind,all-year.early-peak,-0.0
 2045,10,,electricity,all-year.early-peak,0.0
-2045,10,,wind,all-year.late-peak,-0.7491199999999995
-2045,10,,electricity,all-year.late-peak,0.7491199999999995
+2045,10,,wind,all-year.late-peak,-0.48640000000000105
+2045,10,,electricity,all-year.late-peak,0.48640000000000105
 2045,10,,wind,all-year.evening,-0.0
 2045,10,,electricity,all-year.evening,0.0
-2045,11,,electricity,all-year.night,-0.3960000000000003
-2045,11,,heat,all-year.night,0.9900000000000007
-2045,11,,electricity,all-year.morning,-0.3960000000000003
-2045,11,,heat,all-year.morning,0.9900000000000007
-2045,11,,electricity,all-year.afternoon,-0.3960000000000003
-2045,11,,heat,all-year.afternoon,0.9900000000000007
-2045,11,,electricity,all-year.early-peak,-0.3960000000000003
-2045,11,,heat,all-year.early-peak,0.9900000000000007
-2045,11,,electricity,all-year.late-peak,-0.3960000000000003
-2045,11,,heat,all-year.late-peak,0.9900000000000007
-2045,11,,electricity,all-year.evening,-0.3960000000000003
-2045,11,,heat,all-year.evening,0.9900000000000007
-2045,12,,wind,all-year.night,-0.0032767999999996356
-2045,12,,electricity,all-year.night,0.0032767999999996356
+2045,11,,electricity,all-year.night,-0.39599999999999974
+2045,11,,heat,all-year.night,0.9899999999999993
+2045,11,,electricity,all-year.morning,-0.39599999999999974
+2045,11,,heat,all-year.morning,0.9899999999999993
+2045,11,,electricity,all-year.afternoon,-0.39599999999999974
+2045,11,,heat,all-year.afternoon,0.9899999999999993
+2045,11,,electricity,all-year.early-peak,-0.39599999999999974
+2045,11,,heat,all-year.early-peak,0.9899999999999993
+2045,11,,electricity,all-year.late-peak,-0.39599999999999974
+2045,11,,heat,all-year.late-peak,0.9899999999999993
+2045,11,,electricity,all-year.evening,-0.39599999999999974
+2045,11,,heat,all-year.evening,0.9899999999999993
+2045,12,,wind,all-year.night,-0.6390399999999978
+2045,12,,electricity,all-year.night,0.6390399999999978
 2045,12,,wind,all-year.morning,-0.0
 2045,12,,electricity,all-year.morning,0.0
-2045,12,,wind,all-year.afternoon,-0.10521600000000042
-2045,12,,electricity,all-year.afternoon,0.10521600000000042
+2045,12,,wind,all-year.afternoon,-0.2556159999999992
+2045,12,,electricity,all-year.afternoon,0.2556159999999992
 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,-0.27123200000000014
-2045,12,,electricity,all-year.late-peak,0.27123200000000014
-2045,12,,wind,all-year.evening,-0.27123200000000014
-2045,12,,electricity,all-year.evening,0.27123200000000014
+2045,12,,wind,all-year.late-peak,-0.6390399999999978
+2045,12,,electricity,all-year.late-peak,0.6390399999999978
+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
@@ -441,137 +411,137 @@ 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.39600000000000013
-2050,2,,heat,all-year.evening,0.9900000000000002
+2050,2,,electricity,all-year.evening,-0.39599999999999924
+2050,2,,heat,all-year.evening,0.989999999999998
 2050,3,,wind,all-year.night,-0.0
 2050,3,,electricity,all-year.night,0.0
-2050,3,,wind,all-year.morning,-1.0508800000000007
-2050,3,,electricity,all-year.morning,1.0508800000000007
-2050,3,,wind,all-year.afternoon,-0.6003827200000005
-2050,3,,electricity,all-year.afternoon,0.6003827200000005
+2050,3,,wind,all-year.morning,-1.1274623999999975
+2050,3,,electricity,all-year.morning,1.1274623999999975
+2050,3,,wind,all-year.afternoon,-0.0
+2050,3,,electricity,all-year.afternoon,0.0
 2050,3,,wind,all-year.early-peak,-0.0
 2050,3,,electricity,all-year.early-peak,0.0
-2050,3,,wind,all-year.late-peak,-0.0
-2050,3,,electricity,all-year.late-peak,0.0
-2050,3,,wind,all-year.evening,-1.5959999999999999
-2050,3,,electricity,all-year.evening,1.5959999999999999
+2050,3,,wind,all-year.late-peak,-2.216666666666667
+2050,3,,electricity,all-year.late-peak,2.216666666666667
+2050,3,,wind,all-year.evening,-1.5189493333333313
+2050,3,,electricity,all-year.evening,1.5189493333333313
 2050,5,,electricity,all-year.night,-0.0
 2050,5,,heat,all-year.night,0.0
-2050,5,,electricity,all-year.morning,-0.1920000000000001
-2050,5,,heat,all-year.morning,0.4800000000000002
+2050,5,,electricity,all-year.morning,-0.19199999999999928
+2050,5,,heat,all-year.morning,0.4799999999999982
 2050,5,,electricity,all-year.afternoon,-0.0
 2050,5,,heat,all-year.afternoon,0.0
-2050,5,,electricity,all-year.early-peak,-0.19200000000000017
-2050,5,,heat,all-year.early-peak,0.4800000000000004
+2050,5,,electricity,all-year.early-peak,-0.19199999999999928
+2050,5,,heat,all-year.early-peak,0.4799999999999982
 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.7947827200000008
-2050,6,,electricity,all-year.night,0.7947827200000008
+2050,6,,wind,all-year.night,-0.6640000000000001
+2050,6,,electricity,all-year.night,0.6640000000000001
 2050,6,,wind,all-year.morning,-0.0
 2050,6,,electricity,all-year.morning,0.0
-2050,6,,wind,all-year.afternoon,-0.5996172799999995
-2050,6,,electricity,all-year.afternoon,0.5996172799999995
+2050,6,,wind,all-year.afternoon,-0.6640000000000001
+2050,6,,electricity,all-year.afternoon,0.6640000000000001
 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,-0.26560000000000006
+2050,6,,electricity,all-year.late-peak,0.26560000000000006
 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.morning,-0.40799999999999986
-2050,7,,heat,all-year.morning,1.0199999999999996
+2050,7,,electricity,all-year.morning,-0.40800000000000003
+2050,7,,heat,all-year.morning,1.02
 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
-2050,7,,heat,all-year.late-peak,1.0199999999999996
-2050,7,,electricity,all-year.evening,-0.40799999999999986
-2050,7,,heat,all-year.evening,1.0199999999999996
-2050,8,,wind,all-year.night,-0.39168000000000047
-2050,8,,electricity,all-year.night,0.39168000000000047
+2050,7,,electricity,all-year.early-peak,-0.40800000000000003
+2050,7,,heat,all-year.early-peak,1.02
+2050,7,,electricity,all-year.late-peak,-0.40800000000000003
+2050,7,,heat,all-year.late-peak,1.02
+2050,7,,electricity,all-year.evening,-0.40800000000000003
+2050,7,,heat,all-year.evening,1.02
+2050,8,,wind,all-year.night,-0.1759999999999995
+2050,8,,electricity,all-year.night,0.1759999999999995
 2050,8,,wind,all-year.morning,-0.0
 2050,8,,electricity,all-year.morning,0.0
-2050,8,,wind,all-year.afternoon,-0.0
-2050,8,,electricity,all-year.afternoon,0.0
-2050,8,,wind,all-year.early-peak,-0.9792000000000005
-2050,8,,electricity,all-year.early-peak,0.9792000000000005
-2050,8,,wind,all-year.late-peak,-0.9792000000000005
-2050,8,,electricity,all-year.late-peak,0.9792000000000005
-2050,8,,wind,all-year.evening,-0.0
-2050,8,,electricity,all-year.evening,0.0
-2050,9,,electricity,all-year.night,-0.39600000000000013
-2050,9,,heat,all-year.night,0.9900000000000002
-2050,9,,electricity,all-year.morning,-0.3960000000000002
-2050,9,,heat,all-year.morning,0.9900000000000004
-2050,9,,electricity,all-year.afternoon,-0.39600000000000013
-2050,9,,heat,all-year.afternoon,0.9900000000000002
-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,-0.5359999999999999
+2050,8,,electricity,all-year.afternoon,0.5359999999999999
+2050,8,,wind,all-year.early-peak,-0.7999999999999999
+2050,8,,electricity,all-year.early-peak,0.7999999999999999
+2050,8,,wind,all-year.late-peak,-0.16598933333332966
+2050,8,,electricity,all-year.late-peak,0.16598933333332966
+2050,8,,wind,all-year.evening,-0.24201066666667104
+2050,8,,electricity,all-year.evening,0.24201066666667104
+2050,9,,electricity,all-year.night,-0.3959999999999996
+2050,9,,heat,all-year.night,0.9899999999999989
+2050,9,,electricity,all-year.morning,-0.3960000000000003
+2050,9,,heat,all-year.morning,0.9900000000000007
+2050,9,,electricity,all-year.afternoon,-0.3959999999999996
+2050,9,,heat,all-year.afternoon,0.9899999999999989
+2050,9,,electricity,all-year.early-peak,-0.3960000000000003
+2050,9,,heat,all-year.early-peak,0.9900000000000007
+2050,9,,electricity,all-year.late-peak,-0.3960000000000003
+2050,9,,heat,all-year.late-peak,0.9900000000000007
+2050,9,,electricity,all-year.evening,-0.3960000000000003
+2050,9,,heat,all-year.evening,0.9900000000000007
 2050,10,,wind,all-year.night,-0.0
 2050,10,,electricity,all-year.night,0.0
-2050,10,,wind,all-year.morning,-0.7491199999999995
-2050,10,,electricity,all-year.morning,0.7491199999999995
+2050,10,,wind,all-year.morning,-0.48640000000000105
+2050,10,,electricity,all-year.morning,0.48640000000000105
 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
 2050,10,,electricity,all-year.early-peak,0.0
-2050,10,,wind,all-year.late-peak,-0.7491199999999995
-2050,10,,electricity,all-year.late-peak,0.7491199999999995
+2050,10,,wind,all-year.late-peak,-0.48640000000000105
+2050,10,,electricity,all-year.late-peak,0.48640000000000105
 2050,10,,wind,all-year.evening,-0.0
 2050,10,,electricity,all-year.evening,0.0
-2050,11,,electricity,all-year.night,-0.3960000000000003
-2050,11,,heat,all-year.night,0.9900000000000007
-2050,11,,electricity,all-year.morning,-0.3960000000000003
-2050,11,,heat,all-year.morning,0.9900000000000007
-2050,11,,electricity,all-year.afternoon,-0.3960000000000003
-2050,11,,heat,all-year.afternoon,0.9900000000000007
-2050,11,,electricity,all-year.early-peak,-0.3960000000000003
-2050,11,,heat,all-year.early-peak,0.9900000000000007
-2050,11,,electricity,all-year.late-peak,-0.3960000000000003
-2050,11,,heat,all-year.late-peak,0.9900000000000007
-2050,11,,electricity,all-year.evening,-0.3960000000000003
-2050,11,,heat,all-year.evening,0.9900000000000007
-2050,12,,wind,all-year.night,-0.013537279999998764
-2050,12,,electricity,all-year.night,0.013537279999998764
+2050,11,,electricity,all-year.night,-0.39599999999999974
+2050,11,,heat,all-year.night,0.9899999999999993
+2050,11,,electricity,all-year.morning,-0.39599999999999974
+2050,11,,heat,all-year.morning,0.9899999999999993
+2050,11,,electricity,all-year.afternoon,-0.39599999999999974
+2050,11,,heat,all-year.afternoon,0.9899999999999993
+2050,11,,electricity,all-year.early-peak,-0.39599999999999974
+2050,11,,heat,all-year.early-peak,0.9899999999999993
+2050,11,,electricity,all-year.late-peak,-0.39599999999999974
+2050,11,,heat,all-year.late-peak,0.9899999999999993
+2050,11,,electricity,all-year.evening,-0.39599999999999974
+2050,11,,heat,all-year.evening,0.9899999999999993
+2050,12,,wind,all-year.night,-0.36000000000000043
+2050,12,,electricity,all-year.night,0.36000000000000043
 2050,12,,wind,all-year.morning,-0.0
 2050,12,,electricity,all-year.morning,0.0
 2050,12,,wind,all-year.afternoon,-0.0
 2050,12,,electricity,all-year.afternoon,0.0
-2050,12,,wind,all-year.early-peak,-0.09495552000000129
-2050,12,,electricity,all-year.early-peak,0.09495552000000129
-2050,12,,wind,all-year.late-peak,-0.27123200000000014
-2050,12,,electricity,all-year.late-peak,0.27123200000000014
-2050,12,,wind,all-year.evening,-0.27123200000000014
-2050,12,,electricity,all-year.evening,0.27123200000000014
-2050,13,,electricity,all-year.night,-0.4079999999999997
-2050,13,,heat,all-year.night,1.0199999999999991
-2050,13,,electricity,all-year.morning,-0.4079999999999997
-2050,13,,heat,all-year.morning,1.0199999999999991
-2050,13,,electricity,all-year.afternoon,-0.4079999999999997
-2050,13,,heat,all-year.afternoon,1.0199999999999991
-2050,13,,electricity,all-year.early-peak,-0.4079999999999997
-2050,13,,heat,all-year.early-peak,1.0199999999999991
-2050,13,,electricity,all-year.late-peak,-0.4079999999999997
-2050,13,,heat,all-year.late-peak,1.0199999999999991
-2050,13,,electricity,all-year.evening,-0.4079999999999997
-2050,13,,heat,all-year.evening,1.0199999999999991
+2050,12,,wind,all-year.early-peak,-0.5346559999999966
+2050,12,,electricity,all-year.early-peak,0.5346559999999966
+2050,12,,wind,all-year.late-peak,-0.0
+2050,12,,electricity,all-year.late-peak,0.0
+2050,12,,wind,all-year.evening,-0.6390399999999978
+2050,12,,electricity,all-year.evening,0.6390399999999978
+2050,13,,electricity,all-year.night,-0.40800000000000075
+2050,13,,heat,all-year.night,1.0200000000000018
+2050,13,,electricity,all-year.morning,-0.40800000000000075
+2050,13,,heat,all-year.morning,1.0200000000000018
+2050,13,,electricity,all-year.afternoon,-0.40800000000000075
+2050,13,,heat,all-year.afternoon,1.0200000000000018
+2050,13,,electricity,all-year.early-peak,-0.40800000000000075
+2050,13,,heat,all-year.early-peak,1.0200000000000018
+2050,13,,electricity,all-year.late-peak,-0.40800000000000075
+2050,13,,heat,all-year.late-peak,1.0200000000000018
+2050,13,,electricity,all-year.evening,-0.40800000000000075
+2050,13,,heat,all-year.evening,1.0200000000000018
 2050,14,,wind,all-year.night,-0.0
 2050,14,,electricity,all-year.night,0.0
-2050,14,,wind,all-year.morning,-0.0
-2050,14,,electricity,all-year.morning,0.0
+2050,14,,wind,all-year.morning,-0.18613760000000146
+2050,14,,electricity,all-year.morning,0.18613760000000146
 2050,14,,wind,all-year.afternoon,-0.0
 2050,14,,electricity,all-year.afternoon,0.0
-2050,14,,wind,all-year.early-peak,-0.7258444799999985
-2050,14,,electricity,all-year.early-peak,0.7258444799999985
-2050,14,,wind,all-year.late-peak,-0.604448
-2050,14,,electricity,all-year.late-peak,0.604448
-2050,14,,wind,all-year.evening,-0.5327680000000002
-2050,14,,electricity,all-year.evening,0.5327680000000002
+2050,14,,wind,all-year.early-peak,-0.46534400000000353
+2050,14,,electricity,all-year.early-peak,0.46534400000000353
+2050,14,,wind,all-year.late-peak,-0.46534400000000353
+2050,14,,electricity,all-year.late-peak,0.46534400000000353
+2050,14,,wind,all-year.evening,-0.0
+2050,14,,electricity,all-year.evening,0.0
diff --git a/tests/data/muse1_default/commodity_prices.csv b/tests/data/muse1_default/commodity_prices.csv
index 491a8b347..9716006ef 100644
--- a/tests/data/muse1_default/commodity_prices.csv
+++ b/tests/data/muse1_default/commodity_prices.csv
@@ -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.7546314976998
-2025,electricity,R1,all-year.evening,17.70980841241401
-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.685191229522788
+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.483847751734366
-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.107012533202472
-2030,electricity,R1,all-year.evening,9.10681905636597
-2030,heat,R1,all-year.night,14.73042340999724
-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.420323412529198
-2030,heat,R1,all-year.evening,5.310088052316931
+2030,electricity,R1,all-year.night,9.10681905636597
+2030,electricity,R1,all-year.morning,9.271425490003418
+2030,electricity,R1,all-year.afternoon,9.600638357278315
+2030,electricity,R1,all-year.early-peak,9.468951006760358
+2030,electricity,R1,all-year.late-peak,9.600638357278315
+2030,electricity,R1,all-year.evening,9.600638357278315
+2030,heat,R1,all-year.night,4.97961193184988
+2030,heat,R1,all-year.morning,5.265772287623136
+2030,heat,R1,all-year.afternoon,5.1771396522148185
+2030,heat,R1,all-year.early-peak,5.344782494325912
+2030,heat,R1,all-year.late-peak,5.617773742159535
+2030,heat,R1,all-year.evening,5.507615772681869
 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.377989633638364
-2035,electricity,R1,all-year.afternoon,10.701940099144766
-2035,electricity,R1,all-year.early-peak,9.418798049079202
-2035,electricity,R1,all-year.late-peak,9.389146364296424
-2035,electricity,R1,all-year.evening,10.697952296537819
+2035,electricity,R1,all-year.morning,9.86266741868176
+2035,electricity,R1,all-year.afternoon,10.799016882446098
+2035,electricity,R1,all-year.early-peak,9.973203472547526
+2035,electricity,R1,all-year.late-peak,9.766769040135088
+2035,electricity,R1,all-year.evening,10.799016882446098
 2035,heat,R1,all-year.night,4.533789268258482
-2035,heat,R1,all-year.morning,5.231116529259242
-2035,heat,R1,all-year.afternoon,5.17183768537
-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,5.424987643276601
+2035,heat,R1,all-year.afternoon,5.210668398690533
+2035,heat,R1,all-year.early-peak,5.469202064822907
+2035,heat,R1,all-year.late-peak,5.984413385685562
+2035,heat,R1,all-year.evening,6.098420390827249
 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,9.238053870084594
+2040,electricity,R1,all-year.night,9.244242842798764
 2040,electricity,R1,all-year.morning,9.10681905636597
-2040,electricity,R1,all-year.afternoon,10.272113311194635
-2040,electricity,R1,all-year.early-peak,9.405934005149248
-2040,electricity,R1,all-year.late-peak,11.371847695065664
-2040,electricity,R1,all-year.evening,9.960654523049266
-2040,heat,R1,all-year.night,4.620397764254642
+2040,electricity,R1,all-year.afternoon,11.006037377137009
+2040,electricity,R1,all-year.early-peak,9.702588638638304
+2040,electricity,R1,all-year.late-peak,10.348058289136482
+2040,electricity,R1,all-year.evening,9.10681905636597
+2040,heat,R1,all-year.night,4.622873353340313
 2040,heat,R1,all-year.morning,4.933981318237859
-2040,heat,R1,all-year.afternoon,5.034021540698659
-2040,heat,R1,all-year.early-peak,5.053627297751171
-2040,heat,R1,all-year.late-peak,6.798051666286174
-2040,heat,R1,all-year.evening,5.754545522287572
+2040,heat,R1,all-year.afternoon,5.32759116707561
+2040,heat,R1,all-year.early-peak,5.172289151146792
+2040,heat,R1,all-year.late-peak,6.3885359039145015
+2040,heat,R1,all-year.evening,5.413011335614255
 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,9.10681905636597
-2045,electricity,R1,all-year.morning,9.10681905636597
-2045,electricity,R1,all-year.afternoon,10.367767954065643
-2045,electricity,R1,all-year.early-peak,9.233441351435847
-2045,electricity,R1,all-year.late-peak,9.64528002750122
-2045,electricity,R1,all-year.evening,9.198898693194842
-2045,heat,R1,all-year.night,4.56074187945097
-2045,heat,R1,all-year.morning,4.671106150379829
-2045,heat,R1,all-year.afternoon,5.0651214385308405
-2045,heat,R1,all-year.early-peak,4.721755068407779
-2045,heat,R1,all-year.late-peak,6.37388112995338
-2045,heat,R1,all-year.evening,5.451628503391026
+2045,electricity,R1,all-year.night,9.13369294454312
+2045,electricity,R1,all-year.morning,9.304878883806547
+2045,electricity,R1,all-year.afternoon,9.268662229645985
+2045,electricity,R1,all-year.early-peak,9.304878883806547
+2045,electricity,R1,all-year.late-peak,10.735495069181471
+2045,electricity,R1,all-year.evening,10.101235019537093
+2045,heat,R1,all-year.night,4.57149143472183
+2045,heat,R1,all-year.morning,4.750330081356058
+2045,heat,R1,all-year.afternoon,4.6254791487629765
+2045,heat,R1,all-year.early-peak,4.750330081356058
+2045,heat,R1,all-year.late-peak,6.809967146625482
+2045,heat,R1,all-year.evening,5.812563033927926
 2050,electricity,R1,all-year.night,9.106819056365968
-2050,electricity,R1,all-year.morning,10.819604475669003
-2050,electricity,R1,all-year.afternoon,9.925033281623369
+2050,electricity,R1,all-year.morning,10.13494501012271
+2050,electricity,R1,all-year.afternoon,9.106819056365968
 2050,electricity,R1,all-year.early-peak,9.10681905636597
-2050,electricity,R1,all-year.late-peak,9.48582462811624
-2050,electricity,R1,all-year.evening,10.194350276044316
+2050,electricity,R1,all-year.late-peak,9.879765287133006
+2050,electricity,R1,all-year.evening,9.648357348961126
 2050,heat,R1,all-year.night,4.5323141919492205
-2050,heat,R1,all-year.morning,5.415073919920071
-2050,heat,R1,all-year.afternoon,4.859599882052181
+2050,heat,R1,all-year.morning,5.141210133701554
+2050,heat,R1,all-year.afternoon,4.5323141919492205
 2050,heat,R1,all-year.early-peak,4.729959752198858
-2050,heat,R1,all-year.late-peak,6.335685684730892
-2050,heat,R1,all-year.evening,5.751550720935097
+2050,heat,R1,all-year.late-peak,6.493261948337598
+2050,heat,R1,all-year.evening,5.533153550101822
diff --git a/tests/data/two_regions/asset_capacities.csv b/tests/data/two_regions/asset_capacities.csv
index c3c041fad..49806191c 100644
--- a/tests/data/two_regions/asset_capacities.csv
+++ b/tests/data/two_regions/asset_capacities.csv
@@ -3,103 +3,100 @@ 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,8,,3.77034445931108,
 2030,9,,5.939988120023763,
 2030,10,,5.939988120023761,
-2030,11,,5.975988048023905,
+2030,11,,3.9839920320159363,
 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,,3.9839920320159363,
 2035,12,,6.890386219227559,
 2035,13,,6.11998776002448,
 2035,14,,6.119987760024477,
-2035,15,,5.875188249623504,
+2035,15,,4.799990400019199,
 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,,3.9839920320159363,
 2040,12,,6.890386219227559,
 2040,13,,6.11998776002448,
 2040,14,,6.119987760024477,
-2040,15,,5.875188249623504,
+2040,15,,4.799990400019199,
 2040,16,,7.099185801628392,
-2040,17,,5.9399881200237585,
+2040,17,,5.939988120023764,
 2040,18,,5.939988120023761,
-2040,19,,4.494711010577974,
+2040,19,,2.91839416321168,
 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,,3.9839920320159363,
 2045,12,,6.890386219227559,
 2045,13,,6.11998776002448,
 2045,14,,6.119987760024477,
-2045,15,,5.875188249623504,
+2045,15,,4.799990400019199,
 2045,16,,7.099185801628392,
-2045,17,,5.9399881200237585,
+2045,17,,5.939988120023764,
 2045,18,,5.939988120023761,
-2045,19,,4.494711010577974,
+2045,19,,2.91839416321168,
 2045,20,,6.8903862192275644,
 2045,21,,5.939988120023764,
 2045,22,,5.939988120023761,
-2045,23,,1.6273887452225209,
+2045,23,,3.8342323315353344,
 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,,3.9839920320159363,
 2050,12,,6.890386219227559,
 2050,13,,6.11998776002448,
 2050,14,,6.119987760024477,
-2050,15,,5.875188249623504,
+2050,15,,4.799990400019199,
 2050,16,,7.099185801628392,
-2050,17,,5.9399881200237585,
+2050,17,,5.939988120023764,
 2050,18,,5.939988120023761,
-2050,19,,4.494711010577974,
+2050,19,,2.91839416321168,
 2050,20,,6.8903862192275644,
 2050,21,,5.939988120023764,
 2050,22,,5.939988120023761,
-2050,23,,1.6273887452225209,
+2050,23,,3.8342323315353344,
 2050,24,,6.8903862192275644,
-2050,25,,6.119987760024472,
+2050,25,,6.1199877600244665,
 2050,26,,6.119987760024477,
-2050,27,,4.657641884716206,
+2050,27,,2.792058415883152,
 2050,28,,7.099185801628382,
diff --git a/tests/data/two_regions/commodity_flows.csv b/tests/data/two_regions/commodity_flows.csv
index a98853d3c..a477aab67 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.14880800000000058
-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.1116080000000006
+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,22 @@ 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.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.4192000000000004
-2030,7,,CO2f,all-year.evening,38.428064000000035
-2030,8,,gas,all-year.night,0.6283919999999998
-2030,8,,gas,all-year.morning,0.0
+2030,6,,wind,all-year.night,-0.664
+2030,6,,electricity,all-year.night,0.664
+2030,6,,wind,all-year.morning,-0.33199999999999996
+2030,6,,electricity,all-year.morning,0.33199999999999996
+2030,6,,wind,all-year.afternoon,-0.0
+2030,6,,electricity,all-year.afternoon,0.0
+2030,6,,wind,all-year.early-peak,-0.7304
+2030,6,,electricity,all-year.early-peak,0.7304
+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,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,24 +239,24 @@ 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.early-peak,-0.9960000000000001
-2030,11,,electricity,all-year.early-peak,0.9960000000000001
-2030,11,,wind,all-year.late-peak,-0.39600000000000024
-2030,11,,electricity,all-year.late-peak,0.39600000000000024
-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.night,-0.0
+2030,11,,electricity,all-year.night,0.0
+2030,11,,wind,all-year.morning,-0.6640000000000001
+2030,11,,electricity,all-year.morning,0.6640000000000001
+2030,11,,wind,all-year.afternoon,-0.6640000000000001
+2030,11,,electricity,all-year.afternoon,0.6640000000000001
+2030,11,,wind,all-year.early-peak,-0.26560000000000006
+2030,11,,electricity,all-year.early-peak,0.26560000000000006
+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.5200080000000009
 2035,2,,gas,all-year.afternoon,2.32
@@ -343,16 +313,16 @@ 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.5359999999999999
+2035,6,,electricity,all-year.morning,0.5359999999999999
 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.4000000000000001
+2035,6,,electricity,all-year.early-peak,0.4000000000000001
+2035,6,,wind,all-year.late-peak,-2.1344000000000003
+2035,6,,electricity,all-year.late-peak,2.1344000000000003
+2035,6,,wind,all-year.evening,-1.6
+2035,6,,electricity,all-year.evening,1.6
 2035,8,,gas,all-year.night,0.6283919999999998
 2035,8,,gas,all-year.morning,0.6283919999999998
 2035,8,,gas,all-year.afternoon,0.0
@@ -391,14 +361,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.morning,-0.6640000000000001
+2035,11,,electricity,all-year.morning,0.6640000000000001
+2035,11,,wind,all-year.afternoon,-0.6640000000000001
+2035,11,,electricity,all-year.afternoon,0.6640000000000001
 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,-0.26560000000000006
+2035,11,,electricity,all-year.late-peak,0.26560000000000006
 2035,11,,wind,all-year.evening,-0.0
 2035,11,,electricity,all-year.evening,0.0
 2035,12,,gas,all-year.night,1.1483999999999996
@@ -441,14 +411,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2035,15,,electricity,all-year.night,0.8
 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.1359999999999999
+2035,15,,electricity,all-year.afternoon,0.1359999999999999
+2035,15,,wind,all-year.early-peak,-0.7999999999999999
+2035,15,,electricity,all-year.early-peak,0.7999999999999999
 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.00400000000000007
-2035,15,,electricity,all-year.evening,0.00400000000000007
+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
@@ -481,16 +451,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.1979999999999995
+2040,4,,heat,all-year.morning,0.4949999999999988
 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.1979999999999995
+2040,4,,heat,all-year.early-peak,0.4949999999999988
 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.6639999999999996
+2040,4,,heat,all-year.evening,1.6599999999999988
 2040,5,,gas,all-year.night,-0.0
 2040,5,,heat,all-year.night,0.0
 2040,5,,CO2f,all-year.night,0.0
@@ -513,26 +483,26 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,6,,electricity,all-year.night,0.0
 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.afternoon,-0.9320000000000002
+2040,6,,electricity,all-year.afternoon,0.9320000000000002
 2040,6,,wind,all-year.early-peak,-1.398
 2040,6,,electricity,all-year.early-peak,1.398
-2040,6,,wind,all-year.late-peak,-0.07168000000000041
-2040,6,,electricity,all-year.late-peak,0.07168000000000041
-2040,6,,wind,all-year.evening,-0.0
-2040,6,,electricity,all-year.evening,0.0
+2040,6,,wind,all-year.late-peak,-0.8455999999999996
+2040,6,,electricity,all-year.late-peak,0.8455999999999996
+2040,6,,wind,all-year.evening,-0.06543999999999828
+2040,6,,electricity,all-year.evening,0.06543999999999828
 2040,8,,gas,all-year.night,0.6283919999999998
 2040,8,,gas,all-year.morning,0.6283919999999998
 2040,8,,gas,all-year.afternoon,0.0
 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.12799999999999975
+2040,9,,heat,all-year.night,0.3199999999999994
 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.12799999999999975
+2040,9,,heat,all-year.afternoon,0.3199999999999994
 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
@@ -557,18 +527,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2040,10,,gas,all-year.evening,-1.1484
 2040,10,,heat,all-year.evening,0.9900000000000002
 2040,10,,CO2f,all-year.evening,64.06290000000001
-2040,11,,wind,all-year.night,-0.0
-2040,11,,electricity,all-year.night,0.0
+2040,11,,wind,all-year.night,-0.26560000000000006
+2040,11,,electricity,all-year.night,0.26560000000000006
 2040,11,,wind,all-year.morning,-0.0
 2040,11,,electricity,all-year.morning,0.0
 2040,11,,wind,all-year.afternoon,-0.0
 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.evening,-0.376352
-2040,11,,electricity,all-year.evening,0.376352
+2040,11,,wind,all-year.late-peak,-0.6640000000000001
+2040,11,,electricity,all-year.late-peak,0.6640000000000001
+2040,11,,wind,all-year.evening,-0.6640000000000001
+2040,11,,electricity,all-year.evening,0.6640000000000001
 2040,12,,gas,all-year.night,0.0
 2040,12,,gas,all-year.morning,1.1483999999999996
 2040,12,,gas,all-year.afternoon,0.0
@@ -605,36 +575,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.39168000000000047
-2040,15,,electricity,all-year.night,0.39168000000000047
+2040,15,,wind,all-year.night,-0.3200000000000002
+2040,15,,electricity,all-year.night,0.3200000000000002
 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.0
 2040,15,,electricity,all-year.early-peak,0.0
-2040,15,,wind,all-year.late-peak,-0.9792000000000005
-2040,15,,electricity,all-year.late-peak,0.9792000000000005
-2040,15,,wind,all-year.evening,-0.9792000000000005
-2040,15,,electricity,all-year.evening,0.9792000000000005
+2040,15,,wind,all-year.late-peak,-0.7999999999999999
+2040,15,,electricity,all-year.late-peak,0.7999999999999999
+2040,15,,wind,all-year.evening,-0.7999999999999999
+2040,15,,electricity,all-year.evening,0.7999999999999999
 2040,16,,gas,all-year.night,1.1831999999999994
 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.3960000000000003
+2040,17,,heat,all-year.night,0.9900000000000007
+2040,17,,electricity,all-year.morning,-0.3960000000000003
+2040,17,,heat,all-year.morning,0.9900000000000007
+2040,17,,electricity,all-year.afternoon,-0.3960000000000003
+2040,17,,heat,all-year.afternoon,0.9900000000000007
+2040,17,,electricity,all-year.early-peak,-0.3960000000000003
+2040,17,,heat,all-year.early-peak,0.9900000000000007
+2040,17,,electricity,all-year.late-peak,-0.3960000000000003
+2040,17,,heat,all-year.late-peak,0.9900000000000007
+2040,17,,electricity,all-year.evening,-0.3960000000000003
+2040,17,,heat,all-year.evening,0.9900000000000007
 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,18 +623,18 @@ 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.5403199999999996
-2040,19,,electricity,all-year.night,0.5403199999999996
+2040,19,,wind,all-year.night,-0.3463999999999998
+2040,19,,electricity,all-year.night,0.3463999999999998
 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,-0.7491199999999992
-2040,19,,electricity,all-year.late-peak,0.7491199999999992
-2040,19,,wind,all-year.evening,-0.5084479999999995
-2040,19,,electricity,all-year.evening,0.5084479999999995
+2040,19,,wind,all-year.late-peak,-0.48640000000000105
+2040,19,,electricity,all-year.late-peak,0.48640000000000105
+2040,19,,wind,all-year.evening,-0.33456000000000174
+2040,19,,electricity,all-year.evening,0.33456000000000174
 2040,20,,gas,all-year.night,0.0
 2040,20,,gas,all-year.morning,1.1484000000000005
 2040,20,,gas,all-year.afternoon,1.1484000000000005
@@ -705,8 +675,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,4,,heat,all-year.early-peak,0.0
 2045,4,,electricity,all-year.late-peak,-1.596
 2045,4,,heat,all-year.late-peak,3.9899999999999998
-2045,4,,electricity,all-year.evening,-0.5319999999999999
-2045,4,,heat,all-year.evening,1.3299999999999996
+2045,4,,electricity,all-year.evening,-0.5319999999999995
+2045,4,,heat,all-year.evening,1.3299999999999987
 2045,5,,gas,all-year.night,-0.0
 2045,5,,heat,all-year.night,0.0
 2045,5,,CO2f,all-year.night,0.0
@@ -727,16 +697,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.6736000000000011
-2045,6,,electricity,all-year.morning,0.6736000000000011
-2045,6,,wind,all-year.afternoon,-0.08479999999999958
-2045,6,,electricity,all-year.afternoon,0.08479999999999958
+2045,6,,wind,all-year.morning,-1.0742399999999988
+2045,6,,electricity,all-year.morning,1.0742399999999988
+2045,6,,wind,all-year.afternoon,-0.2640000000000002
+2045,6,,electricity,all-year.afternoon,0.2640000000000002
 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.evening,-0.41199999999999926
-2045,6,,electricity,all-year.evening,0.41199999999999926
+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.7010933333333343
+2045,6,,electricity,all-year.evening,0.7010933333333343
 2045,8,,gas,all-year.night,0.0
 2045,8,,gas,all-year.morning,0.0
 2045,8,,gas,all-year.afternoon,0.6283919999999998
@@ -745,12 +715,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,8,,gas,all-year.evening,0.6283919999999998
 2045,9,,electricity,all-year.night,-0.0
 2045,9,,heat,all-year.night,0.0
-2045,9,,electricity,all-year.morning,-0.3959999999999999
-2045,9,,heat,all-year.morning,0.9899999999999998
+2045,9,,electricity,all-year.morning,-0.3959999999999996
+2045,9,,heat,all-year.morning,0.9899999999999989
 2045,9,,electricity,all-year.afternoon,-0.0
 2045,9,,heat,all-year.afternoon,0.0
-2045,9,,electricity,all-year.early-peak,-0.3959999999999999
-2045,9,,heat,all-year.early-peak,0.9899999999999998
+2045,9,,electricity,all-year.early-peak,-0.3959999999999996
+2045,9,,heat,all-year.early-peak,0.9899999999999989
 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
@@ -779,24 +749,24 @@ 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.9960000000000002
-2045,11,,electricity,all-year.early-peak,0.9960000000000002
-2045,11,,wind,all-year.late-peak,-0.3984000000000001
-2045,11,,electricity,all-year.late-peak,0.3984000000000001
-2045,11,,wind,all-year.evening,-0.9960000000000002
-2045,11,,electricity,all-year.evening,0.9960000000000002
+2045,11,,wind,all-year.early-peak,-0.6640000000000001
+2045,11,,electricity,all-year.early-peak,0.6640000000000001
+2045,11,,wind,all-year.late-peak,-0.26560000000000006
+2045,11,,electricity,all-year.late-peak,0.26560000000000006
+2045,11,,wind,all-year.evening,-0.6640000000000001
+2045,11,,electricity,all-year.evening,0.6640000000000001
 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.2719999999999999
-2045,13,,heat,all-year.night,0.6799999999999997
+2045,13,,electricity,all-year.night,-0.2719999999999995
+2045,13,,heat,all-year.night,0.6799999999999988
 2045,13,,electricity,all-year.morning,-0.40800000000000003
 2045,13,,heat,all-year.morning,1.02
-2045,13,,electricity,all-year.afternoon,-0.2719999999999999
-2045,13,,heat,all-year.afternoon,0.6799999999999997
+2045,13,,electricity,all-year.afternoon,-0.2719999999999995
+2045,13,,heat,all-year.afternoon,0.6799999999999988
 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
@@ -823,14 +793,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2045,14,,CO2f,all-year.evening,66.00419999999997
 2045,15,,wind,all-year.night,-0.0
 2045,15,,electricity,all-year.night,0.0
-2045,15,,wind,all-year.morning,-0.06478719999999913
-2045,15,,electricity,all-year.morning,0.06478719999999913
-2045,15,,wind,all-year.afternoon,-0.9792000000000005
-2045,15,,electricity,all-year.afternoon,0.9792000000000005
-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.9263679999999986
-2045,15,,electricity,all-year.late-peak,0.9263679999999986
+2045,15,,wind,all-year.morning,-0.0
+2045,15,,electricity,all-year.morning,0.0
+2045,15,,wind,all-year.afternoon,-0.7999999999999999
+2045,15,,electricity,all-year.afternoon,0.7999999999999999
+2045,15,,wind,all-year.early-peak,-0.44559999999999894
+2045,15,,electricity,all-year.early-peak,0.44559999999999894
+2045,15,,wind,all-year.late-peak,-0.0
+2045,15,,electricity,all-year.late-peak,0.0
 2045,15,,wind,all-year.evening,-0.0
 2045,15,,electricity,all-year.evening,0.0
 2045,16,,gas,all-year.night,0.0
@@ -839,18 +809,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.3960000000000003
+2045,17,,heat,all-year.night,0.9900000000000007
+2045,17,,electricity,all-year.morning,-0.3960000000000003
+2045,17,,heat,all-year.morning,0.9900000000000007
+2045,17,,electricity,all-year.afternoon,-0.3960000000000003
+2045,17,,heat,all-year.afternoon,0.9900000000000007
+2045,17,,electricity,all-year.early-peak,-0.3960000000000003
+2045,17,,heat,all-year.early-peak,0.9900000000000007
+2045,17,,electricity,all-year.late-peak,-0.3960000000000003
+2045,17,,heat,all-year.late-peak,0.9900000000000007
+2045,17,,electricity,all-year.evening,-0.3960000000000003
+2045,17,,heat,all-year.evening,0.9900000000000007
 2045,18,,gas,all-year.night,-1.1484
 2045,18,,heat,all-year.night,0.9900000000000002
 2045,18,,CO2f,all-year.night,64.06290000000001
@@ -871,16 +841,16 @@ 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,-0.7491199999999992
-2045,19,,electricity,all-year.morning,0.7491199999999992
+2045,19,,wind,all-year.morning,-0.48640000000000105
+2045,19,,electricity,all-year.morning,0.48640000000000105
 2045,19,,wind,all-year.afternoon,-0.0
 2045,19,,electricity,all-year.afternoon,0.0
-2045,19,,wind,all-year.early-peak,-0.6
-2045,19,,electricity,all-year.early-peak,0.6
-2045,19,,wind,all-year.late-peak,-0.0
-2045,19,,electricity,all-year.late-peak,0.0
-2045,19,,wind,all-year.evening,-0.44876799999999906
-2045,19,,electricity,all-year.evening,0.44876799999999906
+2045,19,,wind,all-year.early-peak,-0.48640000000000105
+2045,19,,electricity,all-year.early-peak,0.48640000000000105
+2045,19,,wind,all-year.late-peak,-0.07069333333333438
+2045,19,,electricity,all-year.late-peak,0.07069333333333438
+2045,19,,wind,all-year.evening,-0.12386666666666613
+2045,19,,electricity,all-year.evening,0.12386666666666613
 2045,20,,gas,all-year.night,0.0
 2045,20,,gas,all-year.morning,0.0
 2045,20,,gas,all-year.afternoon,0.16040799999999997
@@ -919,16 +889,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.10849280000000072
-2045,23,,electricity,all-year.morning,0.10849280000000072
+2045,23,,wind,all-year.morning,-0.03536000000000028
+2045,23,,electricity,all-year.morning,0.03536000000000028
 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.2712320000000019
-2045,23,,electricity,all-year.late-peak,0.2712320000000019
-2045,23,,wind,all-year.evening,-0.2712320000000019
-2045,23,,electricity,all-year.evening,0.2712320000000019
+2045,23,,wind,all-year.late-peak,-0.6390399999999996
+2045,23,,electricity,all-year.late-peak,0.6390399999999996
+2045,23,,wind,all-year.evening,-0.6390399999999996
+2045,23,,electricity,all-year.evening,0.6390399999999996
 2045,24,,gas,all-year.night,0.0
 2045,24,,gas,all-year.morning,0.0
 2045,24,,gas,all-year.afternoon,1.1484000000000005
@@ -995,12 +965,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.07168000000000027
-2050,6,,electricity,all-year.early-peak,0.07168000000000027
-2050,6,,wind,all-year.late-peak,-1.5959999999999999
-2050,6,,electricity,all-year.late-peak,1.5959999999999999
-2050,6,,wind,all-year.evening,-0.5151475200000052
-2050,6,,electricity,all-year.evening,0.5151475200000052
+2050,6,,wind,all-year.early-peak,-0.5135999999999991
+2050,6,,electricity,all-year.early-peak,0.5135999999999991
+2050,6,,wind,all-year.late-peak,-2.216666666666667
+2050,6,,electricity,all-year.late-peak,2.216666666666667
+2050,6,,wind,all-year.evening,-1.2112117333333368
+2050,6,,electricity,all-year.evening,1.2112117333333368
 2050,8,,gas,all-year.night,0.6283919999999998
 2050,8,,gas,all-year.morning,0.6283919999999998
 2050,8,,gas,all-year.afternoon,0.0
@@ -1039,16 +1009,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 2050,10,,CO2f,all-year.evening,64.06290000000001
 2050,11,,wind,all-year.night,-0.0
 2050,11,,electricity,all-year.night,0.0
-2050,11,,wind,all-year.morning,-0.0716800000000003
-2050,11,,electricity,all-year.morning,0.0716800000000003
+2050,11,,wind,all-year.morning,-0.0482560000000018
+2050,11,,electricity,all-year.morning,0.0482560000000018
 2050,11,,wind,all-year.afternoon,-0.0
 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.9960000000000002
-2050,11,,electricity,all-year.late-peak,0.9960000000000002
-2050,11,,wind,all-year.evening,-0.9960000000000002
-2050,11,,electricity,all-year.evening,0.9960000000000002
+2050,11,,wind,all-year.late-peak,-0.6640000000000001
+2050,11,,electricity,all-year.late-peak,0.6640000000000001
+2050,11,,wind,all-year.evening,-0.6640000000000001
+2050,11,,electricity,all-year.evening,0.6640000000000001
 2050,12,,gas,all-year.night,1.1483999999999996
 2050,12,,gas,all-year.morning,0.0
 2050,12,,gas,all-year.afternoon,0.0
@@ -1087,34 +1057,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.9792000000000005
-2050,15,,electricity,all-year.morning,0.9792000000000005
-2050,15,,wind,all-year.afternoon,-0.2791027200000016
-2050,15,,electricity,all-year.afternoon,0.2791027200000016
-2050,15,,wind,all-year.early-peak,-0.9792000000000005
-2050,15,,electricity,all-year.early-peak,0.9792000000000005
+2050,15,,wind,all-year.morning,-0.7999999999999999
+2050,15,,electricity,all-year.morning,0.7999999999999999
+2050,15,,wind,all-year.afternoon,-0.26055573333333415
+2050,15,,electricity,all-year.afternoon,0.26055573333333415
+2050,15,,wind,all-year.early-peak,-0.7999999999999999
+2050,15,,electricity,all-year.early-peak,0.7999999999999999
 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.11257727999999889
-2050,15,,electricity,all-year.evening,0.11257727999999889
+2050,15,,wind,all-year.evening,-0.059444266666666024
+2050,15,,electricity,all-year.evening,0.059444266666666024
 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.3960000000000003
+2050,17,,heat,all-year.night,0.9900000000000007
+2050,17,,electricity,all-year.morning,-0.3960000000000003
+2050,17,,heat,all-year.morning,0.9900000000000007
+2050,17,,electricity,all-year.afternoon,-0.3960000000000003
+2050,17,,heat,all-year.afternoon,0.9900000000000007
+2050,17,,electricity,all-year.early-peak,-0.3960000000000003
+2050,17,,heat,all-year.early-peak,0.9900000000000007
+2050,17,,electricity,all-year.late-peak,-0.3960000000000003
+2050,17,,heat,all-year.late-peak,0.9900000000000007
+2050,17,,electricity,all-year.evening,-0.3960000000000003
+2050,17,,heat,all-year.evening,0.9900000000000007
 2050,18,,gas,all-year.night,-1.1484
 2050,18,,heat,all-year.night,0.9900000000000002
 2050,18,,CO2f,all-year.night,64.06290000000001
@@ -1135,12 +1105,12 @@ 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,-0.7491199999999992
-2050,19,,electricity,all-year.morning,0.7491199999999992
-2050,19,,wind,all-year.afternoon,-0.2996479999999998
-2050,19,,electricity,all-year.afternoon,0.2996479999999998
-2050,19,,wind,all-year.early-peak,-0.7491199999999992
-2050,19,,electricity,all-year.early-peak,0.7491199999999992
+2050,19,,wind,all-year.morning,-0.48640000000000105
+2050,19,,electricity,all-year.morning,0.48640000000000105
+2050,19,,wind,all-year.afternoon,-0.1945600000000005
+2050,19,,electricity,all-year.afternoon,0.1945600000000005
+2050,19,,wind,all-year.early-peak,-0.48640000000000105
+2050,19,,electricity,all-year.early-peak,0.48640000000000105
 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
@@ -1185,12 +1155,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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,-0.2712320000000019
-2050,23,,electricity,all-year.afternoon,0.2712320000000019
+2050,23,,wind,all-year.afternoon,-0.6390399999999996
+2050,23,,electricity,all-year.afternoon,0.6390399999999996
 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,-0.2712320000000019
-2050,23,,electricity,all-year.late-peak,0.2712320000000019
+2050,23,,wind,all-year.late-peak,-0.6390399999999996
+2050,23,,electricity,all-year.late-peak,0.6390399999999996
 2050,23,,wind,all-year.evening,-0.0
 2050,23,,electricity,all-year.evening,0.0
 2050,24,,gas,all-year.night,0.0
@@ -1199,18 +1169,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.4079999999999995
-2050,25,,heat,all-year.night,1.0199999999999987
-2050,25,,electricity,all-year.morning,-0.4079999999999995
-2050,25,,heat,all-year.morning,1.0199999999999987
-2050,25,,electricity,all-year.afternoon,-0.4079999999999995
-2050,25,,heat,all-year.afternoon,1.0199999999999987
-2050,25,,electricity,all-year.early-peak,-0.4079999999999995
-2050,25,,heat,all-year.early-peak,1.0199999999999987
-2050,25,,electricity,all-year.late-peak,-0.4079999999999995
-2050,25,,heat,all-year.late-peak,1.0199999999999987
-2050,25,,electricity,all-year.evening,-0.4079999999999995
-2050,25,,heat,all-year.evening,1.0199999999999987
+2050,25,,electricity,all-year.night,-0.40799999999999914
+2050,25,,heat,all-year.night,1.0199999999999978
+2050,25,,electricity,all-year.morning,-0.40799999999999914
+2050,25,,heat,all-year.morning,1.0199999999999978
+2050,25,,electricity,all-year.afternoon,-0.40799999999999914
+2050,25,,heat,all-year.afternoon,1.0199999999999978
+2050,25,,electricity,all-year.early-peak,-0.40799999999999914
+2050,25,,heat,all-year.early-peak,1.0199999999999978
+2050,25,,electricity,all-year.late-peak,-0.40799999999999914
+2050,25,,heat,all-year.late-peak,1.0199999999999978
+2050,25,,electricity,all-year.evening,-0.40799999999999914
+2050,25,,heat,all-year.evening,1.0199999999999978
 2050,26,,gas,all-year.night,-1.1831999999999994
 2050,26,,heat,all-year.night,1.0199999999999996
 2050,26,,CO2f,all-year.night,66.00419999999997
@@ -1231,16 +1201,16 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow
 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.3500172799999963
-2050,27,,electricity,all-year.afternoon,0.3500172799999963
+2050,27,,wind,all-year.morning,-0.4653439999999973
+2050,27,,electricity,all-year.morning,0.4653439999999973
+2050,27,,wind,all-year.afternoon,-0.10584426666666547
+2050,27,,electricity,all-year.afternoon,0.10584426666666547
 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.7367679999999981
-2050,27,,electricity,all-year.late-peak,0.7367679999999981
-2050,27,,wind,all-year.evening,-0.776275199999996
-2050,27,,electricity,all-year.evening,0.776275199999996
+2050,27,,wind,all-year.late-peak,-0.08029333333333355
+2050,27,,electricity,all-year.late-peak,0.08029333333333355
+2050,27,,wind,all-year.evening,-0.4653439999999973
+2050,27,,electricity,all-year.evening,0.4653439999999973
 2050,28,,gas,all-year.night,0.0
 2050,28,,gas,all-year.morning,1.1831999999999976
 2050,28,,gas,all-year.afternoon,1.1831999999999976
diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv
index 5f02f9a48..9fd07cae1 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.972455521971101
-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.754905754845083
-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.390250073345624
-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.303230166495217
-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,35 +77,35 @@ 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.night,2.55
 2030,gas,R2,all-year.morning,2.55
 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.106819056365971
-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,R1,all-year.night,9.10681905636597
+2030,electricity,R1,all-year.morning,9.600638357278315
+2030,electricity,R1,all-year.afternoon,9.403100720594422
+2030,electricity,R1,all-year.early-peak,9.600638357278315
+2030,electricity,R1,all-year.late-peak,9.436030546397392
+2030,electricity,R1,all-year.evening,9.600638357278315
+2030,electricity,R2,all-year.night,6.909684587351732
 2030,electricity,R2,all-year.morning,6.909684587351732
 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.1999297141681575
-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,R1,all-year.morning,5.397457434533095
+2030,heat,R1,all-year.afternoon,5.098124597541261
+2030,heat,R1,all-year.early-peak,5.397457434533095
+2030,heat,R1,all-year.late-peak,5.551930617807167
+2030,heat,R1,all-year.evening,5.507615772681869
+2030,heat,R2,all-year.night,3.3494378343751285
 2030,heat,R2,all-year.morning,3.5706263477266953
 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
+2030,heat,R2,all-year.late-peak,3.8653041158566306
 2030,heat,R2,all-year.evening,3.7179657248996216
 2035,gas,R1,all-year.night,2.55
 2035,gas,R1,all-year.morning,2.55
@@ -119,24 +119,24 @@ milestone_year,commodity_id,region_id,time_slice,price
 2035,gas,R2,all-year.early-peak,2.55
 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.night,9.106819056365968
 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.764294718444534
+2035,electricity,R1,all-year.afternoon,10.799016882446098
+2035,electricity,R1,all-year.early-peak,9.669891609969394
+2035,electricity,R1,all-year.late-peak,10.669762624528131
+2035,electricity,R1,all-year.evening,10.238899402013576
 2035,electricity,R2,all-year.night,6.909684587351732
 2035,electricity,R2,all-year.morning,6.909684587351731
 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.909684587351732
 2035,electricity,R2,all-year.evening,6.909684587351732
-2035,heat,R1,all-year.night,4.533789268258482
+2035,heat,R1,all-year.night,4.533789268258481
 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.afternoon,5.210668398690533
+2035,heat,R1,all-year.early-peak,5.347877319791655
+2035,heat,R1,all-year.late-peak,6.345610819442779
+2035,heat,R1,all-year.evening,5.874373398654239
 2035,heat,R2,all-year.night,3.3398845980394016
 2035,heat,R2,all-year.morning,3.4570413315505375
 2035,heat,R2,all-year.afternoon,3.339884598039401
@@ -155,24 +155,24 @@ milestone_year,commodity_id,region_id,time_slice,price
 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.55
-2040,electricity,R1,all-year.night,10.633768412085287
-2040,electricity,R1,all-year.morning,10.785962107056353
-2040,electricity,R1,all-year.afternoon,9.237392958614873
-2040,electricity,R1,all-year.early-peak,9.236961452383614
-2040,electricity,R1,all-year.late-peak,9.892009740357796
-2040,electricity,R1,all-year.evening,10.867431375152512
+2040,electricity,R1,all-year.night,9.491224107711945
+2040,electricity,R1,all-year.morning,9.808716485528176
+2040,electricity,R1,all-year.afternoon,9.286981047985934
+2040,electricity,R1,all-year.early-peak,9.106819056365971
+2040,electricity,R1,all-year.late-peak,9.894519635146231
+2040,electricity,R1,all-year.evening,10.443689885902668
 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.909684587351732
-2040,heat,R1,all-year.night,5.17868358105492
-2040,heat,R1,all-year.morning,5.605638538514011
-2040,heat,R1,all-year.afternoon,4.620133399666755
-2040,heat,R1,all-year.early-peak,4.986038276644916
-2040,heat,R1,all-year.late-peak,6.206116484403026
-2040,heat,R1,all-year.evening,6.11725626312887
+2040,heat,R1,all-year.night,4.721665859305583
+2040,heat,R1,all-year.morning,5.214740289902741
+2040,heat,R1,all-year.afternoon,4.63996863541518
+2040,heat,R1,all-year.early-peak,4.933981318237859
+2040,heat,R1,all-year.late-peak,6.207120442318403
+2040,heat,R1,all-year.evening,5.947759667428934
 2040,heat,R2,all-year.night,3.354503882326303
 2040,heat,R2,all-year.morning,3.4178828966334622
 2040,heat,R2,all-year.afternoon,3.354503882326303
@@ -191,24 +191,24 @@ milestone_year,commodity_id,region_id,time_slice,price
 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,9.80092868654578
-2045,electricity,R1,all-year.morning,9.475130705248045
-2045,electricity,R1,all-year.afternoon,9.499976928806603
-2045,electricity,R1,all-year.early-peak,9.416353710614388
-2045,electricity,R1,all-year.late-peak,9.304300359853904
-2045,electricity,R1,all-year.evening,9.383794893154713
+2045,electricity,R1,all-year.night,10.35016137440823
+2045,electricity,R1,all-year.morning,9.971236418476414
+2045,electricity,R1,all-year.afternoon,10.008176018801747
+2045,electricity,R1,all-year.early-peak,9.836102568086226
+2045,electricity,R1,all-year.late-peak,9.706161770578806
+2045,electricity,R1,all-year.evening,9.769062438396903
 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,4.838385731522894
-2045,heat,R1,all-year.morning,4.818430809932658
-2045,heat,R1,all-year.afternoon,4.718005028427224
-2045,heat,R1,all-year.early-peak,4.794920012079195
-2045,heat,R1,all-year.late-peak,6.237489262894455
-2045,heat,R1,all-year.evening,5.525586983374976
+2045,heat,R1,all-year.night,5.058078806667874
+2045,heat,R1,all-year.morning,5.016873095224005
+2045,heat,R1,all-year.afternoon,4.921284664425281
+2045,heat,R1,all-year.early-peak,4.96281955506793
+2045,heat,R1,all-year.late-peak,6.398233827184416
+2045,heat,R1,all-year.evening,5.6796940014718515
 2045,heat,R2,all-year.night,3.3514351162945855
 2045,heat,R2,all-year.morning,3.3987349566568237
 2045,heat,R2,all-year.afternoon,3.3514351162945855
@@ -221,18 +221,18 @@ milestone_year,commodity_id,region_id,time_slice,price
 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,10.311716901695346
-2050,electricity,R1,all-year.morning,9.16423408217096
-2050,electricity,R1,all-year.afternoon,9.518495847415346
-2050,electricity,R1,all-year.early-peak,9.154800766117754
-2050,electricity,R1,all-year.late-peak,10.177109486429416
-2050,electricity,R1,all-year.evening,9.963784295823567
-2050,heat,R1,all-year.night,5.0142733300809725
-2050,heat,R1,all-year.morning,4.752925762520855
-2050,heat,R1,all-year.afternoon,4.696984908368973
-2050,heat,R1,all-year.early-peak,4.749152436099572
-2050,heat,R1,all-year.late-peak,6.61219962805616
-2050,heat,R1,all-year.evening,5.6593243288467985
+2050,electricity,R1,all-year.night,9.423024587610236
+2050,electricity,R1,all-year.morning,9.145375232236715
+2050,electricity,R1,all-year.afternoon,10.076755997995987
+2050,electricity,R1,all-year.early-peak,9.197043034614333
+2050,electricity,R1,all-year.late-peak,9.890097465557785
+2050,electricity,R1,all-year.evening,9.664297194615004
+2050,heat,R1,all-year.night,4.658796404446928
+2050,heat,R1,all-year.morning,4.745382222547156
+2050,heat,R1,all-year.afternoon,4.920288968601229
+2050,heat,R1,all-year.early-peak,4.766049343498204
+2050,heat,R1,all-year.late-peak,6.497394819707509
+2050,heat,R1,all-year.evening,5.539529488363374
 2050,heat,R2,all-year.night,3.3392513725541697
 2050,heat,R2,all-year.morning,3.42395660947675
 2050,heat,R2,all-year.afternoon,3.33925137255417