From d9d727a35a1586dbb70c5d5063c216d1c818cdb4 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 10 Nov 2026 16:32:56 +0000 Subject: [PATCH] Remove shadow and scarcity pricing strategies --- benches/assets.rs | 1 + docs/model/prices.md | 14 +- docs/release_notes/upcoming.md | 4 + schemas/input/commodities.yaml | 19 +- schemas/input/model.yaml | 2 - src/commodity.rs | 6 - src/example/patches.rs | 16 - src/fixture.rs | 6 +- src/input/commodity.rs | 22 +- src/input/process/flow.rs | 4 +- src/process.rs | 18 +- src/simulation.rs | 51 +- src/simulation/activity.rs | 5 +- src/simulation/optimisation.rs | 9 +- src/simulation/prices.rs | 210 ++--- tests/data/simple_shadow/asset_capacities.csv | 21 - tests/data/simple_shadow/assets.csv | 12 - tests/data/simple_shadow/commodity_flows.csv | 769 ------------------ tests/data/simple_shadow/commodity_prices.csv | 177 ---- tests/regression.rs | 1 - 20 files changed, 168 insertions(+), 1199 deletions(-) delete mode 100644 tests/data/simple_shadow/asset_capacities.csv delete mode 100644 tests/data/simple_shadow/assets.csv delete mode 100644 tests/data/simple_shadow/commodity_flows.csv delete mode 100644 tests/data/simple_shadow/commodity_prices.csv diff --git a/benches/assets.rs b/benches/assets.rs index f56f2d6b7..417b93eeb 100644 --- a/benches/assets.rs +++ b/benches/assets.rs @@ -111,6 +111,7 @@ fn calculate_seed_prices( &solution_existing, &solution_with_candidates, candidates, + &Prices::default(), BASE_YEAR, ) .expect("Failed to calculate prices") diff --git a/docs/model/prices.md b/docs/model/prices.md index b2b085fe8..8e0df43d1 100644 --- a/docs/model/prices.md +++ b/docs/model/prices.md @@ -2,8 +2,7 @@ This section describes how commodity prices are calculated in MUSE2 at the end of each milestone year iteration. The pricing algorithm operates on the results of the dispatch -optimisation, translating flows, capacities, and solver dual values (shadow prices) into commodity -market prices. +optimisation, translating flows and capacities into commodity market prices. ## Pricing Strategies @@ -16,10 +15,6 @@ commodity. active assets. - **`full`**: Prices are set to the full cost (marginal cost + annual fixed/capital costs) of the highest-cost active asset producing the commodity. -- **`shadow`**: Prices are taken directly from the shadow prices (dual values) of the commodity -balance constraints in the dispatch optimisation. -- **`scarcity`**: Prices are set to the shadow price plus the highest activity dual of the assets -producing the commodity in that region and time slice. - **`unpriced`**: No prices are calculated for the commodity. This is mandatory for all OTH (Other)-type commodities. @@ -119,13 +114,15 @@ determined, see [Commodity Graphs](./commodity_graphs.md#investment-and-price-or Within a [circularity][graph-circularities], markets are priced in the reverse of their investment order. As with investment, some processes need the price of an input that hasn't been calculated yet: these are exactly the [feedback processes][graph-circularities]. For these inputs, MUSE2 uses -the shadow price from dispatch as an estimate. +the price from the previous milestone year (or the previous +[ironing-out loop][framework-overview] iteration, if enabled) as an estimate. If there is no +previous price (e.g. in the first year), zero is used. In the [example model][graph-example], hydrogen is invested in before electricity, so prices are calculated in this order: 1. **Electricity** is priced first. The hydrogen turbine (H2YGEN) is a feedback process, and the - price of hydrogen hasn't been calculated yet, so the shadow price of hydrogen is used for its + price of hydrogen hasn't been calculated yet, so the previous price of hydrogen is used for its input. 2. **Hydrogen** is then priced, using the electricity price from step 1 for the electrolyser's (H2YPRO) input. @@ -237,3 +234,4 @@ calculated first and then used as an input cost when calculating the GASNAT pric [graph-circularities]: ./commodity_graphs.md#circularities [graph-example]: ./commodity_graphs.md#example [model-toml]: ../file_formats/input_files.md#model-parameters-modeltoml +[framework-overview]: index.html#framework-overview diff --git a/docs/release_notes/upcoming.md b/docs/release_notes/upcoming.md index ae6aacc31..c507a3172 100644 --- a/docs/release_notes/upcoming.md +++ b/docs/release_notes/upcoming.md @@ -15,6 +15,10 @@ - The `capacity_margin` parameter has been removed ([#1557]) - `portfolio` is now the default agent type. To keep the previous investment behaviour, set `agent_type` to `competitive` in `agents.csv` ([#1574]) +- The `shadow` and `scarcity` pricing strategies have been removed. Commodities using them in + `commodities.csv`, or `fallback_pricing_strategy` in `model.toml`, must switch to another strategy +- Prices in cyclically-dependent markets are now seeded with the previous year's (or previous + ironing-out iteration's) prices, or zero if there are none, rather than with shadow prices ## Bug fixes diff --git a/schemas/input/commodities.yaml b/schemas/input/commodities.yaml index a55c2b1a7..525f82d70 100644 --- a/schemas/input/commodities.yaml +++ b/schemas/input/commodities.yaml @@ -30,26 +30,21 @@ fields: - name: pricing_strategy type: string enum: - - shadow - marginal - marginal_average - full - full_average - - scarcity - unpriced description: The pricing strategy for this commodity notes: | - Optional. If specified, must be one of `shadow` (priced using shadow prices from supply-demand - constraints), `marginal` (priced at the marginal cost of the highest cost active asset), - `marginal_average` (priced at the load-weighted average marginal cost of production across - assets), `full` (priced at the full cost of production of the highest cost active asset, - including capital costs), `full_average` (priced at the load-weighted average full cost of - production across assets), `scarcity` (priced adjusted for scarcity), or `unpriced` (not - priced at all). + Optional. If specified, must be one of `marginal` (priced at the marginal cost of the highest + cost active asset), `marginal_average` (priced at the load-weighted average marginal cost of + production across assets), `full` (priced at the full cost of production of the highest cost + active asset, including capital costs), `full_average` (priced at the load-weighted average + full cost of production across assets), or `unpriced` (not priced at all). - For `svd` and `sed` commodities, it must be one of `shadow`, `marginal`, - `marginal_average`, `full` or `full_average`. For `oth` commodities, it *must* be - `unpriced`. + For `svd` and `sed` commodities, it must be one of `marginal`, `marginal_average`, `full` or + `full_average`. For `oth` commodities, it *must* be `unpriced`. If unspecified, the commodity will use the default pricing strategy according to the commodity type: `full_average` for `svd` and `sed` commodities, and `unpriced` for `oth` commodities. diff --git a/schemas/input/model.yaml b/schemas/input/model.yaml index e170a8497..bf3d1b726 100644 --- a/schemas/input/model.yaml +++ b/schemas/input/model.yaml @@ -48,8 +48,6 @@ properties: default: full_average enum: - unpriced - - shadow - - scarcity - marginal - marginal_average - full diff --git a/src/commodity.rs b/src/commodity.rs index 24bbbc4c5..903b0afdc 100644 --- a/src/commodity.rs +++ b/src/commodity.rs @@ -101,12 +101,6 @@ pub enum CommodityType { /// The strategy used for calculating commodity prices #[derive(Debug, PartialEq, Clone, Copy, Deserialize, Hash, Eq)] pub enum PricingStrategy { - /// Take commodity prices directly from the shadow prices - #[serde(rename = "shadow")] - Shadow, - /// Adjust shadow prices for scarcity - #[serde(rename = "scarcity")] - ScarcityAdjusted, /// Use marginal cost of highest-cost active asset producing the commodity #[serde(rename = "marginal")] MarginalCost, diff --git a/src/example/patches.rs b/src/example/patches.rs index c8cb1e8c1..897a75002 100644 --- a/src/example/patches.rs +++ b/src/example/patches.rs @@ -137,22 +137,6 @@ fn get_all_patches() -> PatchMap { None, ), ), - ( - // The simple example with electricity priced using shadow prices - "simple_shadow", - PatchInfo::new( - "simple", - vec![FilePatch::new("commodities.csv").with_replacement(&[ - "id,description,type,time_slice_level,pricing_strategy,units", - "GASPRD,Gas produced,sed,season,,PJ", - "GASNAT,Natural gas,sed,season,,PJ", - "ELCTRI,Electricity,sed,daynight,shadow,PJ", - "RSHEAT,Residential heating,svd,daynight,,PJ", - "CO2EMT,CO2 emitted,oth,annual,,ktCO2", - ])], - None, - ), - ), // The simple example with the ironing-out loop turned on ( "simple_ironing_out", diff --git a/src/fixture.rs b/src/fixture.rs index 8923b77d8..b451bf6d1 100644 --- a/src/fixture.rs +++ b/src/fixture.rs @@ -150,7 +150,7 @@ pub fn svd_commodity() -> Commodity { description: String::new(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::DayNight, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -166,7 +166,7 @@ pub fn sed_commodity() -> Commodity { description: "Test SED commodity".into(), kind: CommodityType::SupplyEqualsDemand, time_slice_level: TimeSliceLevel::DayNight, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -182,7 +182,7 @@ pub fn other_commodity() -> Commodity { description: "Test other commodity".into(), kind: CommodityType::Other, time_slice_level: TimeSliceLevel::DayNight, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), diff --git a/src/input/commodity.rs b/src/input/commodity.rs index e3d503fc9..7651e370b 100644 --- a/src/input/commodity.rs +++ b/src/input/commodity.rs @@ -1,16 +1,13 @@ //! Code for reading commodity-related data from CSV files. use super::{input_err_msg, read_csv}; -use crate::ISSUES_URL; use crate::commodity::{ BalanceType, Commodity, CommodityConstraintsMap, CommodityID, CommodityLevyMap, CommodityMap, CommodityType, DemandMap, PricingStrategy, }; -use crate::model::{ALLOW_DANGEROUS_OPTION_NAME, dangerous_model_options_enabled}; use crate::region::RegionID; use crate::time_slice::{TimeSliceInfo, TimeSliceLevel}; use anyhow::{Context, Ok, Result, ensure}; use indexmap::{IndexMap, IndexSet}; -use log::warn; use serde::Deserialize; use std::path::Path; @@ -181,20 +178,6 @@ fn validate_commodity(commodity: &Commodity) -> Result<()> { } } - // Gatekeep scarcity-adjusted pricing option - if commodity.pricing_strategy == PricingStrategy::ScarcityAdjusted { - ensure!( - dangerous_model_options_enabled(), - "The 'scarcity' pricing strategy is currently experimental. \ - To run anyway, set the {ALLOW_DANGEROUS_OPTION_NAME} option to true." - ); - warn!( - "The pricing strategy for {} is set to 'scarcity'. Commodity prices may be \ - incorrect if assets have more than one output commodity. See: {ISSUES_URL}/677", - commodity.id - ); - } - // check that units are provided ensure!( !commodity.units.trim().is_empty(), @@ -228,7 +211,10 @@ mod tests { #[test] fn validate_commodity_works() { - let commodity = make_commodity(CommodityType::SupplyEqualsDemand, PricingStrategy::Shadow); + let commodity = make_commodity( + CommodityType::SupplyEqualsDemand, + PricingStrategy::FullCostAverage, + ); validate_commodity(&commodity).unwrap(); } diff --git a/src/input/process/flow.rs b/src/input/process/flow.rs index 6248039ed..a33427668 100644 --- a/src/input/process/flow.rs +++ b/src/input/process/flow.rs @@ -442,7 +442,7 @@ mod tests { description: "Test SED commodity (PJ)".into(), kind: CommodityType::SupplyEqualsDemand, time_slice_level: TimeSliceLevel::DayNight, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -458,7 +458,7 @@ mod tests { description: "Test SED commodity (tonnes)".into(), kind: CommodityType::SupplyEqualsDemand, time_slice_level: TimeSliceLevel::DayNight, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), diff --git a/src/process.rs b/src/process.rs index d592ad95d..860d209f7 100644 --- a/src/process.rs +++ b/src/process.rs @@ -642,7 +642,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod, levies_cons, demand: DemandMap::new(), @@ -664,7 +664,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: levies, demand: DemandMap::new(), @@ -686,7 +686,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: levies, levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -710,7 +710,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod, levies_cons, demand: DemandMap::new(), @@ -726,7 +726,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -743,7 +743,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -767,7 +767,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: levies, levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -791,7 +791,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: levies, levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), @@ -1060,7 +1060,7 @@ mod tests { description: "Test commodity".into(), kind: CommodityType::ServiceDemand, time_slice_level: TimeSliceLevel::Annual, - pricing_strategy: PricingStrategy::Shadow, + pricing_strategy: PricingStrategy::FullCostAverage, levies_prod: CommodityLevyMap::new(), levies_cons: CommodityLevyMap::new(), demand: DemandMap::new(), diff --git a/src/simulation.rs b/src/simulation.rs index cf10aba07..3900c75a7 100644 --- a/src/simulation.rs +++ b/src/simulation.rs @@ -29,6 +29,7 @@ pub use prices::PriceMap; /// * `model` - The model to run /// * `output_path` - The folder to which output files will be written /// * `debug_model` - Whether to write additional information (e.g. duals) to output files +#[allow(clippy::too_many_lines)] pub fn run(model: &Model, output_path: &Path, debug_model: bool) -> Result<()> { let mut writer = DataWriter::create(output_path, &model.model_path, debug_model)?; let mut user_assets = model.user_assets.clone(); @@ -57,8 +58,15 @@ pub fn run(model: &Model, output_path: &Path, debug_model: bool) -> Result<()> { // Run dispatch optimisation info!("Running dispatch optimisation..."); - let (mut prices, flow_map) = - run_dispatch_for_year(model, &asset_pool, &candidates, year, &mut writer)?; + // There are no previous prices in the base year, so cyclic markets are seeded with zero + let (mut prices, flow_map) = run_dispatch_for_year( + model, + &asset_pool, + &candidates, + &Prices::default(), + year, + &mut writer, + )?; // Write results of dispatch optimisation to file writer.write_flows(year, &flow_map)?; @@ -98,8 +106,14 @@ pub fn run(model: &Model, output_path: &Path, debug_model: bool) -> Result<()> { // Run dispatch optimisation to get updated prices for the next iteration info!("Running dispatch optimisation..."); - let (new_prices, ..) = - run_dispatch_for_year(model, &selected_assets, &candidates, year, &mut writer)?; + let (new_prices, ..) = run_dispatch_for_year( + model, + &selected_assets, + &candidates, + &prices, + year, + &mut writer, + )?; // Check if prices have converged using time slice-weighted averages let prices_stable = prices.market.within_tolerance_weighted( @@ -154,7 +168,7 @@ pub fn run(model: &Model, output_path: &Path, debug_model: bool) -> Result<()> { // Run dispatch optimisation info!("Running final dispatch optimisation for year {year}..."); let (new_prices, flow_map) = - run_dispatch_for_year(model, &asset_pool, &candidates, year, &mut writer)?; + run_dispatch_for_year(model, &asset_pool, &candidates, &prices, year, &mut writer)?; // Write results of dispatch optimisation to file writer.write_flows(year, &flow_map)?; @@ -175,12 +189,16 @@ pub fn run(model: &Model, output_path: &Path, debug_model: bool) -> Result<()> { /// from a run with both existing and candidate assets. If either flows or prices cannot be /// calculated, empty maps are returned. /// +/// `previous_prices` (from the previous year or ironing-out iteration) are used to seed price +/// calculations for cyclic markets. +/// /// Fully mothballed assets or mothballed tranches thereof are excluded. #[context_manager::wrap(DispatchTimer)] fn run_dispatch_for_year( model: &Model, assets: &[AssetRef], candidates: &[AssetRef], + previous_prices: &Prices, year: u32, writer: &mut DataWriter, ) -> Result<(Prices, FlowMap)> { @@ -221,17 +239,28 @@ fn run_dispatch_for_year( solution_with_candidates.as_ref(), ) { (None, None) => Prices::default(), - (Some(existing), None) => { - calculate_prices_from_solutions(model, existing, existing, candidates, year)? - } - (Some(existing), Some(with_candidates)) => { - calculate_prices_from_solutions(model, existing, with_candidates, candidates, year)? - } + (Some(existing), None) => calculate_prices_from_solutions( + model, + existing, + existing, + candidates, + previous_prices, + year, + )?, + (Some(existing), Some(with_candidates)) => calculate_prices_from_solutions( + model, + existing, + with_candidates, + candidates, + previous_prices, + year, + )?, (None, Some(with_candidates)) => calculate_prices_from_solutions( model, with_candidates, with_candidates, candidates, + previous_prices, year, )?, }; diff --git a/src/simulation/activity.rs b/src/simulation/activity.rs index 6be5236ae..6e5be01f2 100644 --- a/src/simulation/activity.rs +++ b/src/simulation/activity.rs @@ -2,15 +2,12 @@ use crate::asset::AssetRef; use crate::commodity::CommodityID; use crate::time_slice::TimeSliceID; -use crate::units::{Activity, Flow, MoneyPerActivity}; +use crate::units::{Activity, Flow}; use indexmap::IndexMap; /// A map of asset activities in each time slice pub type ActivityMap = IndexMap<(AssetRef, TimeSliceID), Activity>; -/// A map of the dual values of asset activity constraints in each time slice -pub type ActivityDualMap = IndexMap<(AssetRef, TimeSliceID), MoneyPerActivity>; - /// A map of commodity flows for assets in each time slice pub type FlowMap = IndexMap<(AssetRef, CommodityID, TimeSliceID), Flow>; diff --git a/src/simulation/optimisation.rs b/src/simulation/optimisation.rs index 6548b9707..38d3d56db 100644 --- a/src/simulation/optimisation.rs +++ b/src/simulation/optimisation.rs @@ -8,7 +8,7 @@ use crate::model::Model; use crate::output::DataWriter; use crate::region::RegionID; use crate::simulation::PriceMap; -use crate::simulation::activity::{ActivityDualMap, ActivityMap, FlowMap, create_flow_map}; +use crate::simulation::activity::{ActivityMap, FlowMap, create_flow_map}; use crate::simulation::investment::AllDemandMap; use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceSelection}; use crate::units::{Activity, Flow, Money, MoneyPerActivity, MoneyPerFlow}; @@ -269,13 +269,6 @@ impl Solution<'_> { }) } - /// Dual values for activity constraints, as an [`ActivityDualMap`] - pub fn activity_dual_map(&self) -> ActivityDualMap { - self.iter_activity_duals() - .map(|(asset, time_slice, dual)| ((asset.clone(), time_slice.clone()), dual)) - .collect() - } - /// Keys and values for column duals. pub fn iter_column_duals( &self, diff --git a/src/simulation/prices.rs b/src/simulation/prices.rs index f556e1e1c..0bed7fbde 100644 --- a/src/simulation/prices.rs +++ b/src/simulation/prices.rs @@ -5,11 +5,11 @@ use crate::asset::AssetRef; use crate::commodity::{CommodityID, CommodityMap, CommodityType, PricingStrategy}; use crate::model::Model; use crate::region::RegionID; -use crate::simulation::activity::{ActivityDualMap, ActivityMap}; +use crate::simulation::activity::ActivityMap; use crate::simulation::market::MarketSet; use crate::simulation::optimisation::Solution; use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceSelection}; -use crate::units::{Activity, Dimensionless, Flow, MoneyPerActivity, MoneyPerFlow, UnitType, Year}; +use crate::units::{Activity, Dimensionless, Flow, MoneyPerFlow, UnitType, Year}; use anyhow::Result; use indexmap::IndexMap; use itertools::iproduct; @@ -66,8 +66,8 @@ pub struct Prices { /// Calculate commodity prices from the solutions to dispatch optimisations. /// -/// This extracts the activities of existing assets from `solution_without_candidates` and the dual -/// values from `solution_with_candidates`, then calls [`calculate_prices`]. +/// This extracts the activities of existing assets from `solution_without_candidates` and the +/// shadow prices from `solution_with_candidates`, then calls [`calculate_prices`]. /// /// # Arguments /// @@ -75,24 +75,29 @@ pub struct Prices { /// * `solution_without_candidates` - Solution to dispatch optimisation without candidates /// * `solution_with_candidates` - Solution to dispatch optimisation with candidates /// * `candidates` - The candidate assets included in `solution_with_candidates`, if any +/// * `previous_prices` - Prices from the previous year or ironing-out iteration, used to seed +/// price calculations for cyclic markets /// * `year` - The year for which prices are being calculated pub fn calculate_prices_from_solutions( model: &Model, solution_without_candidates: &Solution, solution_with_candidates: &Solution, candidates: &[AssetRef], + previous_prices: &Prices, year: u32, ) -> Result { - // Shadow prices come from the solution _with_ candidates, so that we can get them for - // commodities not produced/consumed by any existing assets. - calculate_prices( + let mut prices = calculate_prices( model, &solution_without_candidates.activity_map_for_existing(), candidates, - PriceMap::from_iter(solution_with_candidates.iter_commodity_balance_duals()), - &solution_with_candidates.activity_dual_map(), + previous_prices, year, - ) + )?; + + // Shadow prices come from the solution _with_ candidates, so that we can get them for + // commodities not produced/consumed by any existing assets. + prices.shadow = PriceMap::from_iter(solution_with_candidates.iter_commodity_balance_duals()); + Ok(prices) } /// Calculate commodity prices. @@ -105,22 +110,18 @@ pub fn calculate_prices_from_solutions( /// * `model` - The model /// * `activity` - Activity of existing assets in each time slice /// * `candidates` - Candidate assets -/// * `shadow_prices` - Shadow prices for all SED/SVD commodities. These should be derived from a -/// dispatch that includes candidates, so that commodities not produced/consumed by any existing -/// assets get prices. -/// * `activity_duals` - Dual values of the activity constraints for assets (only used for -/// scarcity-adjusted pricing) +/// * `previous_prices` - Prices from the previous year or ironing-out iteration. These are used to +/// seed the prices of markets in cycles; markets with no previous price are seeded with zero. /// * `year` - The year for which prices are being calculated /// /// # Returns /// -/// Market prices for commodities as well as shadow prices. +/// Market prices and fallback prices. The `shadow` prices are left empty. pub fn calculate_prices( model: &Model, activity: &ActivityMap, candidates: &[AssetRef], - shadow_prices: PriceMap, - activity_duals: &ActivityDualMap, + previous_prices: &Prices, year: u32, ) -> Result { // Set up empty market prices map @@ -139,9 +140,8 @@ pub fn calculate_prices( model, activity, candidates, - activity_duals, year, - &shadow_prices, + &previous_prices.market, &mut annual_activities, &mut market_prices, None, @@ -152,9 +152,8 @@ pub fn calculate_prices( model, activity, candidates, - activity_duals, year, - &shadow_prices, + &previous_prices.fallback, &mut annual_activities, &mut fallback_prices, Some(model.parameters.fallback_pricing_strategy), @@ -164,21 +163,23 @@ pub fn calculate_prices( Ok(Prices { market: market_prices, - shadow: shadow_prices, + shadow: PriceMap::default(), fallback: fallback_prices, }) } /// Calculate prices for the markets in an market set, updating `market_prices`. +/// +/// `previous_prices` is the previous set of prices for the same strategy as `market_prices` +/// (market or fallback), used to seed markets in cycles. #[allow(clippy::too_many_arguments)] fn price_market_set( market_set: &MarketSet, model: &Model, activity: &ActivityMap, candidates: &[AssetRef], - activity_duals: &ActivityDualMap, year: u32, - shadow_prices: &PriceMap, + previous_prices: &PriceMap, annual_activities: &mut Option>, market_prices: &mut PriceMap, strategy_override: Option, @@ -189,10 +190,8 @@ fn price_market_set( model, activity, candidates, - activity_duals, year, std::slice::from_ref(market), - shadow_prices, annual_activities, market_prices, strategy_override, @@ -203,10 +202,9 @@ fn price_market_set( model, activity, candidates, - activity_duals, year, markets, - shadow_prices, + previous_prices, annual_activities, market_prices, strategy_override, @@ -219,9 +217,8 @@ fn price_market_set( model, activity, candidates, - activity_duals, year, - shadow_prices, + previous_prices, annual_activities, market_prices, strategy_override, @@ -241,10 +238,8 @@ fn price_market_set( /// * `model` - The model /// * `activity` - Activity of existing assets in each time slice /// * `candidates` - Candidate assets -/// * `activity_duals` - Dual values of the activity constraints for assets /// * `year` - The year for which prices are being calculated /// * `markets` - The markets to calculate prices for -/// * `shadow_prices` - Shadow prices for all commodities /// * `annual_activities` - Optional map of annual activities for all assets, used for full cost /// pricing. If not provided, it will be calculated on demand if at least one market uses full /// cost pricing. @@ -255,10 +250,8 @@ fn price_markets( model: &Model, activity: &ActivityMap, candidates: &[AssetRef], - activity_duals: &ActivityDualMap, year: u32, markets: &[(CommodityID, RegionID)], - shadow_prices: &PriceMap, annual_activities: &mut Option>, market_prices: &mut PriceMap, strategy_override: Option, @@ -295,29 +288,6 @@ fn price_markets( .insert((commodity_id.clone(), region_id.clone())); } - // Add prices for shadow-priced commodities - if let Some(shadow_set) = pricing_sets.get(&PricingStrategy::Shadow) { - for (commodity_id, region_id) in shadow_set { - for time_slice in model.time_slice_info.iter_ids() { - if let Some(shadow_price) = shadow_prices.get(commodity_id, region_id, time_slice) { - market_prices.insert(commodity_id, region_id, time_slice, shadow_price); - } - } - } - } - - // Add prices for scarcity-adjusted commodities - if let Some(scarcity_set) = pricing_sets.get(&PricingStrategy::ScarcityAdjusted) { - add_scarcity_adjusted_prices( - activity_duals - .iter() - .map(|((asset, time_slice), dual)| (asset, time_slice, *dual)), - shadow_prices, - market_prices, - scarcity_set, - ); - } - // Add prices for marginal cost commodities if let Some(marginal_set) = pricing_sets.get(&PricingStrategy::MarginalCost) { add_marginal_cost_prices( @@ -388,20 +358,20 @@ fn price_cycle( model: &Model, activity: &ActivityMap, candidates: &[AssetRef], - activity_duals: &ActivityDualMap, year: u32, markets: &[(CommodityID, RegionID)], - shadow_prices: &PriceMap, + previous_prices: &PriceMap, annual_activities: &mut Option>, market_prices: &mut PriceMap, strategy_override: Option, ) { - // Seed the markets with shadow prices + // Seed the markets with the previous prices, or zero if there are none for (commodity_id, region_id) in markets { for time_slice in model.time_slice_info.iter_ids() { - if let Some(shadow_price) = shadow_prices.get(commodity_id, region_id, time_slice) { - market_prices.insert(commodity_id, region_id, time_slice, shadow_price); - } + let seed = previous_prices + .get(commodity_id, region_id, time_slice) + .unwrap_or(MoneyPerFlow(0.0)); + market_prices.insert(commodity_id, region_id, time_slice, seed); } } @@ -413,10 +383,8 @@ fn price_cycle( model, activity, candidates, - activity_duals, year, std::slice::from_ref(market), - shadow_prices, annual_activities, market_prices, strategy_override, @@ -578,60 +546,6 @@ impl IntoIterator for PriceMap { } } -/// Calculate scarcity-adjusted prices for a set of commodities and add to an existing prices map. -/// -/// # Arguments -/// -/// * `activity_duals` - Iterator over activity duals from optimisation solution -/// * `shadow_prices` - Shadow prices for all commodities -/// * `market_prices` - Existing prices map to extend with scarcity-adjusted prices -/// * `markets_to_price` - Set of markets to calculate scarcity-adjusted prices for -fn add_scarcity_adjusted_prices<'a, I>( - activity_duals: I, - shadow_prices: &PriceMap, - market_prices: &mut PriceMap, - markets_to_price: &HashSet<(CommodityID, RegionID)>, -) where - I: Iterator, -{ - // Calculate highest activity dual for each commodity/region/time slice - let mut highest_duals = IndexMap::new(); - for (asset, time_slice, dual) in activity_duals { - let region_id = asset.region_id(); - - // Iterate over the output flows of this asset - // Only consider flows for commodities we are pricing - for flow in asset.iter_output_flows().filter(|flow| { - markets_to_price.contains(&(flow.commodity.id.clone(), region_id.clone())) - }) { - // Update the highest dual for this commodity/time slice - highest_duals - .entry(( - flow.commodity.id.clone(), - region_id.clone(), - time_slice.clone(), - )) - .and_modify(|current_dual| { - if dual > *current_dual { - *current_dual = dual; - } - }) - .or_insert(dual); - } - } - - // Add this to the shadow price for each commodity/region/time slice and insert into the map - for ((commodity, region, time_slice), highest_dual) in &highest_duals { - // There should always be a shadow price for commodities we are considering here, so it - // should be safe to unwrap - let shadow_price = shadow_prices.get(commodity, region, time_slice).unwrap(); - // highest_dual is in units of MoneyPerActivity, and shadow_price is in MoneyPerFlow, but - // this is correct according to Adam - let scarcity_price = shadow_price + MoneyPerFlow(highest_dual.value()); - market_prices.insert(commodity, region, time_slice, scarcity_price); - } -} - /// Calculate marginal cost prices for a set of commodities and add to an existing prices map. /// /// This pricing strategy aims to incorporate the marginal cost of commodity production into the price. @@ -1385,14 +1299,18 @@ fn add_full_cost_average_prices<'a, I, J>( #[cfg(test)] mod tests { use super::*; + use crate::agent::AgentMap; use crate::asset::Asset; use crate::asset::AssetRef; use crate::commodity::{Commodity, CommodityID, CommodityMap}; use crate::fixture::{ commodity_id, other_commodity, region_id, sed_commodity, time_slice, time_slice_info, }; + use crate::model::ModelParameters; + use crate::process::ProcessMap; use crate::process::{ActivityLimits, FlowType, Process, ProcessFlow, ProcessParameter}; use crate::region::RegionID; + use crate::region::RegionMap; use crate::time_slice::TimeSliceID; use crate::units::ActivityPerCapacity; use crate::units::{ @@ -1403,6 +1321,7 @@ mod tests { use indexmap::{IndexMap, IndexSet}; use rstest::rstest; use std::collections::{HashMap, HashSet}; + use std::path::PathBuf; use std::sync::Arc; fn build_process_flow(commodity: &Commodity, coeff: f64, cost: MoneyPerFlow) -> ProcessFlow { @@ -1703,4 +1622,55 @@ mod tests { let accum = WeightedAverageAccumulator::::default(); assert_eq!(accum.finalise(), None); } + + #[rstest] + #[case(Some(MoneyPerFlow(3.0)), MoneyPerFlow(3.0))] + #[case(None, MoneyPerFlow(0.0))] + fn price_cycle_seeds_from_previous_prices( + commodity_id: CommodityID, + sed_commodity: Commodity, + region_id: RegionID, + time_slice: TimeSliceID, + time_slice_info: TimeSliceInfo, + #[case] previous_price: Option, + #[case] expected: MoneyPerFlow, + ) { + // With no assets, nothing overwrites the seed + let commodities: CommodityMap = [(commodity_id.clone(), Arc::new(sed_commodity))] + .into_iter() + .collect(); + let model = Model { + model_path: PathBuf::default(), + parameters: ModelParameters::default(), + agents: AgentMap::default(), + commodities, + processes: ProcessMap::default(), + time_slice_info, + regions: RegionMap::default(), + user_assets: Vec::new(), + investment_order: HashMap::new(), + }; + let mut previous = PriceMap::default(); + if let Some(price) = previous_price { + previous.insert(&commodity_id, ®ion_id, &time_slice, price); + } + + let mut market_prices = PriceMap::default(); + price_cycle( + &model, + &ActivityMap::default(), + &[], + 2020, + &[(commodity_id.clone(), region_id.clone())], + &previous, + &mut None, + &mut market_prices, + None, + ); + + let price = market_prices + .get(&commodity_id, ®ion_id, &time_slice) + .unwrap(); + assert_approx_eq!(MoneyPerFlow, price, expected); + } } diff --git a/tests/data/simple_shadow/asset_capacities.csv b/tests/data/simple_shadow/asset_capacities.csv deleted file mode 100644 index 71a2f3119..000000000 --- a/tests/data/simple_shadow/asset_capacities.csv +++ /dev/null @@ -1,21 +0,0 @@ -milestone_year,asset_id,capacity,num_tranches,mothballed_capacity,mothballed_tranches -2020,0,4002.26,,0.0, -2020,1,3782.13,,0.0, -2020,2,3.964844,,0.0, -2020,3,2.43,,0.0, -2020,4,2900.0,,0.0, -2020,5,399.98,,0.0, -2030,0,1897.4214205283952,,0.0, -2030,1,1807.0680195508528,,0.0, -2030,2,3.964844,,0.0, -2030,3,0.3248593189860096,,0.0, -2030,4,2900.0,,0.0, -2030,5,399.98,,0.0, -2030,6,355.83840587648046,,0.0, -2030,7,4.520911454047764,,0.0, -2040,0,1897.4214205283952,,0.0, -2040,1,1807.0680195508528,,0.0, -2040,6,355.83840587648046,,0.0, -2040,8,3655.8189696,,0.0, -2040,9,679.7717018943207,,0.0, -2040,10,713.7602869890369,,0.0, diff --git a/tests/data/simple_shadow/assets.csv b/tests/data/simple_shadow/assets.csv deleted file mode 100644 index 2da4b631c..000000000 --- a/tests/data/simple_shadow/assets.csv +++ /dev/null @@ -1,12 +0,0 @@ -asset_id,process_id,region_id,agent_id,commission_year -0,GASDRV,GBR,A0_GEX,2020 -1,GASPRC,GBR,A0_GPR,2020 -2,WNDFRM,GBR,A0_ELC,2020 -3,GASCGT,GBR,A0_ELC,2020 -4,RGASBR,GBR,A0_RES,2020 -5,RELCHP,GBR,A0_RES,2020 -6,RGASBR,GBR,A0_RES,2030 -7,WNDFRM,GBR,A0_ELC,2030 -8,RGASBR,GBR,A0_RES,2040 -9,GASPRC,GBR,A0_GPR,2040 -10,GASDRV,GBR,A0_GEX,2040 diff --git a/tests/data/simple_shadow/commodity_flows.csv b/tests/data/simple_shadow/commodity_flows.csv deleted file mode 100644 index 74dbea18b..000000000 --- a/tests/data/simple_shadow/commodity_flows.csv +++ /dev/null @@ -1,769 +0,0 @@ -milestone_year,asset_id,commodity_id,time_slice,flow -2020,0,GASPRD,winter.night,129.1893930049388 -2020,0,CO2EMT,winter.night,660.5453664342522 -2020,0,GASPRD,winter.day,184.55627546823544 -2020,0,CO2EMT,winter.day,943.6362364690879 -2020,0,GASPRD,winter.peak,55.3668824632966 -2020,0,CO2EMT,winter.peak,283.0908700348355 -2020,0,GASPRD,winter.evening,73.8225105416422 -2020,0,CO2EMT,winter.evening,377.4544963994166 -2020,0,GASPRD,peak.night,65.75235928881611 -2020,0,CO2EMT,peak.night,336.1918130437168 -2020,0,GASPRD,peak.day,93.93194171234494 -2020,0,CO2EMT,peak.day,480.2740179752197 -2020,0,GASPRD,peak.peak,28.179582423528814 -2020,0,CO2EMT,peak.peak,144.08220493150284 -2020,0,GASPRD,peak.evening,37.572776865287295 -2020,0,CO2EMT,peak.evening,192.10960811221395 -2020,0,GASPRD,summer.night,0.049180730683069954 -2020,0,CO2EMT,summer.night,0.2514610759825367 -2020,0,GASPRD,summer.day,0.07025818659374586 -2020,0,CO2EMT,summer.day,0.3592301080538226 -2020,0,GASPRD,summer.peak,0.021077455910675894 -2020,0,CO2EMT,summer.peak,0.10776903207128585 -2020,0,GASPRD,summer.evening,0.028103274772394056 -2020,0,CO2EMT,summer.evening,0.14369204391125082 -2020,0,GASPRD,autumn.night,47.65492160507282 -2020,0,CO2EMT,autumn.night,243.65961416673736 -2020,0,GASPRD,autumn.day,68.07845934245358 -2020,0,CO2EMT,autumn.day,348.0851626179652 -2020,0,GASPRD,autumn.peak,20.42353773738075 -2020,0,CO2EMT,autumn.peak,104.4255484512278 -2020,0,GASPRD,autumn.evening,27.23138386769207 -2020,0,CO2EMT,autumn.evening,139.23406571550956 -2020,1,GASPRD,winter.night,-129.18939300493878 -2020,1,GASNAT,winter.night,123.03751714756075 -2020,1,CO2EMT,winter.night,314.54541258773907 -2020,1,GASPRD,winter.day,-184.55627546823538 -2020,1,GASNAT,winter.day,175.76788139831942 -2020,1,CO2EMT,winter.day,449.3505887948036 -2020,1,GASPRD,winter.peak,-55.36688246329659 -2020,1,GASNAT,winter.peak,52.730364250758655 -2020,1,CO2EMT,winter.peak,134.8051762070645 -2020,1,GASPRD,winter.evening,-73.8225105416422 -2020,1,GASNAT,winter.evening,70.3071528968021 -2020,1,CO2EMT,winter.evening,179.74023638067456 -2020,1,GASPRD,peak.night,-65.7523592888161 -2020,1,GASNAT,peak.night,62.62129456077724 -2020,1,CO2EMT,peak.night,160.09133954462703 -2020,1,GASPRD,peak.day,-93.93194171234494 -2020,1,GASNAT,peak.day,89.45899210699517 -2020,1,CO2EMT,peak.day,228.70191332153317 -2020,1,GASPRD,peak.peak,-28.17958242352881 -2020,1,GASNAT,peak.peak,26.837697546217914 -2020,1,CO2EMT,peak.peak,68.61057377690611 -2020,1,GASPRD,peak.evening,-37.572776865287295 -2020,1,GASNAT,peak.evening,35.78359701455933 -2020,1,CO2EMT,peak.evening,91.48076576772092 -2020,1,GASPRD,summer.night,-0.04918073068306996 -2020,1,GASNAT,summer.night,0.046838791126733295 -2020,1,CO2EMT,summer.night,0.11974336951549368 -2020,1,GASPRD,summer.day,-0.07025818659374586 -2020,1,GASNAT,summer.day,0.06691255866071034 -2020,1,CO2EMT,summer.day,0.171061956216106 -2020,1,GASPRD,summer.peak,-0.021077455910675898 -2020,1,GASNAT,summer.peak,0.020073767533977046 -2020,1,CO2EMT,summer.peak,0.051318586700612324 -2020,1,GASPRD,summer.evening,-0.028103274772394063 -2020,1,GASNAT,summer.evening,0.02676502359275625 -2020,1,CO2EMT,summer.evening,0.06842478281488136 -2020,1,GASPRD,autumn.night,-47.65492160507282 -2020,1,GASNAT,autumn.night,45.38563962387887 -2020,1,CO2EMT,autumn.night,116.02838769844635 -2020,1,GASPRD,autumn.day,-68.07845934245358 -2020,1,GASNAT,autumn.day,64.83662794519388 -2020,1,CO2EMT,autumn.day,165.7548393418882 -2020,1,GASPRD,autumn.peak,-20.423537737380748 -2020,1,GASNAT,autumn.peak,19.450988321315 -2020,1,CO2EMT,autumn.peak,49.7264516434418 -2020,1,GASPRD,autumn.evening,-27.231383867692067 -2020,1,GASNAT,autumn.evening,25.93465130256387 -2020,1,CO2EMT,autumn.evening,66.30193605500455 -2020,2,ELCTRI,winter.night,4.435312795545212 -2020,2,ELCTRI,winter.day,7.075379933645912 -2020,2,ELCTRI,winter.peak,1.9712501261051125 -2020,2,ELCTRI,winter.evening,2.5696653598405335 -2020,2,ELCTRI,peak.night,2.851272517283696 -2020,2,ELCTRI,peak.day,6.3713620320039785 -2020,2,ELCTRI,peak.peak,1.7776452018191917 -2020,2,ELCTRI,peak.evening,1.72484387381507 -2020,2,ELCTRI,summer.night,1.6368416242136155 -2020,2,ELCTRI,summer.day,2.9055524196533997 -2020,2,ELCTRI,summer.peak,0.9567924409494001 -2020,2,ELCTRI,summer.evening,0.7124084843502 -2020,2,ELCTRI,autumn.night,3.203281465982185 -2020,2,ELCTRI,autumn.day,6.001752635595889 -2020,2,ELCTRI,autumn.peak,1.5488393825638174 -2020,2,ELCTRI,autumn.evening,1.9008483513729915 -2020,3,GASNAT,winter.night,-7.783808997678886 -2020,3,ELCTRI,winter.night,5.18920599845259 -2020,3,CO2EMT,winter.night,397.98615405132136 -2020,3,GASNAT,winter.day,-10.010898915527836 -2020,3,ELCTRI,winter.day,6.673932610351891 -2020,3,CO2EMT,winter.day,511.8572615509382 -2020,3,GASNAT,winter.peak,-3.2303154358423316 -2020,3,ELCTRI,winter.peak,2.1535436238948877 -2020,3,CO2EMT,winter.peak,165.1660282346184 -2020,3,GASNAT,winter.evening,-4.3950895262359 -2020,3,ELCTRI,winter.evening,2.930059684157267 -2020,3,CO2EMT,winter.evening,224.72092747644155 -2020,3,GASNAT,peak.night,-8.382740663321101 -2020,3,ELCTRI,peak.night,5.5884937755474 -2020,3,CO2EMT,peak.night,428.6095301156078 -2020,3,GASNAT,peak.day,-11.066925767990735 -2020,3,ELCTRI,peak.day,7.377950511993824 -2020,3,CO2EMT,peak.day,565.8519145173663 -2020,3,GASNAT,peak.peak,-3.520722822271213 -2020,3,ELCTRI,peak.peak,2.3471485481808085 -2020,3,CO2EMT,peak.peak,180.0145579027271 -2020,3,GASNAT,peak.evening,-4.790137538321099 -2020,3,ELCTRI,peak.evening,3.1934250255473997 -2020,3,CO2EMT,peak.evening,244.9197323343578 -2020,3,GASNAT,summer.night,-0.16059014091417692 -2020,3,ELCTRI,summer.night,0.10706009394278461 -2020,3,CO2EMT,summer.night,8.210973904941865 -2020,3,GASNAT,summer.day,-0.0 -2020,3,ELCTRI,summer.day,0.0 -2020,3,CO2EMT,summer.day,0.0 -2020,3,GASNAT,summer.peak,-0.0 -2020,3,ELCTRI,summer.peak,0.0 -2020,3,CO2EMT,summer.peak,0.0 -2020,3,GASNAT,summer.evening,-0.0 -2020,3,ELCTRI,summer.evening,0.0 -2020,3,CO2EMT,summer.evening,0.0 -2020,3,GASNAT,autumn.night,-8.382740663321101 -2020,3,ELCTRI,autumn.night,5.5884937755474 -2020,3,CO2EMT,autumn.night,428.6095301156078 -2020,3,GASNAT,autumn.day,-11.62133986260287 -2020,3,ELCTRI,autumn.day,7.7475599084019136 -2020,3,CO2EMT,autumn.day,594.1991071748847 -2020,3,GASNAT,autumn.peak,-3.592603125 -2020,3,ELCTRI,autumn.peak,2.39506875 -2020,3,CO2EMT,autumn.peak,183.68979778124998 -2020,3,GASNAT,autumn.evening,-4.790137538321099 -2020,3,ELCTRI,autumn.evening,3.1934250255473997 -2020,3,CO2EMT,autumn.evening,244.9197323343578 -2020,4,GASNAT,winter.night,-36.31286857370999 -2020,4,RSHEAT,winter.night,31.576407455399995 -2020,4,CO2EMT,winter.night,1856.6769701737921 -2020,4,GASNAT,winter.day,-193.26973453857997 -2020,4,RSHEAT,winter.day,168.06063872919998 -2020,4,CO2EMT,winter.day,9881.881526957595 -2020,4,GASNAT,winter.peak,-104.21872974118598 -2020,4,RSHEAT,winter.peak,90.62498238363999 -2020,4,CO2EMT,winter.peak,5328.7036516668395 -2020,4,GASNAT,winter.evening,-62.62146996467999 -2020,4,RSHEAT,winter.evening,54.453452143199996 -2020,4,CO2EMT,winter.evening,3201.8357592940883 -2020,4,GASNAT,peak.night,-19.522272516985236 -2020,4,RSHEAT,peak.night,16.975889145204555 -2020,4,CO2EMT,peak.night,998.1737937934553 -2020,4,GASNAT,peak.day,-82.18418839575197 -2020,4,RSHEAT,peak.day,71.46451164847998 -2020,4,CO2EMT,peak.day,4202.077552674799 -2020,4,GASNAT,peak.peak,-58.291277616306004 -2020,4,RSHEAT,peak.peak,50.688067492440005 -2020,4,CO2EMT,peak.peak,2980.433024521726 -2020,4,GASNAT,peak.evening,-26.943315907602273 -2020,4,RSHEAT,peak.evening,23.42897035443676 -2020,4,CO2EMT,peak.evening,1377.6117423557043 -2020,4,GASNAT,summer.night,-0.0 -2020,4,RSHEAT,summer.night,0.0 -2020,4,CO2EMT,summer.night,0.0 -2020,4,GASNAT,summer.day,-0.0 -2020,4,RSHEAT,summer.day,0.0 -2020,4,CO2EMT,summer.day,0.0 -2020,4,GASNAT,summer.peak,-0.0 -2020,4,RSHEAT,summer.peak,0.0 -2020,4,CO2EMT,summer.peak,0.0 -2020,4,GASNAT,summer.evening,-0.0 -2020,4,RSHEAT,summer.evening,0.0 -2020,4,CO2EMT,summer.evening,0.0 -2020,4,GASNAT,autumn.night,-9.108961229673207 -2020,4,RSHEAT,autumn.night,7.920835851889746 -2020,4,CO2EMT,autumn.night,465.7411876731911 -2020,4,GASNAT,autumn.day,-56.69422338503598 -2020,4,RSHEAT,autumn.day,49.29932468263999 -2020,4,CO2EMT,autumn.day,2898.7756416768902 -2020,4,GASNAT,autumn.peak,-44.38022605095635 -2020,4,RSHEAT,autumn.peak,38.591500913875095 -2020,4,CO2EMT,autumn.peak,2269.160957985399 -2020,4,GASNAT,autumn.evening,-17.037675338040994 -2020,4,RSHEAT,autumn.evening,14.815369859166085 -2020,4,CO2EMT,autumn.evening,871.1363400340363 -2020,5,ELCTRI,winter.night,-9.624518793997803 -2020,5,RSHEAT,winter.night,29.165208466660005 -2020,5,ELCTRI,winter.day,-13.749312543997803 -2020,5,RSHEAT,winter.day,41.664583466660005 -2020,5,ELCTRI,winter.peak,-4.12479375 -2020,5,RSHEAT,winter.peak,12.499375 -2020,5,ELCTRI,winter.evening,-5.499725043997801 -2020,5,RSHEAT,winter.evening,16.66583346666 -2020,5,ELCTRI,peak.night,-8.439766292831097 -2020,5,RSHEAT,peak.night,25.575049372215442 -2020,5,ELCTRI,peak.day,-13.749312543997803 -2020,5,RSHEAT,peak.day,41.664583466660005 -2020,5,ELCTRI,peak.peak,-4.12479375 -2020,5,RSHEAT,peak.peak,12.499375 -2020,5,ELCTRI,peak.evening,-4.91826889936247 -2020,5,RSHEAT,peak.evening,14.903845149583242 -2020,5,ELCTRI,summer.night,-1.7439017181564 -2020,5,RSHEAT,summer.night,5.28455066108 -2020,5,ELCTRI,summer.day,-2.9055524196533997 -2020,5,RSHEAT,summer.day,8.80470430198 -2020,5,ELCTRI,summer.peak,-0.9567924409494001 -2020,5,RSHEAT,summer.peak,2.89937103318 -2020,5,ELCTRI,summer.evening,-0.7124084843502 -2020,5,RSHEAT,summer.evening,2.1588135889399998 -2020,5,ELCTRI,autumn.night,-8.791775241529585 -2020,5,RSHEAT,autumn.night,26.641743156150255 -2020,5,ELCTRI,autumn.day,-13.749312543997803 -2020,5,RSHEAT,autumn.day,41.664583466660005 -2020,5,ELCTRI,autumn.peak,-3.9439081325638172 -2020,5,RSHEAT,autumn.peak,11.9512367653449 -2020,5,ELCTRI,autumn.evening,-5.094273376920391 -2020,5,RSHEAT,autumn.evening,15.437192051273913 -2030,0,GASPRD,winter.night,138.35364587933597 -2030,0,CO2EMT,winter.night,707.4021913810449 -2030,0,GASPRD,winter.day,197.64806527084824 -2030,0,CO2EMT,winter.day,1010.5745577298471 -2030,0,GASPRD,winter.peak,59.29441939151235 -2030,0,CO2EMT,winter.peak,303.17236634880265 -2030,0,GASPRD,winter.evening,79.05922648782361 -2030,0,CO2EMT,winter.evening,404.22982503224216 -2030,0,GASPRD,peak.night,70.30727869933519 -2030,0,CO2EMT,peak.night,359.4811159897008 -2030,0,GASPRD,peak.day,100.43896943273397 -2030,0,CO2EMT,peak.day,513.5444507095689 -2030,0,GASPRD,peak.peak,30.131690733398777 -2030,0,CO2EMT,peak.peak,154.06333471986795 -2030,0,GASPRD,peak.evening,40.17558796593637 -2030,0,CO2EMT,peak.evening,205.4177812698327 -2030,0,GASPRD,summer.night,0.0 -2030,0,CO2EMT,summer.night,0.0 -2030,0,GASPRD,summer.day,0.0 -2030,0,CO2EMT,summer.day,0.0 -2030,0,GASPRD,summer.peak,0.0 -2030,0,CO2EMT,summer.peak,0.0 -2030,0,GASPRD,summer.evening,0.0 -2030,0,CO2EMT,summer.evening,0.0 -2030,0,GASPRD,autumn.night,50.13626882010274 -2030,0,CO2EMT,autumn.night,256.34674247718533 -2030,0,GASPRD,autumn.day,71.6232410733492 -2030,0,CO2EMT,autumn.day,366.2096316080345 -2030,0,GASPRD,autumn.peak,21.486972253246446 -2030,0,CO2EMT,autumn.peak,109.86288913084908 -2030,0,GASPRD,autumn.evening,28.64929656685625 -2030,0,CO2EMT,autumn.evening,146.48385334633602 -2030,1,GASPRD,winter.night,-138.35364587933594 -2030,1,GASNAT,winter.night,131.765377027939 -2030,1,CO2EMT,winter.night,336.8581863719261 -2030,1,GASPRD,winter.day,-197.6480652708483 -2030,1,GASNAT,winter.day,188.23625263890312 -2030,1,CO2EMT,winter.day,481.2259798713559 -2030,1,GASPRD,winter.peak,-59.294419391512335 -2030,1,GASNAT,winter.peak,56.47087561096413 -2030,1,CO2EMT,winter.peak,144.3677934994298 -2030,1,GASPRD,winter.evening,-79.0592264878236 -2030,1,GASNAT,winter.evening,75.29450141697485 -2030,1,CO2EMT,winter.evening,192.49039287249622 -2030,1,GASPRD,peak.night,-70.30727869933519 -2030,1,GASNAT,peak.night,66.95931304698588 -2030,1,CO2EMT,peak.night,171.18148380461943 -2030,1,GASPRD,peak.day,-100.43896943273397 -2030,1,GASNAT,peak.day,95.65616136450853 -2030,1,CO2EMT,peak.day,244.54497652836608 -2030,1,GASPRD,peak.peak,-30.131690733398784 -2030,1,GASNAT,peak.peak,28.69684831752265 -2030,1,CO2EMT,peak.peak,73.36349272374666 -2030,1,GASPRD,peak.evening,-40.1755879659364 -2030,1,GASNAT,peak.evening,38.26246472946324 -2030,1,CO2EMT,peak.evening,97.81799108087279 -2030,1,GASPRD,summer.night,-0.0 -2030,1,GASNAT,summer.night,0.0 -2030,1,CO2EMT,summer.night,0.0 -2030,1,GASPRD,summer.day,-0.0 -2030,1,GASNAT,summer.day,0.0 -2030,1,CO2EMT,summer.day,0.0 -2030,1,GASPRD,summer.peak,-0.0 -2030,1,GASNAT,summer.peak,0.0 -2030,1,CO2EMT,summer.peak,0.0 -2030,1,GASPRD,summer.evening,-0.0 -2030,1,GASNAT,summer.evening,0.0 -2030,1,CO2EMT,summer.evening,0.0 -2030,1,GASPRD,autumn.night,-50.13626882010273 -2030,1,GASNAT,autumn.night,47.748827447716884 -2030,1,CO2EMT,autumn.night,122.06987737008822 -2030,1,GASPRD,autumn.day,-71.62324107334918 -2030,1,GASNAT,autumn.day,68.21261054604683 -2030,1,CO2EMT,autumn.day,174.38553886096875 -2030,1,GASPRD,autumn.peak,-21.486972253246446 -2030,1,GASNAT,autumn.peak,20.463783098329948 -2030,1,CO2EMT,autumn.peak,52.315661490880515 -2030,1,GASPRD,autumn.evening,-28.64929656685629 -2030,1,GASNAT,autumn.evening,27.28504434938694 -2030,1,CO2EMT,autumn.evening,69.75421587920772 -2030,2,ELCTRI,winter.night,4.435312795545212 -2030,2,ELCTRI,winter.day,6.42416336876535 -2030,2,ELCTRI,winter.peak,1.9272490044624078 -2030,2,ELCTRI,winter.evening,2.5696653598405335 -2030,2,ELCTRI,peak.night,2.851272517283696 -2030,2,ELCTRI,peak.day,6.3713620320039785 -2030,2,ELCTRI,peak.peak,1.7776452018191915 -2030,2,ELCTRI,peak.evening,1.72484387381507 -2030,2,ELCTRI,summer.night,0.9026740953570744 -2030,2,ELCTRI,summer.day,1.5039648591526713 -2030,2,ELCTRI,summer.peak,0.49525253750626186 -2030,2,ELCTRI,summer.evening,0.36875511815846956 -2030,2,ELCTRI,autumn.night,3.2032814659821844 -2030,2,ELCTRI,autumn.day,6.001752635595889 -2030,2,ELCTRI,autumn.peak,1.5488393825638174 -2030,2,ELCTRI,autumn.evening,1.9008483513729912 -2030,3,GASNAT,winter.night,-0.19776409162522152 -2030,3,ELCTRI,winter.night,0.1318427277501477 -2030,3,CO2EMT,winter.night,10.111678004797575 -2030,3,GASNAT,winter.day,-0.0 -2030,3,ELCTRI,winter.day,0.0 -2030,3,CO2EMT,winter.day,0.0 -2030,3,GASNAT,winter.peak,-0.0 -2030,3,ELCTRI,winter.peak,0.0 -2030,3,CO2EMT,winter.peak,0.0 -2030,3,GASNAT,winter.evening,-0.0 -2030,3,ELCTRI,winter.evening,0.0 -2030,3,CO2EMT,winter.evening,0.0 -2030,3,GASNAT,peak.night,-1.1206631370875815 -2030,3,ELCTRI,peak.night,0.7471087580583876 -2030,3,CO2EMT,peak.night,57.29950619928803 -2030,3,GASNAT,peak.day,-0.16951205321211232 -2030,3,ELCTRI,peak.day,0.11300803547474156 -2030,3,CO2EMT,peak.day,8.667151280735302 -2030,3,GASNAT,peak.peak,-0.48028419941337813 -2030,3,ELCTRI,peak.peak,0.3201894662755854 -2030,3,CO2EMT,peak.peak,24.556931116006023 -2030,3,GASNAT,peak.evening,-0.6403789376742028 -2030,3,ELCTRI,peak.evening,0.42691929178280186 -2030,3,CO2EMT,peak.evening,32.742575083281984 -2030,3,GASNAT,summer.night,-0.0 -2030,3,ELCTRI,summer.night,0.0 -2030,3,CO2EMT,summer.night,0.0 -2030,3,GASNAT,summer.day,-0.0 -2030,3,ELCTRI,summer.day,0.0 -2030,3,CO2EMT,summer.day,0.0 -2030,3,GASNAT,summer.peak,-0.0 -2030,3,ELCTRI,summer.peak,0.0 -2030,3,CO2EMT,summer.peak,0.0 -2030,3,GASNAT,summer.evening,-0.0 -2030,3,ELCTRI,summer.evening,0.0 -2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-1.1206631370875815 -2030,3,ELCTRI,autumn.night,0.7471087580583876 -2030,3,CO2EMT,autumn.night,57.29950619928803 -2030,3,GASNAT,autumn.day,-1.356096551153489 -2030,3,ELCTRI,autumn.day,0.9040643674356594 -2030,3,CO2EMT,autumn.day,69.33721666047789 -2030,3,GASNAT,autumn.peak,-0.4802841994133785 -2030,3,ELCTRI,autumn.peak,0.3201894662755857 -2030,3,CO2EMT,autumn.peak,24.556931116006044 -2030,3,GASNAT,autumn.evening,-0.6403789376742028 -2030,3,ELCTRI,autumn.evening,0.42691929178280186 -2030,3,CO2EMT,autumn.evening,32.742575083281984 -2030,4,GASNAT,winter.night,-39.05320689404105 -2030,4,RSHEAT,winter.night,33.95931034264439 -2030,4,CO2EMT,winter.night,1996.790468492319 -2030,4,GASNAT,winter.day,-195.3114808657696 -2030,4,RSHEAT,winter.day,169.83607031806054 -2030,4,CO2EMT,winter.day,9986.276016666801 -2030,4,GASNAT,winter.peak,-104.21874999999999 -2030,4,RSHEAT,winter.peak,90.625 -2030,4,CO2EMT,winter.peak,5328.704687500001 -2030,4,GASNAT,winter.evening,-63.63271682130648 -2030,4,RSHEAT,winter.evening,55.33279723591868 -2030,4,CO2EMT,winter.evening,3253.5408110734006 -2030,4,GASNAT,peak.night,-27.02451265838976 -2030,4,RSHEAT,peak.night,23.49957622468675 -2030,4,CO2EMT,peak.night,1381.7633322234685 -2030,4,GASNAT,peak.day,-85.69746422905426 -2030,4,RSHEAT,peak.day,74.51953411222111 -2030,4,CO2EMT,peak.day,4381.711346031545 -2030,4,GASNAT,peak.peak,-58.89969026539048 -2030,4,RSHEAT,peak.peak,51.217121969904774 -2030,4,CO2EMT,peak.peak,3011.541163269416 -2030,4,GASNAT,peak.evening,-30.71498791307493 -2030,4,RSHEAT,peak.evening,26.70868514180429 -2030,4,CO2EMT,peak.evening,1570.4573319955214 -2030,4,GASNAT,summer.night,-0.0 -2030,4,RSHEAT,summer.night,0.0 -2030,4,CO2EMT,summer.night,0.0 -2030,4,GASNAT,summer.day,-0.0 -2030,4,RSHEAT,summer.day,0.0 -2030,4,CO2EMT,summer.day,0.0 -2030,4,GASNAT,summer.peak,-0.0 -2030,4,RSHEAT,summer.peak,0.0 -2030,4,CO2EMT,summer.peak,0.0 -2030,4,GASNAT,summer.evening,-0.0 -2030,4,RSHEAT,summer.evening,0.0 -2030,4,CO2EMT,summer.evening,0.0 -2030,4,GASNAT,autumn.night,-15.621093685627669 -2030,4,RSHEAT,autumn.night,13.583559726632757 -2030,4,CO2EMT,autumn.night,798.7065201461428 -2030,4,GASNAT,autumn.day,-60.54516002953708 -2030,4,RSHEAT,autumn.day,52.647965243075724 -2030,4,CO2EMT,autumn.day,3095.6740323102313 -2030,4,GASNAT,autumn.peak,-46.07093137941947 -2030,4,RSHEAT,autumn.peak,40.06167946036476 -2030,4,CO2EMT,autumn.peak,2355.6067214297177 -2030,4,GASNAT,autumn.evening,-20.376540067197137 -2030,4,RSHEAT,autumn.evening,17.718730493214903 -2030,4,CO2EMT,autumn.evening,1041.8524936357896 -2030,5,ELCTRI,winter.night,-9.624518793997803 -2030,5,RSHEAT,winter.night,29.165208466660005 -2030,5,ELCTRI,winter.day,-13.749312543997803 -2030,5,RSHEAT,winter.day,41.664583466660005 -2030,5,ELCTRI,winter.peak,-4.12479375 -2030,5,RSHEAT,winter.peak,12.499375 -2030,5,ELCTRI,winter.evening,-5.499725043997801 -2030,5,RSHEAT,winter.evening,16.66583346666 -2030,5,ELCTRI,peak.night,-6.8495433846203975 -2030,5,RSHEAT,peak.night,20.756192074607263 -2030,5,ELCTRI,peak.day,-13.749312543997803 -2030,5,RSHEAT,peak.day,41.664583466660005 -2030,5,ELCTRI,peak.peak,-4.12479375 -2030,5,RSHEAT,peak.peak,12.499375 -2030,5,ELCTRI,peak.evening,-4.118515558775173 -2030,5,RSHEAT,peak.evening,12.480350178106585 -2030,5,ELCTRI,summer.night,-1.9319477961564002 -2030,5,RSHEAT,summer.night,5.85438726108 -2030,5,ELCTRI,summer.day,-3.2188600626534005 -2030,5,RSHEAT,summer.day,9.75412140198 -2030,5,ELCTRI,summer.peak,-1.0599640039494003 -2030,5,RSHEAT,summer.peak,3.2120121331800005 -2030,5,ELCTRI,summer.evening,-0.7892279633502001 -2030,5,RSHEAT,summer.evening,2.39159988894 -2030,5,ELCTRI,autumn.night,-7.602930366880435 -2030,5,RSHEAT,autumn.night,23.03918292994071 -2030,5,ELCTRI,autumn.day,-13.749312543997803 -2030,5,RSHEAT,autumn.day,41.664583466660005 -2030,5,ELCTRI,autumn.peak,-3.6350922059634234 -2030,5,RSHEAT,autumn.peak,11.015430927161889 -2030,5,ELCTRI,autumn.evening,-4.495209056772562 -2030,5,RSHEAT,autumn.evening,13.62184562658352 -2030,6,GASNAT,winter.night,-4.791941684668946 -2030,6,RSHEAT,winter.night,4.166905812755606 -2030,6,CO2EMT,winter.night,245.01197833712325 -2030,6,GASNAT,winter.day,-23.9652848278104 -2030,6,RSHEAT,winter.day,20.83937811113948 -2030,6,CO2EMT,winter.day,1225.345013245946 -2030,6,GASNAT,winter.peak,-12.787942711186016 -2030,6,RSHEAT,winter.peak,11.119950183640015 -2030,6,CO2EMT,winter.peak,653.8475108229411 -2030,6,GASNAT,winter.evening,-7.807918798373517 -2030,6,RSHEAT,winter.evening,6.78949460728132 -2030,6,CO2EMT,winter.evening,399.218888160838 -2030,6,GASNAT,peak.night,-3.3159860358448894 -2030,6,RSHEAT,peak.night,2.883466118125991 -2030,6,CO2EMT,peak.night,169.54636601274922 -2030,6,GASNAT,peak.day,-10.515327261697717 -2030,6,RSHEAT,peak.day,9.143762836258885 -2030,6,CO2EMT,peak.day,537.6486828906043 -2030,6,GASNAT,peak.peak,-7.227162720915519 -2030,6,RSHEAT,peak.peak,6.284489322535235 -2030,6,CO2EMT,peak.peak,369.5248299204105 -2030,6,GASNAT,peak.evening,-3.7688180467254995 -2030,6,RSHEAT,peak.evening,3.27723308410913 -2030,6,CO2EMT,peak.evening,192.6996667290748 -2030,6,GASNAT,summer.night,0.0 -2030,6,RSHEAT,summer.night,-0.0 -2030,6,CO2EMT,summer.night,-0.0 -2030,6,GASNAT,summer.day,0.0 -2030,6,RSHEAT,summer.day,-0.0 -2030,6,CO2EMT,summer.day,-0.0 -2030,6,GASNAT,summer.peak,0.0 -2030,6,RSHEAT,summer.peak,-0.0 -2030,6,CO2EMT,summer.peak,-0.0 -2030,6,GASNAT,summer.evening,0.0 -2030,6,RSHEAT,summer.evening,-0.0 -2030,6,CO2EMT,summer.evening,-0.0 -2030,6,GASNAT,autumn.night,-1.9167534741865189 -2030,6,RSHEAT,autumn.night,1.6667421514665384 -2030,6,CO2EMT,autumn.night,98.00360513515673 -2030,6,GASNAT,autumn.day,-7.429066630498923 -2030,6,RSHEAT,autumn.day,6.460057939564281 -2030,6,CO2EMT,autumn.day,379.84817681741 -2030,6,GASNAT,autumn.peak,-5.65303682044736 -2030,6,RSHEAT,autumn.peak,4.915684191693357 -2030,6,CO2EMT,autumn.peak,289.03977262947353 -2030,6,GASNAT,autumn.evening,-2.500260529237814 -2030,6,RSHEAT,autumn.evening,2.1741395906415777 -2030,6,CO2EMT,autumn.evening,127.83832085992945 -2030,7,ELCTRI,winter.night,5.057363270702443 -2030,7,ELCTRI,winter.day,7.325149175232453 -2030,7,ELCTRI,winter.peak,2.1975447455375923 -2030,7,ELCTRI,winter.evening,2.9300596841572673 -2030,7,ELCTRI,peak.night,3.251162109278313 -2030,7,ELCTRI,peak.day,7.264942476519082 -2030,7,ELCTRI,peak.peak,2.0269590819052232 -2030,7,ELCTRI,peak.evening,1.9667523931773019 -2030,7,ELCTRI,summer.night,1.0292737007993258 -2030,7,ELCTRI,summer.day,1.7148952035007292 -2030,7,ELCTRI,summer.peak,0.5647114664431384 -2030,7,ELCTRI,summer.evening,0.4204728451917305 -2030,7,ELCTRI,autumn.night,3.6525401428398627 -2030,7,ELCTRI,autumn.day,6.843495540966255 -2030,7,ELCTRI,autumn.peak,1.7660633571240203 -2030,7,ELCTRI,autumn.evening,2.167441413616769 -2040,0,GASPRD,winter.night,138.35364587933591 -2040,0,CO2EMT,winter.night,707.4021913810446 -2040,0,GASPRD,winter.day,197.64806527084832 -2040,0,CO2EMT,winter.day,1010.5745577298476 -2040,0,GASPRD,winter.peak,59.29441939151235 -2040,0,CO2EMT,winter.peak,303.17236634880265 -2040,0,GASPRD,winter.evening,79.05922648782361 -2040,0,CO2EMT,winter.evening,404.22982503224216 -2040,0,GASPRD,peak.night,80.0174486087451 -2040,0,CO2EMT,peak.night,409.12921473651375 -2040,0,GASPRD,peak.day,114.31064071286698 -2040,0,CO2EMT,peak.day,584.4703059648889 -2040,0,GASPRD,peak.peak,34.29319210412195 -2040,0,CO2EMT,peak.peak,175.34109122837555 -2040,0,GASPRD,peak.evening,45.72425650462322 -2040,0,CO2EMT,peak.evening,233.78812350813854 -2040,0,GASPRD,summer.night,5.956949944699524 -2040,0,CO2EMT,summer.night,30.457885067248668 -2040,0,GASPRD,summer.day,8.509928480757136 -2040,0,CO2EMT,summer.day,43.51126432211124 -2040,0,GASPRD,summer.peak,2.552978536057609 -2040,0,CO2EMT,summer.peak,13.053379254862556 -2040,0,GASPRD,summer.evening,3.403971408641916 -2040,0,CO2EMT,summer.evening,17.40450581238612 -2040,0,GASPRD,autumn.night,64.1886634860634 -2040,0,CO2EMT,autumn.night,328.1966364042422 -2040,0,GASPRD,autumn.day,91.69809056861892 -2040,0,CO2EMT,autumn.day,468.8523370773486 -2040,0,GASPRD,autumn.peak,27.50942708255553 -2040,0,CO2EMT,autumn.peak,140.65570067310642 -2040,0,GASPRD,autumn.evening,36.6792364035079 -2040,0,CO2EMT,autumn.evening,187.5409357311359 -2040,1,GASPRD,winter.night,-138.35364587933591 -2040,1,GASNAT,winter.night,131.76537702793897 -2040,1,CO2EMT,winter.night,336.858186371926 -2040,1,GASPRD,winter.day,-197.64806527084835 -2040,1,GASNAT,winter.day,188.23625263890318 -2040,1,CO2EMT,winter.day,481.225979871356 -2040,1,GASPRD,winter.peak,-59.29441939151236 -2040,1,GASNAT,winter.peak,56.47087561096415 -2040,1,CO2EMT,winter.peak,144.36779349942987 -2040,1,GASPRD,winter.evening,-79.05922648782361 -2040,1,GASNAT,winter.evening,75.29450141697487 -2040,1,CO2EMT,winter.evening,192.49039287249627 -2040,1,GASPRD,peak.night,-80.01744860874513 -2040,1,GASNAT,peak.night,76.20709391309059 -2040,1,CO2EMT,peak.night,194.8234355888161 -2040,1,GASPRD,peak.day,-114.31064071286704 -2040,1,GASNAT,peak.day,108.86727686939717 -2040,1,CO2EMT,peak.day,278.3191933166139 -2040,1,GASPRD,peak.peak,-34.293192104121886 -2040,1,GASNAT,peak.peak,32.660182956306556 -2040,1,CO2EMT,peak.peak,83.49575772779772 -2040,1,GASPRD,peak.evening,-45.724256504623234 -2040,1,GASNAT,peak.evening,43.54691095678403 -2040,1,CO2EMT,peak.evening,111.32767786101839 -2040,1,GASPRD,summer.night,-5.956949944699525 -2040,1,GASNAT,summer.night,5.6732856616185945 -2040,1,CO2EMT,summer.night,14.503754793927937 -2040,1,GASPRD,summer.day,-8.509928480757138 -2040,1,GASNAT,summer.day,8.104693791197274 -2040,1,CO2EMT,summer.day,20.719649677195832 -2040,1,GASPRD,summer.peak,-2.552978536057609 -2040,1,GASNAT,summer.peak,2.431408129578675 -2040,1,CO2EMT,summer.peak,6.215894883267883 -2040,1,GASPRD,summer.evening,-3.4039714086419166 -2040,1,GASNAT,summer.evening,3.2418775320399202 -2040,1,CO2EMT,summer.evening,8.287859910660057 -2040,1,GASPRD,autumn.night,-64.18866348606342 -2040,1,GASNAT,autumn.night,61.132060462917536 -2040,1,CO2EMT,autumn.night,156.28411257344868 -2040,1,GASPRD,autumn.day,-91.69809056861895 -2040,1,GASNAT,autumn.day,87.33151482725614 -2040,1,CO2EMT,autumn.day,223.26301765588036 -2040,1,GASPRD,autumn.peak,-27.509427082555515 -2040,1,GASNAT,autumn.peak,26.199454364338585 -2040,1,CO2EMT,autumn.peak,66.9789050824316 -2040,1,GASPRD,autumn.evening,-36.67923640350791 -2040,1,GASNAT,autumn.evening,34.93260609857896 -2040,1,CO2EMT,autumn.evening,89.30520749101711 -2040,6,GASNAT,winter.night,-7.532268072289539 -2040,6,RSHEAT,winter.night,6.549798323730035 -2040,6,CO2EMT,winter.night,385.1248665361642 -2040,6,GASNAT,winter.day,-26.006989954411 -2040,6,RSHEAT,winter.day,22.61477387340087 -2040,6,CO2EMT,winter.day,1329.7373963690345 -2040,6,GASNAT,winter.peak,-12.787942711186016 -2040,6,RSHEAT,winter.peak,11.119950183640015 -2040,6,CO2EMT,winter.peak,653.8475108229411 -2040,6,GASNAT,winter.evening,-8.819151683592912 -2040,6,RSHEAT,winter.evening,7.6688275509503585 -2040,6,CO2EMT,winter.evening,450.9232255821056 -2040,6,GASNAT,peak.night,-5.276531925854109 -2040,6,RSHEAT,peak.night,4.588288631177487 -2040,6,CO2EMT,peak.night,269.78907736892063 -2040,6,GASNAT,peak.day,-14.028580870751991 -2040,6,RSHEAT,peak.day,12.19876597456695 -2040,6,CO2EMT,peak.day,717.2813399215494 -2040,6,GASNAT,peak.peak,-7.835562956806105 -2040,6,RSHEAT,peak.peak,6.8135330059183525 -2040,6,CO2EMT,peak.peak,400.6323339814962 -2040,6,GASNAT,peak.evening,-4.7534633045057655 -2040,6,RSHEAT,peak.evening,4.133446351744144 -2040,6,CO2EMT,peak.evening,243.04457875937982 -2040,6,GASNAT,summer.night,-0.6553110518482815 -2040,6,RSHEAT,summer.night,0.5698356972593753 -2040,6,CO2EMT,summer.night,33.50605408100264 -2040,6,GASNAT,summer.day,-1.091827935312939 -2040,6,RSHEAT,summer.day,0.9494155959242948 -2040,6,CO2EMT,summer.day,55.825162332550576 -2040,6,GASNAT,summer.peak,-0.3595366954176053 -2040,6,RSHEAT,summer.peak,0.31264060471096117 -2040,6,CO2EMT,summer.peak,18.383111236702163 -2040,6,GASNAT,summer.evening,-0.26770382090035916 -2040,6,RSHEAT,summer.evening,0.23278593121770363 -2040,6,CO2EMT,summer.evening,13.687696362635366 -2040,6,GASNAT,autumn.night,-4.285934880169967 -2040,6,RSHEAT,autumn.night,3.7268998957999715 -2040,6,CO2EMT,autumn.night,219.13985042309042 -2040,6,GASNAT,autumn.day,-11.279985405110274 -2040,6,RSHEAT,autumn.day,9.808682960965456 -2040,6,CO2EMT,autumn.day,576.7456537632884 -2040,6,GASNAT,autumn.peak,-6.267555505862531 -2040,6,RSHEAT,autumn.peak,5.4500482659674185 -2040,6,CO2EMT,autumn.peak,320.46011301475124 -2040,6,GASNAT,autumn.evening,-3.751470926874245 -2040,6,RSHEAT,autumn.evening,3.2621486320645614 -2040,6,CO2EMT,autumn.evening,191.81270849108017 -2040,8,GASNAT,winter.night,-77.38515024807946 -2040,8,RSHEAT,winter.night,67.29143499832996 -2040,8,CO2EMT,winter.night,3956.7027321843025 -2040,8,GASNAT,winter.day,-267.19107788082795 -2040,8,RSHEAT,winter.day,232.3400677224591 -2040,8,CO2EMT,winter.day,13661.479812046735 -2040,8,GASNAT,winter.peak,-131.38099422 -2040,8,RSHEAT,winter.peak,114.2443428 -2040,8,CO2EMT,winter.peak,6717.5102344686 -2040,8,GASNAT,winter.evening,-90.60635807774611 -2040,8,RSHEAT,winter.evening,78.78813745890966 -2040,8,CO2EMT,winter.evening,4632.703088515159 -2040,8,GASNAT,peak.night,-54.210127939178896 -2040,8,RSHEAT,peak.night,47.13924168624252 -2040,8,CO2EMT,peak.night,2771.763841530217 -2040,8,GASNAT,peak.day,-144.12708470165902 -2040,8,RSHEAT,peak.day,125.32789974057306 -2040,8,CO2EMT,peak.day,7369.217840795825 -2040,8,GASNAT,peak.peak,-80.5011466494999 -2040,8,RSHEAT,peak.peak,70.00099708652166 -2040,8,CO2EMT,peak.peak,4116.023628188931 -2040,8,GASNAT,peak.evening,-48.836216195117245 -2040,8,RSHEAT,peak.evening,42.46627495227587 -2040,8,CO2EMT,peak.evening,2496.995734056345 -2040,8,GASNAT,summer.night,-6.732546388393719 -2040,8,RSHEAT,summer.night,5.854388163820626 -2040,8,CO2EMT,summer.night,344.2350968385709 -2040,8,GASNAT,summer.day,-11.21724134196406 -2040,8,RSHEAT,summer.day,9.754122906055706 -2040,8,CO2EMT,summer.day,573.5375498146225 -2040,8,GASNAT,summer.peak,-3.693814522739395 -2040,8,RSHEAT,summer.peak,3.2120126284690396 -2040,8,CO2EMT,summer.peak,188.8647365476653 -2040,8,GASNAT,summer.evening,-2.7503402963806405 -2040,8,RSHEAT,summer.evening,2.3916002577222963 -2040,8,CO2EMT,summer.evening,140.62489935394217 -2040,8,GASNAT,autumn.night,-44.03291431907604 -2040,8,RSHEAT,autumn.night,38.28949071224004 -2040,8,CO2EMT,autumn.night,2251.402909134358 -2040,8,GASNAT,autumn.day,-115.88851551658473 -2040,8,RSHEAT,autumn.day,100.77262218833455 -2040,8,CO2EMT,autumn.day,5925.379798362977 -2040,8,GASNAT,autumn.peak,-64.39172369524047 -2040,8,RSHEAT,autumn.peak,55.992803213252586 -2040,8,CO2EMT,autumn.peak,3292.3488325376456 -2040,8,GASNAT,autumn.evening,-38.54192901013175 -2040,8,RSHEAT,autumn.evening,33.51472087837544 -2040,8,CO2EMT,autumn.evening,1970.6488302880368 -2040,9,GASPRD,winter.night,-52.04502116420401 -2040,9,GASNAT,winter.night,49.566686823051434 -2040,9,CO2EMT,winter.night,126.717234863131 -2040,9,GASPRD,winter.day,-74.35003013261144 -2040,9,GASNAT,winter.day,70.80955250724898 -2040,9,CO2EMT,winter.day,181.02462098478205 -2040,9,GASPRD,winter.peak,-22.3050089684074 -2040,9,GASNAT,winter.peak,21.242865684197522 -2040,9,CO2EMT,winter.peak,54.30738612165097 -2040,9,GASPRD,winter.evening,-29.740012195796627 -2040,9,GASNAT,winter.evening,28.32382113885393 -2040,9,CO2EMT,winter.evening,72.40984874148008 -2040,9,GASPRD,peak.night,-30.100470283087382 -2040,9,GASNAT,peak.night,28.667114555321316 -2040,9,CO2EMT,peak.night,73.28747836067895 -2040,9,GASPRD,peak.day,-43.00067177400963 -2040,9,GASNAT,peak.day,40.95302073715203 -2040,9,CO2EMT,peak.day,104.69639751452918 -2040,9,GASPRD,peak.peak,-12.900201490922242 -2040,9,GASNAT,peak.peak,12.285906181830706 -2040,9,CO2EMT,peak.peak,31.408919153850203 -2040,9,GASPRD,peak.evening,-17.200268792165144 -2040,9,GASNAT,peak.evening,16.38120837349061 -2040,9,CO2EMT,peak.evening,41.878559206828754 -2040,9,GASPRD,summer.night,-2.240848688703011 -2040,9,GASNAT,summer.night,2.134141608288582 -2040,9,CO2EMT,summer.night,5.45593302158976 -2040,9,GASPRD,summer.day,-3.2012124080426405 -2040,9,GASNAT,summer.day,3.0487737219453717 -2040,9,CO2EMT,summer.day,7.794190020153343 -2040,9,GASPRD,summer.peak,-0.9603637193396277 -2040,9,GASNAT,summer.peak,0.9146321136567883 -2040,9,CO2EMT,summer.peak,2.3382569985635797 -2040,9,GASPRD,summer.evening,-1.2804849693633835 -2040,9,GASNAT,summer.evening,1.2195094946317937 -2040,9,CO2EMT,summer.evening,3.117676023026181 -2040,9,GASPRD,autumn.night,-24.146095524997623 -2040,9,GASNAT,autumn.night,22.99628145237869 -2040,9,CO2EMT,autumn.night,58.789993533006125 -2040,9,GASPRD,autumn.day,-34.49442213126141 -2040,9,GASNAT,autumn.day,32.85183060120134 -2040,9,CO2EMT,autumn.day,83.98570493197124 -2040,9,GASPRD,autumn.peak,-10.348326606263775 -2040,9,GASNAT,autumn.peak,9.855549148822643 -2040,9,CO2EMT,autumn.peak,25.195711398965088 -2040,9,GASPRD,autumn.evening,-13.797768918733853 -2040,9,GASNAT,autumn.evening,13.14073230355605 -2040,9,CO2EMT,autumn.evening,33.594282134041045 -2040,10,GASPRD,winter.night,52.04502116420402 -2040,10,CO2EMT,winter.night,266.1061932125752 -2040,10,GASPRD,winter.day,74.35003013261145 -2040,10,CO2EMT,winter.day,380.15170406804236 -2040,10,GASPRD,winter.peak,22.305008968407403 -2040,10,CO2EMT,winter.peak,114.04551085546706 -2040,10,GASPRD,winter.evening,29.740012195796634 -2040,10,CO2EMT,winter.evening,152.0606823571082 -2040,10,GASPRD,peak.night,30.100470283087386 -2040,10,CO2EMT,peak.night,153.9037045574258 -2040,10,GASPRD,peak.day,43.00067177400963 -2040,10,CO2EMT,peak.day,219.86243478051128 -2040,10,GASPRD,peak.peak,12.900201490922269 -2040,10,CO2EMT,peak.peak,65.95873022308557 -2040,10,GASPRD,peak.evening,17.20026879216514 -2040,10,CO2EMT,peak.evening,87.94497433434037 -2040,10,GASPRD,summer.night,2.2408486887030117 -2040,10,CO2EMT,summer.night,11.4574593453385 -2040,10,GASPRD,summer.day,3.201212408042641 -2040,10,CO2EMT,summer.day,16.367799042322023 -2040,10,GASPRD,summer.peak,0.9603637193396282 -2040,10,CO2EMT,summer.peak,4.910339696983519 -2040,10,GASPRD,summer.evening,1.280484969363384 -2040,10,CO2EMT,summer.evening,6.5471196483549825 -2040,10,GASPRD,autumn.night,24.14609552499763 -2040,10,CO2EMT,autumn.night,123.4589864193129 -2040,10,GASPRD,autumn.day,34.494422131261416 -2040,10,CO2EMT,autumn.day,176.36998035713964 -2040,10,GASPRD,autumn.peak,10.348326606263786 -2040,10,CO2EMT,autumn.peak,52.910993937826746 -2040,10,GASPRD,autumn.evening,13.797768918733853 -2040,10,CO2EMT,autumn.evening,70.54799248148619 diff --git a/tests/data/simple_shadow/commodity_prices.csv b/tests/data/simple_shadow/commodity_prices.csv deleted file mode 100644 index 424ebcd72..000000000 --- a/tests/data/simple_shadow/commodity_prices.csv +++ /dev/null @@ -1,177 +0,0 @@ -milestone_year,commodity_id,region_id,time_slice,price -2020,GASPRD,GBR,winter.night,8.947755404506319 -2020,GASPRD,GBR,winter.day,8.947755404506319 -2020,GASPRD,GBR,winter.peak,8.947755404506319 -2020,GASPRD,GBR,winter.evening,8.947755404506319 -2020,GASPRD,GBR,peak.night,8.947755404506319 -2020,GASPRD,GBR,peak.day,8.947755404506319 -2020,GASPRD,GBR,peak.peak,8.947755404506319 -2020,GASPRD,GBR,peak.evening,8.947755404506319 -2020,GASPRD,GBR,summer.night,8.947755404506319 -2020,GASPRD,GBR,summer.day,8.947755404506319 -2020,GASPRD,GBR,summer.peak,8.947755404506319 -2020,GASPRD,GBR,summer.evening,8.947755404506319 -2020,GASPRD,GBR,autumn.night,8.947755404506319 -2020,GASPRD,GBR,autumn.day,8.947755404506319 -2020,GASPRD,GBR,autumn.peak,8.947755404506319 -2020,GASPRD,GBR,autumn.evening,8.947755404506319 -2020,GASNAT,GBR,winter.night,14.681078847108598 -2020,GASNAT,GBR,winter.day,14.681078847108598 -2020,GASNAT,GBR,winter.peak,14.681078847108598 -2020,GASNAT,GBR,winter.evening,14.681078847108598 -2020,GASNAT,GBR,peak.night,14.681078847108596 -2020,GASNAT,GBR,peak.day,14.681078847108596 -2020,GASNAT,GBR,peak.peak,14.681078847108596 -2020,GASNAT,GBR,peak.evening,14.681078847108596 -2020,GASNAT,GBR,summer.night,14.681078847108596 -2020,GASNAT,GBR,summer.day,14.681078847108596 -2020,GASNAT,GBR,summer.peak,14.681078847108596 -2020,GASNAT,GBR,summer.evening,14.681078847108596 -2020,GASNAT,GBR,autumn.night,14.681078847108594 -2020,GASNAT,GBR,autumn.day,14.681078847108594 -2020,GASNAT,GBR,autumn.peak,14.681078847108594 -2020,GASNAT,GBR,autumn.evening,14.681078847108594 -2020,ELCTRI,GBR,winter.night,7.993435183705007 -2020,ELCTRI,GBR,winter.day,7.993435074999508 -2020,ELCTRI,GBR,winter.peak,7.993435074999508 -2020,ELCTRI,GBR,winter.evening,7.993435074999508 -2020,ELCTRI,GBR,peak.night,17.26224017424242 -2020,ELCTRI,GBR,peak.day,7.9933120749999995 -2020,ELCTRI,GBR,peak.peak,7.9933120749999995 -2020,ELCTRI,GBR,peak.evening,17.26224017424242 -2020,ELCTRI,GBR,summer.night,7.993312183705419 -2020,ELCTRI,GBR,summer.day,0.4 -2020,ELCTRI,GBR,summer.peak,0.40000025364616465 -2020,ELCTRI,GBR,summer.evening,0.4 -2020,ELCTRI,GBR,autumn.night,17.26224017424242 -2020,ELCTRI,GBR,autumn.day,7.9933120749999995 -2020,ELCTRI,GBR,autumn.peak,17.262264416666763 -2020,ELCTRI,GBR,autumn.evening,17.26224017424242 -2020,RSHEAT,GBR,winter.night,47.23785557244168 -2020,RSHEAT,GBR,winter.day,55.599763596127076 -2020,RSHEAT,GBR,winter.peak,57.9006652949128 -2020,RSHEAT,GBR,winter.evening,54.54004452213207 -2020,RSHEAT,GBR,peak.night,45.485020416131135 -2020,RSHEAT,GBR,peak.day,50.56073761425642 -2020,RSHEAT,GBR,peak.peak,55.6249609585916 -2020,RSHEAT,GBR,peak.evening,51.14074651425612 -2020,RSHEAT,GBR,summer.night,31.795233457290315 -2020,RSHEAT,GBR,summer.day,29.289440436667523 -2020,RSHEAT,GBR,summer.peak,29.28944052037076 -2020,RSHEAT,GBR,summer.evening,29.289440436667526 -2020,RSHEAT,GBR,autumn.night,40.96082988680505 -2020,RSHEAT,GBR,autumn.day,47.89486655706465 -2020,RSHEAT,GBR,autumn.peak,55.20027495366886 -2020,RSHEAT,GBR,autumn.evening,47.903745991666796 -2030,GASPRD,GBR,winter.night,5.201888478554478 -2030,GASPRD,GBR,winter.day,5.201888478554478 -2030,GASPRD,GBR,winter.peak,5.201888478554478 -2030,GASPRD,GBR,winter.evening,5.201888478554478 -2030,GASPRD,GBR,peak.night,5.201888478554476 -2030,GASPRD,GBR,peak.day,5.201888478554476 -2030,GASPRD,GBR,peak.peak,5.201888478554476 -2030,GASPRD,GBR,peak.evening,5.201888478554476 -2030,GASPRD,GBR,summer.night,5.201888478554477 -2030,GASPRD,GBR,summer.day,5.201888478554477 -2030,GASPRD,GBR,summer.peak,5.201888478554477 -2030,GASPRD,GBR,summer.evening,5.201888478554477 -2030,GASPRD,GBR,autumn.night,5.201888478554477 -2030,GASPRD,GBR,autumn.day,5.201888478554477 -2030,GASPRD,GBR,autumn.peak,5.201888478554477 -2030,GASPRD,GBR,autumn.evening,5.201888478554477 -2030,GASNAT,GBR,winter.night,8.162400837470337 -2030,GASNAT,GBR,winter.day,8.162400837470337 -2030,GASNAT,GBR,winter.peak,8.162400837470337 -2030,GASNAT,GBR,winter.evening,8.162400837470337 -2030,GASNAT,GBR,peak.night,8.162400837470335 -2030,GASNAT,GBR,peak.day,8.162400837470335 -2030,GASNAT,GBR,peak.peak,8.162400837470335 -2030,GASNAT,GBR,peak.evening,8.162400837470335 -2030,GASNAT,GBR,summer.night,8.162400837470337 -2030,GASNAT,GBR,summer.day,8.162400837470337 -2030,GASNAT,GBR,summer.peak,8.162400837470337 -2030,GASNAT,GBR,summer.evening,8.162400837470337 -2030,GASNAT,GBR,autumn.night,8.162400837470337 -2030,GASNAT,GBR,autumn.day,8.162400837470337 -2030,GASNAT,GBR,autumn.peak,8.162400837470337 -2030,GASNAT,GBR,autumn.evening,8.162400837470337 -2030,ELCTRI,GBR,winter.night,7.993435183705008 -2030,ELCTRI,GBR,winter.day,0.4 -2030,ELCTRI,GBR,winter.peak,0.40001039949270867 -2030,ELCTRI,GBR,winter.evening,0.4 -2030,ELCTRI,GBR,peak.night,17.262240174242425 -2030,ELCTRI,GBR,peak.day,7.993312075000002 -2030,ELCTRI,GBR,peak.peak,7.993312075000002 -2030,ELCTRI,GBR,peak.evening,17.262240174242425 -2030,ELCTRI,GBR,summer.night,0.4 -2030,ELCTRI,GBR,summer.day,0.4 -2030,ELCTRI,GBR,summer.peak,0.40000025364616465 -2030,ELCTRI,GBR,summer.evening,0.4 -2030,ELCTRI,GBR,autumn.night,17.262240174242425 -2030,ELCTRI,GBR,autumn.day,7.993312075000002 -2030,ELCTRI,GBR,autumn.peak,17.262264416666767 -2030,ELCTRI,GBR,autumn.evening,17.262240174242425 -2030,RSHEAT,GBR,winter.night,43.697015424408804 -2030,RSHEAT,GBR,winter.day,48.08199593872508 -2030,RSHEAT,GBR,winter.peak,49.587435989561925 -2030,RSHEAT,GBR,winter.evening,47.388640312288324 -2030,RSHEAT,GBR,peak.night,44.91252952103841 -2030,RSHEAT,GBR,peak.day,45.61809676534286 -2030,RSHEAT,GBR,peak.peak,48.545921740544166 -2030,RSHEAT,GBR,peak.evening,47.25059943424864 -2030,RSHEAT,GBR,summer.night,30.41132932722019 -2030,RSHEAT,GBR,summer.day,30.411329327220194 -2030,RSHEAT,GBR,summer.peak,30.411329410923425 -2030,RSHEAT,GBR,summer.evening,30.41132932722019 -2030,RSHEAT,GBR,autumn.night,42.33549857862437 -2030,RSHEAT,GBR,autumn.day,44.07685276182885 -2030,RSHEAT,GBR,autumn.peak,48.8019749365685 -2030,RSHEAT,GBR,autumn.evening,45.45339138209924 -2040,GASPRD,GBR,winter.night,4.89313569725816 -2040,GASPRD,GBR,winter.day,4.89313569725816 -2040,GASPRD,GBR,winter.peak,4.89313569725816 -2040,GASPRD,GBR,winter.evening,4.89313569725816 -2040,GASPRD,GBR,peak.night,4.89313569725816 -2040,GASPRD,GBR,peak.day,4.89313569725816 -2040,GASPRD,GBR,peak.peak,4.89313569725816 -2040,GASPRD,GBR,peak.evening,4.89313569725816 -2040,GASPRD,GBR,summer.night,4.8931356972581606 -2040,GASPRD,GBR,summer.day,4.8931356972581606 -2040,GASPRD,GBR,summer.peak,4.8931356972581606 -2040,GASPRD,GBR,summer.evening,4.8931356972581606 -2040,GASPRD,GBR,autumn.night,4.893135697258158 -2040,GASPRD,GBR,autumn.day,4.893135697258158 -2040,GASPRD,GBR,autumn.peak,4.893135697258158 -2040,GASPRD,GBR,autumn.evening,4.893135697258158 -2040,GASNAT,GBR,winter.night,7.622083470201777 -2040,GASNAT,GBR,winter.day,7.622083470201777 -2040,GASNAT,GBR,winter.peak,7.622083470201777 -2040,GASNAT,GBR,winter.evening,7.622083470201777 -2040,GASNAT,GBR,peak.night,7.622083470201782 -2040,GASNAT,GBR,peak.day,7.622083470201782 -2040,GASNAT,GBR,peak.peak,7.622083470201782 -2040,GASNAT,GBR,peak.evening,7.622083470201782 -2040,GASNAT,GBR,summer.night,7.62208347020178 -2040,GASNAT,GBR,summer.day,7.62208347020178 -2040,GASNAT,GBR,summer.peak,7.62208347020178 -2040,GASNAT,GBR,summer.evening,7.62208347020178 -2040,GASNAT,GBR,autumn.night,7.62208347020178 -2040,GASNAT,GBR,autumn.day,7.62208347020178 -2040,GASNAT,GBR,autumn.peak,7.62208347020178 -2040,GASNAT,GBR,autumn.evening,7.62208347020178 -2040,RSHEAT,GBR,winter.night,43.20140884377474 -2040,RSHEAT,GBR,winter.day,43.201408843774736 -2040,RSHEAT,GBR,winter.peak,43.20140884377474 -2040,RSHEAT,GBR,winter.evening,43.20140884377474 -2040,RSHEAT,GBR,peak.night,43.201408843774765 -2040,RSHEAT,GBR,peak.day,43.20140884377476 -2040,RSHEAT,GBR,peak.peak,43.20140884377475 -2040,RSHEAT,GBR,peak.evening,43.201408843774765 -2040,RSHEAT,GBR,summer.night,43.20140884377476 -2040,RSHEAT,GBR,summer.day,43.20140884377475 -2040,RSHEAT,GBR,summer.peak,43.20140884377476 -2040,RSHEAT,GBR,summer.evening,43.20140884377475 -2040,RSHEAT,GBR,autumn.night,43.20140884377475 -2040,RSHEAT,GBR,autumn.day,43.20140884377475 -2040,RSHEAT,GBR,autumn.peak,43.20140884377476 -2040,RSHEAT,GBR,autumn.evening,43.20140884377475 diff --git a/tests/regression.rs b/tests/regression.rs index 4b5669431..1ea797e30 100644 --- a/tests/regression.rs +++ b/tests/regression.rs @@ -31,7 +31,6 @@ mod regression { define_regression_test_with_patches!(simple_marginal); define_regression_test_with_patches!(simple_marginal_average); define_regression_test_with_patches!(simple_full); - define_regression_test_with_patches!(simple_shadow); define_regression_test_with_patches!(simple_ironing_out); define_regression_test_with_patches!(simple_mothball);