From 44cffa6a0bca166f30f0f6614e3bbe80b0aab94a Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Tue, 10 Mar 2026 12:53:22 +0000 Subject: [PATCH 01/14] add regression tests for different pricing strategies with simple model --- docs/release_notes/upcoming.md | 2 + src/example/patches.rs | 24 + src/input/commodity.rs | 11 +- src/patch.rs | 42 +- tests/data/simple_full/assets.csv | 10 + tests/data/simple_full/commodity_flows.csv | 721 ++++++++++++++++++ tests/data/simple_full/commodity_prices.csv | 166 ++++ tests/data/simple_marginal/assets.csv | 10 + .../data/simple_marginal/commodity_flows.csv | 721 ++++++++++++++++++ .../data/simple_marginal/commodity_prices.csv | 177 +++++ tests/regression.rs | 73 +- 11 files changed, 1923 insertions(+), 34 deletions(-) create mode 100644 tests/data/simple_full/assets.csv create mode 100644 tests/data/simple_full/commodity_flows.csv create mode 100644 tests/data/simple_full/commodity_prices.csv create mode 100644 tests/data/simple_marginal/assets.csv create mode 100644 tests/data/simple_marginal/commodity_flows.csv create mode 100644 tests/data/simple_marginal/commodity_prices.csv diff --git a/docs/release_notes/upcoming.md b/docs/release_notes/upcoming.md index e4b0ad259..7ca3ab3de 100644 --- a/docs/release_notes/upcoming.md +++ b/docs/release_notes/upcoming.md @@ -31,6 +31,8 @@ ready to be released, carry out the following steps: - Allow for adding both a `prod` and `cons` levy to a commodity ([#969]) - Availability limits can now be provided at multiple levels for a process ([#1018]) - Pricing strategy can now vary by commodity ([#1021]) +- `marginal` and `full` commodity pricing strategies no longer require enabling + `please_give_me_broken_results` ## Experimental features diff --git a/src/example/patches.rs b/src/example/patches.rs index 66dbd278f..893193eba 100644 --- a/src/example/patches.rs +++ b/src/example/patches.rs @@ -32,6 +32,30 @@ fn get_all_patches() -> PatchMap { .with_addition("A0_RES,all,npv,,"), ], ), + ( + // The simple example with electricity priced using marginal costs + "simple_marginal", + vec![FilePatch::new("commodities.csv").with_replacement( + "id,description,type,time_slice_level,pricing_strategy,units\n\ + GASPRD,Gas produced,sed,season,shadow,PJ\n\ + GASNAT,Natural gas,sed,season,shadow,PJ\n\ + ELCTRI,Electricity,sed,daynight,marginal,PJ\n\ + RSHEAT,Residential heating,svd,daynight,shadow,PJ\n\ + CO2EMT,CO2 emitted,oth,annual,unpriced,ktCO2\n", + )], + ), + ( + // The simple example with gas commodities priced using full costs + "simple_full", + vec![FilePatch::new("commodities.csv").with_replacement( + "id,description,type,time_slice_level,pricing_strategy,units\n\ + GASPRD,Gas produced,sed,season,full,PJ\n\ + GASNAT,Natural gas,sed,season,full,PJ\n\ + ELCTRI,Electricity,sed,daynight,shadow,PJ\n\ + RSHEAT,Residential heating,svd,daynight,shadow,PJ\n\ + CO2EMT,CO2 emitted,oth,annual,unpriced,ktCO2\n", + )], + ), ] .into_iter() .collect() diff --git a/src/input/commodity.rs b/src/input/commodity.rs index d30a79cfa..96e0601ad 100644 --- a/src/input/commodity.rs +++ b/src/input/commodity.rs @@ -164,18 +164,13 @@ fn validate_commodity(commodity: &Commodity) -> Result<()> { } } - // Gatekeep alternative pricing options - if !matches!( - commodity.pricing_strategy, - PricingStrategy::Shadow | PricingStrategy::Unpriced - ) { + // Gatekeep scarcity-adjusted pricing option + if commodity.pricing_strategy == PricingStrategy::ScarcityAdjusted { ensure!( broken_model_options_allowed(), - "Price strategies other than 'shadow' and 'unpriced' are currently experimental. \ + "The 'scarcity' pricing strategy is currently experimental. \ To run anyway, set the {ALLOW_BROKEN_OPTION_NAME} option to true." ); - } - if commodity.pricing_strategy == PricingStrategy::ScarcityAdjusted { 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", diff --git a/src/patch.rs b/src/patch.rs index 7c28c0db9..e8e452b92 100644 --- a/src/patch.rs +++ b/src/patch.rs @@ -120,6 +120,8 @@ pub struct FilePatch { filename: String, /// The header row (optional). If `None`, the header is not checked against base files. header_row: Option>, + /// Full replacement content for this file (optional) + replacement_content: Option, /// Rows to delete (each row is a vector of fields) to_delete: CSVTable, /// Rows to add (each row is a vector of fields) @@ -132,6 +134,7 @@ impl FilePatch { FilePatch { filename: filename.into(), header_row: None, + replacement_content: None, to_delete: IndexSet::new(), to_add: IndexSet::new(), } @@ -149,6 +152,16 @@ impl FilePatch { self } + /// Set full replacement content for this file. + pub fn with_replacement(mut self, content: impl Into) -> Self { + assert!( + self.replacement_content.is_none(), + "Replacement content already set for this FilePatch", + ); + self.replacement_content = Some(content.into()); + self + } + /// Add a row to the patch (row should be a comma-joined string, e.g. "a,b,c"). pub fn with_addition(mut self, row: impl Into) -> Self { let s = row.into(); @@ -167,6 +180,10 @@ impl FilePatch { /// Apply this patch to a base model and return the modified CSV as a string. fn apply(&self, base_model_dir: &Path) -> Result { + if let Some(content) = &self.replacement_content { + return Ok(content.clone()); + } + // Read the base file to string let base_path = base_model_dir.join(&self.filename); ensure!( @@ -232,7 +249,6 @@ fn modify_base_with_patch(base: &str, patch: &FilePatch) -> Result { header_row_vec.join(", ") ); } - // Read all rows from the base, preserving order and checking for duplicates let mut base_rows: CSVTable = CSVTable::new(); for result in reader.records() { @@ -278,6 +294,16 @@ fn modify_base_with_patch(base: &str, patch: &FilePatch) -> Result { ); } + // Check all rows match base header length + let expected_len = base_header_vec.len(); + for row in &base_rows { + ensure!( + row.len() == expected_len, + "Row has {} columns but header has {expected_len}: {row:?}", + row.len(), + ); + } + // Serialize CSV output using csv::Writer let mut wtr = Writer::from_writer(vec![]); wtr.write_record(base_header_vec.iter())?; @@ -379,6 +405,20 @@ mod tests { assert!(assets_content.contains("GASDRV,GBR,A0_GEX,4003.26,2020")); } + #[test] + fn file_patch_with_replacement() { + let replacement = "col1,col2\nnew1,new2\n"; + + let model_dir = ModelPatch::from_example("simple") + .with_file_patch(FilePatch::new("assets.csv").with_replacement(replacement)) + .build_to_tempdir() + .unwrap(); + + let assets_path = model_dir.path().join("assets.csv"); + let assets_content = std::fs::read_to_string(assets_path).unwrap(); + assert_eq!(assets_content, replacement); + } + #[test] fn toml_patch() { // Patch to add an extra milestone year (2050) diff --git a/tests/data/simple_full/assets.csv b/tests/data/simple_full/assets.csv new file mode 100644 index 000000000..5f4559fa2 --- /dev/null +++ b/tests/data/simple_full/assets.csv @@ -0,0 +1,10 @@ +asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_year,capacity +0,GASDRV,GBR,A0_GEX,,2020,,4002.26 +1,GASPRC,GBR,A0_GPR,,2020,,3782.13 +2,WNDFRM,GBR,A0_ELC,,2020,2040,3.964844 +3,GASCGT,GBR,A0_ELC,,2020,2040,2.43 +4,RGASBR,GBR,A0_RES,,2020,2035,2900.0 +5,RELCHP,GBR,A0_RES,,2020,2035,399.98 +6,RGASBR,GBR,A0_RES,,2030,,355.83840587648046 +7,GASCGT,GBR,A0_ELC,,2030,2040,0.5151564434825014 +8,RGASBR,GBR,A0_RES,,2040,,3655.8189696 diff --git a/tests/data/simple_full/commodity_flows.csv b/tests/data/simple_full/commodity_flows.csv new file mode 100644 index 000000000..f7217b32f --- /dev/null +++ b/tests/data/simple_full/commodity_flows.csv @@ -0,0 +1,721 @@ +milestone_year,asset_id,commodity_id,time_slice,flow +2020,0,GASPRD,winter.night,0.0 +2020,0,CO2EMT,winter.night,0.0 +2020,0,GASPRD,winter.day,151.10360181069296 +2020,0,CO2EMT,winter.day,772.5927160580732 +2020,0,GASPRD,winter.peak,125.070625 +2020,0,CO2EMT,winter.peak,639.486105625 +2020,0,GASPRD,winter.evening,166.76083466742 +2020,0,CO2EMT,winter.evening,852.6481476545185 +2020,0,GASPRD,peak.night,0.0 +2020,0,CO2EMT,peak.night,0.0 +2020,0,GASPRD,peak.day,0.0 +2020,0,CO2EMT,peak.day,0.0 +2020,0,GASPRD,peak.peak,58.67582562255717 +2020,0,CO2EMT,peak.peak,300.00949640813485 +2020,0,GASPRD,peak.evening,166.76083466742 +2020,0,CO2EMT,peak.evening,852.6481476545185 +2020,0,GASPRD,summer.night,0.0 +2020,0,CO2EMT,summer.night,0.0 +2020,0,GASPRD,summer.day,0.0 +2020,0,CO2EMT,summer.day,0.0 +2020,0,GASPRD,summer.peak,0.0 +2020,0,CO2EMT,summer.peak,0.0 +2020,0,GASPRD,summer.evening,0.16861964795988574 +2020,0,CO2EMT,summer.evening,0.8621522600188959 +2020,0,GASPRD,autumn.night,0.0 +2020,0,CO2EMT,autumn.night,0.0 +2020,0,GASPRD,autumn.day,0.0 +2020,0,CO2EMT,autumn.day,0.0 +2020,0,GASPRD,autumn.peak,0.0 +2020,0,CO2EMT,autumn.peak,0.0 +2020,0,GASPRD,autumn.evening,163.3883025525992 +2020,0,CO2EMT,autumn.evening,835.4043909514398 +2020,1,GASPRD,winter.night,-0.0 +2020,1,GASNAT,winter.night,0.0 +2020,1,CO2EMT,winter.night,0.0 +2020,1,GASPRD,winter.day,-153.36573202936748 +2020,1,GASNAT,winter.day,146.06260193273093 +2020,1,CO2EMT,winter.day,373.40904184102664 +2020,1,GASPRD,winter.peak,-124.10114062500001 +2020,1,GASNAT,winter.peak,118.1915625 +2020,1,CO2EMT,winter.peak,302.15672953125005 +2020,1,GASPRD,winter.evening,-165.4681888237455 +2020,1,GASNAT,winter.evening,157.58875126070998 +2020,1,CO2EMT,winter.evening,402.87564259800513 +2020,1,GASPRD,peak.night,-0.0 +2020,1,GASNAT,peak.night,0.0 +2020,1,CO2EMT,peak.night,0.0 +2020,1,GASPRD,peak.day,-0.0 +2020,1,GASNAT,peak.day,0.0 +2020,1,CO2EMT,peak.day,0.0 +2020,1,GASPRD,peak.peak,-59.96847146623166 +2020,1,GASNAT,peak.peak,57.11282996783967 +2020,1,CO2EMT,peak.peak,146.00894981278213 +2020,1,GASPRD,peak.evening,-165.4681888237455 +2020,1,GASNAT,peak.evening,157.58875126070998 +2020,1,CO2EMT,peak.evening,402.87564259800513 +2020,1,GASPRD,summer.night,-0.0 +2020,1,GASNAT,summer.night,0.0 +2020,1,CO2EMT,summer.night,0.0 +2020,1,GASPRD,summer.day,-0.0 +2020,1,GASNAT,summer.day,0.0 +2020,1,CO2EMT,summer.day,0.0 +2020,1,GASPRD,summer.peak,-0.0 +2020,1,GASNAT,summer.peak,0.0 +2020,1,CO2EMT,summer.peak,0.0 +2020,1,GASPRD,summer.evening,-0.16861964795988574 +2020,1,GASNAT,summer.evening,0.1605901409141769 +2020,1,CO2EMT,summer.evening,0.41054869524709325 +2020,1,GASPRD,autumn.night,-0.0 +2020,1,GASNAT,autumn.night,0.0 +2020,1,CO2EMT,autumn.night,0.0 +2020,1,GASPRD,autumn.day,-0.0 +2020,1,GASNAT,autumn.day,0.0 +2020,1,CO2EMT,autumn.day,0.0 +2020,1,GASPRD,autumn.peak,-0.0 +2020,1,GASNAT,autumn.peak,0.0 +2020,1,CO2EMT,autumn.peak,0.0 +2020,1,GASPRD,autumn.evening,-163.3883025525992 +2020,1,GASNAT,autumn.evening,155.60790719295161 +2020,1,CO2EMT,autumn.evening,397.81161473878086 +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.783808997678887 +2020,3,ELCTRI,winter.night,5.189205998452591 +2020,3,CO2EMT,winter.night,397.9861540513214 +2020,3,GASNAT,winter.day,-10.010898915527838 +2020,3,ELCTRI,winter.day,6.6739326103518914 +2020,3,CO2EMT,winter.day,511.8572615509383 +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.395089526235901 +2020,3,ELCTRI,winter.evening,2.9300596841572673 +2020,3,CO2EMT,winter.evening,224.7209274764416 +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.066925767990737 +2020,3,ELCTRI,peak.day,7.3779505119938245 +2020,3,CO2EMT,peak.day,565.8519145173664 +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.1605901409141769 +2020,3,ELCTRI,summer.night,0.1070600939427846 +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.621339862602872 +2020,3,ELCTRI,autumn.day,7.747559908401914 +2020,3,CO2EMT,autumn.day,594.1991071748848 +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.52227251698524 +2020,4,RSHEAT,peak.night,16.975889145204558 +2020,4,CO2EMT,peak.night,998.1737937934555 +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.943315907602276 +2020,4,RSHEAT,peak.evening,23.428970354436764 +2020,4,CO2EMT,peak.evening,1377.6117423557046 +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.10896122967321 +2020,4,RSHEAT,autumn.night,7.920835851889748 +2020,4,CO2EMT,autumn.night,465.7411876731913 +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,0.0 +2030,0,CO2EMT,winter.night,0.0 +2030,0,GASPRD,winter.day,209.007363584943 +2030,0,CO2EMT,winter.day,1068.6546500098136 +2030,0,GASPRD,winter.peak,125.070625 +2030,0,CO2EMT,winter.peak,639.486105625 +2030,0,GASPRD,winter.evening,166.76083466742 +2030,0,CO2EMT,winter.evening,852.6481476545185 +2030,0,GASPRD,peak.night,0.0 +2030,0,CO2EMT,peak.night,0.0 +2030,0,GASPRD,peak.day,0.0 +2030,0,CO2EMT,peak.day,0.0 +2030,0,GASPRD,peak.peak,88.48378530453337 +2030,0,CO2EMT,peak.peak,452.41759426207915 +2030,0,GASPRD,peak.evening,166.76083466742 +2030,0,CO2EMT,peak.evening,852.6481476545185 +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.464792220809886 +2030,0,CO2EMT,summer.evening,2.3764826250009476 +2030,0,GASPRD,autumn.night,0.0 +2030,0,CO2EMT,autumn.night,0.0 +2030,0,GASPRD,autumn.day,0.0 +2030,0,CO2EMT,autumn.day,0.0 +2030,0,GASPRD,autumn.peak,20.534211026060376 +2030,0,CO2EMT,autumn.peak,104.99142097624672 +2030,0,GASPRD,autumn.evening,166.76083466742 +2030,0,CO2EMT,autumn.evening,852.6481476545185 +2030,1,GASPRD,winter.night,-0.0 +2030,1,GASNAT,winter.night,0.0 +2030,1,CO2EMT,winter.night,0.0 +2030,1,GASPRD,winter.day,-211.26949380361748 +2030,1,GASNAT,winter.day,201.2090417177309 +2030,1,CO2EMT,winter.day,514.3909151513791 +2030,1,GASPRD,winter.peak,-124.10114062500001 +2030,1,GASNAT,winter.peak,118.1915625 +2030,1,CO2EMT,winter.peak,302.15672953125005 +2030,1,GASPRD,winter.evening,-165.4681888237455 +2030,1,GASNAT,winter.evening,157.58875126070998 +2030,1,CO2EMT,winter.evening,402.87564259800513 +2030,1,GASPRD,peak.night,-0.0 +2030,1,GASNAT,peak.night,0.0 +2030,1,CO2EMT,peak.night,0.0 +2030,1,GASPRD,peak.day,-0.0 +2030,1,GASNAT,peak.day,0.0 +2030,1,CO2EMT,peak.day,0.0 +2030,1,GASPRD,peak.peak,-89.77643114820788 +2030,1,GASNAT,peak.peak,85.50136299829322 +2030,1,CO2EMT,peak.peak,218.58423450513664 +2030,1,GASPRD,peak.evening,-165.4681888237455 +2030,1,GASNAT,peak.evening,157.58875126070998 +2030,1,CO2EMT,peak.evening,402.87564259800513 +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.464792220809886 +2030,1,GASNAT,summer.evening,0.44265925791417715 +2030,1,CO2EMT,summer.evening,1.131658392857594 +2030,1,GASPRD,autumn.night,-0.0 +2030,1,GASNAT,autumn.night,0.0 +2030,1,CO2EMT,autumn.night,0.0 +2030,1,GASPRD,autumn.day,-0.0 +2030,1,GASNAT,autumn.day,0.0 +2030,1,CO2EMT,autumn.day,0.0 +2030,1,GASPRD,autumn.peak,-21.826856869734893 +2030,1,GASNAT,autumn.peak,20.78748273308085 +2030,1,CO2EMT,autumn.peak,53.1431996071212 +2030,1,GASPRD,autumn.evening,-165.4681888237455 +2030,1,GASNAT,autumn.evening,157.58875126070998 +2030,1,CO2EMT,autumn.evening,402.87564259800513 +2030,2,ELCTRI,winter.night,4.435312795545212 +2030,2,ELCTRI,winter.day,7.075379933645912 +2030,2,ELCTRI,winter.peak,1.9712501261051125 +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.7776452018191917 +2030,2,ELCTRI,peak.evening,1.72484387381507 +2030,2,ELCTRI,summer.night,1.6368416242136155 +2030,2,ELCTRI,summer.day,3.2188600626534005 +2030,2,ELCTRI,summer.peak,1.0599640039494003 +2030,2,ELCTRI,summer.evening,0.7892279633502001 +2030,2,ELCTRI,autumn.night,3.203281465982185 +2030,2,ELCTRI,autumn.day,6.001752635595889 +2030,2,ELCTRI,autumn.peak,1.5488393825638174 +2030,2,ELCTRI,autumn.evening,1.9008483513729915 +2030,3,GASNAT,winter.night,-7.783808997678887 +2030,3,ELCTRI,winter.night,5.189205998452591 +2030,3,CO2EMT,winter.night,397.9861540513214 +2030,3,GASNAT,winter.day,-10.010898915527838 +2030,3,ELCTRI,winter.day,6.6739326103518914 +2030,3,CO2EMT,winter.day,511.8572615509383 +2030,3,GASNAT,winter.peak,-2.468688831431171 +2030,3,ELCTRI,winter.peak,1.6457925542874472 +2030,3,CO2EMT,winter.peak,126.22405995107574 +2030,3,GASNAT,winter.evening,-3.3795873788970026 +2030,3,ELCTRI,winter.evening,2.253058252598002 +2030,3,CO2EMT,winter.evening,172.79830268300373 +2030,3,GASNAT,peak.night,-8.382740663321101 +2030,3,ELCTRI,peak.night,5.588493775547401 +2030,3,CO2EMT,peak.night,428.60953011560787 +2030,3,GASNAT,peak.day,-11.066925767990737 +2030,3,ELCTRI,peak.day,7.3779505119938245 +2030,3,CO2EMT,peak.day,565.8519145173664 +2030,3,GASNAT,peak.peak,-3.520722822271213 +2030,3,ELCTRI,peak.peak,2.3471485481808085 +2030,3,CO2EMT,peak.peak,180.0145579027271 +2030,3,GASNAT,peak.evening,-4.646819607935198 +2030,3,ELCTRI,peak.evening,3.0978797386234653 +2030,3,CO2EMT,peak.evening,237.59188655372665 +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,-7.854727240273368 +2030,3,ELCTRI,autumn.night,5.236484826848912 +2030,3,CO2EMT,autumn.night,401.61220379517727 +2030,3,GASNAT,autumn.day,-11.621339862602872 +2030,3,ELCTRI,autumn.day,7.747559908401914 +2030,3,CO2EMT,autumn.day,594.1991071748848 +2030,3,GASNAT,autumn.peak,-3.592603125 +2030,3,ELCTRI,autumn.peak,2.39506875 +2030,3,CO2EMT,autumn.peak,183.68979778124998 +2030,3,GASNAT,autumn.evening,-4.3828128915983156 +2030,3,ELCTRI,autumn.evening,2.921875261065544 +2030,3,CO2EMT,autumn.evening,224.09322314742187 +2030,4,GASNAT,winter.night,-43.845148578709995 +2030,4,RSHEAT,winter.night,38.1262161554 +2030,4,CO2EMT,winter.night,2241.8024468294425 +2030,4,GASNAT,winter.day,-219.27676569358 +2030,4,RSHEAT,winter.day,190.6754484292 +2030,4,CO2EMT,winter.day,11211.621029912745 +2030,4,GASNAT,winter.peak,-104.21874999999999 +2030,4,RSHEAT,winter.peak,90.625 +2030,4,CO2EMT,winter.peak,5328.704687500001 +2030,4,GASNAT,winter.evening,-71.44063561968 +2030,4,RSHEAT,winter.evening,62.1222918432 +2030,4,CO2EMT,winter.evening,3652.7596992342387 +2030,4,GASNAT,peak.night,-0.0 +2030,4,RSHEAT,peak.night,0.0 +2030,4,CO2EMT,peak.night,0.0 +2030,4,GASNAT,peak.day,-96.21279149075198 +2030,4,RSHEAT,peak.day,83.66329694848 +2030,4,CO2EMT,peak.day,4919.3600289221495 +2030,4,GASNAT,peak.peak,-66.12685298630602 +2030,4,RSHEAT,peak.peak,57.50161129244002 +2030,4,CO2EMT,peak.peak,3381.0659931898267 +2030,4,GASNAT,peak.evening,-29.670500177964005 +2030,4,RSHEAT,peak.evening,25.800434937360006 +2030,4,CO2EMT,peak.evening,1517.0526740992998 +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,-0.0 +2030,4,RSHEAT,autumn.night,0.0 +2030,4,CO2EMT,autumn.night,0.0 +2030,4,GASNAT,autumn.day,-67.97422666003601 +2030,4,RSHEAT,autumn.day,59.10802318264001 +2030,4,CO2EMT,autumn.day,3475.5222091276414 +2030,4,GASNAT,autumn.peak,-50.017432516103 +2030,4,RSHEAT,autumn.peak,43.49341957922 +2030,4,CO2EMT,autumn.peak,2557.391324548347 +2030,4,GASNAT,autumn.evening,-19.376214580347 +2030,4,RSHEAT,autumn.evening,16.84888224378 +2030,4,CO2EMT,autumn.evening,990.7058514931422 +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,-9.624518793997803 +2030,5,RSHEAT,peak.night,29.165208466660005 +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,-5.499725043997801 +2030,5,RSHEAT,peak.evening,16.66583346666 +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,-9.624518793997803 +2030,5,RSHEAT,autumn.night,29.165208466660005 +2030,5,ELCTRI,autumn.day,-13.749312543997803 +2030,5,RSHEAT,autumn.day,41.664583466660005 +2030,5,ELCTRI,autumn.peak,-4.12479375 +2030,5,RSHEAT,autumn.peak,12.499375 +2030,5,ELCTRI,autumn.evening,-5.499725043997801 +2030,5,RSHEAT,autumn.evening,16.66583346666 +2030,6,GASNAT,winter.night,-0.0 +2030,6,RSHEAT,winter.night,0.0 +2030,6,CO2EMT,winter.night,0.0 +2030,6,GASNAT,winter.day,-0.0 +2030,6,RSHEAT,winter.day,0.0 +2030,6,CO2EMT,winter.day,0.0 +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,-0.0 +2030,6,RSHEAT,winter.evening,0.0 +2030,6,CO2EMT,winter.evening,0.0 +2030,6,GASNAT,peak.night,-20.670129843374 +2030,6,RSHEAT,peak.night,17.97402595076 +2030,6,CO2EMT,peak.night,1056.8637388917127 +2030,6,GASNAT,peak.day,-0.0 +2030,6,RSHEAT,peak.day,0.0 +2030,6,CO2EMT,peak.day,0.0 +2030,6,GASNAT,peak.peak,-0.0 +2030,6,RSHEAT,peak.peak,0.0 +2030,6,CO2EMT,peak.peak,0.0 +2030,6,GASNAT,peak.evening,-0.0 +2030,6,RSHEAT,peak.evening,0.0 +2030,6,CO2EMT,peak.evening,0.0 +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,-10.492917792587003 +2030,6,RSHEAT,autumn.night,9.124276341380003 +2030,6,CO2EMT,autumn.night,536.5028867349736 +2030,6,GASNAT,autumn.day,-0.0 +2030,6,RSHEAT,autumn.day,0.0 +2030,6,CO2EMT,autumn.day,0.0 +2030,6,GASNAT,autumn.peak,-0.0 +2030,6,RSHEAT,autumn.peak,0.0 +2030,6,CO2EMT,autumn.peak,0.0 +2030,6,GASNAT,autumn.evening,-0.0 +2030,6,RSHEAT,autumn.evening,0.0 +2030,6,CO2EMT,autumn.evening,0.0 +2030,7,GASNAT,winter.night,-0.0 +2030,7,ELCTRI,winter.night,0.0 +2030,7,CO2EMT,winter.night,0.0 +2030,7,GASNAT,winter.day,-0.0 +2030,7,ELCTRI,winter.day,0.0 +2030,7,CO2EMT,winter.day,0.0 +2030,7,GASNAT,winter.peak,-0.7616266044111606 +2030,7,ELCTRI,winter.peak,0.5077510696074404 +2030,7,CO2EMT,winter.peak,38.94196828354264 +2030,7,GASNAT,winter.evening,-1.0155021473388979 +2030,7,ELCTRI,winter.evening,0.6770014315592653 +2030,7,CO2EMT,winter.evening,51.92262479343785 +2030,7,GASNAT,peak.night,-1.7771287517500585 +2030,7,ELCTRI,peak.night,1.1847525011667057 +2030,7,CO2EMT,peak.night,90.86459307698048 +2030,7,GASNAT,peak.day,-0.0 +2030,7,ELCTRI,peak.day,0.0 +2030,7,CO2EMT,peak.day,0.0 +2030,7,GASNAT,peak.peak,-0.0 +2030,7,ELCTRI,peak.peak,0.0 +2030,7,CO2EMT,peak.peak,0.0 +2030,7,GASNAT,peak.evening,-1.0155021473388979 +2030,7,ELCTRI,peak.evening,0.6770014315592653 +2030,7,CO2EMT,peak.evening,51.92262479343785 +2030,7,GASNAT,summer.night,-0.44265925791417715 +2030,7,ELCTRI,summer.night,0.29510617194278477 +2030,7,CO2EMT,summer.night,22.633167857151875 +2030,7,GASNAT,summer.day,-0.0 +2030,7,ELCTRI,summer.day,0.0 +2030,7,CO2EMT,summer.day,0.0 +2030,7,GASNAT,summer.peak,-0.0 +2030,7,ELCTRI,summer.peak,0.0 +2030,7,CO2EMT,summer.peak,0.0 +2030,7,GASNAT,summer.evening,-0.0 +2030,7,ELCTRI,summer.evening,0.0 +2030,7,CO2EMT,summer.evening,0.0 +2030,7,GASNAT,autumn.night,-1.7771287517500585 +2030,7,ELCTRI,autumn.night,1.1847525011667057 +2030,7,CO2EMT,autumn.night,90.86459307698048 +2030,7,GASNAT,autumn.day,-0.0 +2030,7,ELCTRI,autumn.day,0.0 +2030,7,CO2EMT,autumn.day,0.0 +2030,7,GASNAT,autumn.peak,-0.27132842615427455 +2030,7,ELCTRI,autumn.peak,0.18088561743618303 +2030,7,CO2EMT,autumn.peak,13.873022429268056 +2030,7,GASNAT,autumn.evening,-1.0155021473388979 +2030,7,ELCTRI,autumn.evening,0.6770014315592653 +2030,7,CO2EMT,autumn.evening,51.92262479343785 +2040,0,GASPRD,winter.night,0.0 +2040,0,CO2EMT,winter.night,0.0 +2040,0,GASPRD,winter.day,360.96396982311984 +2040,0,CO2EMT,winter.day,1845.6087777056118 +2040,0,GASPRD,winter.peak,125.070625 +2040,0,CO2EMT,winter.peak,639.486105625 +2040,0,GASPRD,winter.evening,166.76083466742 +2040,0,CO2EMT,winter.evening,852.6481476545185 +2040,0,GASPRD,peak.night,0.0 +2040,0,CO2EMT,peak.night,0.0 +2040,0,GASPRD,peak.day,85.71569060312174 +2040,0,CO2EMT,peak.day,438.2643260537615 +2040,0,GASPRD,peak.peak,125.070625 +2040,0,CO2EMT,peak.peak,639.486105625 +2040,0,GASPRD,peak.evening,166.76083466742 +2040,0,CO2EMT,peak.evening,852.6481476545185 +2040,0,GASPRD,summer.night,0.0 +2040,0,CO2EMT,summer.night,0.0 +2040,0,GASPRD,summer.day,0.0 +2040,0,CO2EMT,summer.day,0.0 +2040,0,GASPRD,summer.peak,0.0 +2040,0,CO2EMT,summer.peak,0.0 +2040,0,GASPRD,summer.evening,28.106738155604855 +2040,0,CO2EMT,summer.evening,143.70975218960763 +2040,0,GASPRD,autumn.night,0.0 +2040,0,CO2EMT,autumn.night,0.0 +2040,0,GASPRD,autumn.day,11.030571054582595 +2040,0,CO2EMT,autumn.day,56.39930980208081 +2040,0,GASPRD,autumn.peak,125.070625 +2040,0,CO2EMT,autumn.peak,639.486105625 +2040,0,GASPRD,autumn.evening,166.76083466742 +2040,0,CO2EMT,autumn.evening,852.6481476545185 +2040,1,GASPRD,winter.night,-289.5693294487456 +2040,1,GASNAT,winter.night,275.78031376071004 +2040,1,CO2EMT,winter.night,705.0323721292552 +2040,1,GASPRD,winter.day,-73.65677059304869 +2040,1,GASNAT,winter.day,70.14930532671303 +2040,1,CO2EMT,winter.day,179.33669906774188 +2040,1,GASPRD,winter.peak,-124.10114062500001 +2040,1,GASNAT,winter.peak,118.1915625 +2040,1,CO2EMT,winter.peak,302.15672953125005 +2040,1,GASPRD,winter.evening,-165.4681888237455 +2040,1,GASNAT,winter.evening,157.58875126070998 +2040,1,CO2EMT,winter.evening,402.87564259800513 +2040,1,GASPRD,peak.night,-0.0 +2040,1,GASNAT,peak.night,0.0 +2040,1,CO2EMT,peak.night,0.0 +2040,1,GASPRD,peak.day,-87.97782082179623 +2040,1,GASNAT,peak.day,83.78840078266308 +2040,1,CO2EMT,peak.day,214.20504660087818 +2040,1,GASPRD,peak.peak,-124.10114062500001 +2040,1,GASNAT,peak.peak,118.1915625 +2040,1,CO2EMT,peak.peak,302.15672953125005 +2040,1,GASPRD,peak.evening,-165.4681888237455 +2040,1,GASNAT,peak.evening,157.58875126070998 +2040,1,CO2EMT,peak.evening,402.87564259800513 +2040,1,GASPRD,summer.night,-0.0 +2040,1,GASNAT,summer.night,0.0 +2040,1,CO2EMT,summer.night,0.0 +2040,1,GASPRD,summer.day,-0.0 +2040,1,GASNAT,summer.day,0.0 +2040,1,CO2EMT,summer.day,0.0 +2040,1,GASPRD,summer.peak,-0.0 +2040,1,GASNAT,summer.peak,0.0 +2040,1,CO2EMT,summer.peak,0.0 +2040,1,GASPRD,summer.evening,-28.106738155604855 +2040,1,GASNAT,summer.evening,26.768322052957004 +2040,1,CO2EMT,summer.evening,68.43321532838459 +2040,1,GASPRD,autumn.night,-0.0 +2040,1,GASNAT,autumn.night,0.0 +2040,1,CO2EMT,autumn.night,0.0 +2040,1,GASPRD,autumn.day,-13.292701273257066 +2040,1,GASNAT,autumn.day,12.659715498340063 +2040,1,CO2EMT,autumn.day,32.36456267150637 +2040,1,GASPRD,autumn.peak,-124.10114062500001 +2040,1,GASNAT,autumn.peak,118.1915625 +2040,1,CO2EMT,autumn.peak,302.15672953125005 +2040,1,GASPRD,autumn.evening,-165.4681888237455 +2040,1,GASNAT,autumn.evening,157.58875126070998 +2040,1,CO2EMT,autumn.evening,402.87564259800513 +2040,6,GASNAT,winter.night,-29.838533129172095 +2040,6,RSHEAT,winter.night,25.94655054710617 +2040,6,CO2EMT,winter.night,1525.6441988945694 +2040,6,GASNAT,winter.day,-42.62647584035811 +2040,6,RSHEAT,winter.day,37.066500730746185 +2040,6,CO2EMT,winter.day,2179.4917097175103 +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,-17.050590417986076 +2040,6,RSHEAT,winter.evening,14.826600363466154 +2040,6,CO2EMT,winter.evening,871.7966880716282 +2040,6,GASNAT,peak.night,-29.838533129172095 +2040,6,RSHEAT,peak.night,25.94655054710617 +2040,6,CO2EMT,peak.night,1525.6441988945694 +2040,6,GASNAT,peak.day,-42.62647584035811 +2040,6,RSHEAT,peak.day,37.066500730746185 +2040,6,CO2EMT,peak.day,2179.4917097175103 +2040,6,GASNAT,peak.peak,-12.787942711186016 +2040,6,RSHEAT,peak.peak,11.119950183640015 +2040,6,CO2EMT,peak.peak,653.8475108229411 +2040,6,GASNAT,peak.evening,-17.050590417986076 +2040,6,RSHEAT,peak.evening,14.826600363466154 +2040,6,CO2EMT,peak.evening,871.7966880716282 +2040,6,GASNAT,summer.night,-0.0 +2040,6,RSHEAT,summer.night,0.0 +2040,6,CO2EMT,summer.night,0.0 +2040,6,GASNAT,summer.day,-0.0 +2040,6,RSHEAT,summer.day,0.0 +2040,6,CO2EMT,summer.day,0.0 +2040,6,GASNAT,summer.peak,-0.0 +2040,6,RSHEAT,summer.peak,0.0 +2040,6,CO2EMT,summer.peak,0.0 +2040,6,GASNAT,summer.evening,-0.0 +2040,6,RSHEAT,summer.evening,0.0 +2040,6,CO2EMT,summer.evening,0.0 +2040,6,GASNAT,autumn.night,-29.838533129172095 +2040,6,RSHEAT,autumn.night,25.94655054710617 +2040,6,CO2EMT,autumn.night,1525.6441988945694 +2040,6,GASNAT,autumn.day,-42.62647584035811 +2040,6,RSHEAT,autumn.day,37.066500730746185 +2040,6,CO2EMT,autumn.day,2179.4917097175103 +2040,6,GASNAT,autumn.peak,-12.787942711186016 +2040,6,RSHEAT,autumn.peak,11.119950183640015 +2040,6,CO2EMT,autumn.peak,653.8475108229411 +2040,6,GASNAT,autumn.evening,-17.050590417986076 +2040,6,RSHEAT,autumn.evening,14.826600363466154 +2040,6,CO2EMT,autumn.evening,871.7966880716282 +2040,8,GASNAT,winter.night,-55.07888519119691 +2040,8,RSHEAT,winter.night,47.894682774953836 +2040,8,CO2EMT,winter.night,2816.183399825898 +2040,8,GASNAT,winter.day,-250.5715919948809 +2040,8,RSHEAT,winter.day,217.88834086511383 +2040,8,CO2EMT,winter.day,12811.72549869826 +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,-82.37491934335293 +2040,8,RSHEAT,winter.evening,71.63036464639386 +2040,8,CO2EMT,winter.evening,4211.829626025636 +2040,8,GASNAT,peak.night,-29.648126735860906 +2040,8,RSHEAT,peak.night,25.780979770313834 +2040,8,CO2EMT,peak.night,1515.9087200045683 +2040,8,GASNAT,peak.day,-115.5291897320529 +2040,8,RSHEAT,peak.day,100.46016498439383 +2040,8,CO2EMT,peak.day,5907.007470999865 +2040,8,GASNAT,peak.peak,-75.54876689511998 +2040,8,RSHEAT,peak.peak,65.6945799088 +2040,8,CO2EMT,peak.peak,3862.8084513474855 +2040,8,GASNAT,peak.evening,-36.53908908163693 +2040,8,RSHEAT,peak.evening,31.773120940553852 +2040,8,CO2EMT,peak.evening,1868.2436247440962 +2040,8,GASNAT,summer.night,-7.3878574402420005 +2040,8,RSHEAT,summer.night,6.424223861080001 +2040,8,CO2EMT,summer.night,377.7411509195735 +2040,8,GASNAT,summer.day,-12.309069277277 +2040,8,RSHEAT,summer.day,10.70353850198 +2040,8,CO2EMT,summer.day,629.362712147173 +2040,8,GASNAT,summer.peak,-4.053351218157 +2040,8,RSHEAT,summer.peak,3.5246532331800005 +2040,8,CO2EMT,summer.peak,207.24784778436745 +2040,8,GASNAT,summer.evening,-3.0180441172809997 +2040,8,RSHEAT,summer.evening,2.62438618894 +2040,8,CO2EMT,summer.evening,154.31259571657753 +2040,8,GASNAT,autumn.night,-18.480316070073908 +2040,8,RSHEAT,autumn.night,16.069840060933835 +2040,8,CO2EMT,autumn.night,944.898560662879 +2040,8,GASNAT,autumn.day,-84.54202508133689 +2040,8,RSHEAT,autumn.day,73.51480441855382 +2040,8,CO2EMT,autumn.day,4322.633742408756 +2040,8,GASNAT,autumn.peak,-57.871336489916985 +2040,8,RSHEAT,autumn.peak,50.32290129557999 +2040,8,CO2EMT,autumn.peak,2958.9614347294555 +2040,8,GASNAT,autumn.evening,-25.24280951901992 +2040,8,RSHEAT,autumn.evening,21.950269146973845 +2040,8,CO2EMT,autumn.evening,1290.6648507074885 diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv new file mode 100644 index 000000000..307934ae2 --- /dev/null +++ b/tests/data/simple_full/commodity_prices.csv @@ -0,0 +1,166 @@ +milestone_year,commodity_id,region_id,time_slice,price +2020,ELCTRI,GBR,winter.night,7.993308999999999 +2020,ELCTRI,GBR,winter.day,7.993308999999999 +2020,ELCTRI,GBR,winter.peak,7.993308999999999 +2020,ELCTRI,GBR,winter.evening,7.993308999999999 +2020,ELCTRI,GBR,peak.night,17.26223303030303 +2020,ELCTRI,GBR,peak.day,7.993308999999999 +2020,ELCTRI,GBR,peak.peak,7.993308999999999 +2020,ELCTRI,GBR,peak.evening,17.26223303030303 +2020,ELCTRI,GBR,summer.night,7.993308999999999 +2020,ELCTRI,GBR,summer.day,0.4 +2020,ELCTRI,GBR,summer.peak,0.4 +2020,ELCTRI,GBR,summer.evening,0.4 +2020,ELCTRI,GBR,autumn.night,17.26223303030303 +2020,ELCTRI,GBR,autumn.day,7.993308999999999 +2020,ELCTRI,GBR,autumn.peak,17.26223303030303 +2020,ELCTRI,GBR,autumn.evening,17.26223303030303 +2020,RSHEAT,GBR,winter.night,5.8665369 +2020,RSHEAT,GBR,winter.day,5.8665369 +2020,RSHEAT,GBR,winter.peak,5.8665369 +2020,RSHEAT,GBR,winter.evening,5.8665369 +2020,RSHEAT,GBR,peak.night,5.8665369 +2020,RSHEAT,GBR,peak.day,5.8665369 +2020,RSHEAT,GBR,peak.peak,5.8665369 +2020,RSHEAT,GBR,peak.evening,5.8665369 +2020,RSHEAT,GBR,summer.night,2.80779197 +2020,RSHEAT,GBR,summer.day,0.30200000000000005 +2020,RSHEAT,GBR,summer.peak,0.30200000000000005 +2020,RSHEAT,GBR,summer.evening,0.30200000000000005 +2020,RSHEAT,GBR,autumn.night,5.8665369 +2020,RSHEAT,GBR,autumn.day,5.8665369 +2020,RSHEAT,GBR,autumn.peak,5.8665369 +2020,RSHEAT,GBR,autumn.evening,5.8665369 +2020,GASPRD,GBR,winter.day,7.504534967942034 +2020,GASPRD,GBR,summer.evening,7.504534967942034 +2020,GASNAT,GBR,summer.evening,6.5982585862326335 +2020,GASPRD,GBR,summer.day,3.428609686103873 +2020,GASPRD,GBR,autumn.peak,3.428609686103873 +2020,GASNAT,GBR,peak.night,3.7738687802727107 +2020,GASPRD,GBR,winter.peak,7.504534967942034 +2020,GASPRD,GBR,winter.evening,7.504534967942034 +2020,GASNAT,GBR,winter.peak,6.5982585862326335 +2020,GASNAT,GBR,summer.day,3.7738687802727107 +2020,GASNAT,GBR,autumn.day,3.7738687802727107 +2020,GASNAT,GBR,peak.day,3.7738687802727107 +2020,GASPRD,GBR,peak.evening,7.504534967942034 +2020,GASNAT,GBR,autumn.evening,6.5982585862326335 +2020,GASPRD,GBR,summer.night,3.428609686103873 +2020,GASPRD,GBR,autumn.day,3.428609686103873 +2020,GASPRD,GBR,autumn.night,3.428609686103873 +2020,GASPRD,GBR,peak.night,3.428609686103873 +2020,GASPRD,GBR,autumn.evening,7.504534967942034 +2020,GASNAT,GBR,autumn.peak,3.7738687802727107 +2020,GASNAT,GBR,autumn.night,3.7738687802727107 +2020,GASNAT,GBR,peak.evening,6.5982585862326335 +2020,GASPRD,GBR,summer.peak,3.428609686103873 +2020,GASNAT,GBR,summer.night,3.7738687802727107 +2020,GASNAT,GBR,peak.peak,6.5982585862326335 +2020,GASNAT,GBR,winter.night,3.7738687802727107 +2020,GASNAT,GBR,summer.peak,3.7738687802727107 +2020,GASPRD,GBR,peak.peak,7.504534967942034 +2020,GASPRD,GBR,winter.night,3.428609686103873 +2020,GASNAT,GBR,winter.evening,6.5982585862326335 +2020,GASPRD,GBR,peak.day,3.428609686103873 +2020,GASNAT,GBR,winter.day,6.5982585862326335 +2030,ELCTRI,GBR,winter.night,7.993308999999999 +2030,ELCTRI,GBR,winter.day,7.993308999999999 +2030,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,ELCTRI,GBR,winter.evening,7.993308999999999 +2030,ELCTRI,GBR,peak.night,7.993308999999999 +2030,ELCTRI,GBR,peak.day,7.993308999999999 +2030,ELCTRI,GBR,peak.peak,7.993308999999999 +2030,ELCTRI,GBR,peak.evening,7.993308999999999 +2030,ELCTRI,GBR,summer.night,7.993308999999999 +2030,ELCTRI,GBR,summer.day,0.4 +2030,ELCTRI,GBR,summer.peak,0.4 +2030,ELCTRI,GBR,summer.evening,0.4 +2030,ELCTRI,GBR,autumn.night,7.993308999999999 +2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,autumn.peak,7.993308999999999 +2030,ELCTRI,GBR,autumn.evening,7.993308999999999 +2030,RSHEAT,GBR,winter.night,5.8665369 +2030,RSHEAT,GBR,winter.day,5.8665369 +2030,RSHEAT,GBR,winter.peak,5.8665369 +2030,RSHEAT,GBR,winter.evening,5.8665369 +2030,RSHEAT,GBR,peak.night,5.8665369 +2030,RSHEAT,GBR,peak.day,5.8665369 +2030,RSHEAT,GBR,peak.peak,5.8665369 +2030,RSHEAT,GBR,peak.evening,5.8665369 +2030,RSHEAT,GBR,summer.night,2.80779197 +2030,RSHEAT,GBR,summer.day,0.30200000000000005 +2030,RSHEAT,GBR,summer.peak,0.30200000000000005 +2030,RSHEAT,GBR,summer.evening,0.30200000000000005 +2030,RSHEAT,GBR,autumn.night,5.8665369 +2030,RSHEAT,GBR,autumn.day,5.8665369 +2030,RSHEAT,GBR,autumn.peak,5.8665369 +2030,RSHEAT,GBR,autumn.evening,5.8665369 +2030,GASNAT,GBR,peak.peak,6.161750462640322 +2030,GASNAT,GBR,winter.day,6.161750462640322 +2030,GASNAT,GBR,peak.evening,6.161750462640322 +2030,GASNAT,GBR,summer.evening,6.161750462640322 +2030,GASPRD,GBR,summer.peak,3.428609686103873 +2030,GASPRD,GBR,autumn.peak,6.876080672233131 +2030,GASNAT,GBR,winter.night,3.7738687802727107 +2030,GASNAT,GBR,autumn.day,3.7738687802727107 +2030,GASPRD,GBR,peak.evening,6.876080672233131 +2030,GASNAT,GBR,winter.evening,6.161750462640322 +2030,GASNAT,GBR,peak.night,3.7738687802727107 +2030,GASNAT,GBR,peak.day,3.7738687802727107 +2030,GASPRD,GBR,summer.evening,6.876080672233131 +2030,GASNAT,GBR,autumn.evening,6.161750462640322 +2030,GASNAT,GBR,winter.peak,6.161750462640322 +2030,GASNAT,GBR,autumn.peak,6.161750462640322 +2030,GASPRD,GBR,peak.peak,6.876080672233131 +2030,GASNAT,GBR,summer.night,3.7738687802727107 +2030,GASNAT,GBR,summer.day,3.7738687802727107 +2030,GASPRD,GBR,summer.night,3.428609686103873 +2030,GASPRD,GBR,winter.evening,6.876080672233131 +2030,GASPRD,GBR,autumn.evening,6.876080672233131 +2030,GASPRD,GBR,autumn.day,3.428609686103873 +2030,GASPRD,GBR,winter.day,6.876080672233131 +2030,GASPRD,GBR,peak.day,3.428609686103873 +2030,GASPRD,GBR,autumn.night,3.428609686103873 +2030,GASPRD,GBR,winter.night,3.428609686103873 +2030,GASPRD,GBR,winter.peak,6.876080672233131 +2030,GASPRD,GBR,peak.night,3.428609686103873 +2030,GASPRD,GBR,summer.day,3.428609686103873 +2030,GASNAT,GBR,summer.peak,3.7738687802727107 +2030,GASNAT,GBR,autumn.night,3.7738687802727107 +2040,RSHEAT,GBR,winter.night,5.8665369 +2040,RSHEAT,GBR,winter.day,5.8665369 +2040,RSHEAT,GBR,winter.peak,5.8665369 +2040,RSHEAT,GBR,winter.evening,5.8665369 +2040,RSHEAT,GBR,peak.night,5.8665369 +2040,RSHEAT,GBR,peak.day,5.8665369 +2040,RSHEAT,GBR,peak.peak,5.8665369 +2040,RSHEAT,GBR,peak.evening,5.8665369 +2040,RSHEAT,GBR,summer.night,5.8665369 +2040,RSHEAT,GBR,summer.day,5.8665369 +2040,RSHEAT,GBR,summer.peak,5.8665369 +2040,RSHEAT,GBR,summer.evening,5.8665369 +2040,RSHEAT,GBR,autumn.night,5.8665369 +2040,RSHEAT,GBR,autumn.day,5.8665369 +2040,RSHEAT,GBR,autumn.peak,5.8665369 +2040,RSHEAT,GBR,autumn.evening,5.8665369 +2040,GASNAT,GBR,winter.evening,5.166692883880049 +2040,GASPRD,GBR,peak.peak,5.443465073396721 +2040,GASPRD,GBR,summer.evening,5.443465073396721 +2040,GASPRD,GBR,autumn.day,5.443465073396721 +2040,GASNAT,GBR,peak.day,5.166692883880049 +2040,GASNAT,GBR,winter.night,5.166692883880049 +2040,GASNAT,GBR,peak.peak,5.166692883880049 +2040,GASNAT,GBR,autumn.peak,5.166692883880049 +2040,GASNAT,GBR,winter.peak,5.166692883880049 +2040,GASPRD,GBR,autumn.peak,5.443465073396721 +2040,GASPRD,GBR,autumn.evening,5.443465073396721 +2040,GASNAT,GBR,summer.evening,5.166692883880049 +2040,GASNAT,GBR,autumn.day,5.166692883880049 +2040,GASPRD,GBR,peak.day,5.443465073396721 +2040,GASPRD,GBR,winter.evening,5.443465073396721 +2040,GASNAT,GBR,peak.evening,5.166692883880049 +2040,GASNAT,GBR,autumn.evening,5.166692883880049 +2040,GASPRD,GBR,winter.day,5.443465073396721 +2040,GASPRD,GBR,peak.evening,5.443465073396721 +2040,GASPRD,GBR,winter.peak,5.443465073396721 +2040,GASNAT,GBR,winter.day,5.166692883880049 diff --git a/tests/data/simple_marginal/assets.csv b/tests/data/simple_marginal/assets.csv new file mode 100644 index 000000000..5f4559fa2 --- /dev/null +++ b/tests/data/simple_marginal/assets.csv @@ -0,0 +1,10 @@ +asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_year,capacity +0,GASDRV,GBR,A0_GEX,,2020,,4002.26 +1,GASPRC,GBR,A0_GPR,,2020,,3782.13 +2,WNDFRM,GBR,A0_ELC,,2020,2040,3.964844 +3,GASCGT,GBR,A0_ELC,,2020,2040,2.43 +4,RGASBR,GBR,A0_RES,,2020,2035,2900.0 +5,RELCHP,GBR,A0_RES,,2020,2035,399.98 +6,RGASBR,GBR,A0_RES,,2030,,355.83840587648046 +7,GASCGT,GBR,A0_ELC,,2030,2040,0.5151564434825014 +8,RGASBR,GBR,A0_RES,,2040,,3655.8189696 diff --git a/tests/data/simple_marginal/commodity_flows.csv b/tests/data/simple_marginal/commodity_flows.csv new file mode 100644 index 000000000..f7217b32f --- /dev/null +++ b/tests/data/simple_marginal/commodity_flows.csv @@ -0,0 +1,721 @@ +milestone_year,asset_id,commodity_id,time_slice,flow +2020,0,GASPRD,winter.night,0.0 +2020,0,CO2EMT,winter.night,0.0 +2020,0,GASPRD,winter.day,151.10360181069296 +2020,0,CO2EMT,winter.day,772.5927160580732 +2020,0,GASPRD,winter.peak,125.070625 +2020,0,CO2EMT,winter.peak,639.486105625 +2020,0,GASPRD,winter.evening,166.76083466742 +2020,0,CO2EMT,winter.evening,852.6481476545185 +2020,0,GASPRD,peak.night,0.0 +2020,0,CO2EMT,peak.night,0.0 +2020,0,GASPRD,peak.day,0.0 +2020,0,CO2EMT,peak.day,0.0 +2020,0,GASPRD,peak.peak,58.67582562255717 +2020,0,CO2EMT,peak.peak,300.00949640813485 +2020,0,GASPRD,peak.evening,166.76083466742 +2020,0,CO2EMT,peak.evening,852.6481476545185 +2020,0,GASPRD,summer.night,0.0 +2020,0,CO2EMT,summer.night,0.0 +2020,0,GASPRD,summer.day,0.0 +2020,0,CO2EMT,summer.day,0.0 +2020,0,GASPRD,summer.peak,0.0 +2020,0,CO2EMT,summer.peak,0.0 +2020,0,GASPRD,summer.evening,0.16861964795988574 +2020,0,CO2EMT,summer.evening,0.8621522600188959 +2020,0,GASPRD,autumn.night,0.0 +2020,0,CO2EMT,autumn.night,0.0 +2020,0,GASPRD,autumn.day,0.0 +2020,0,CO2EMT,autumn.day,0.0 +2020,0,GASPRD,autumn.peak,0.0 +2020,0,CO2EMT,autumn.peak,0.0 +2020,0,GASPRD,autumn.evening,163.3883025525992 +2020,0,CO2EMT,autumn.evening,835.4043909514398 +2020,1,GASPRD,winter.night,-0.0 +2020,1,GASNAT,winter.night,0.0 +2020,1,CO2EMT,winter.night,0.0 +2020,1,GASPRD,winter.day,-153.36573202936748 +2020,1,GASNAT,winter.day,146.06260193273093 +2020,1,CO2EMT,winter.day,373.40904184102664 +2020,1,GASPRD,winter.peak,-124.10114062500001 +2020,1,GASNAT,winter.peak,118.1915625 +2020,1,CO2EMT,winter.peak,302.15672953125005 +2020,1,GASPRD,winter.evening,-165.4681888237455 +2020,1,GASNAT,winter.evening,157.58875126070998 +2020,1,CO2EMT,winter.evening,402.87564259800513 +2020,1,GASPRD,peak.night,-0.0 +2020,1,GASNAT,peak.night,0.0 +2020,1,CO2EMT,peak.night,0.0 +2020,1,GASPRD,peak.day,-0.0 +2020,1,GASNAT,peak.day,0.0 +2020,1,CO2EMT,peak.day,0.0 +2020,1,GASPRD,peak.peak,-59.96847146623166 +2020,1,GASNAT,peak.peak,57.11282996783967 +2020,1,CO2EMT,peak.peak,146.00894981278213 +2020,1,GASPRD,peak.evening,-165.4681888237455 +2020,1,GASNAT,peak.evening,157.58875126070998 +2020,1,CO2EMT,peak.evening,402.87564259800513 +2020,1,GASPRD,summer.night,-0.0 +2020,1,GASNAT,summer.night,0.0 +2020,1,CO2EMT,summer.night,0.0 +2020,1,GASPRD,summer.day,-0.0 +2020,1,GASNAT,summer.day,0.0 +2020,1,CO2EMT,summer.day,0.0 +2020,1,GASPRD,summer.peak,-0.0 +2020,1,GASNAT,summer.peak,0.0 +2020,1,CO2EMT,summer.peak,0.0 +2020,1,GASPRD,summer.evening,-0.16861964795988574 +2020,1,GASNAT,summer.evening,0.1605901409141769 +2020,1,CO2EMT,summer.evening,0.41054869524709325 +2020,1,GASPRD,autumn.night,-0.0 +2020,1,GASNAT,autumn.night,0.0 +2020,1,CO2EMT,autumn.night,0.0 +2020,1,GASPRD,autumn.day,-0.0 +2020,1,GASNAT,autumn.day,0.0 +2020,1,CO2EMT,autumn.day,0.0 +2020,1,GASPRD,autumn.peak,-0.0 +2020,1,GASNAT,autumn.peak,0.0 +2020,1,CO2EMT,autumn.peak,0.0 +2020,1,GASPRD,autumn.evening,-163.3883025525992 +2020,1,GASNAT,autumn.evening,155.60790719295161 +2020,1,CO2EMT,autumn.evening,397.81161473878086 +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.783808997678887 +2020,3,ELCTRI,winter.night,5.189205998452591 +2020,3,CO2EMT,winter.night,397.9861540513214 +2020,3,GASNAT,winter.day,-10.010898915527838 +2020,3,ELCTRI,winter.day,6.6739326103518914 +2020,3,CO2EMT,winter.day,511.8572615509383 +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.395089526235901 +2020,3,ELCTRI,winter.evening,2.9300596841572673 +2020,3,CO2EMT,winter.evening,224.7209274764416 +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.066925767990737 +2020,3,ELCTRI,peak.day,7.3779505119938245 +2020,3,CO2EMT,peak.day,565.8519145173664 +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.1605901409141769 +2020,3,ELCTRI,summer.night,0.1070600939427846 +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.621339862602872 +2020,3,ELCTRI,autumn.day,7.747559908401914 +2020,3,CO2EMT,autumn.day,594.1991071748848 +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.52227251698524 +2020,4,RSHEAT,peak.night,16.975889145204558 +2020,4,CO2EMT,peak.night,998.1737937934555 +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.943315907602276 +2020,4,RSHEAT,peak.evening,23.428970354436764 +2020,4,CO2EMT,peak.evening,1377.6117423557046 +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.10896122967321 +2020,4,RSHEAT,autumn.night,7.920835851889748 +2020,4,CO2EMT,autumn.night,465.7411876731913 +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,0.0 +2030,0,CO2EMT,winter.night,0.0 +2030,0,GASPRD,winter.day,209.007363584943 +2030,0,CO2EMT,winter.day,1068.6546500098136 +2030,0,GASPRD,winter.peak,125.070625 +2030,0,CO2EMT,winter.peak,639.486105625 +2030,0,GASPRD,winter.evening,166.76083466742 +2030,0,CO2EMT,winter.evening,852.6481476545185 +2030,0,GASPRD,peak.night,0.0 +2030,0,CO2EMT,peak.night,0.0 +2030,0,GASPRD,peak.day,0.0 +2030,0,CO2EMT,peak.day,0.0 +2030,0,GASPRD,peak.peak,88.48378530453337 +2030,0,CO2EMT,peak.peak,452.41759426207915 +2030,0,GASPRD,peak.evening,166.76083466742 +2030,0,CO2EMT,peak.evening,852.6481476545185 +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.464792220809886 +2030,0,CO2EMT,summer.evening,2.3764826250009476 +2030,0,GASPRD,autumn.night,0.0 +2030,0,CO2EMT,autumn.night,0.0 +2030,0,GASPRD,autumn.day,0.0 +2030,0,CO2EMT,autumn.day,0.0 +2030,0,GASPRD,autumn.peak,20.534211026060376 +2030,0,CO2EMT,autumn.peak,104.99142097624672 +2030,0,GASPRD,autumn.evening,166.76083466742 +2030,0,CO2EMT,autumn.evening,852.6481476545185 +2030,1,GASPRD,winter.night,-0.0 +2030,1,GASNAT,winter.night,0.0 +2030,1,CO2EMT,winter.night,0.0 +2030,1,GASPRD,winter.day,-211.26949380361748 +2030,1,GASNAT,winter.day,201.2090417177309 +2030,1,CO2EMT,winter.day,514.3909151513791 +2030,1,GASPRD,winter.peak,-124.10114062500001 +2030,1,GASNAT,winter.peak,118.1915625 +2030,1,CO2EMT,winter.peak,302.15672953125005 +2030,1,GASPRD,winter.evening,-165.4681888237455 +2030,1,GASNAT,winter.evening,157.58875126070998 +2030,1,CO2EMT,winter.evening,402.87564259800513 +2030,1,GASPRD,peak.night,-0.0 +2030,1,GASNAT,peak.night,0.0 +2030,1,CO2EMT,peak.night,0.0 +2030,1,GASPRD,peak.day,-0.0 +2030,1,GASNAT,peak.day,0.0 +2030,1,CO2EMT,peak.day,0.0 +2030,1,GASPRD,peak.peak,-89.77643114820788 +2030,1,GASNAT,peak.peak,85.50136299829322 +2030,1,CO2EMT,peak.peak,218.58423450513664 +2030,1,GASPRD,peak.evening,-165.4681888237455 +2030,1,GASNAT,peak.evening,157.58875126070998 +2030,1,CO2EMT,peak.evening,402.87564259800513 +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.464792220809886 +2030,1,GASNAT,summer.evening,0.44265925791417715 +2030,1,CO2EMT,summer.evening,1.131658392857594 +2030,1,GASPRD,autumn.night,-0.0 +2030,1,GASNAT,autumn.night,0.0 +2030,1,CO2EMT,autumn.night,0.0 +2030,1,GASPRD,autumn.day,-0.0 +2030,1,GASNAT,autumn.day,0.0 +2030,1,CO2EMT,autumn.day,0.0 +2030,1,GASPRD,autumn.peak,-21.826856869734893 +2030,1,GASNAT,autumn.peak,20.78748273308085 +2030,1,CO2EMT,autumn.peak,53.1431996071212 +2030,1,GASPRD,autumn.evening,-165.4681888237455 +2030,1,GASNAT,autumn.evening,157.58875126070998 +2030,1,CO2EMT,autumn.evening,402.87564259800513 +2030,2,ELCTRI,winter.night,4.435312795545212 +2030,2,ELCTRI,winter.day,7.075379933645912 +2030,2,ELCTRI,winter.peak,1.9712501261051125 +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.7776452018191917 +2030,2,ELCTRI,peak.evening,1.72484387381507 +2030,2,ELCTRI,summer.night,1.6368416242136155 +2030,2,ELCTRI,summer.day,3.2188600626534005 +2030,2,ELCTRI,summer.peak,1.0599640039494003 +2030,2,ELCTRI,summer.evening,0.7892279633502001 +2030,2,ELCTRI,autumn.night,3.203281465982185 +2030,2,ELCTRI,autumn.day,6.001752635595889 +2030,2,ELCTRI,autumn.peak,1.5488393825638174 +2030,2,ELCTRI,autumn.evening,1.9008483513729915 +2030,3,GASNAT,winter.night,-7.783808997678887 +2030,3,ELCTRI,winter.night,5.189205998452591 +2030,3,CO2EMT,winter.night,397.9861540513214 +2030,3,GASNAT,winter.day,-10.010898915527838 +2030,3,ELCTRI,winter.day,6.6739326103518914 +2030,3,CO2EMT,winter.day,511.8572615509383 +2030,3,GASNAT,winter.peak,-2.468688831431171 +2030,3,ELCTRI,winter.peak,1.6457925542874472 +2030,3,CO2EMT,winter.peak,126.22405995107574 +2030,3,GASNAT,winter.evening,-3.3795873788970026 +2030,3,ELCTRI,winter.evening,2.253058252598002 +2030,3,CO2EMT,winter.evening,172.79830268300373 +2030,3,GASNAT,peak.night,-8.382740663321101 +2030,3,ELCTRI,peak.night,5.588493775547401 +2030,3,CO2EMT,peak.night,428.60953011560787 +2030,3,GASNAT,peak.day,-11.066925767990737 +2030,3,ELCTRI,peak.day,7.3779505119938245 +2030,3,CO2EMT,peak.day,565.8519145173664 +2030,3,GASNAT,peak.peak,-3.520722822271213 +2030,3,ELCTRI,peak.peak,2.3471485481808085 +2030,3,CO2EMT,peak.peak,180.0145579027271 +2030,3,GASNAT,peak.evening,-4.646819607935198 +2030,3,ELCTRI,peak.evening,3.0978797386234653 +2030,3,CO2EMT,peak.evening,237.59188655372665 +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,-7.854727240273368 +2030,3,ELCTRI,autumn.night,5.236484826848912 +2030,3,CO2EMT,autumn.night,401.61220379517727 +2030,3,GASNAT,autumn.day,-11.621339862602872 +2030,3,ELCTRI,autumn.day,7.747559908401914 +2030,3,CO2EMT,autumn.day,594.1991071748848 +2030,3,GASNAT,autumn.peak,-3.592603125 +2030,3,ELCTRI,autumn.peak,2.39506875 +2030,3,CO2EMT,autumn.peak,183.68979778124998 +2030,3,GASNAT,autumn.evening,-4.3828128915983156 +2030,3,ELCTRI,autumn.evening,2.921875261065544 +2030,3,CO2EMT,autumn.evening,224.09322314742187 +2030,4,GASNAT,winter.night,-43.845148578709995 +2030,4,RSHEAT,winter.night,38.1262161554 +2030,4,CO2EMT,winter.night,2241.8024468294425 +2030,4,GASNAT,winter.day,-219.27676569358 +2030,4,RSHEAT,winter.day,190.6754484292 +2030,4,CO2EMT,winter.day,11211.621029912745 +2030,4,GASNAT,winter.peak,-104.21874999999999 +2030,4,RSHEAT,winter.peak,90.625 +2030,4,CO2EMT,winter.peak,5328.704687500001 +2030,4,GASNAT,winter.evening,-71.44063561968 +2030,4,RSHEAT,winter.evening,62.1222918432 +2030,4,CO2EMT,winter.evening,3652.7596992342387 +2030,4,GASNAT,peak.night,-0.0 +2030,4,RSHEAT,peak.night,0.0 +2030,4,CO2EMT,peak.night,0.0 +2030,4,GASNAT,peak.day,-96.21279149075198 +2030,4,RSHEAT,peak.day,83.66329694848 +2030,4,CO2EMT,peak.day,4919.3600289221495 +2030,4,GASNAT,peak.peak,-66.12685298630602 +2030,4,RSHEAT,peak.peak,57.50161129244002 +2030,4,CO2EMT,peak.peak,3381.0659931898267 +2030,4,GASNAT,peak.evening,-29.670500177964005 +2030,4,RSHEAT,peak.evening,25.800434937360006 +2030,4,CO2EMT,peak.evening,1517.0526740992998 +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,-0.0 +2030,4,RSHEAT,autumn.night,0.0 +2030,4,CO2EMT,autumn.night,0.0 +2030,4,GASNAT,autumn.day,-67.97422666003601 +2030,4,RSHEAT,autumn.day,59.10802318264001 +2030,4,CO2EMT,autumn.day,3475.5222091276414 +2030,4,GASNAT,autumn.peak,-50.017432516103 +2030,4,RSHEAT,autumn.peak,43.49341957922 +2030,4,CO2EMT,autumn.peak,2557.391324548347 +2030,4,GASNAT,autumn.evening,-19.376214580347 +2030,4,RSHEAT,autumn.evening,16.84888224378 +2030,4,CO2EMT,autumn.evening,990.7058514931422 +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,-9.624518793997803 +2030,5,RSHEAT,peak.night,29.165208466660005 +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,-5.499725043997801 +2030,5,RSHEAT,peak.evening,16.66583346666 +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,-9.624518793997803 +2030,5,RSHEAT,autumn.night,29.165208466660005 +2030,5,ELCTRI,autumn.day,-13.749312543997803 +2030,5,RSHEAT,autumn.day,41.664583466660005 +2030,5,ELCTRI,autumn.peak,-4.12479375 +2030,5,RSHEAT,autumn.peak,12.499375 +2030,5,ELCTRI,autumn.evening,-5.499725043997801 +2030,5,RSHEAT,autumn.evening,16.66583346666 +2030,6,GASNAT,winter.night,-0.0 +2030,6,RSHEAT,winter.night,0.0 +2030,6,CO2EMT,winter.night,0.0 +2030,6,GASNAT,winter.day,-0.0 +2030,6,RSHEAT,winter.day,0.0 +2030,6,CO2EMT,winter.day,0.0 +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,-0.0 +2030,6,RSHEAT,winter.evening,0.0 +2030,6,CO2EMT,winter.evening,0.0 +2030,6,GASNAT,peak.night,-20.670129843374 +2030,6,RSHEAT,peak.night,17.97402595076 +2030,6,CO2EMT,peak.night,1056.8637388917127 +2030,6,GASNAT,peak.day,-0.0 +2030,6,RSHEAT,peak.day,0.0 +2030,6,CO2EMT,peak.day,0.0 +2030,6,GASNAT,peak.peak,-0.0 +2030,6,RSHEAT,peak.peak,0.0 +2030,6,CO2EMT,peak.peak,0.0 +2030,6,GASNAT,peak.evening,-0.0 +2030,6,RSHEAT,peak.evening,0.0 +2030,6,CO2EMT,peak.evening,0.0 +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,-10.492917792587003 +2030,6,RSHEAT,autumn.night,9.124276341380003 +2030,6,CO2EMT,autumn.night,536.5028867349736 +2030,6,GASNAT,autumn.day,-0.0 +2030,6,RSHEAT,autumn.day,0.0 +2030,6,CO2EMT,autumn.day,0.0 +2030,6,GASNAT,autumn.peak,-0.0 +2030,6,RSHEAT,autumn.peak,0.0 +2030,6,CO2EMT,autumn.peak,0.0 +2030,6,GASNAT,autumn.evening,-0.0 +2030,6,RSHEAT,autumn.evening,0.0 +2030,6,CO2EMT,autumn.evening,0.0 +2030,7,GASNAT,winter.night,-0.0 +2030,7,ELCTRI,winter.night,0.0 +2030,7,CO2EMT,winter.night,0.0 +2030,7,GASNAT,winter.day,-0.0 +2030,7,ELCTRI,winter.day,0.0 +2030,7,CO2EMT,winter.day,0.0 +2030,7,GASNAT,winter.peak,-0.7616266044111606 +2030,7,ELCTRI,winter.peak,0.5077510696074404 +2030,7,CO2EMT,winter.peak,38.94196828354264 +2030,7,GASNAT,winter.evening,-1.0155021473388979 +2030,7,ELCTRI,winter.evening,0.6770014315592653 +2030,7,CO2EMT,winter.evening,51.92262479343785 +2030,7,GASNAT,peak.night,-1.7771287517500585 +2030,7,ELCTRI,peak.night,1.1847525011667057 +2030,7,CO2EMT,peak.night,90.86459307698048 +2030,7,GASNAT,peak.day,-0.0 +2030,7,ELCTRI,peak.day,0.0 +2030,7,CO2EMT,peak.day,0.0 +2030,7,GASNAT,peak.peak,-0.0 +2030,7,ELCTRI,peak.peak,0.0 +2030,7,CO2EMT,peak.peak,0.0 +2030,7,GASNAT,peak.evening,-1.0155021473388979 +2030,7,ELCTRI,peak.evening,0.6770014315592653 +2030,7,CO2EMT,peak.evening,51.92262479343785 +2030,7,GASNAT,summer.night,-0.44265925791417715 +2030,7,ELCTRI,summer.night,0.29510617194278477 +2030,7,CO2EMT,summer.night,22.633167857151875 +2030,7,GASNAT,summer.day,-0.0 +2030,7,ELCTRI,summer.day,0.0 +2030,7,CO2EMT,summer.day,0.0 +2030,7,GASNAT,summer.peak,-0.0 +2030,7,ELCTRI,summer.peak,0.0 +2030,7,CO2EMT,summer.peak,0.0 +2030,7,GASNAT,summer.evening,-0.0 +2030,7,ELCTRI,summer.evening,0.0 +2030,7,CO2EMT,summer.evening,0.0 +2030,7,GASNAT,autumn.night,-1.7771287517500585 +2030,7,ELCTRI,autumn.night,1.1847525011667057 +2030,7,CO2EMT,autumn.night,90.86459307698048 +2030,7,GASNAT,autumn.day,-0.0 +2030,7,ELCTRI,autumn.day,0.0 +2030,7,CO2EMT,autumn.day,0.0 +2030,7,GASNAT,autumn.peak,-0.27132842615427455 +2030,7,ELCTRI,autumn.peak,0.18088561743618303 +2030,7,CO2EMT,autumn.peak,13.873022429268056 +2030,7,GASNAT,autumn.evening,-1.0155021473388979 +2030,7,ELCTRI,autumn.evening,0.6770014315592653 +2030,7,CO2EMT,autumn.evening,51.92262479343785 +2040,0,GASPRD,winter.night,0.0 +2040,0,CO2EMT,winter.night,0.0 +2040,0,GASPRD,winter.day,360.96396982311984 +2040,0,CO2EMT,winter.day,1845.6087777056118 +2040,0,GASPRD,winter.peak,125.070625 +2040,0,CO2EMT,winter.peak,639.486105625 +2040,0,GASPRD,winter.evening,166.76083466742 +2040,0,CO2EMT,winter.evening,852.6481476545185 +2040,0,GASPRD,peak.night,0.0 +2040,0,CO2EMT,peak.night,0.0 +2040,0,GASPRD,peak.day,85.71569060312174 +2040,0,CO2EMT,peak.day,438.2643260537615 +2040,0,GASPRD,peak.peak,125.070625 +2040,0,CO2EMT,peak.peak,639.486105625 +2040,0,GASPRD,peak.evening,166.76083466742 +2040,0,CO2EMT,peak.evening,852.6481476545185 +2040,0,GASPRD,summer.night,0.0 +2040,0,CO2EMT,summer.night,0.0 +2040,0,GASPRD,summer.day,0.0 +2040,0,CO2EMT,summer.day,0.0 +2040,0,GASPRD,summer.peak,0.0 +2040,0,CO2EMT,summer.peak,0.0 +2040,0,GASPRD,summer.evening,28.106738155604855 +2040,0,CO2EMT,summer.evening,143.70975218960763 +2040,0,GASPRD,autumn.night,0.0 +2040,0,CO2EMT,autumn.night,0.0 +2040,0,GASPRD,autumn.day,11.030571054582595 +2040,0,CO2EMT,autumn.day,56.39930980208081 +2040,0,GASPRD,autumn.peak,125.070625 +2040,0,CO2EMT,autumn.peak,639.486105625 +2040,0,GASPRD,autumn.evening,166.76083466742 +2040,0,CO2EMT,autumn.evening,852.6481476545185 +2040,1,GASPRD,winter.night,-289.5693294487456 +2040,1,GASNAT,winter.night,275.78031376071004 +2040,1,CO2EMT,winter.night,705.0323721292552 +2040,1,GASPRD,winter.day,-73.65677059304869 +2040,1,GASNAT,winter.day,70.14930532671303 +2040,1,CO2EMT,winter.day,179.33669906774188 +2040,1,GASPRD,winter.peak,-124.10114062500001 +2040,1,GASNAT,winter.peak,118.1915625 +2040,1,CO2EMT,winter.peak,302.15672953125005 +2040,1,GASPRD,winter.evening,-165.4681888237455 +2040,1,GASNAT,winter.evening,157.58875126070998 +2040,1,CO2EMT,winter.evening,402.87564259800513 +2040,1,GASPRD,peak.night,-0.0 +2040,1,GASNAT,peak.night,0.0 +2040,1,CO2EMT,peak.night,0.0 +2040,1,GASPRD,peak.day,-87.97782082179623 +2040,1,GASNAT,peak.day,83.78840078266308 +2040,1,CO2EMT,peak.day,214.20504660087818 +2040,1,GASPRD,peak.peak,-124.10114062500001 +2040,1,GASNAT,peak.peak,118.1915625 +2040,1,CO2EMT,peak.peak,302.15672953125005 +2040,1,GASPRD,peak.evening,-165.4681888237455 +2040,1,GASNAT,peak.evening,157.58875126070998 +2040,1,CO2EMT,peak.evening,402.87564259800513 +2040,1,GASPRD,summer.night,-0.0 +2040,1,GASNAT,summer.night,0.0 +2040,1,CO2EMT,summer.night,0.0 +2040,1,GASPRD,summer.day,-0.0 +2040,1,GASNAT,summer.day,0.0 +2040,1,CO2EMT,summer.day,0.0 +2040,1,GASPRD,summer.peak,-0.0 +2040,1,GASNAT,summer.peak,0.0 +2040,1,CO2EMT,summer.peak,0.0 +2040,1,GASPRD,summer.evening,-28.106738155604855 +2040,1,GASNAT,summer.evening,26.768322052957004 +2040,1,CO2EMT,summer.evening,68.43321532838459 +2040,1,GASPRD,autumn.night,-0.0 +2040,1,GASNAT,autumn.night,0.0 +2040,1,CO2EMT,autumn.night,0.0 +2040,1,GASPRD,autumn.day,-13.292701273257066 +2040,1,GASNAT,autumn.day,12.659715498340063 +2040,1,CO2EMT,autumn.day,32.36456267150637 +2040,1,GASPRD,autumn.peak,-124.10114062500001 +2040,1,GASNAT,autumn.peak,118.1915625 +2040,1,CO2EMT,autumn.peak,302.15672953125005 +2040,1,GASPRD,autumn.evening,-165.4681888237455 +2040,1,GASNAT,autumn.evening,157.58875126070998 +2040,1,CO2EMT,autumn.evening,402.87564259800513 +2040,6,GASNAT,winter.night,-29.838533129172095 +2040,6,RSHEAT,winter.night,25.94655054710617 +2040,6,CO2EMT,winter.night,1525.6441988945694 +2040,6,GASNAT,winter.day,-42.62647584035811 +2040,6,RSHEAT,winter.day,37.066500730746185 +2040,6,CO2EMT,winter.day,2179.4917097175103 +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,-17.050590417986076 +2040,6,RSHEAT,winter.evening,14.826600363466154 +2040,6,CO2EMT,winter.evening,871.7966880716282 +2040,6,GASNAT,peak.night,-29.838533129172095 +2040,6,RSHEAT,peak.night,25.94655054710617 +2040,6,CO2EMT,peak.night,1525.6441988945694 +2040,6,GASNAT,peak.day,-42.62647584035811 +2040,6,RSHEAT,peak.day,37.066500730746185 +2040,6,CO2EMT,peak.day,2179.4917097175103 +2040,6,GASNAT,peak.peak,-12.787942711186016 +2040,6,RSHEAT,peak.peak,11.119950183640015 +2040,6,CO2EMT,peak.peak,653.8475108229411 +2040,6,GASNAT,peak.evening,-17.050590417986076 +2040,6,RSHEAT,peak.evening,14.826600363466154 +2040,6,CO2EMT,peak.evening,871.7966880716282 +2040,6,GASNAT,summer.night,-0.0 +2040,6,RSHEAT,summer.night,0.0 +2040,6,CO2EMT,summer.night,0.0 +2040,6,GASNAT,summer.day,-0.0 +2040,6,RSHEAT,summer.day,0.0 +2040,6,CO2EMT,summer.day,0.0 +2040,6,GASNAT,summer.peak,-0.0 +2040,6,RSHEAT,summer.peak,0.0 +2040,6,CO2EMT,summer.peak,0.0 +2040,6,GASNAT,summer.evening,-0.0 +2040,6,RSHEAT,summer.evening,0.0 +2040,6,CO2EMT,summer.evening,0.0 +2040,6,GASNAT,autumn.night,-29.838533129172095 +2040,6,RSHEAT,autumn.night,25.94655054710617 +2040,6,CO2EMT,autumn.night,1525.6441988945694 +2040,6,GASNAT,autumn.day,-42.62647584035811 +2040,6,RSHEAT,autumn.day,37.066500730746185 +2040,6,CO2EMT,autumn.day,2179.4917097175103 +2040,6,GASNAT,autumn.peak,-12.787942711186016 +2040,6,RSHEAT,autumn.peak,11.119950183640015 +2040,6,CO2EMT,autumn.peak,653.8475108229411 +2040,6,GASNAT,autumn.evening,-17.050590417986076 +2040,6,RSHEAT,autumn.evening,14.826600363466154 +2040,6,CO2EMT,autumn.evening,871.7966880716282 +2040,8,GASNAT,winter.night,-55.07888519119691 +2040,8,RSHEAT,winter.night,47.894682774953836 +2040,8,CO2EMT,winter.night,2816.183399825898 +2040,8,GASNAT,winter.day,-250.5715919948809 +2040,8,RSHEAT,winter.day,217.88834086511383 +2040,8,CO2EMT,winter.day,12811.72549869826 +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,-82.37491934335293 +2040,8,RSHEAT,winter.evening,71.63036464639386 +2040,8,CO2EMT,winter.evening,4211.829626025636 +2040,8,GASNAT,peak.night,-29.648126735860906 +2040,8,RSHEAT,peak.night,25.780979770313834 +2040,8,CO2EMT,peak.night,1515.9087200045683 +2040,8,GASNAT,peak.day,-115.5291897320529 +2040,8,RSHEAT,peak.day,100.46016498439383 +2040,8,CO2EMT,peak.day,5907.007470999865 +2040,8,GASNAT,peak.peak,-75.54876689511998 +2040,8,RSHEAT,peak.peak,65.6945799088 +2040,8,CO2EMT,peak.peak,3862.8084513474855 +2040,8,GASNAT,peak.evening,-36.53908908163693 +2040,8,RSHEAT,peak.evening,31.773120940553852 +2040,8,CO2EMT,peak.evening,1868.2436247440962 +2040,8,GASNAT,summer.night,-7.3878574402420005 +2040,8,RSHEAT,summer.night,6.424223861080001 +2040,8,CO2EMT,summer.night,377.7411509195735 +2040,8,GASNAT,summer.day,-12.309069277277 +2040,8,RSHEAT,summer.day,10.70353850198 +2040,8,CO2EMT,summer.day,629.362712147173 +2040,8,GASNAT,summer.peak,-4.053351218157 +2040,8,RSHEAT,summer.peak,3.5246532331800005 +2040,8,CO2EMT,summer.peak,207.24784778436745 +2040,8,GASNAT,summer.evening,-3.0180441172809997 +2040,8,RSHEAT,summer.evening,2.62438618894 +2040,8,CO2EMT,summer.evening,154.31259571657753 +2040,8,GASNAT,autumn.night,-18.480316070073908 +2040,8,RSHEAT,autumn.night,16.069840060933835 +2040,8,CO2EMT,autumn.night,944.898560662879 +2040,8,GASNAT,autumn.day,-84.54202508133689 +2040,8,RSHEAT,autumn.day,73.51480441855382 +2040,8,CO2EMT,autumn.day,4322.633742408756 +2040,8,GASNAT,autumn.peak,-57.871336489916985 +2040,8,RSHEAT,autumn.peak,50.32290129557999 +2040,8,CO2EMT,autumn.peak,2958.9614347294555 +2040,8,GASNAT,autumn.evening,-25.24280951901992 +2040,8,RSHEAT,autumn.evening,21.950269146973845 +2040,8,CO2EMT,autumn.evening,1290.6648507074885 diff --git a/tests/data/simple_marginal/commodity_prices.csv b/tests/data/simple_marginal/commodity_prices.csv new file mode 100644 index 000000000..e2fed7285 --- /dev/null +++ b/tests/data/simple_marginal/commodity_prices.csv @@ -0,0 +1,177 @@ +milestone_year,commodity_id,region_id,time_slice,price +2020,GASPRD,GBR,winter.night,2.20452 +2020,GASPRD,GBR,winter.day,2.20452 +2020,GASPRD,GBR,winter.peak,2.20452 +2020,GASPRD,GBR,winter.evening,2.20452 +2020,GASPRD,GBR,peak.night,2.20452 +2020,GASPRD,GBR,peak.day,2.20452 +2020,GASPRD,GBR,peak.peak,2.20452 +2020,GASPRD,GBR,peak.evening,2.20452 +2020,GASPRD,GBR,summer.night,2.20452 +2020,GASPRD,GBR,summer.day,2.20452 +2020,GASPRD,GBR,summer.peak,2.20452 +2020,GASPRD,GBR,summer.evening,2.20452 +2020,GASPRD,GBR,autumn.night,2.20452 +2020,GASPRD,GBR,autumn.day,2.20452 +2020,GASPRD,GBR,autumn.peak,2.20452 +2020,GASPRD,GBR,autumn.evening,2.20452 +2020,GASNAT,GBR,winter.night,2.9170059999999998 +2020,GASNAT,GBR,winter.day,2.9170059999999998 +2020,GASNAT,GBR,winter.peak,2.9170059999999998 +2020,GASNAT,GBR,winter.evening,2.9170059999999998 +2020,GASNAT,GBR,peak.night,2.9170059999999998 +2020,GASNAT,GBR,peak.day,2.9170059999999998 +2020,GASNAT,GBR,peak.peak,2.9170059999999998 +2020,GASNAT,GBR,peak.evening,2.9170059999999998 +2020,GASNAT,GBR,summer.night,2.9170059999999998 +2020,GASNAT,GBR,summer.day,2.9170059999999998 +2020,GASNAT,GBR,summer.peak,2.9170059999999998 +2020,GASNAT,GBR,summer.evening,2.9170059999999998 +2020,GASNAT,GBR,autumn.night,2.9170059999999998 +2020,GASNAT,GBR,autumn.day,2.9170059999999998 +2020,GASNAT,GBR,autumn.peak,2.9170059999999998 +2020,GASNAT,GBR,autumn.evening,2.9170059999999998 +2020,RSHEAT,GBR,winter.night,5.8665369 +2020,RSHEAT,GBR,winter.day,5.8665369 +2020,RSHEAT,GBR,winter.peak,5.8665369 +2020,RSHEAT,GBR,winter.evening,5.8665369 +2020,RSHEAT,GBR,peak.night,5.8665369 +2020,RSHEAT,GBR,peak.day,5.8665369 +2020,RSHEAT,GBR,peak.peak,5.8665369 +2020,RSHEAT,GBR,peak.evening,5.8665369 +2020,RSHEAT,GBR,summer.night,2.80779197 +2020,RSHEAT,GBR,summer.day,0.30200000000000005 +2020,RSHEAT,GBR,summer.peak,0.30200000000000005 +2020,RSHEAT,GBR,summer.evening,0.30200000000000005 +2020,RSHEAT,GBR,autumn.night,5.8665369 +2020,RSHEAT,GBR,autumn.day,5.8665369 +2020,RSHEAT,GBR,autumn.peak,5.8665369 +2020,RSHEAT,GBR,autumn.evening,5.8665369 +2020,ELCTRI,GBR,autumn.peak,7.993308999999999 +2020,ELCTRI,GBR,summer.evening,0.4 +2020,ELCTRI,GBR,peak.day,7.993308999999999 +2020,ELCTRI,GBR,peak.night,7.993308999999999 +2020,ELCTRI,GBR,autumn.day,7.993308999999999 +2020,ELCTRI,GBR,summer.peak,0.4 +2020,ELCTRI,GBR,summer.day,0.4 +2020,ELCTRI,GBR,winter.day,7.993308999999999 +2020,ELCTRI,GBR,summer.night,7.993308999999999 +2020,ELCTRI,GBR,peak.peak,7.993308999999999 +2020,ELCTRI,GBR,autumn.evening,7.993308999999999 +2020,ELCTRI,GBR,peak.evening,7.993308999999999 +2020,ELCTRI,GBR,autumn.night,7.993308999999999 +2020,ELCTRI,GBR,winter.night,7.993308999999999 +2020,ELCTRI,GBR,winter.evening,7.993308999999999 +2020,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,GASPRD,GBR,winter.night,2.20452 +2030,GASPRD,GBR,winter.day,2.20452 +2030,GASPRD,GBR,winter.peak,2.20452 +2030,GASPRD,GBR,winter.evening,2.20452 +2030,GASPRD,GBR,peak.night,2.20452 +2030,GASPRD,GBR,peak.day,2.20452 +2030,GASPRD,GBR,peak.peak,2.20452 +2030,GASPRD,GBR,peak.evening,2.20452 +2030,GASPRD,GBR,summer.night,2.20452 +2030,GASPRD,GBR,summer.day,2.20452 +2030,GASPRD,GBR,summer.peak,2.20452 +2030,GASPRD,GBR,summer.evening,2.20452 +2030,GASPRD,GBR,autumn.night,2.20452 +2030,GASPRD,GBR,autumn.day,2.20452 +2030,GASPRD,GBR,autumn.peak,2.20452 +2030,GASPRD,GBR,autumn.evening,2.20452 +2030,GASNAT,GBR,winter.night,2.9170059999999998 +2030,GASNAT,GBR,winter.day,2.9170059999999998 +2030,GASNAT,GBR,winter.peak,2.9170059999999998 +2030,GASNAT,GBR,winter.evening,2.9170059999999998 +2030,GASNAT,GBR,peak.night,2.9170059999999998 +2030,GASNAT,GBR,peak.day,2.9170059999999998 +2030,GASNAT,GBR,peak.peak,2.9170059999999998 +2030,GASNAT,GBR,peak.evening,2.9170059999999998 +2030,GASNAT,GBR,summer.night,2.9170059999999998 +2030,GASNAT,GBR,summer.day,2.9170059999999998 +2030,GASNAT,GBR,summer.peak,2.9170059999999998 +2030,GASNAT,GBR,summer.evening,2.9170059999999998 +2030,GASNAT,GBR,autumn.night,2.9170059999999998 +2030,GASNAT,GBR,autumn.day,2.9170059999999998 +2030,GASNAT,GBR,autumn.peak,2.9170059999999998 +2030,GASNAT,GBR,autumn.evening,2.9170059999999998 +2030,RSHEAT,GBR,winter.night,5.8665369 +2030,RSHEAT,GBR,winter.day,5.8665369 +2030,RSHEAT,GBR,winter.peak,5.8665369 +2030,RSHEAT,GBR,winter.evening,5.8665369 +2030,RSHEAT,GBR,peak.night,5.8665369 +2030,RSHEAT,GBR,peak.day,5.8665369 +2030,RSHEAT,GBR,peak.peak,5.8665369 +2030,RSHEAT,GBR,peak.evening,5.8665369 +2030,RSHEAT,GBR,summer.night,2.80779197 +2030,RSHEAT,GBR,summer.day,0.30200000000000005 +2030,RSHEAT,GBR,summer.peak,0.30200000000000005 +2030,RSHEAT,GBR,summer.evening,0.30200000000000005 +2030,RSHEAT,GBR,autumn.night,5.8665369 +2030,RSHEAT,GBR,autumn.day,5.8665369 +2030,RSHEAT,GBR,autumn.peak,5.8665369 +2030,RSHEAT,GBR,autumn.evening,5.8665369 +2030,ELCTRI,GBR,summer.day,0.4 +2030,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,ELCTRI,GBR,peak.evening,7.993308999999999 +2030,ELCTRI,GBR,peak.night,7.993308999999999 +2030,ELCTRI,GBR,summer.night,7.993308999999999 +2030,ELCTRI,GBR,winter.night,7.993308999999999 +2030,ELCTRI,GBR,winter.day,7.993308999999999 +2030,ELCTRI,GBR,peak.peak,7.993308999999999 +2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,summer.peak,0.4 +2030,ELCTRI,GBR,autumn.evening,7.993308999999999 +2030,ELCTRI,GBR,winter.evening,7.993308999999999 +2030,ELCTRI,GBR,summer.evening,0.4 +2030,ELCTRI,GBR,autumn.peak,7.993308999999999 +2030,ELCTRI,GBR,peak.day,7.993308999999999 +2030,ELCTRI,GBR,autumn.night,7.993308999999999 +2040,GASPRD,GBR,winter.night,2.20452 +2040,GASPRD,GBR,winter.day,2.20452 +2040,GASPRD,GBR,winter.peak,2.20452 +2040,GASPRD,GBR,winter.evening,2.20452 +2040,GASPRD,GBR,peak.night,2.20452 +2040,GASPRD,GBR,peak.day,2.20452 +2040,GASPRD,GBR,peak.peak,2.20452 +2040,GASPRD,GBR,peak.evening,2.20452 +2040,GASPRD,GBR,summer.night,2.20452 +2040,GASPRD,GBR,summer.day,2.20452 +2040,GASPRD,GBR,summer.peak,2.20452 +2040,GASPRD,GBR,summer.evening,2.20452 +2040,GASPRD,GBR,autumn.night,2.20452 +2040,GASPRD,GBR,autumn.day,2.20452 +2040,GASPRD,GBR,autumn.peak,2.20452 +2040,GASPRD,GBR,autumn.evening,2.20452 +2040,GASNAT,GBR,winter.night,2.9170059999999998 +2040,GASNAT,GBR,winter.day,2.9170059999999998 +2040,GASNAT,GBR,winter.peak,2.9170059999999998 +2040,GASNAT,GBR,winter.evening,2.9170059999999998 +2040,GASNAT,GBR,peak.night,2.9170059999999998 +2040,GASNAT,GBR,peak.day,2.9170059999999998 +2040,GASNAT,GBR,peak.peak,2.9170059999999998 +2040,GASNAT,GBR,peak.evening,2.9170059999999998 +2040,GASNAT,GBR,summer.night,2.9170059999999998 +2040,GASNAT,GBR,summer.day,2.9170059999999998 +2040,GASNAT,GBR,summer.peak,2.9170059999999998 +2040,GASNAT,GBR,summer.evening,2.9170059999999998 +2040,GASNAT,GBR,autumn.night,2.9170059999999998 +2040,GASNAT,GBR,autumn.day,2.9170059999999998 +2040,GASNAT,GBR,autumn.peak,2.9170059999999998 +2040,GASNAT,GBR,autumn.evening,2.9170059999999998 +2040,RSHEAT,GBR,winter.night,5.8665369 +2040,RSHEAT,GBR,winter.day,5.8665369 +2040,RSHEAT,GBR,winter.peak,5.8665369 +2040,RSHEAT,GBR,winter.evening,5.8665369 +2040,RSHEAT,GBR,peak.night,5.8665369 +2040,RSHEAT,GBR,peak.day,5.8665369 +2040,RSHEAT,GBR,peak.peak,5.8665369 +2040,RSHEAT,GBR,peak.evening,5.8665369 +2040,RSHEAT,GBR,summer.night,5.8665369 +2040,RSHEAT,GBR,summer.day,5.8665369 +2040,RSHEAT,GBR,summer.peak,5.8665369 +2040,RSHEAT,GBR,summer.evening,5.8665369 +2040,RSHEAT,GBR,autumn.night,5.8665369 +2040,RSHEAT,GBR,autumn.day,5.8665369 +2040,RSHEAT,GBR,autumn.peak,5.8665369 +2040,RSHEAT,GBR,autumn.evening,5.8665369 diff --git a/tests/regression.rs b/tests/regression.rs index b60ac228d..39df77c58 100644 --- a/tests/regression.rs +++ b/tests/regression.rs @@ -1,10 +1,9 @@ //! Common code for running regression tests. -use anyhow::Result; +use csv::{ReaderBuilder, StringRecord, Trim}; use float_cmp::approx_eq; use itertools::Itertools; use std::env; -use std::fs::{File, read_dir}; -use std::io::{BufRead, BufReader}; +use std::fs::read_dir; use std::path::{Path, PathBuf}; use tempfile::{TempDir, tempdir}; @@ -26,6 +25,8 @@ define_regression_test!(circularity); // Patched examples define_regression_test_with_patches!(simple_divisible); define_regression_test_with_patches!(simple_npv); +define_regression_test_with_patches!(simple_marginal); +define_regression_test_with_patches!(simple_full); // ------ END: regression tests ------ @@ -87,38 +88,69 @@ fn compare_lines( file_name: &str, errors: &mut Vec, ) { - let lines1 = read_lines(&output_dir1.join(file_name)); - let lines2 = read_lines(&output_dir2.join(file_name)); + let path1 = output_dir1.join(file_name); + let path2 = output_dir2.join(file_name); + let (header1, mut rows1) = read_csv_records(&path1); + let (header2, mut rows2) = read_csv_records(&path2); + + if header1 != header2 { + errors.push(format!( + "{file_name}: Different CSV headers: '{}' vs '{}'", + header1.iter().join(","), + header2.iter().join(","), + )); + } + + rows1.sort_by_key(row_key); + rows2.sort_by_key(row_key); // Check for different number of lines - if lines1.len() != lines2.len() { + if rows1.len() != rows2.len() { errors.push(format!( "{}: Different number of lines: {} vs {}", file_name, - lines1.len(), - lines2.len() + rows1.len() + 1, + rows2.len() + 1 )); } // Compare each line - for (num, (line1, line2)) in lines1.into_iter().zip(lines2).enumerate() { - if !compare_line(num, &line1, &line2, file_name, errors) { + for (num, (row1, row2)) in rows1.into_iter().zip(rows2).enumerate() { + if !compare_row(num + 1, &row1, &row2, file_name, errors) { errors.push(format!( - "{file_name}: line {num}:\n + \"{line1}\"\n - \"{line2}\"" + "{file_name}: line {}:\n + \"{}\"\n - \"{}\"", + num + 1, + row1.iter().join(","), + row2.iter().join(",") )); } } } -fn compare_line( +fn read_csv_records(path: &Path) -> (StringRecord, Vec) { + let mut reader = ReaderBuilder::new() + .trim(Trim::All) + .from_path(path) + .unwrap(); + let header = reader.headers().unwrap().clone(); + let rows = reader.records().map(|record| record.unwrap()).collect_vec(); + + (header, rows) +} + +fn row_key(row: &StringRecord) -> String { + row.iter().join("\u{1F}") +} + +fn compare_row( num: usize, - line1: &str, - line2: &str, + row1: &StringRecord, + row2: &StringRecord, file_name: &str, errors: &mut Vec, ) -> bool { - let fields1 = line1.split(',').collect_vec(); - let fields2 = line2.split(',').collect_vec(); + let fields1 = row1.iter().collect_vec(); + let fields2 = row2.iter().collect_vec(); if fields1.len() != fields2.len() { errors.push(format!( "{}: line {}: Different number of fields: {} vs {}", @@ -171,12 +203,3 @@ fn get_csv_file_names(dir_path: &Path) -> Vec { file_names.sort(); file_names } - -// Read all lines from a file into a `Vec` -fn read_lines(path: &Path) -> Vec { - let file1 = File::open(path).unwrap(); - BufReader::new(file1) - .lines() - .map_while(Result::ok) - .collect() -} From 1a449a49c021bee4354b38184430f060bf8602b5 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Wed, 11 Mar 2026 11:46:39 +0000 Subject: [PATCH 02/14] change all pricing methods to use index map make regression test files order-dependent again add pr number to upcoming regenerate regression data --- docs/release_notes/upcoming.md | 2 +- src/simulation/prices.rs | 16 +-- tests/data/simple_full/commodity_prices.csv | 114 +++++++++--------- .../data/simple_marginal/commodity_prices.csv | 44 +++---- tests/regression.rs | 71 ++++------- 5 files changed, 113 insertions(+), 134 deletions(-) diff --git a/docs/release_notes/upcoming.md b/docs/release_notes/upcoming.md index 7ca3ab3de..6d94973c4 100644 --- a/docs/release_notes/upcoming.md +++ b/docs/release_notes/upcoming.md @@ -32,7 +32,7 @@ ready to be released, carry out the following steps: - Availability limits can now be provided at multiple levels for a process ([#1018]) - Pricing strategy can now vary by commodity ([#1021]) - `marginal` and `full` commodity pricing strategies no longer require enabling - `please_give_me_broken_results` + `please_give_me_broken_results` ([#1185]) ## Experimental features diff --git a/src/simulation/prices.rs b/src/simulation/prices.rs index 1242ef18d..46dabd86d 100644 --- a/src/simulation/prices.rs +++ b/src/simulation/prices.rs @@ -270,12 +270,12 @@ fn calculate_scarcity_adjusted_prices<'a, I>( activity_duals: I, shadow_prices: &CommodityPrices, markets_to_price: &HashSet<(CommodityID, RegionID)>, -) -> HashMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> +) -> IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> where I: Iterator, { // Calculate highest activity dual for each commodity/region/time slice - let mut highest_duals = HashMap::new(); + let mut highest_duals = IndexMap::new(); for (asset, time_slice, dual) in activity_duals { let region_id = asset.region_id(); @@ -301,7 +301,7 @@ where } // Add this to the shadow price for each commodity/region/time slice - let mut scarcity_prices = HashMap::new(); + let mut scarcity_prices = IndexMap::new(); 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 @@ -378,12 +378,12 @@ fn calculate_marginal_cost_prices<'a, I, J>( shadow_prices: &CommodityPrices, year: u32, markets_to_price: &HashSet<(CommodityID, RegionID)>, -) -> HashMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> +) -> IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> where I: Iterator>, J: Iterator>, { - let mut prices: HashMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> = HashMap::new(); + let mut prices: IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> = IndexMap::new(); // Start by looking at existing assets // Calculate highest marginal cost for each commodity/region/time slice @@ -530,12 +530,12 @@ fn calculate_full_cost_prices<'a, I, J>( shadow_prices: &CommodityPrices, year: u32, markets_to_price: &HashSet<(CommodityID, RegionID)>, -) -> HashMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> +) -> IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> where I: Iterator>, J: Iterator>, { - let mut prices: HashMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> = HashMap::new(); + let mut prices: IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> = IndexMap::new(); // Start by looking at existing assets // Calculate highest full cost for each commodity/region/time slice @@ -721,7 +721,7 @@ mod tests { } fn assert_price_approx( - prices: &HashMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow>, + prices: &IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow>, commodity: &CommodityID, region: &RegionID, time_slice: &TimeSliceID, diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv index 307934ae2..9667a6a19 100644 --- a/tests/data/simple_full/commodity_prices.csv +++ b/tests/data/simple_full/commodity_prices.csv @@ -32,37 +32,37 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 2020,GASPRD,GBR,winter.day,7.504534967942034 -2020,GASPRD,GBR,summer.evening,7.504534967942034 -2020,GASNAT,GBR,summer.evening,6.5982585862326335 -2020,GASPRD,GBR,summer.day,3.428609686103873 -2020,GASPRD,GBR,autumn.peak,3.428609686103873 -2020,GASNAT,GBR,peak.night,3.7738687802727107 2020,GASPRD,GBR,winter.peak,7.504534967942034 2020,GASPRD,GBR,winter.evening,7.504534967942034 -2020,GASNAT,GBR,winter.peak,6.5982585862326335 -2020,GASNAT,GBR,summer.day,3.7738687802727107 -2020,GASNAT,GBR,autumn.day,3.7738687802727107 -2020,GASNAT,GBR,peak.day,3.7738687802727107 +2020,GASPRD,GBR,peak.peak,7.504534967942034 2020,GASPRD,GBR,peak.evening,7.504534967942034 -2020,GASNAT,GBR,autumn.evening,6.5982585862326335 -2020,GASPRD,GBR,summer.night,3.428609686103873 -2020,GASPRD,GBR,autumn.day,3.428609686103873 -2020,GASPRD,GBR,autumn.night,3.428609686103873 -2020,GASPRD,GBR,peak.night,3.428609686103873 +2020,GASPRD,GBR,summer.evening,7.504534967942034 2020,GASPRD,GBR,autumn.evening,7.504534967942034 -2020,GASNAT,GBR,autumn.peak,3.7738687802727107 -2020,GASNAT,GBR,autumn.night,3.7738687802727107 +2020,GASNAT,GBR,winter.day,6.5982585862326335 +2020,GASNAT,GBR,winter.peak,6.5982585862326335 +2020,GASNAT,GBR,winter.evening,6.5982585862326335 +2020,GASNAT,GBR,peak.peak,6.5982585862326335 2020,GASNAT,GBR,peak.evening,6.5982585862326335 +2020,GASNAT,GBR,summer.evening,6.5982585862326335 +2020,GASNAT,GBR,autumn.evening,6.5982585862326335 +2020,GASPRD,GBR,winter.night,3.428609686103873 +2020,GASPRD,GBR,peak.night,3.428609686103873 +2020,GASPRD,GBR,peak.day,3.428609686103873 +2020,GASPRD,GBR,summer.night,3.428609686103873 +2020,GASPRD,GBR,summer.day,3.428609686103873 2020,GASPRD,GBR,summer.peak,3.428609686103873 -2020,GASNAT,GBR,summer.night,3.7738687802727107 -2020,GASNAT,GBR,peak.peak,6.5982585862326335 +2020,GASPRD,GBR,autumn.night,3.428609686103873 +2020,GASPRD,GBR,autumn.day,3.428609686103873 +2020,GASPRD,GBR,autumn.peak,3.428609686103873 2020,GASNAT,GBR,winter.night,3.7738687802727107 +2020,GASNAT,GBR,peak.night,3.7738687802727107 +2020,GASNAT,GBR,peak.day,3.7738687802727107 +2020,GASNAT,GBR,summer.night,3.7738687802727107 +2020,GASNAT,GBR,summer.day,3.7738687802727107 2020,GASNAT,GBR,summer.peak,3.7738687802727107 -2020,GASPRD,GBR,peak.peak,7.504534967942034 -2020,GASPRD,GBR,winter.night,3.428609686103873 -2020,GASNAT,GBR,winter.evening,6.5982585862326335 -2020,GASPRD,GBR,peak.day,3.428609686103873 -2020,GASNAT,GBR,winter.day,6.5982585862326335 +2020,GASNAT,GBR,autumn.night,3.7738687802727107 +2020,GASNAT,GBR,autumn.day,3.7738687802727107 +2020,GASNAT,GBR,autumn.peak,3.7738687802727107 2030,ELCTRI,GBR,winter.night,7.993308999999999 2030,ELCTRI,GBR,winter.day,7.993308999999999 2030,ELCTRI,GBR,winter.peak,7.993308999999999 @@ -95,38 +95,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2030,GASNAT,GBR,peak.peak,6.161750462640322 +2030,GASPRD,GBR,winter.day,6.876080672233131 +2030,GASPRD,GBR,winter.peak,6.876080672233131 +2030,GASPRD,GBR,winter.evening,6.876080672233131 +2030,GASPRD,GBR,peak.peak,6.876080672233131 +2030,GASPRD,GBR,peak.evening,6.876080672233131 +2030,GASPRD,GBR,summer.evening,6.876080672233131 +2030,GASPRD,GBR,autumn.peak,6.876080672233131 +2030,GASPRD,GBR,autumn.evening,6.876080672233131 2030,GASNAT,GBR,winter.day,6.161750462640322 +2030,GASNAT,GBR,winter.peak,6.161750462640322 +2030,GASNAT,GBR,winter.evening,6.161750462640322 +2030,GASNAT,GBR,peak.peak,6.161750462640322 2030,GASNAT,GBR,peak.evening,6.161750462640322 2030,GASNAT,GBR,summer.evening,6.161750462640322 +2030,GASNAT,GBR,autumn.peak,6.161750462640322 +2030,GASNAT,GBR,autumn.evening,6.161750462640322 +2030,GASPRD,GBR,winter.night,3.428609686103873 +2030,GASPRD,GBR,peak.night,3.428609686103873 +2030,GASPRD,GBR,peak.day,3.428609686103873 +2030,GASPRD,GBR,summer.night,3.428609686103873 +2030,GASPRD,GBR,summer.day,3.428609686103873 2030,GASPRD,GBR,summer.peak,3.428609686103873 -2030,GASPRD,GBR,autumn.peak,6.876080672233131 +2030,GASPRD,GBR,autumn.night,3.428609686103873 +2030,GASPRD,GBR,autumn.day,3.428609686103873 2030,GASNAT,GBR,winter.night,3.7738687802727107 -2030,GASNAT,GBR,autumn.day,3.7738687802727107 -2030,GASPRD,GBR,peak.evening,6.876080672233131 -2030,GASNAT,GBR,winter.evening,6.161750462640322 2030,GASNAT,GBR,peak.night,3.7738687802727107 2030,GASNAT,GBR,peak.day,3.7738687802727107 -2030,GASPRD,GBR,summer.evening,6.876080672233131 -2030,GASNAT,GBR,autumn.evening,6.161750462640322 -2030,GASNAT,GBR,winter.peak,6.161750462640322 -2030,GASNAT,GBR,autumn.peak,6.161750462640322 -2030,GASPRD,GBR,peak.peak,6.876080672233131 2030,GASNAT,GBR,summer.night,3.7738687802727107 2030,GASNAT,GBR,summer.day,3.7738687802727107 -2030,GASPRD,GBR,summer.night,3.428609686103873 -2030,GASPRD,GBR,winter.evening,6.876080672233131 -2030,GASPRD,GBR,autumn.evening,6.876080672233131 -2030,GASPRD,GBR,autumn.day,3.428609686103873 -2030,GASPRD,GBR,winter.day,6.876080672233131 -2030,GASPRD,GBR,peak.day,3.428609686103873 -2030,GASPRD,GBR,autumn.night,3.428609686103873 -2030,GASPRD,GBR,winter.night,3.428609686103873 -2030,GASPRD,GBR,winter.peak,6.876080672233131 -2030,GASPRD,GBR,peak.night,3.428609686103873 -2030,GASPRD,GBR,summer.day,3.428609686103873 2030,GASNAT,GBR,summer.peak,3.7738687802727107 2030,GASNAT,GBR,autumn.night,3.7738687802727107 +2030,GASNAT,GBR,autumn.day,3.7738687802727107 2040,RSHEAT,GBR,winter.night,5.8665369 2040,RSHEAT,GBR,winter.day,5.8665369 2040,RSHEAT,GBR,winter.peak,5.8665369 @@ -143,24 +143,24 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,RSHEAT,GBR,autumn.day,5.8665369 2040,RSHEAT,GBR,autumn.peak,5.8665369 2040,RSHEAT,GBR,autumn.evening,5.8665369 -2040,GASNAT,GBR,winter.evening,5.166692883880049 +2040,GASPRD,GBR,winter.day,5.443465073396721 +2040,GASPRD,GBR,winter.peak,5.443465073396721 +2040,GASPRD,GBR,winter.evening,5.443465073396721 +2040,GASPRD,GBR,peak.day,5.443465073396721 2040,GASPRD,GBR,peak.peak,5.443465073396721 +2040,GASPRD,GBR,peak.evening,5.443465073396721 2040,GASPRD,GBR,summer.evening,5.443465073396721 2040,GASPRD,GBR,autumn.day,5.443465073396721 -2040,GASNAT,GBR,peak.day,5.166692883880049 -2040,GASNAT,GBR,winter.night,5.166692883880049 -2040,GASNAT,GBR,peak.peak,5.166692883880049 -2040,GASNAT,GBR,autumn.peak,5.166692883880049 -2040,GASNAT,GBR,winter.peak,5.166692883880049 2040,GASPRD,GBR,autumn.peak,5.443465073396721 2040,GASPRD,GBR,autumn.evening,5.443465073396721 +2040,GASNAT,GBR,winter.night,5.166692883880049 +2040,GASNAT,GBR,winter.day,5.166692883880049 +2040,GASNAT,GBR,winter.peak,5.166692883880049 +2040,GASNAT,GBR,winter.evening,5.166692883880049 +2040,GASNAT,GBR,peak.day,5.166692883880049 +2040,GASNAT,GBR,peak.peak,5.166692883880049 +2040,GASNAT,GBR,peak.evening,5.166692883880049 2040,GASNAT,GBR,summer.evening,5.166692883880049 2040,GASNAT,GBR,autumn.day,5.166692883880049 -2040,GASPRD,GBR,peak.day,5.443465073396721 -2040,GASPRD,GBR,winter.evening,5.443465073396721 -2040,GASNAT,GBR,peak.evening,5.166692883880049 +2040,GASNAT,GBR,autumn.peak,5.166692883880049 2040,GASNAT,GBR,autumn.evening,5.166692883880049 -2040,GASPRD,GBR,winter.day,5.443465073396721 -2040,GASPRD,GBR,peak.evening,5.443465073396721 -2040,GASPRD,GBR,winter.peak,5.443465073396721 -2040,GASNAT,GBR,winter.day,5.166692883880049 diff --git a/tests/data/simple_marginal/commodity_prices.csv b/tests/data/simple_marginal/commodity_prices.csv index e2fed7285..a9b8ee0fc 100644 --- a/tests/data/simple_marginal/commodity_prices.csv +++ b/tests/data/simple_marginal/commodity_prices.csv @@ -47,22 +47,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 -2020,ELCTRI,GBR,autumn.peak,7.993308999999999 -2020,ELCTRI,GBR,summer.evening,0.4 -2020,ELCTRI,GBR,peak.day,7.993308999999999 -2020,ELCTRI,GBR,peak.night,7.993308999999999 -2020,ELCTRI,GBR,autumn.day,7.993308999999999 -2020,ELCTRI,GBR,summer.peak,0.4 -2020,ELCTRI,GBR,summer.day,0.4 +2020,ELCTRI,GBR,winter.night,7.993308999999999 2020,ELCTRI,GBR,winter.day,7.993308999999999 -2020,ELCTRI,GBR,summer.night,7.993308999999999 +2020,ELCTRI,GBR,winter.peak,7.993308999999999 +2020,ELCTRI,GBR,winter.evening,7.993308999999999 +2020,ELCTRI,GBR,peak.night,7.993308999999999 +2020,ELCTRI,GBR,peak.day,7.993308999999999 2020,ELCTRI,GBR,peak.peak,7.993308999999999 -2020,ELCTRI,GBR,autumn.evening,7.993308999999999 2020,ELCTRI,GBR,peak.evening,7.993308999999999 +2020,ELCTRI,GBR,summer.night,7.993308999999999 +2020,ELCTRI,GBR,summer.day,0.4 +2020,ELCTRI,GBR,summer.peak,0.4 +2020,ELCTRI,GBR,summer.evening,0.4 2020,ELCTRI,GBR,autumn.night,7.993308999999999 -2020,ELCTRI,GBR,winter.night,7.993308999999999 -2020,ELCTRI,GBR,winter.evening,7.993308999999999 -2020,ELCTRI,GBR,winter.peak,7.993308999999999 +2020,ELCTRI,GBR,autumn.day,7.993308999999999 +2020,ELCTRI,GBR,autumn.peak,7.993308999999999 +2020,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,GASPRD,GBR,winter.night,2.20452 2030,GASPRD,GBR,winter.day,2.20452 2030,GASPRD,GBR,winter.peak,2.20452 @@ -111,22 +111,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2030,ELCTRI,GBR,summer.day,0.4 -2030,ELCTRI,GBR,winter.peak,7.993308999999999 -2030,ELCTRI,GBR,peak.evening,7.993308999999999 -2030,ELCTRI,GBR,peak.night,7.993308999999999 -2030,ELCTRI,GBR,summer.night,7.993308999999999 2030,ELCTRI,GBR,winter.night,7.993308999999999 2030,ELCTRI,GBR,winter.day,7.993308999999999 +2030,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,ELCTRI,GBR,winter.evening,7.993308999999999 +2030,ELCTRI,GBR,peak.night,7.993308999999999 +2030,ELCTRI,GBR,peak.day,7.993308999999999 2030,ELCTRI,GBR,peak.peak,7.993308999999999 -2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,peak.evening,7.993308999999999 +2030,ELCTRI,GBR,summer.night,7.993308999999999 +2030,ELCTRI,GBR,summer.day,0.4 2030,ELCTRI,GBR,summer.peak,0.4 -2030,ELCTRI,GBR,autumn.evening,7.993308999999999 -2030,ELCTRI,GBR,winter.evening,7.993308999999999 2030,ELCTRI,GBR,summer.evening,0.4 -2030,ELCTRI,GBR,autumn.peak,7.993308999999999 -2030,ELCTRI,GBR,peak.day,7.993308999999999 2030,ELCTRI,GBR,autumn.night,7.993308999999999 +2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,autumn.peak,7.993308999999999 +2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2040,GASPRD,GBR,winter.night,2.20452 2040,GASPRD,GBR,winter.day,2.20452 2040,GASPRD,GBR,winter.peak,2.20452 diff --git a/tests/regression.rs b/tests/regression.rs index 39df77c58..33efd00d6 100644 --- a/tests/regression.rs +++ b/tests/regression.rs @@ -1,9 +1,10 @@ //! Common code for running regression tests. -use csv::{ReaderBuilder, StringRecord, Trim}; +use anyhow::Result; use float_cmp::approx_eq; use itertools::Itertools; use std::env; -use std::fs::read_dir; +use std::fs::{File, read_dir}; +use std::io::{BufRead, BufReader}; use std::path::{Path, PathBuf}; use tempfile::{TempDir, tempdir}; @@ -88,69 +89,38 @@ fn compare_lines( file_name: &str, errors: &mut Vec, ) { - let path1 = output_dir1.join(file_name); - let path2 = output_dir2.join(file_name); - let (header1, mut rows1) = read_csv_records(&path1); - let (header2, mut rows2) = read_csv_records(&path2); - - if header1 != header2 { - errors.push(format!( - "{file_name}: Different CSV headers: '{}' vs '{}'", - header1.iter().join(","), - header2.iter().join(","), - )); - } - - rows1.sort_by_key(row_key); - rows2.sort_by_key(row_key); + let lines1 = read_lines(&output_dir1.join(file_name)); + let lines2 = read_lines(&output_dir2.join(file_name)); // Check for different number of lines - if rows1.len() != rows2.len() { + if lines1.len() != lines2.len() { errors.push(format!( "{}: Different number of lines: {} vs {}", file_name, - rows1.len() + 1, - rows2.len() + 1 + lines1.len(), + lines2.len() )); } // Compare each line - for (num, (row1, row2)) in rows1.into_iter().zip(rows2).enumerate() { - if !compare_row(num + 1, &row1, &row2, file_name, errors) { + for (num, (line1, line2)) in lines1.into_iter().zip(lines2).enumerate() { + if !compare_line(num, &line1, &line2, file_name, errors) { errors.push(format!( - "{file_name}: line {}:\n + \"{}\"\n - \"{}\"", - num + 1, - row1.iter().join(","), - row2.iter().join(",") + "{file_name}: line {num}:\n + \"{line1}\"\n - \"{line2}\"" )); } } } -fn read_csv_records(path: &Path) -> (StringRecord, Vec) { - let mut reader = ReaderBuilder::new() - .trim(Trim::All) - .from_path(path) - .unwrap(); - let header = reader.headers().unwrap().clone(); - let rows = reader.records().map(|record| record.unwrap()).collect_vec(); - - (header, rows) -} - -fn row_key(row: &StringRecord) -> String { - row.iter().join("\u{1F}") -} - -fn compare_row( +fn compare_line( num: usize, - row1: &StringRecord, - row2: &StringRecord, + line1: &str, + line2: &str, file_name: &str, errors: &mut Vec, ) -> bool { - let fields1 = row1.iter().collect_vec(); - let fields2 = row2.iter().collect_vec(); + let fields1 = line1.split(',').collect_vec(); + let fields2 = line2.split(',').collect_vec(); if fields1.len() != fields2.len() { errors.push(format!( "{}: line {}: Different number of fields: {} vs {}", @@ -203,3 +173,12 @@ fn get_csv_file_names(dir_path: &Path) -> Vec { file_names.sort(); file_names } + +// Read all lines from a file into a `Vec` +fn read_lines(path: &Path) -> Vec { + let file1 = File::open(path).unwrap(); + BufReader::new(file1) + .lines() + .map_while(Result::ok) + .collect() +} From a1a47e7813b901a0ffd88586ae33fce34754456b Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Wed, 11 Mar 2026 11:49:12 +0000 Subject: [PATCH 03/14] make patches with_replacement feature more robust --- src/patch.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/patch.rs b/src/patch.rs index e8e452b92..8a87c097a 100644 --- a/src/patch.rs +++ b/src/patch.rs @@ -142,6 +142,10 @@ impl FilePatch { /// Set the header row for this patch (header should be a comma-joined string, e.g. "a,b,c"). pub fn with_header(mut self, header: impl Into) -> Self { + assert!( + self.replacement_content.is_none(), + "Cannot set header when replacement content is set for this FilePatch", + ); assert!( self.header_row.is_none(), "Header already set for this FilePatch", @@ -154,6 +158,14 @@ impl FilePatch { /// Set full replacement content for this file. pub fn with_replacement(mut self, content: impl Into) -> Self { + assert!( + self.header_row.is_none(), + "Cannot set replacement content when header is set for this FilePatch", + ); + assert!( + self.to_delete.is_empty() && self.to_add.is_empty(), + "Cannot set replacement content when additions/deletions are set for this FilePatch", + ); assert!( self.replacement_content.is_none(), "Replacement content already set for this FilePatch", @@ -164,6 +176,10 @@ impl FilePatch { /// Add a row to the patch (row should be a comma-joined string, e.g. "a,b,c"). pub fn with_addition(mut self, row: impl Into) -> Self { + assert!( + self.replacement_content.is_none(), + "Cannot add rows when replacement content is set for this FilePatch", + ); let s = row.into(); let v = s.split(',').map(|s| s.trim().to_string()).collect(); self.to_add.insert(v); @@ -172,6 +188,10 @@ impl FilePatch { /// Mark a row for deletion from the base (row should be a comma-joined string, e.g. "a,b,c"). pub fn with_deletion(mut self, row: impl Into) -> Self { + assert!( + self.replacement_content.is_none(), + "Cannot delete rows when replacement content is set for this FilePatch", + ); let s = row.into(); let v = s.split(',').map(|s| s.trim().to_string()).collect(); self.to_delete.insert(v); @@ -419,6 +439,34 @@ mod tests { assert_eq!(assets_content, replacement); } + #[test] + #[should_panic( + expected = "Cannot set replacement content when header is set for this FilePatch" + )] + fn file_patch_replacement_after_header_panics() { + let _ = FilePatch::new("assets.csv") + .with_header("col1,col2") + .with_replacement("col1,col2\na,b\n"); + } + + #[test] + #[should_panic( + expected = "Cannot set replacement content when additions/deletions are set for this FilePatch" + )] + fn file_patch_replacement_after_addition_panics() { + let _ = FilePatch::new("assets.csv") + .with_addition("a,b") + .with_replacement("col1,col2\na,b\n"); + } + + #[test] + #[should_panic(expected = "Cannot add rows when replacement content is set for this FilePatch")] + fn file_patch_addition_after_replacement_panics() { + let _ = FilePatch::new("assets.csv") + .with_replacement("col1,col2\na,b\n") + .with_addition("c,d"); + } + #[test] fn toml_patch() { // Patch to add an extra milestone year (2050) From 048e52eac584ccbf53bd626a3af7255bb32ebf3e Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Wed, 11 Mar 2026 11:52:03 +0000 Subject: [PATCH 04/14] make spply with_replacement more robust --- src/patch.rs | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/patch.rs b/src/patch.rs index 8a87c097a..ae469e0c9 100644 --- a/src/patch.rs +++ b/src/patch.rs @@ -200,17 +200,20 @@ impl FilePatch { /// Apply this patch to a base model and return the modified CSV as a string. fn apply(&self, base_model_dir: &Path) -> Result { - if let Some(content) = &self.replacement_content { - return Ok(content.clone()); - } - - // Read the base file to string + // Read and validate the base file path let base_path = base_model_dir.join(&self.filename); ensure!( base_path.exists() && base_path.is_file(), "Base file for patching does not exist: {}", base_path.display() ); + + // nothing further to do if this patch is a full replacement + if let Some(content) = &self.replacement_content { + return Ok(content.clone()); + } + + // Read the base file to string let base = fs::read_to_string(&base_path)?; // Apply the patch @@ -467,6 +470,17 @@ mod tests { .with_addition("c,d"); } + #[test] + fn file_patch_with_replacement_missing_base_file_fails() { + let model_patch = ModelPatch::from_example("simple") + .with_file_patch(FilePatch::new("not_a_real_file.csv").with_replacement("x,y\n1,2\n")); + + assert_error!( + model_patch.build_to_tempdir(), + "Error applying patch to file: not_a_real_file.csv" + ); + } + #[test] fn toml_patch() { // Patch to add an extra milestone year (2050) From 4758654e57d0c39db02ee1ecf718caa7cf5f17f6 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Wed, 11 Mar 2026 11:56:06 +0000 Subject: [PATCH 05/14] update patch unit test --- src/patch.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/patch.rs b/src/patch.rs index ae469e0c9..9925ed32d 100644 --- a/src/patch.rs +++ b/src/patch.rs @@ -477,7 +477,7 @@ mod tests { assert_error!( model_patch.build_to_tempdir(), - "Error applying patch to file: not_a_real_file.csv" + "Base file for patching does not exist: examples/simple/not_a_real_file.csv" ); } From fd9ea490796bebc3839f7345b8364fa4394649c8 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Wed, 11 Mar 2026 13:19:41 +0000 Subject: [PATCH 06/14] make with_replacement patch easier to use and less error prone --- src/example/patches.rs | 32 +++++++++++++------------- src/patch.rs | 52 ++++++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 28 deletions(-) diff --git a/src/example/patches.rs b/src/example/patches.rs index 893193eba..d05f65331 100644 --- a/src/example/patches.rs +++ b/src/example/patches.rs @@ -35,26 +35,26 @@ fn get_all_patches() -> PatchMap { ( // The simple example with electricity priced using marginal costs "simple_marginal", - vec![FilePatch::new("commodities.csv").with_replacement( - "id,description,type,time_slice_level,pricing_strategy,units\n\ - GASPRD,Gas produced,sed,season,shadow,PJ\n\ - GASNAT,Natural gas,sed,season,shadow,PJ\n\ - ELCTRI,Electricity,sed,daynight,marginal,PJ\n\ - RSHEAT,Residential heating,svd,daynight,shadow,PJ\n\ - CO2EMT,CO2 emitted,oth,annual,unpriced,ktCO2\n", - )], + vec![FilePatch::new("commodities.csv").with_replacement(&[ + "id,description,type,time_slice_level,pricing_strategy,units", + "GASPRD,Gas produced,sed,season,shadow,PJ", + "GASNAT,Natural gas,sed,season,shadow,PJ", + "ELCTRI,Electricity,sed,daynight,marginal,PJ", + "RSHEAT,Residential heating,svd,daynight,shadow,PJ", + "CO2EMT,CO2 emitted,oth,annual,unpriced,ktCO2", + ])], ), ( // The simple example with gas commodities priced using full costs "simple_full", - vec![FilePatch::new("commodities.csv").with_replacement( - "id,description,type,time_slice_level,pricing_strategy,units\n\ - GASPRD,Gas produced,sed,season,full,PJ\n\ - GASNAT,Natural gas,sed,season,full,PJ\n\ - ELCTRI,Electricity,sed,daynight,shadow,PJ\n\ - RSHEAT,Residential heating,svd,daynight,shadow,PJ\n\ - CO2EMT,CO2 emitted,oth,annual,unpriced,ktCO2\n", - )], + vec![FilePatch::new("commodities.csv").with_replacement(&[ + "id,description,type,time_slice_level,pricing_strategy,units", + "GASPRD,Gas produced,sed,season,full,PJ", + "GASNAT,Natural gas,sed,season,full,PJ", + "ELCTRI,Electricity,sed,daynight,shadow,PJ", + "RSHEAT,Residential heating,svd,daynight,shadow,PJ", + "CO2EMT,CO2 emitted,oth,annual,unpriced,ktCO2", + ])], ), ] .into_iter() diff --git a/src/patch.rs b/src/patch.rs index 9925ed32d..44191e304 100644 --- a/src/patch.rs +++ b/src/patch.rs @@ -156,8 +156,12 @@ impl FilePatch { self } - /// Set full replacement content for this file. - pub fn with_replacement(mut self, content: impl Into) -> Self { + /// Set full replacement content for this file from a slice of lines. + /// + /// Each line is joined with newlines, and a trailing newline is added. + /// All lines must have the same number of columns (commas). + /// Example: `with_replacement(&["header1,header2", "value1,value2"])` + pub fn with_replacement(mut self, lines: &[&str]) -> Self { assert!( self.header_row.is_none(), "Cannot set replacement content when header is set for this FilePatch", @@ -170,7 +174,21 @@ impl FilePatch { self.replacement_content.is_none(), "Replacement content already set for this FilePatch", ); - self.replacement_content = Some(content.into()); + + // Validate that all lines have the same number of columns + if !lines.is_empty() { + let first_col_count = lines[0].matches(',').count() + 1; + for (idx, line) in lines.iter().enumerate() { + let col_count = line.matches(',').count() + 1; + assert_eq!( + col_count, first_col_count, + "Line {idx} has {col_count} columns but line 0 has {first_col_count}: {line:?}" + ); + } + } + + let content = lines.join("\n") + "\n"; + self.replacement_content = Some(content); self } @@ -208,7 +226,8 @@ impl FilePatch { base_path.display() ); - // nothing further to do if this patch is a full replacement + // If this patch is a full replacement, validate the base file exists + // (checked above) and return the replacement content if let Some(content) = &self.replacement_content { return Ok(content.clone()); } @@ -430,16 +449,18 @@ mod tests { #[test] fn file_patch_with_replacement() { - let replacement = "col1,col2\nnew1,new2\n"; + let expected = "col1,col2\nnew1,new2\n"; let model_dir = ModelPatch::from_example("simple") - .with_file_patch(FilePatch::new("assets.csv").with_replacement(replacement)) + .with_file_patch( + FilePatch::new("assets.csv").with_replacement(&["col1,col2", "new1,new2"]), + ) .build_to_tempdir() .unwrap(); let assets_path = model_dir.path().join("assets.csv"); let assets_content = std::fs::read_to_string(assets_path).unwrap(); - assert_eq!(assets_content, replacement); + assert_eq!(assets_content, expected); } #[test] @@ -449,7 +470,7 @@ mod tests { fn file_patch_replacement_after_header_panics() { let _ = FilePatch::new("assets.csv") .with_header("col1,col2") - .with_replacement("col1,col2\na,b\n"); + .with_replacement(&["col1,col2", "a,b"]); } #[test] @@ -459,21 +480,22 @@ mod tests { fn file_patch_replacement_after_addition_panics() { let _ = FilePatch::new("assets.csv") .with_addition("a,b") - .with_replacement("col1,col2\na,b\n"); + .with_replacement(&["col1,col2", "a,b"]); } #[test] #[should_panic(expected = "Cannot add rows when replacement content is set for this FilePatch")] fn file_patch_addition_after_replacement_panics() { let _ = FilePatch::new("assets.csv") - .with_replacement("col1,col2\na,b\n") + .with_replacement(&["col1,col2", "a,b"]) .with_addition("c,d"); } #[test] fn file_patch_with_replacement_missing_base_file_fails() { - let model_patch = ModelPatch::from_example("simple") - .with_file_patch(FilePatch::new("not_a_real_file.csv").with_replacement("x,y\n1,2\n")); + let model_patch = ModelPatch::from_example("simple").with_file_patch( + FilePatch::new("not_a_real_file.csv").with_replacement(&["x,y", "1,2"]), + ); assert_error!( model_patch.build_to_tempdir(), @@ -481,6 +503,12 @@ mod tests { ); } + #[test] + #[should_panic(expected = "Line 1 has 2 columns but line 0 has 3")] + fn file_patch_replacement_column_count_mismatch_panics() { + let _ = FilePatch::new("test.csv").with_replacement(&["col1,col2,col3", "a,b"]); + } + #[test] fn toml_patch() { // Patch to add an extra milestone year (2050) From 63ddd2dc429328854414b43b18bf710c2c298427 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Wed, 11 Mar 2026 14:33:36 +0000 Subject: [PATCH 07/14] show the correct csv line number when there is a difference in regression results --- tests/regression.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/regression.rs b/tests/regression.rs index 33efd00d6..254a41546 100644 --- a/tests/regression.rs +++ b/tests/regression.rs @@ -95,18 +95,18 @@ fn compare_lines( // Check for different number of lines if lines1.len() != lines2.len() { errors.push(format!( - "{}: Different number of lines: {} vs {}", - file_name, + "{file_name}: Different number of lines: {} vs {}", lines1.len(), lines2.len() )); } // Compare each line - for (num, (line1, line2)) in lines1.into_iter().zip(lines2).enumerate() { - if !compare_line(num, &line1, &line2, file_name, errors) { + for (idx, (line1, line2)) in lines1.into_iter().zip(lines2).enumerate() { + let line_num = idx + 1; // (1-based) line number + if !compare_line(line_num, &line1, &line2, file_name, errors) { errors.push(format!( - "{file_name}: line {num}:\n + \"{line1}\"\n - \"{line2}\"" + "{file_name}: line {line_num}:\n + \"{line1}\"\n - \"{line2}\"" )); } } From 58d149d696a462a26bb7819ed60a2f593e7dff70 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Thu, 12 Mar 2026 13:50:34 +0000 Subject: [PATCH 08/14] make path testing more robust across os's --- src/patch.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/patch.rs b/src/patch.rs index 44191e304..6b0b843e1 100644 --- a/src/patch.rs +++ b/src/patch.rs @@ -497,10 +497,15 @@ mod tests { FilePatch::new("not_a_real_file.csv").with_replacement(&["x,y", "1,2"]), ); - assert_error!( - model_patch.build_to_tempdir(), - "Base file for patching does not exist: examples/simple/not_a_real_file.csv" + let expected = format!( + "Base file for patching does not exist: {}", + std::path::PathBuf::from("examples") + .join("simple") + .join("not_a_real_file.csv") + .display() ); + + assert_error!(model_patch.build_to_tempdir(), expected); } #[test] From cdbe3c7597e677ce4e5d60a7aa2cbc8181e4f005 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Fri, 13 Mar 2026 11:35:59 +0000 Subject: [PATCH 09/14] test adding options to make highs more deterministic across oses --- src/simulation/optimisation.rs | 10 +- tests/data/circularity/assets.csv | 4 +- tests/data/circularity/commodity_flows.csv | 310 ++--- tests/data/circularity/commodity_prices.csv | 16 +- tests/data/muse1_default/commodity_flows.csv | 292 ++-- tests/data/muse1_default/commodity_prices.csv | 4 +- tests/data/simple/debug_dispatch_assets.csv | 316 ++--- tests/data/simple/debug_solver.csv | 10 +- .../data/simple_divisible/commodity_flows.csv | 114 +- tests/data/simple_full/commodity_flows.csv | 68 +- tests/data/simple_full/commodity_prices.csv | 60 +- .../data/simple_marginal/commodity_flows.csv | 68 +- tests/data/simple_npv/assets.csv | 4 +- tests/data/simple_npv/commodity_flows.csv | 352 ++--- tests/data/two_outputs/commodity_flows.csv | 136 +- tests/data/two_regions/assets.csv | 9 +- tests/data/two_regions/commodity_flows.csv | 1174 +++++++++-------- tests/data/two_regions/commodity_prices.csv | 14 +- 18 files changed, 1488 insertions(+), 1473 deletions(-) diff --git a/src/simulation/optimisation.rs b/src/simulation/optimisation.rs index c86638224..71961d8b7 100644 --- a/src/simulation/optimisation.rs +++ b/src/simulation/optimisation.rs @@ -654,8 +654,16 @@ impl<'model, 'run> DispatchRun<'model, 'run> { self.year, ); + let mut model = problem.optimise(Sense::Minimise); + + model.set_option("random_seed", 42); + model.set_option("parallel", "off"); + model.set_option("simplex_max_concurrency", 1); + model.set_option("solver", "simplex"); + model.set_option("presolve", "on"); + // Solve model - let solution = solve_optimal(problem.optimise(Sense::Minimise))?; + let solution = solve_optimal(model)?; let solution = Solution { solution: solution.get_solution(), diff --git a/tests/data/circularity/assets.csv b/tests/data/circularity/assets.csv index c70589985..42848b611 100644 --- a/tests/data/circularity/assets.csv +++ b/tests/data/circularity/assets.csv @@ -20,10 +20,10 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 18,H2YPRO,GBR,A0_ELC,,2030,,30.278400121113602 19,OILRF2,GBR,A0_REF,,2030,,756.7022737069626 20,BIOPLL,GBR,A0_BPL,,2030,,427.00608705177655 -21,BIOPRO,GBR,A0_BPD,,2030,,448.35639140436535 +21,BIOPRO,GBR,A0_BPD,,2030,,408.1748675995067 22,THYBCR,GBR,A0_TRA,,2040,,912.8939641298439 23,RBIOBL,GBR,A0_RES,,2040,,3655.8189696 24,GASCGT,GBR,A0_ELC,,2040,,0.8124316982834766 25,H2YPRO,GBR,A0_ELC,,2040,,19.235689279503628 26,BIOPLL,GBR,A0_BPL,,2040,,2167.9571005431867 -27,BIOPRO,GBR,A0_BPD,,2040,,2276.354955570347 +27,BIOPRO,GBR,A0_BPD,,2040,,2316.536479375206 diff --git a/tests/data/circularity/commodity_flows.csv b/tests/data/circularity/commodity_flows.csv index 06c6aad44..3f23b8759 100644 --- a/tests/data/circularity/commodity_flows.csv +++ b/tests/data/circularity/commodity_flows.csv @@ -319,10 +319,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2020,7,ELCTRI,peak.peak,0.0 2020,7,H2YPRD,peak.evening,0.0 2020,7,ELCTRI,peak.evening,-0.0 -2020,7,H2YPRD,summer.night,0.0 -2020,7,ELCTRI,summer.night,-0.0 -2020,7,H2YPRD,summer.day,-0.0 -2020,7,ELCTRI,summer.day,0.0 +2020,7,H2YPRD,summer.night,-0.0 +2020,7,ELCTRI,summer.night,0.0 +2020,7,H2YPRD,summer.day,0.0 +2020,7,ELCTRI,summer.day,-0.0 2020,7,H2YPRD,summer.peak,-0.0 2020,7,ELCTRI,summer.peak,0.0 2020,7,H2YPRD,summer.evening,-0.0 @@ -625,16 +625,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2020,14,RSHEAT,autumn.evening,11.435412867700338 2030,0,GASPRD,winter.night,0.0 2030,0,CO2EMT,winter.night,0.0 -2030,0,GASPRD,winter.day,285.2964532338849 -2030,0,CO2EMT,winter.day,1458.7207653848536 +2030,0,GASPRD,winter.day,294.923276683973 +2030,0,CO2EMT,winter.day,1507.9427136851539 2030,0,GASPRD,winter.peak,125.31875 2030,0,CO2EMT,winter.peak,640.75476875 2030,0,GASPRD,winter.evening,167.09166800339997 2030,0,CO2EMT,winter.evening,854.3396985013842 2030,0,GASPRD,peak.night,0.0 2030,0,CO2EMT,peak.night,0.0 -2030,0,GASPRD,peak.day,49.319315001711914 -2030,0,CO2EMT,peak.day,252.16965760375302 +2030,0,GASPRD,peak.day,53.463034660662856 +2030,0,CO2EMT,peak.day,273.3564962199692 2030,0,GASPRD,peak.peak,125.31875 2030,0,CO2EMT,peak.peak,640.75476875 2030,0,GASPRD,peak.evening,167.09166800339997 @@ -651,8 +651,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,113.65524839627804 -2030,0,CO2EMT,autumn.peak,581.1192850501697 +2030,0,GASPRD,autumn.peak,117.79896805522893 +2030,0,CO2EMT,autumn.peak,602.3061236663856 2030,0,GASPRD,autumn.evening,167.09166800339997 2030,0,CO2EMT,autumn.evening,854.3396985013842 2030,1,OILCRD,winter.night,0.0 @@ -706,9 +706,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,winter.night,-0.0 2030,2,GASNAT,winter.night,0.0 2030,2,CO2EMT,winter.night,0.0 -2030,2,GASPRD,winter.day,-306.33679948591083 -2030,2,GASNAT,winter.day,291.7493328437246 -2030,2,CO2EMT,winter.day,745.857169414982 +2030,2,GASPRD,winter.day,-315.9636229359989 +2030,2,GASNAT,winter.day,300.9177361295227 +2030,2,CO2EMT,winter.day,769.2961924151249 2030,2,GASPRD,winter.peak,-124.3475625 2030,2,GASNAT,winter.peak,118.42625 2030,2,CO2EMT,winter.peak,302.756708125 @@ -718,9 +718,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,peak.night,-0.0 2030,2,GASNAT,peak.night,0.0 2030,2,CO2EMT,peak.night,0.0 -2030,2,GASPRD,peak.day,-70.35966125373784 -2030,2,GASNAT,peak.day,67.00920119403604 -2030,2,CO2EMT,peak.day,171.30902285255314 +2030,2,GASPRD,peak.day,-74.50338091268875 +2030,2,GASNAT,peak.day,70.95560086922738 +2030,2,CO2EMT,peak.day,181.39799362217983 2030,2,GASPRD,peak.peak,-124.3475625 2030,2,GASNAT,peak.peak,118.42625 2030,2,CO2EMT,peak.peak,302.756708125 @@ -742,9 +742,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,autumn.night,-0.0 2030,2,GASNAT,autumn.night,0.0 2030,2,CO2EMT,autumn.night,0.0 -2030,2,GASPRD,autumn.day,-9.37684464830395 -2030,2,GASNAT,autumn.day,8.930328236479951 -2030,2,CO2EMT,autumn.day,22.830384136560998 +2030,2,GASPRD,autumn.day,-13.520564307254862 +2030,2,GASNAT,autumn.day,12.876727911671296 +2030,2,CO2EMT,autumn.day,32.91935490618767 2030,2,GASPRD,autumn.peak,-124.3475625 2030,2,GASNAT,autumn.peak,118.42625 2030,2,CO2EMT,autumn.peak,302.756708125 @@ -779,9 +779,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,winter.evening,-5.911778797294229 2030,6,ELCTRI,winter.evening,3.9411858648628195 2030,6,CO2EMT,winter.evening,302.2692499056539 -2030,6,GASNAT,peak.night,-0.0 -2030,6,ELCTRI,peak.night,0.0 -2030,6,CO2EMT,peak.night,0.0 +2030,6,GASNAT,peak.night,-10.34561285979423 +2030,6,ELCTRI,peak.night,6.89707523986282 +2030,6,CO2EMT,peak.night,528.9711855212789 2030,6,GASNAT,peak.day,-14.77944692229423 2030,6,ELCTRI,peak.day,9.85296461486282 2030,6,CO2EMT,peak.day,755.6731211369039 @@ -791,9 +791,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,peak.evening,-5.911778797294229 2030,6,ELCTRI,peak.evening,3.9411858648628195 2030,6,CO2EMT,peak.evening,302.2692499056539 -2030,6,GASNAT,summer.night,-0.0 -2030,6,ELCTRI,summer.night,0.0 -2030,6,CO2EMT,summer.night,0.0 +2030,6,GASNAT,summer.night,-4.808493968439487 +2030,6,ELCTRI,summer.night,3.205662645626325 +2030,6,CO2EMT,summer.night,245.85829660631097 2030,6,GASNAT,summer.day,-2.1020805394776474 2030,6,ELCTRI,summer.day,1.4013870263184316 2030,6,CO2EMT,summer.day,107.4793779834921 @@ -825,12 +825,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,ELCTRI,winter.evening,0.0 2030,7,H2YPRD,peak.night,-0.0 2030,7,ELCTRI,peak.night,0.0 -2030,7,H2YPRD,peak.day,-0.0 -2030,7,ELCTRI,peak.day,0.0 +2030,7,H2YPRD,peak.day,0.0 +2030,7,ELCTRI,peak.day,-0.0 2030,7,H2YPRD,peak.peak,-0.0 2030,7,ELCTRI,peak.peak,0.0 -2030,7,H2YPRD,peak.evening,0.0 -2030,7,ELCTRI,peak.evening,-0.0 +2030,7,H2YPRD,peak.evening,-0.0 +2030,7,ELCTRI,peak.evening,0.0 2030,7,H2YPRD,summer.night,-0.0 2030,7,ELCTRI,summer.night,0.0 2030,7,H2YPRD,summer.day,-0.0 @@ -879,9 +879,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,H2YPRD,autumn.peak,0.0 2030,8,ELCTRI,autumn.evening,-0.0 2030,8,H2YPRD,autumn.evening,0.0 -2030,13,GASNAT,winter.night,-14.006615449537906 -2030,13,RSHEAT,winter.night,12.179665608293831 -2030,13,CO2EMT,winter.night,716.1582479348732 +2030,13,GASNAT,winter.night,-23.17501873533602 +2030,13,RSHEAT,winter.night,20.15219020464002 +2030,13,CO2EMT,winter.night,1184.938707937731 2030,13,GASNAT,winter.day,-186.34120376960664 2030,13,RSHEAT,winter.day,162.03582936487535 2030,13,CO2EMT,winter.day,9527.625748739989 @@ -935,8 +935,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,14,RSHEAT,winter.peak,12.499375 2030,14,ELCTRI,winter.evening,-4.12689026226823 2030,14,RSHEAT,winter.evening,12.505728067479483 -2030,14,ELCTRI,peak.night,-6.9935856772035665 -2030,14,RSHEAT,peak.night,21.192683870313836 +2030,14,ELCTRI,peak.night,-9.62451879399781 +2030,14,RSHEAT,peak.night,29.16520846666003 2030,14,ELCTRI,peak.day,-10.26442369243675 2030,14,RSHEAT,peak.day,31.1043142195053 2030,14,ELCTRI,peak.peak,-2.945563825714082 @@ -951,8 +951,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,14,RSHEAT,summer.peak,0.0 2030,14,ELCTRI,summer.evening,-0.0 2030,14,RSHEAT,summer.evening,0.0 -2030,14,ELCTRI,autumn.night,-4.073168306108166 -2030,14,RSHEAT,autumn.night,12.342934260933838 +2030,14,ELCTRI,autumn.night,-6.7041014229024105 +2030,14,RSHEAT,autumn.night,20.31545885728003 2030,14,ELCTRI,autumn.day,-9.89481429602867 2030,14,RSHEAT,autumn.day,29.984285745541424 2030,14,ELCTRI,autumn.peak,-2.7167580064587074 @@ -1007,16 +1007,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,ELCTRI,autumn.evening,-27.671451920975297 2030,15,GASOLI,autumn.evening,-32.3875309924775 2030,15,TPASKM,autumn.evening,32.3875309924775 -2030,16,BIOPEL,winter.night,-31.135860656527402 -2030,16,RSHEAT,winter.night,25.94655054710617 +2030,16,BIOPEL,winter.night,-21.568831140911975 +2030,16,RSHEAT,winter.night,17.97402595075998 2030,16,BIOPEL,winter.day,-44.47980087689542 2030,16,RSHEAT,winter.day,37.066500730746185 2030,16,BIOPEL,winter.peak,-13.343940220368017 2030,16,RSHEAT,winter.peak,11.119950183640015 2030,16,BIOPEL,winter.evening,-17.791920436159383 2030,16,RSHEAT,winter.evening,14.826600363466154 -2030,16,BIOPEL,peak.night,-31.135860656527402 -2030,16,RSHEAT,peak.night,25.94655054710617 +2030,16,BIOPEL,peak.night,-21.56883114091197 +2030,16,RSHEAT,peak.night,17.974025950759977 2030,16,BIOPEL,peak.day,-44.47980087689542 2030,16,RSHEAT,peak.day,37.066500730746185 2030,16,BIOPEL,peak.peak,-13.343940220368017 @@ -1031,8 +1031,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,16,RSHEAT,summer.peak,3.2120121331800005 2030,16,BIOPEL,summer.evening,-2.869919866728 2030,16,RSHEAT,summer.evening,2.39159988894 -2030,16,BIOPEL,autumn.night,-31.135860656527402 -2030,16,RSHEAT,autumn.night,25.94655054710617 +2030,16,BIOPEL,autumn.night,-21.56883114091197 +2030,16,RSHEAT,autumn.night,17.974025950759977 2030,16,BIOPEL,autumn.day,-44.47980087689542 2030,16,RSHEAT,autumn.day,37.066500730746185 2030,16,BIOPEL,autumn.peak,-13.343940220368017 @@ -1051,9 +1051,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,17,GASNAT,winter.evening,-37.93123643781026 2030,17,ELCTRI,winter.evening,25.287490958540175 2030,17,CO2EMT,winter.evening,1939.4241190652385 -2030,17,GASNAT,peak.night,-13.477226144639717 -2030,17,ELCTRI,peak.night,8.984817429759811 -2030,17,CO2EMT,peak.night,689.0905727754287 +2030,17,GASNAT,peak.night,-7.07801296003685 +2030,17,ELCTRI,peak.night,4.7186753066912335 +2030,17,CO2EMT,peak.night,361.89880264668415 2030,17,GASNAT,peak.day,-94.82809063935083 2030,17,ELCTRI,peak.day,63.21872709290056 2030,17,CO2EMT,peak.day,4848.560274390008 @@ -1063,9 +1063,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,17,GASNAT,peak.evening,-37.93123643781026 2030,17,ELCTRI,peak.evening,25.287490958540175 2030,17,CO2EMT,peak.evening,1939.4241190652385 -2030,17,GASNAT,summer.night,-4.808493968439487 -2030,17,ELCTRI,summer.night,3.205662645626325 -2030,17,CO2EMT,summer.night,245.85829660631097 +2030,17,GASNAT,summer.night,-0.0 +2030,17,ELCTRI,summer.night,0.0 +2030,17,CO2EMT,summer.night,0.0 2030,17,GASNAT,summer.day,-94.82809063935083 2030,17,ELCTRI,summer.day,63.21872709290056 2030,17,CO2EMT,summer.day,4848.560274390008 @@ -1075,9 +1075,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,17,GASNAT,summer.evening,-34.011358793963126 2030,17,ELCTRI,summer.evening,22.674239195975417 2030,17,CO2EMT,summer.evening,1739.0007751353344 -2030,17,GASNAT,autumn.night,-8.568586664948883 -2030,17,ELCTRI,autumn.night,5.712391109965922 -2030,17,CO2EMT,autumn.night,438.11183617883637 +2030,17,GASNAT,autumn.night,-12.51498634014025 +2030,17,ELCTRI,autumn.night,8.343324226760167 +2030,17,CO2EMT,autumn.night,639.891251571371 2030,17,GASNAT,autumn.day,-94.82809063935083 2030,17,ELCTRI,autumn.day,63.21872709290056 2030,17,CO2EMT,autumn.day,4848.560274390008 @@ -1167,16 +1167,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,19,OILCRD,autumn.evening,-41.30333277026503 2030,19,GASOLI,autumn.evening,31.529261656690863 2030,19,CO2EMT,autumn.evening,693.6437564471989 -2030,20,BIOPRD,winter.night,-32.69265368935377 -2030,20,BIOPEL,winter.night,31.135860656527395 +2030,20,BIOPRD,winter.night,-22.64727269795757 +2030,20,BIOPEL,winter.night,21.568831140911968 2030,20,BIOPRD,winter.day,-46.7037909207402 2030,20,BIOPEL,winter.day,44.479800876895425 2030,20,BIOPRD,winter.peak,-14.011137231386419 2030,20,BIOPEL,winter.peak,13.343940220368017 2030,20,BIOPRD,winter.evening,-18.681516457967355 2030,20,BIOPEL,winter.evening,17.791920436159383 -2030,20,BIOPRD,peak.night,-32.69265368935377 -2030,20,BIOPEL,peak.night,31.135860656527395 +2030,20,BIOPRD,peak.night,-22.647272697957572 +2030,20,BIOPEL,peak.night,21.56883114091197 2030,20,BIOPRD,peak.day,-46.7037909207402 2030,20,BIOPEL,peak.day,44.479800876895425 2030,20,BIOPRD,peak.peak,-14.011137231386419 @@ -1191,36 +1191,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,20,BIOPEL,summer.peak,7.6626243860566206 2030,20,BIOPRD,summer.evening,-18.681516457967355 2030,20,BIOPEL,summer.evening,17.791920436159383 -2030,20,BIOPRD,autumn.night,-32.69265368935377 -2030,20,BIOPEL,autumn.night,31.135860656527395 +2030,20,BIOPRD,autumn.night,-22.647272697957572 +2030,20,BIOPEL,autumn.night,21.56883114091197 2030,20,BIOPRD,autumn.day,-46.7037909207402 2030,20,BIOPEL,autumn.day,44.479800876895425 2030,20,BIOPRD,autumn.peak,-14.011137231386419 2030,20,BIOPEL,autumn.peak,13.343940220368017 2030,20,BIOPRD,autumn.evening,-18.681516457967355 2030,20,BIOPEL,autumn.evening,17.791920436159383 -2030,21,BIOPRD,winter.night,32.692653689353776 -2030,21,BIOPRD,winter.day,46.70379092074019 -2030,21,BIOPRD,winter.peak,14.011137231386417 -2030,21,BIOPRD,winter.evening,18.68151645796735 -2030,21,BIOPRD,peak.night,32.692653689353776 -2030,21,BIOPRD,peak.day,46.70379092074019 -2030,21,BIOPRD,peak.peak,14.011137231386417 -2030,21,BIOPRD,peak.evening,18.68151645796735 +2030,21,BIOPRD,winter.night,29.76275089852232 +2030,21,BIOPRD,winter.day,42.5182155110069 +2030,21,BIOPRD,winter.peak,12.755464612484584 +2030,21,BIOPRD,winter.evening,17.007286286037733 +2030,21,BIOPRD,peak.night,29.76275089852232 +2030,21,BIOPRD,peak.day,42.5182155110069 +2030,21,BIOPRD,peak.peak,12.755464612484584 +2030,21,BIOPRD,peak.evening,17.007286286037733 2030,21,BIOPRD,summer.night,0.0 2030,21,BIOPRD,summer.day,0.0 -2030,21,BIOPRD,summer.peak,8.045755605359457 -2030,21,BIOPRD,summer.evening,18.68151645796735 -2030,21,BIOPRD,autumn.night,32.692653689353776 -2030,21,BIOPRD,autumn.day,46.70379092074019 -2030,21,BIOPRD,autumn.peak,14.011137231386417 -2030,21,BIOPRD,autumn.evening,18.68151645796735 +2030,21,BIOPRD,summer.peak,9.719985777289075 +2030,21,BIOPRD,summer.evening,17.007286286037733 +2030,21,BIOPRD,autumn.night,29.76275089852232 +2030,21,BIOPRD,autumn.day,42.5182155110069 +2030,21,BIOPRD,autumn.peak,12.755464612484584 +2030,21,BIOPRD,autumn.evening,17.007286286037733 2040,0,GASPRD,winter.night,0.0 2040,0,CO2EMT,winter.night,0.0 2040,0,GASPRD,winter.day,0.0 2040,0,CO2EMT,winter.day,0.0 -2040,0,GASPRD,winter.peak,12.071980068513625 -2040,0,CO2EMT,winter.peak,61.72403409031017 +2040,0,GASPRD,winter.peak,12.071980068513597 +2040,0,CO2EMT,winter.peak,61.72403409031003 2040,0,GASPRD,winter.evening,167.09166800339997 2040,0,CO2EMT,winter.evening,854.3396985013842 2040,0,GASPRD,peak.night,0.0 @@ -1301,9 +1301,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,2,GASPRD,winter.day,-0.0 2040,2,GASNAT,winter.day,0.0 2040,2,CO2EMT,winter.day,0.0 -2040,2,GASPRD,winter.peak,-35.416138820539636 -2040,2,GASNAT,winter.peak,33.72965601956156 -2040,2,CO2EMT,winter.peak,86.22986561400913 +2040,2,GASPRD,winter.peak,-35.41613882053961 +2040,2,GASNAT,winter.peak,33.72965601956153 +2040,2,CO2EMT,winter.peak,86.22986561400906 2040,2,GASPRD,winter.evening,-165.796751326374 2040,2,GASNAT,winter.evening,157.90166792987998 2040,2,CO2EMT,winter.evening,403.6756140627382 @@ -1359,9 +1359,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,5,ELCTRI,autumn.day,6.001752635595889 2040,5,ELCTRI,autumn.peak,1.5488393825638174 2040,5,ELCTRI,autumn.evening,1.9008483513729915 -2040,6,GASNAT,winter.night,-1.8778850857827112 -2040,6,ELCTRI,winter.night,1.2519233905218075 -2040,6,CO2EMT,winter.night,96.01626443607002 +2040,6,GASNAT,winter.night,-0.0 +2040,6,ELCTRI,winter.night,0.0 +2040,6,CO2EMT,winter.night,0.0 2040,6,GASNAT,winter.day,-14.77944692229423 2040,6,ELCTRI,winter.day,9.85296461486282 2040,6,CO2EMT,winter.day,755.6731211369039 @@ -1371,15 +1371,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,6,GASNAT,winter.evening,-5.911778797294229 2040,6,ELCTRI,winter.evening,3.9411858648628195 2040,6,CO2EMT,winter.evening,302.2692499056539 -2040,6,GASNAT,peak.night,-0.0 -2040,6,ELCTRI,peak.night,0.0 -2040,6,CO2EMT,peak.night,0.0 -2040,6,GASNAT,peak.day,-13.480443990108558 -2040,6,ELCTRI,peak.day,8.986962660072372 -2040,6,CO2EMT,peak.day,689.2551012142505 -2040,6,GASNAT,peak.peak,-4.244778058450182 -2040,6,ELCTRI,peak.peak,2.829852038966788 -2040,6,CO2EMT,peak.peak,217.03550212855777 +2040,6,GASNAT,peak.night,-2.8828517310778556 +2040,6,ELCTRI,peak.night,1.9219011540519038 +2040,6,CO2EMT,peak.night,147.40020901001074 +2040,6,GASNAT,peak.day,-14.77944692229423 +2040,6,ELCTRI,peak.day,9.85296461486282 +2040,6,CO2EMT,peak.day,755.6731211369039 +2040,6,GASNAT,peak.peak,-4.4338340625 +2040,6,ELCTRI,peak.peak,2.955889375 +2040,6,CO2EMT,peak.peak,226.70193561562496 2040,6,GASNAT,peak.evening,-5.911778797294229 2040,6,ELCTRI,peak.evening,3.9411858648628195 2040,6,CO2EMT,peak.evening,302.2692499056539 @@ -1474,21 +1474,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,17,GASNAT,winter.night,-0.0 2040,17,ELCTRI,winter.night,0.0 2040,17,CO2EMT,winter.night,0.0 -2040,17,GASNAT,winter.day,-92.47306085470227 -2040,17,ELCTRI,winter.day,61.64870723646818 -2040,17,CO2EMT,winter.day,4728.147601500927 +2040,17,GASNAT,winter.day,-94.82809063935083 +2040,17,ELCTRI,winter.day,63.21872709290056 +2040,17,CO2EMT,winter.day,4848.560274390008 2040,17,GASNAT,winter.peak,-28.44842710077028 2040,17,ELCTRI,winter.peak,18.965618067180188 2040,17,CO2EMT,winter.peak,1454.5680776623844 2040,17,GASNAT,winter.evening,-37.3799540536769 2040,17,ELCTRI,winter.evening,24.91996936911793 2040,17,CO2EMT,winter.evening,1911.2370507644994 -2040,17,GASNAT,peak.night,-5.6854872180621845 -2040,17,ELCTRI,peak.night,3.7903248120414563 -2040,17,CO2EMT,peak.night,290.69896145951947 -2040,17,GASNAT,peak.day,-94.82809063935083 -2040,17,ELCTRI,peak.day,63.21872709290056 -2040,17,CO2EMT,peak.day,4848.560274390008 +2040,17,GASNAT,peak.night,-0.0 +2040,17,ELCTRI,peak.night,0.0 +2040,17,CO2EMT,peak.night,0.0 +2040,17,GASNAT,peak.day,-93.52908770716516 +2040,17,ELCTRI,peak.day,62.35272513811011 +2040,17,CO2EMT,peak.day,4782.142254467354 2040,17,GASNAT,peak.peak,-28.44842710077028 2040,17,ELCTRI,peak.peak,18.965618067180188 2040,17,CO2EMT,peak.peak,1454.5680776623844 @@ -1510,9 +1510,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,17,GASNAT,autumn.night,-0.0 2040,17,ELCTRI,autumn.night,0.0 2040,17,CO2EMT,autumn.night,0.0 -2040,17,GASNAT,autumn.day,-94.82809063935083 -2040,17,ELCTRI,autumn.day,63.21872709290056 -2040,17,CO2EMT,autumn.day,4848.560274390008 +2040,17,GASNAT,autumn.day,-94.08350180177729 +2040,17,ELCTRI,autumn.day,62.7223345345182 +2040,17,CO2EMT,autumn.day,4810.489447124873 2040,17,GASNAT,autumn.peak,-28.44842710077028 2040,17,ELCTRI,autumn.peak,18.965618067180188 2040,17,CO2EMT,autumn.peak,1454.5680776623844 @@ -1607,34 +1607,34 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,20,BIOPEL,winter.peak,13.343940220368017 2040,20,BIOPRD,winter.evening,-18.681516457967355 2040,20,BIOPEL,winter.evening,17.791920436159383 -2040,20,BIOPRD,peak.night,-32.692653689353776 -2040,20,BIOPEL,peak.night,31.135860656527406 -2040,20,BIOPRD,peak.day,-46.7037909207402 -2040,20,BIOPEL,peak.day,44.479800876895425 -2040,20,BIOPRD,peak.peak,-14.011137231386419 -2040,20,BIOPEL,peak.peak,13.343940220368017 -2040,20,BIOPRD,peak.evening,-18.681516457967355 -2040,20,BIOPEL,peak.evening,17.791920436159383 +2040,20,BIOPRD,peak.night,-0.0 +2040,20,BIOPEL,peak.night,0.0 +2040,20,BIOPRD,peak.day,-0.0 +2040,20,BIOPEL,peak.day,0.0 +2040,20,BIOPRD,peak.peak,-0.0 +2040,20,BIOPEL,peak.peak,0.0 +2040,20,BIOPRD,peak.evening,-0.0 +2040,20,BIOPEL,peak.evening,0.0 2040,20,BIOPRD,summer.night,-0.0 2040,20,BIOPEL,summer.night,0.0 2040,20,BIOPRD,summer.day,-0.0 2040,20,BIOPEL,summer.day,0.0 -2040,20,BIOPRD,summer.peak,-0.0 -2040,20,BIOPEL,summer.peak,0.0 -2040,20,BIOPRD,summer.evening,-0.0 -2040,20,BIOPEL,summer.evening,0.0 -2040,20,BIOPRD,autumn.night,-32.692653689353776 -2040,20,BIOPEL,autumn.night,31.135860656527406 -2040,20,BIOPRD,autumn.day,-46.7037909207402 -2040,20,BIOPEL,autumn.day,44.479800876895425 -2040,20,BIOPRD,autumn.peak,-14.011137231386419 -2040,20,BIOPEL,autumn.peak,13.343940220368017 -2040,20,BIOPRD,autumn.evening,-18.681516457967355 -2040,20,BIOPEL,autumn.evening,17.791920436159383 -2040,21,BIOPRD,winter.night,32.692653689353605 -2040,21,BIOPRD,winter.day,46.70379092074019 -2040,21,BIOPRD,winter.peak,14.011137231386417 -2040,21,BIOPRD,winter.evening,18.68151645796735 +2040,20,BIOPRD,summer.peak,-10.647253791359448 +2040,20,BIOPEL,summer.peak,10.140241706056617 +2040,20,BIOPRD,summer.evening,-18.681516457967355 +2040,20,BIOPEL,summer.evening,17.791920436159383 +2040,20,BIOPRD,autumn.night,-0.0 +2040,20,BIOPEL,autumn.night,0.0 +2040,20,BIOPRD,autumn.day,-0.0 +2040,20,BIOPEL,autumn.day,0.0 +2040,20,BIOPRD,autumn.peak,-0.0 +2040,20,BIOPEL,autumn.peak,0.0 +2040,20,BIOPRD,autumn.evening,-0.0 +2040,20,BIOPEL,autumn.evening,0.0 +2040,21,BIOPRD,winter.night,29.76275089852203 +2040,21,BIOPRD,winter.day,42.5182155110069 +2040,21,BIOPRD,winter.peak,12.755464612484584 +2040,21,BIOPRD,winter.evening,17.007286286037733 2040,21,BIOPRD,peak.night,0.0 2040,21,BIOPRD,peak.day,0.0 2040,21,BIOPRD,peak.peak,0.0 @@ -1727,27 +1727,27 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,23,RSHEAT,autumn.peak,50.32290129557999 2040,23,BIOPEL,autumn.evening,-26.340322976368615 2040,23,RSHEAT,autumn.evening,21.950269146973845 -2040,24,GASNAT,winter.night,-0.0 -2040,24,ELCTRI,winter.night,0.0 -2040,24,CO2EMT,winter.night,0.0 -2040,24,GASNAT,winter.day,-4.003764975915306 -2040,24,ELCTRI,winter.day,2.669176650610204 -2040,24,CO2EMT,winter.day,204.71250321854959 +2040,24,GASNAT,winter.night,-1.8778850857827112 +2040,24,ELCTRI,winter.night,1.2519233905218075 +2040,24,CO2EMT,winter.night,96.01626443607002 +2040,24,GASNAT,winter.day,-1.6487351912667236 +2040,24,ELCTRI,winter.day,1.0991567941778158 +2040,24,CO2EMT,winter.day,84.29983032946757 2040,24,GASNAT,winter.peak,-1.2011294889309774 2040,24,ELCTRI,winter.peak,0.8007529926206516 2040,24,CO2EMT,winter.peak,61.41375076904087 2040,24,GASNAT,winter.evening,-1.6015059980533508 2040,24,ELCTRI,winter.evening,1.0676706653689005 2040,24,CO2EMT,winter.evening,81.88500168046782 -2040,24,GASNAT,peak.night,-0.0 -2040,24,ELCTRI,peak.night,0.0 -2040,24,CO2EMT,peak.night,0.0 +2040,24,GASNAT,peak.night,-2.8026354869843284 +2040,24,ELCTRI,peak.night,1.8684236579895523 +2040,24,CO2EMT,peak.night,143.2987524495087 2040,24,GASNAT,peak.day,-4.003764975915306 2040,24,ELCTRI,peak.day,2.669176650610204 2040,24,CO2EMT,peak.day,204.71250321854959 -2040,24,GASNAT,peak.peak,-1.2011294889309774 -2040,24,ELCTRI,peak.peak,0.8007529926206516 -2040,24,CO2EMT,peak.peak,61.41375076904087 +2040,24,GASNAT,peak.peak,-1.0120734848811566 +2040,24,ELCTRI,peak.peak,0.6747156565874377 +2040,24,CO2EMT,peak.peak,51.74731728197353 2040,24,GASNAT,peak.evening,-1.6015059980533508 2040,24,ELCTRI,peak.evening,1.0676706653689005 2040,24,CO2EMT,peak.evening,81.88500168046782 @@ -1766,9 +1766,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,24,GASNAT,autumn.night,-0.0 2040,24,ELCTRI,autumn.night,0.0 2040,24,CO2EMT,autumn.night,0.0 -2040,24,GASNAT,autumn.day,-3.259176138341765 -2040,24,ELCTRI,autumn.day,2.172784092227843 -2040,24,CO2EMT,autumn.day,166.64167595341442 +2040,24,GASNAT,autumn.day,-4.003764975915306 +2040,24,ELCTRI,autumn.day,2.669176650610204 +2040,24,CO2EMT,autumn.day,204.71250321854959 2040,24,GASNAT,autumn.peak,-1.2011294889309774 2040,24,ELCTRI,autumn.peak,0.8007529926206516 2040,24,CO2EMT,autumn.peak,61.41375076904087 @@ -1817,8 +1817,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,26,BIOPEL,winter.evening,90.33154657861847 2040,26,BIOPRD,peak.night,-0.0 2040,26,BIOPEL,peak.night,0.0 -2040,26,BIOPRD,peak.day,-115.88892919199479 -2040,26,BIOPEL,peak.day,110.37040875428075 +2040,26,BIOPRD,peak.day,-227.9780274914425 +2040,26,BIOPEL,peak.day,217.12193094423094 2040,26,BIOPRD,peak.peak,-71.13609236157332 2040,26,BIOPEL,peak.peak,67.74865939197458 2040,26,BIOPRD,peak.evening,-94.8481239075494 @@ -1829,29 +1829,29 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,26,BIOPEL,summer.day,0.0 2040,26,BIOPRD,summer.peak,-0.0 2040,26,BIOPEL,summer.peak,0.0 -2040,26,BIOPRD,summer.evening,-29.3287702493268 -2040,26,BIOPEL,summer.evening,27.932162142216 +2040,26,BIOPRD,summer.evening,-0.0 +2040,26,BIOPEL,summer.evening,0.0 2040,26,BIOPRD,autumn.night,-0.0 2040,26,BIOPEL,autumn.night,0.0 -2040,26,BIOPRD,autumn.day,-37.95663053264955 -2040,26,BIOPEL,autumn.day,36.149171935856714 +2040,26,BIOPRD,autumn.day,-150.04572883209727 +2040,26,BIOPEL,autumn.day,142.90069412580692 2040,26,BIOPRD,autumn.peak,-71.13609236157332 2040,26,BIOPEL,autumn.peak,67.74865939197458 2040,26,BIOPRD,autumn.evening,-94.8481239075494 2040,26,BIOPEL,autumn.evening,90.33154657861847 -2040,27,BIOPRD,winter.night,165.9842162691228 -2040,27,BIOPRD,winter.day,237.12030863069614 -2040,27,BIOPRD,winter.peak,71.13609236157335 -2040,27,BIOPRD,winter.evening,94.84812390754944 +2040,27,BIOPRD,winter.night,168.9141190599543 +2040,27,BIOPRD,winter.day,241.30588404042948 +2040,27,BIOPRD,winter.peak,72.39176498047519 +2040,27,BIOPRD,winter.evening,96.52235407947907 2040,27,BIOPRD,peak.night,0.0 -2040,27,BIOPRD,peak.day,227.97802749144245 -2040,27,BIOPRD,peak.peak,71.13609236157335 -2040,27,BIOPRD,peak.evening,94.84812390754944 +2040,27,BIOPRD,peak.day,225.04812470061094 +2040,27,BIOPRD,peak.peak,72.39176498047519 +2040,27,BIOPRD,peak.evening,96.52235407947907 2040,27,BIOPRD,summer.night,0.0 2040,27,BIOPRD,summer.day,0.0 2040,27,BIOPRD,summer.peak,0.0 2040,27,BIOPRD,summer.evening,29.3287702493268 2040,27,BIOPRD,autumn.night,0.0 -2040,27,BIOPRD,autumn.day,150.0457288320972 -2040,27,BIOPRD,autumn.peak,71.13609236157335 -2040,27,BIOPRD,autumn.evening,94.84812390754944 +2040,27,BIOPRD,autumn.day,147.11582604126573 +2040,27,BIOPRD,autumn.peak,72.39176498047519 +2040,27,BIOPRD,autumn.evening,96.52235407947907 diff --git a/tests/data/circularity/commodity_prices.csv b/tests/data/circularity/commodity_prices.csv index 763694956..aad5936e7 100644 --- a/tests/data/circularity/commodity_prices.csv +++ b/tests/data/circularity/commodity_prices.csv @@ -227,18 +227,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,DIESEL,GBR,winter.day,6.373430018579993 2030,DIESEL,GBR,winter.peak,6.373430018579993 2030,DIESEL,GBR,winter.evening,6.373430018579993 -2030,DIESEL,GBR,peak.night,6.373430018579991 -2030,DIESEL,GBR,peak.day,6.373430018579991 -2030,DIESEL,GBR,peak.peak,6.373430018579991 -2030,DIESEL,GBR,peak.evening,6.373430018579991 +2030,DIESEL,GBR,peak.night,6.373430018579993 +2030,DIESEL,GBR,peak.day,6.373430018579993 +2030,DIESEL,GBR,peak.peak,6.373430018579993 +2030,DIESEL,GBR,peak.evening,6.373430018579993 2030,DIESEL,GBR,summer.night,2.8097726472596607 2030,DIESEL,GBR,summer.day,2.8097726472596607 2030,DIESEL,GBR,summer.peak,2.8097726472596607 2030,DIESEL,GBR,summer.evening,2.8097726472596607 -2030,DIESEL,GBR,autumn.night,6.373430018579993 -2030,DIESEL,GBR,autumn.day,6.373430018579993 -2030,DIESEL,GBR,autumn.peak,6.373430018579993 -2030,DIESEL,GBR,autumn.evening,6.373430018579993 +2030,DIESEL,GBR,autumn.night,6.373430018579991 +2030,DIESEL,GBR,autumn.day,6.373430018579991 +2030,DIESEL,GBR,autumn.peak,6.373430018579991 +2030,DIESEL,GBR,autumn.evening,6.373430018579991 2030,GASNAT,GBR,winter.night,2.9170059999999998 2030,GASNAT,GBR,winter.day,2.9170059999999998 2030,GASNAT,GBR,winter.peak,2.9170059999999998 diff --git a/tests/data/muse1_default/commodity_flows.csv b/tests/data/muse1_default/commodity_flows.csv index 81efff3a9..d4881fd45 100644 --- a/tests/data/muse1_default/commodity_flows.csv +++ b/tests/data/muse1_default/commodity_flows.csv @@ -24,11 +24,11 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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,0.0 +2025,0,gas,all-year.morning,1.33266 2025,0,gas,all-year.afternoon,0.0 -2025,0,gas,all-year.early-peak,1.33266 -2025,0,gas,all-year.late-peak,2.8810991999999995 -2025,0,gas,all-year.evening,0.7818272000000002 +2025,0,gas,all-year.early-peak,0.7818272000000002 +2025,0,gas,all-year.late-peak,1.3885199999999995 +2025,0,gas,all-year.evening,1.4925792000000002 2025,1,gas,all-year.night,-0.0 2025,1,heat,all-year.night,0.0 2025,1,CO2f,all-year.night,0.0 @@ -61,34 +61,34 @@ milestone_year,asset_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.798 -2025,3,electricity,all-year.morning,0.798 +2025,3,wind,all-year.morning,-0.0 +2025,3,electricity,all-year.morning,0.0 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.late-peak,-0.22344000000000008 -2025,3,electricity,all-year.late-peak,0.22344000000000008 -2025,3,wind,all-year.evening,-0.5958399999999999 -2025,3,electricity,all-year.evening,0.5958399999999999 +2025,3,wind,all-year.early-peak,-0.3298399999999999 +2025,3,electricity,all-year.early-peak,0.3298399999999999 +2025,3,wind,all-year.late-peak,-1.1172000000000002 +2025,3,electricity,all-year.late-peak,1.1172000000000002 +2025,3,wind,all-year.evening,-0.17023999999999995 +2025,3,electricity,all-year.evening,0.17023999999999995 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.morning,-1.33266 +2025,4,electricity,all-year.morning,0.798 +2025,4,CO2f,all-year.morning,73.15266000000001 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,-1.4925792000000002 -2025,4,electricity,all-year.late-peak,0.8937600000000001 -2025,4,CO2f,all-year.late-peak,81.93097920000001 -2025,4,gas,all-year.evening,-0.7818272000000002 -2025,4,electricity,all-year.evening,0.46816000000000013 -2025,4,CO2f,all-year.evening,42.916227200000016 +2025,4,gas,all-year.early-peak,-0.7818272000000002 +2025,4,electricity,all-year.early-peak,0.46816000000000013 +2025,4,CO2f,all-year.early-peak,42.916227200000016 +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,-1.4925792000000002 +2025,4,electricity,all-year.evening,0.8937600000000001 +2025,4,CO2f,all-year.evening,81.93097920000001 2030,2,electricity,all-year.night,-0.0 2030,2,heat,all-year.night,0.0 2030,2,electricity,all-year.morning,-0.12120000000000015 @@ -101,18 +101,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,heat,all-year.late-peak,2.7930000000000006 2030,2,electricity,all-year.evening,-0.4532000000000002 2030,2,heat,all-year.evening,1.1330000000000005 -2030,3,wind,all-year.night,-0.6640000000000001 -2030,3,electricity,all-year.night,0.6640000000000001 +2030,3,wind,all-year.night,-0.0 +2030,3,electricity,all-year.night,0.0 2030,3,wind,all-year.morning,-0.9960000000000002 2030,3,electricity,all-year.morning,0.9960000000000002 -2030,3,wind,all-year.afternoon,-0.6640000000000001 -2030,3,electricity,all-year.afternoon,0.6640000000000001 +2030,3,wind,all-year.afternoon,-0.0 +2030,3,electricity,all-year.afternoon,0.0 2030,3,wind,all-year.early-peak,-0.0 2030,3,electricity,all-year.early-peak,0.0 2030,3,wind,all-year.late-peak,-0.0 2030,3,electricity,all-year.late-peak,0.0 -2030,3,wind,all-year.evening,-0.3572799999999996 -2030,3,electricity,all-year.evening,0.3572799999999996 +2030,3,wind,all-year.evening,-1.1172 +2030,3,electricity,all-year.evening,1.1172 2030,4,gas,all-year.night,-0.0 2030,4,electricity,all-year.night,0.0 2030,4,CO2f,all-year.night,0.0 @@ -143,18 +143,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,5,heat,all-year.late-peak,2.187 2030,5,electricity,all-year.evening,-0.8748 2030,5,heat,all-year.evening,2.187 -2030,6,wind,all-year.night,-0.0 -2030,6,electricity,all-year.night,0.0 +2030,6,wind,all-year.night,-0.6640000000000001 +2030,6,electricity,all-year.night,0.6640000000000001 2030,6,wind,all-year.morning,-0.0 2030,6,electricity,all-year.morning,0.0 -2030,6,wind,all-year.afternoon,-0.0 -2030,6,electricity,all-year.afternoon,0.0 +2030,6,wind,all-year.afternoon,-0.6640000000000001 +2030,6,electricity,all-year.afternoon,0.6640000000000001 2030,6,wind,all-year.early-peak,-0.9960000000000002 2030,6,electricity,all-year.early-peak,0.9960000000000002 2030,6,wind,all-year.late-peak,-1.9920000000000002 2030,6,electricity,all-year.late-peak,1.9920000000000002 -2030,6,wind,all-year.evening,-0.9707200000000007 -2030,6,electricity,all-year.evening,0.9707200000000007 +2030,6,wind,all-year.evening,-0.21080000000000026 +2030,6,electricity,all-year.evening,0.21080000000000026 2035,2,electricity,all-year.night,-0.0 2035,2,heat,all-year.night,0.0 2035,2,electricity,all-year.morning,-0.0 @@ -169,12 +169,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,2,heat,all-year.evening,0.7930000000000006 2035,3,wind,all-year.night,-0.0 2035,3,electricity,all-year.night,0.0 -2035,3,wind,all-year.morning,-1.1172 -2035,3,electricity,all-year.morning,1.1172 +2035,3,wind,all-year.morning,-0.0 +2035,3,electricity,all-year.morning,0.0 2035,3,wind,all-year.afternoon,-0.0 2035,3,electricity,all-year.afternoon,0.0 -2035,3,wind,all-year.early-peak,-1.1172 -2035,3,electricity,all-year.early-peak,1.1172 +2035,3,wind,all-year.early-peak,-0.0 +2035,3,electricity,all-year.early-peak,0.0 2035,3,wind,all-year.late-peak,-0.0 2035,3,electricity,all-year.late-peak,0.0 2035,3,wind,all-year.evening,-0.0 @@ -211,12 +211,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,5,heat,all-year.evening,2.187 2035,6,wind,all-year.night,-0.0 2035,6,electricity,all-year.night,0.0 -2035,6,wind,all-year.morning,-0.08280000000000015 -2035,6,electricity,all-year.morning,0.08280000000000015 -2035,6,wind,all-year.afternoon,-0.0 -2035,6,electricity,all-year.afternoon,0.0 -2035,6,wind,all-year.early-peak,-0.08280000000000015 -2035,6,electricity,all-year.early-peak,0.08280000000000015 +2035,6,wind,all-year.morning,-0.0 +2035,6,electricity,all-year.morning,0.0 +2035,6,wind,all-year.afternoon,-0.8 +2035,6,electricity,all-year.afternoon,0.8 +2035,6,wind,all-year.early-peak,-1.2000000000000002 +2035,6,electricity,all-year.early-peak,1.2000000000000002 2035,6,wind,all-year.late-peak,-1.9919999999999998 2035,6,electricity,all-year.late-peak,1.9919999999999998 2035,6,wind,all-year.evening,-0.0 @@ -235,10 +235,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,7,heat,all-year.evening,1.0199999999999996 2035,8,wind,all-year.night,-0.8 2035,8,electricity,all-year.night,0.8 -2035,8,wind,all-year.morning,-0.0 -2035,8,electricity,all-year.morning,0.0 -2035,8,wind,all-year.afternoon,-0.8 -2035,8,electricity,all-year.afternoon,0.8 +2035,8,wind,all-year.morning,-1.2000000000000002 +2035,8,electricity,all-year.morning,1.2000000000000002 +2035,8,wind,all-year.afternoon,-0.0 +2035,8,electricity,all-year.afternoon,0.0 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.4080000000000003 @@ -259,14 +259,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,2,heat,all-year.evening,0.4630000000000005 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.morning,-1.1172 +2040,3,electricity,all-year.morning,1.1172 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,-0.6360000000000001 -2040,3,electricity,all-year.late-peak,0.6360000000000001 +2040,3,wind,all-year.early-peak,-0.11520000000000002 +2040,3,electricity,all-year.early-peak,0.11520000000000002 +2040,3,wind,all-year.late-peak,-1.1172 +2040,3,electricity,all-year.late-peak,1.1172 2040,3,wind,all-year.evening,-0.0 2040,3,electricity,all-year.evening,0.0 2040,5,electricity,all-year.night,-0.1280000000000001 @@ -281,18 +281,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,5,heat,all-year.late-peak,2.187 2040,5,electricity,all-year.evening,-0.8748 2040,5,heat,all-year.evening,2.187 -2040,6,wind,all-year.night,-0.9320000000000002 -2040,6,electricity,all-year.night,0.9320000000000002 -2040,6,wind,all-year.morning,-1.3980000000000001 -2040,6,electricity,all-year.morning,1.3980000000000001 +2040,6,wind,all-year.night,-0.0 +2040,6,electricity,all-year.night,0.0 +2040,6,wind,all-year.morning,-0.2808000000000002 +2040,6,electricity,all-year.morning,0.2808000000000002 2040,6,wind,all-year.afternoon,-0.0 2040,6,electricity,all-year.afternoon,0.0 -2040,6,wind,all-year.early-peak,-0.11520000000000002 -2040,6,electricity,all-year.early-peak,0.11520000000000002 +2040,6,wind,all-year.early-peak,-0.0 +2040,6,electricity,all-year.early-peak,0.0 2040,6,wind,all-year.late-peak,-0.0 2040,6,electricity,all-year.late-peak,0.0 -2040,6,wind,all-year.evening,-1.8640000000000003 -2040,6,electricity,all-year.evening,1.8640000000000003 +2040,6,wind,all-year.evening,-0.0 +2040,6,electricity,all-year.evening,0.0 2040,7,electricity,all-year.night,-0.40799999999999986 2040,7,heat,all-year.night,1.0199999999999996 2040,7,electricity,all-year.morning,-0.40799999999999986 @@ -305,18 +305,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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.night,-0.9320000000000002 +2040,8,electricity,all-year.night,0.9320000000000002 2040,8,wind,all-year.morning,-0.0 2040,8,electricity,all-year.morning,0.0 -2040,8,wind,all-year.afternoon,-0.9320000000000002 -2040,8,electricity,all-year.afternoon,0.9320000000000002 +2040,8,wind,all-year.afternoon,-0.0 +2040,8,electricity,all-year.afternoon,0.0 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,-2.16 -2040,8,electricity,all-year.late-peak,2.16 -2040,8,wind,all-year.evening,-0.0 -2040,8,electricity,all-year.evening,0.0 +2040,8,wind,all-year.late-peak,-0.8148799999999996 +2040,8,electricity,all-year.late-peak,0.8148799999999996 +2040,8,wind,all-year.evening,-1.8640000000000003 +2040,8,electricity,all-year.evening,1.8640000000000003 2040,9,electricity,all-year.night,-0.39600000000000013 2040,9,heat,all-year.night,0.9900000000000002 2040,9,electricity,all-year.morning,-0.39600000000000013 @@ -333,12 +333,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,10,electricity,all-year.night,0.0 2040,10,wind,all-year.morning,-0.0 2040,10,electricity,all-year.morning,0.0 -2040,10,wind,all-year.afternoon,-0.0 -2040,10,electricity,all-year.afternoon,0.0 +2040,10,wind,all-year.afternoon,-0.9320000000000002 +2040,10,electricity,all-year.afternoon,0.9320000000000002 2040,10,wind,all-year.early-peak,-1.2828000000000002 2040,10,electricity,all-year.early-peak,1.2828000000000002 -2040,10,wind,all-year.late-peak,-0.0 -2040,10,electricity,all-year.late-peak,0.0 +2040,10,wind,all-year.late-peak,-0.8639200000000007 +2040,10,electricity,all-year.late-peak,0.8639200000000007 2040,10,wind,all-year.evening,-0.0 2040,10,electricity,all-year.evening,0.0 2045,2,electricity,all-year.night,-0.0 @@ -355,16 +355,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,2,heat,all-year.evening,0.13300000000000045 2045,3,wind,all-year.night,-0.0 2045,3,electricity,all-year.night,0.0 -2045,3,wind,all-year.morning,-1.1172 -2045,3,electricity,all-year.morning,1.1172 +2045,3,wind,all-year.morning,-0.0 +2045,3,electricity,all-year.morning,0.0 2045,3,wind,all-year.afternoon,-0.0 2045,3,electricity,all-year.afternoon,0.0 -2045,3,wind,all-year.early-peak,-0.44688000000000017 -2045,3,electricity,all-year.early-peak,0.44688000000000017 +2045,3,wind,all-year.early-peak,-0.0 +2045,3,electricity,all-year.early-peak,0.0 2045,3,wind,all-year.late-peak,-0.0 2045,3,electricity,all-year.late-peak,0.0 -2045,3,wind,all-year.evening,-1.1172 -2045,3,electricity,all-year.evening,1.1172 +2045,3,wind,all-year.evening,-0.6807999999999994 +2045,3,electricity,all-year.evening,0.6807999999999994 2045,5,electricity,all-year.night,-0.0 2045,5,heat,all-year.night,0.0 2045,5,electricity,all-year.morning,-0.39600000000000013 @@ -377,16 +377,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,5,heat,all-year.late-peak,2.187 2045,5,electricity,all-year.evening,-0.8748 2045,5,heat,all-year.evening,2.187 -2045,6,wind,all-year.night,-0.6975199999999983 -2045,6,electricity,all-year.night,0.6975199999999983 -2045,6,wind,all-year.morning,-0.0 -2045,6,electricity,all-year.morning,0.0 +2045,6,wind,all-year.night,-0.0 +2045,6,electricity,all-year.night,0.0 +2045,6,wind,all-year.morning,-1.5960000000000003 +2045,6,electricity,all-year.morning,1.5960000000000003 2045,6,wind,all-year.afternoon,-0.0 2045,6,electricity,all-year.afternoon,0.0 -2045,6,wind,all-year.early-peak,-1.1491200000000001 -2045,6,electricity,all-year.early-peak,1.1491200000000001 -2045,6,wind,all-year.late-peak,-0.0 -2045,6,electricity,all-year.late-peak,0.0 +2045,6,wind,all-year.early-peak,-0.0 +2045,6,electricity,all-year.early-peak,0.0 +2045,6,wind,all-year.late-peak,-1.9919999999999998 +2045,6,electricity,all-year.late-peak,1.9919999999999998 2045,6,wind,all-year.evening,-0.0 2045,6,electricity,all-year.evening,0.0 2045,7,electricity,all-year.night,-0.2719999999999999 @@ -401,16 +401,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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.0 -2045,8,electricity,all-year.night,0.0 -2045,8,wind,all-year.morning,-0.47880000000000034 -2045,8,electricity,all-year.morning,0.47880000000000034 +2045,8,wind,all-year.night,-1.064 +2045,8,electricity,all-year.night,1.064 +2045,8,wind,all-year.morning,-0.0 +2045,8,electricity,all-year.morning,0.0 2045,8,wind,all-year.afternoon,-0.0 2045,8,electricity,all-year.afternoon,0.0 -2045,8,wind,all-year.early-peak,-0.0 -2045,8,electricity,all-year.early-peak,0.0 -2045,8,wind,all-year.late-peak,-2.16 -2045,8,electricity,all-year.late-peak,2.16 +2045,8,wind,all-year.early-peak,-1.5960000000000003 +2045,8,electricity,all-year.early-peak,1.5960000000000003 +2045,8,wind,all-year.late-peak,-0.0 +2045,8,electricity,all-year.late-peak,0.0 2045,8,wind,all-year.evening,-0.0 2045,8,electricity,all-year.evening,0.0 2045,9,electricity,all-year.night,-0.39600000000000013 @@ -429,8 +429,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,10,electricity,all-year.night,0.0 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.afternoon,-1.064 +2045,10,electricity,all-year.afternoon,1.064 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.0 @@ -449,18 +449,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,11,heat,all-year.late-peak,0.9900000000000002 2045,11,electricity,all-year.evening,-0.39600000000000013 2045,11,heat,all-year.evening,0.9900000000000002 -2045,12,wind,all-year.night,-0.3664800000000019 -2045,12,electricity,all-year.night,0.3664800000000019 +2045,12,wind,all-year.night,-0.0 +2045,12,electricity,all-year.night,0.0 2045,12,wind,all-year.morning,-0.0 2045,12,electricity,all-year.morning,0.0 -2045,12,wind,all-year.afternoon,-1.064 -2045,12,electricity,all-year.afternoon,1.064 +2045,12,wind,all-year.afternoon,-0.0 +2045,12,electricity,all-year.afternoon,0.0 2045,12,wind,all-year.early-peak,-0.0 2045,12,electricity,all-year.early-peak,0.0 -2045,12,wind,all-year.late-peak,-1.032 -2045,12,electricity,all-year.late-peak,1.032 -2045,12,wind,all-year.evening,-1.0108000000000004 -2045,12,electricity,all-year.evening,1.0108000000000004 +2045,12,wind,all-year.late-peak,-1.2000000000000006 +2045,12,electricity,all-year.late-peak,1.2000000000000006 +2045,12,wind,all-year.evening,-1.447200000000001 +2045,12,electricity,all-year.evening,1.447200000000001 2050,2,electricity,all-year.night,-0.0 2050,2,heat,all-year.night,0.0 2050,2,electricity,all-year.morning,-0.0 @@ -497,16 +497,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,5,heat,all-year.late-peak,2.187 2050,5,electricity,all-year.evening,-0.7920000000000003 2050,5,heat,all-year.evening,1.9800000000000004 -2050,6,wind,all-year.night,-0.0 -2050,6,electricity,all-year.night,0.0 -2050,6,wind,all-year.morning,-0.0 -2050,6,electricity,all-year.morning,0.0 -2050,6,wind,all-year.afternoon,-0.0 -2050,6,electricity,all-year.afternoon,0.0 -2050,6,wind,all-year.early-peak,-0.0 -2050,6,electricity,all-year.early-peak,0.0 -2050,6,wind,all-year.late-peak,-0.6264000000000085 -2050,6,electricity,all-year.late-peak,0.6264000000000085 +2050,6,wind,all-year.night,-0.47400000000000364 +2050,6,electricity,all-year.night,0.47400000000000364 +2050,6,wind,all-year.morning,-1.8000000000000003 +2050,6,electricity,all-year.morning,1.8000000000000003 +2050,6,wind,all-year.afternoon,-0.7067999999999959 +2050,6,electricity,all-year.afternoon,0.7067999999999959 +2050,6,wind,all-year.early-peak,-1.8000000000000003 +2050,6,electricity,all-year.early-peak,1.8000000000000003 +2050,6,wind,all-year.late-peak,-0.0 +2050,6,electricity,all-year.late-peak,0.0 2050,6,wind,all-year.evening,-0.0 2050,6,electricity,all-year.evening,0.0 2050,7,electricity,all-year.night,-0.0 @@ -525,14 +525,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,8,electricity,all-year.night,0.0 2050,8,wind,all-year.morning,-0.0 2050,8,electricity,all-year.morning,0.0 -2050,8,wind,all-year.afternoon,-1.2000000000000002 -2050,8,electricity,all-year.afternoon,1.2000000000000002 -2050,8,wind,all-year.early-peak,-1.0740000000000038 -2050,8,electricity,all-year.early-peak,1.0740000000000038 -2050,8,wind,all-year.late-peak,-1.235999999999992 -2050,8,electricity,all-year.late-peak,1.235999999999992 -2050,8,wind,all-year.evening,-1.6740000000000037 -2050,8,electricity,all-year.evening,1.6740000000000037 +2050,8,wind,all-year.afternoon,-0.0 +2050,8,electricity,all-year.afternoon,0.0 +2050,8,wind,all-year.early-peak,-0.0 +2050,8,electricity,all-year.early-peak,0.0 +2050,8,wind,all-year.late-peak,-2.16 +2050,8,electricity,all-year.late-peak,2.16 +2050,8,wind,all-year.evening,-2.16 +2050,8,electricity,all-year.evening,2.16 2050,9,electricity,all-year.night,-0.39600000000000013 2050,9,heat,all-year.night,0.9900000000000002 2050,9,electricity,all-year.morning,-0.39600000000000013 @@ -547,14 +547,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,9,heat,all-year.evening,0.9900000000000002 2050,10,wind,all-year.night,-0.0 2050,10,electricity,all-year.night,0.0 -2050,10,wind,all-year.morning,-1.2828000000000002 -2050,10,electricity,all-year.morning,1.2828000000000002 +2050,10,wind,all-year.morning,-0.0 +2050,10,electricity,all-year.morning,0.0 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.0 -2050,10,electricity,all-year.late-peak,0.0 +2050,10,wind,all-year.late-peak,-1.2828000000000002 +2050,10,electricity,all-year.late-peak,1.2828000000000002 2050,10,wind,all-year.evening,-0.0 2050,10,electricity,all-year.evening,0.0 2050,11,electricity,all-year.night,-0.39600000000000013 @@ -569,16 +569,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,11,heat,all-year.late-peak,0.9900000000000002 2050,11,electricity,all-year.evening,-0.39600000000000013 2050,11,heat,all-year.evening,0.9900000000000002 -2050,12,wind,all-year.night,-1.2000000000000002 -2050,12,electricity,all-year.night,1.2000000000000002 -2050,12,wind,all-year.morning,-0.5172000000000001 -2050,12,electricity,all-year.morning,0.5172000000000001 -2050,12,wind,all-year.afternoon,-0.0 -2050,12,electricity,all-year.afternoon,0.0 +2050,12,wind,all-year.night,-0.0 +2050,12,electricity,all-year.night,0.0 +2050,12,wind,all-year.morning,-0.0 +2050,12,electricity,all-year.morning,0.0 +2050,12,wind,all-year.afternoon,-0.49320000000000425 +2050,12,electricity,all-year.afternoon,0.49320000000000425 2050,12,wind,all-year.early-peak,-0.0 2050,12,electricity,all-year.early-peak,0.0 -2050,12,wind,all-year.late-peak,-1.447200000000001 -2050,12,electricity,all-year.late-peak,1.447200000000001 +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.0 2050,12,electricity,all-year.evening,0.0 2050,13,electricity,all-year.night,-0.40799999999999986 @@ -593,15 +593,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,13,heat,all-year.late-peak,1.0199999999999996 2050,13,electricity,all-year.evening,-0.40799999999999986 2050,13,heat,all-year.evening,1.0199999999999996 -2050,14,wind,all-year.night,-0.0 -2050,14,electricity,all-year.night,0.0 +2050,14,wind,all-year.night,-0.7259999999999965 +2050,14,electricity,all-year.night,0.7259999999999965 2050,14,wind,all-year.morning,-0.0 2050,14,electricity,all-year.morning,0.0 2050,14,wind,all-year.afternoon,-0.0 2050,14,electricity,all-year.afternoon,0.0 -2050,14,wind,all-year.early-peak,-0.7259999999999965 -2050,14,electricity,all-year.early-peak,0.7259999999999965 -2050,14,wind,all-year.late-peak,-0.290399999999999 -2050,14,electricity,all-year.late-peak,0.290399999999999 -2050,14,wind,all-year.evening,-0.7259999999999965 -2050,14,electricity,all-year.evening,0.7259999999999965 +2050,14,wind,all-year.early-peak,-0.0 +2050,14,electricity,all-year.early-peak,0.0 +2050,14,wind,all-year.late-peak,-0.15719999999999973 +2050,14,electricity,all-year.late-peak,0.15719999999999973 +2050,14,wind,all-year.evening,-0.2400000000000002 +2050,14,electricity,all-year.evening,0.2400000000000002 diff --git a/tests/data/muse1_default/commodity_prices.csv b/tests/data/muse1_default/commodity_prices.csv index 097e21a2d..5a9fc6535 100644 --- a/tests/data/muse1_default/commodity_prices.csv +++ b/tests/data/muse1_default/commodity_prices.csv @@ -25,8 +25,8 @@ milestone_year,commodity_id,region_id,time_slice,price 2025,electricity,R1,all-year.evening,15.26529810765 2025,gas,R1,all-year.night,2.55 2025,gas,R1,all-year.morning,2.55 -2025,gas,R1,all-year.afternoon,2.55 -2025,gas,R1,all-year.early-peak,2.55 +2025,gas,R1,all-year.afternoon,2.5500000000000007 +2025,gas,R1,all-year.early-peak,2.5500000000000007 2025,gas,R1,all-year.late-peak,2.55 2025,gas,R1,all-year.evening,2.55 2025,heat,R1,all-year.night,6.10611924306 diff --git a/tests/data/simple/debug_dispatch_assets.csv b/tests/data/simple/debug_dispatch_assets.csv index 762f6907f..b848fe274 100644 --- a/tests/data/simple/debug_dispatch_assets.csv +++ b/tests/data/simple/debug_dispatch_assets.csv @@ -96,7 +96,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final without candidates,5,RELCHP,GBR,autumn.peak,11.9512367653449,-0.0,0.0 2020,final without candidates,5,RELCHP,GBR,autumn.evening,15.437192051273913,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2020,final with candidates,0,GASDRV,GBR,winter.day,151.1029469806843,-0.0,0.0 +2020,final with candidates,0,GASDRV,GBR,winter.day,151.10292198068436,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 @@ -106,13 +106,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2020,final with candidates,0,GASDRV,GBR,summer.evening,0.16855462584153408,-0.0,0.0 +2020,final with candidates,0,GASDRV,GBR,summer.evening,0.168529625841434,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 -2020,final with candidates,0,GASDRV,GBR,autumn.evening,163.38648438726446,-0.0,0.0 +2020,final with candidates,0,GASDRV,GBR,autumn.evening,163.38648438726443,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,1,GASPRC,GBR,winter.day,146.06195328510356,-0.0,0.0 +2020,final with candidates,1,GASPRC,GBR,winter.day,146.06197828510372,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -122,11 +122,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,1,GASPRC,GBR,summer.evening,0.1605032150870753,-0.0,0.0 +2020,final with candidates,1,GASPRC,GBR,summer.evening,0.1605282150871752,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,1,GASPRC,GBR,autumn.evening,155.60615060691842,-0.0,0.0 +2020,final with candidates,1,GASPRC,GBR,autumn.evening,155.6061756069185,-0.0,0.0 2020,final with candidates,2,WNDFRM,GBR,winter.night,4.435312795545212,-7.593308999999999,0.0 2020,final with candidates,2,WNDFRM,GBR,winter.day,7.075379933645912,-7.593308999999999,0.0 2020,final with candidates,2,WNDFRM,GBR,winter.peak,1.9712501261051125,-7.593308999999999,0.0 @@ -143,15 +143,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0 2020,final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0 2020,final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0 -2020,final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0 -2020,final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0 -2020,final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0 2020,final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,peak.peak,2.3471047442443087,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0 -2020,final with candidates,3,GASCGT,GBR,summer.night,0.10701881005811686,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,summer.night,0.10678883089039881,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2020,final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2020,final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -191,38 +191,38 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,5,RELCHP,GBR,autumn.day,41.664583466660005,-3.05874493,0.0 2020,final with candidates,5,RELCHP,GBR,autumn.peak,11.951650691317264,-0.0,0.0 2020,final with candidates,5,RELCHP,GBR,autumn.evening,15.437731397467225,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593308999999999,0.0 2020,final with candidates,,WNDFRM,GBR,winter.day,0.00017845292106438267,-7.593308999999999,0.0 2020,final with candidates,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-7.593308999999999,0.0 @@ -239,15 +239,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0 2020,final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0 2020,final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0 -2020,final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0 -2020,final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0 -2020,final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0 2020,final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0 -2020,final with candidates,,GASCGT,GBR,summer.night,0.0,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2020,final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2020,final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -799,29 +799,29 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.day,7.3774647114145555,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.peak,2.3470061817443093,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.peak,2.347104744244309,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.night,0.294834908890399,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.night,5.5884937755474,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.day,7.747083429990085,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.day,7.747411971657804,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.peak,2.39506875,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.evening,3.1934250255473997,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,201.2083930701036,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,201.20839307010357,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,89.00558285782782,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,89.00555785782771,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 @@ -829,36 +829,36 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,0.4425973320871755,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,23.602386596208433,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,23.60241159620854,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,209.00668375493427,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,209.00670875493438,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,92.1631911570446,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,92.1632161570447,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,0.4647271986915343,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,0.4647021986914343,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234447,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 @@ -867,18 +867,18 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.day,0.00017845292106438267,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-7.593308999999999,0.0 @@ -895,20 +895,20 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.peak,0.0000985625,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.night,0.00022997916771800003,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.day,0.00032854166771800004,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.peak,0.0000985625,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.evening,0.000131416667718,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,,RGASBR,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 @@ -1056,7 +1056,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final without candidates,6,RGASBR,GBR,autumn.peak,0.0,-0.0,0.0 2030,final without candidates,6,RGASBR,GBR,autumn.evening,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,final with candidates,0,GASDRV,GBR,winter.day,209.00670875493444,-0.0,0.0 +2030,final with candidates,0,GASDRV,GBR,winter.day,209.0066837549344,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 @@ -1066,13 +1066,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,final with candidates,0,GASDRV,GBR,summer.evening,0.46472719869153434,-0.0,0.0 +2030,final with candidates,0,GASDRV,GBR,summer.evening,0.4647021986914343,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 -2030,final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234447,-0.0,0.0 +2030,final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234444,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,1,GASPRC,GBR,winter.day,201.20839307010365,-0.0,0.0 +2030,final with candidates,1,GASPRC,GBR,winter.day,201.20841807010382,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -1082,10 +1082,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,1,GASPRC,GBR,summer.evening,0.4425723320870756,-0.0,0.0 +2030,final with candidates,1,GASPRC,GBR,summer.evening,0.4425973320871755,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,1,GASPRC,GBR,autumn.peak,23.602386596208447,-0.0,0.0 +2030,final with candidates,1,GASPRC,GBR,autumn.peak,23.602411596208526,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,2,WNDFRM,GBR,winter.night,4.435312795545212,-7.593308999999999,0.0 2030,final with candidates,2,WNDFRM,GBR,winter.day,7.075379933645912,-7.593308999999999,0.0 @@ -1103,15 +1103,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0 2030,final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0 2030,final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0 -2030,final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0 -2030,final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0 -2030,final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0 2030,final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,peak.peak,2.3471047442443087,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0 -2030,final with candidates,3,GASCGT,GBR,summer.night,0.29506488805811704,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,summer.night,0.294834908890399,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -1167,38 +1167,38 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,6,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 2030,final with candidates,6,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 2030,final with candidates,6,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593308999999999,0.0 2030,final with candidates,,WNDFRM,GBR,winter.day,0.00017845292106438267,-7.593308999999999,0.0 2030,final with candidates,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-7.593308999999999,0.0 @@ -1215,15 +1215,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0 2030,final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0 2030,final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0 -2030,final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0 -2030,final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0 -2030,final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0 2030,final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0 -2030,final with candidates,,GASCGT,GBR,summer.night,0.0,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -1504,7 +1504,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,,RGASBR,GBR,autumn.peak,50.32289817057999,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,RGASBR,GBR,autumn.evening,21.950264980307146,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,345.9295903374229,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,345.9295653374228,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -1514,17 +1514,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,26.76826830295678,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,26.76829330295688,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,12.659661748339765,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,12.659686748339873,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561946,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,360.9639396356195,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,85.71566041562158,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,85.71563541562148,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 @@ -1532,17 +1532,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,28.106682968104625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082215,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082272,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 @@ -1551,22 +1551,22 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.night,2.406250011e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.day,3.4375000110000007e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.peak,1.03125e-6,-0.0,0.0 @@ -1872,7 +1872,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,,RGASBR,GBR,autumn.peak,50.32289817057999,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,RGASBR,GBR,autumn.evening,21.950264980307146,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.day,345.9295903374229,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.day,345.9295653374228,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -1882,17 +1882,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.evening,26.76826830295678,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.evening,26.76829330295688,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.day,12.659661748339765,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.day,12.659686748339873,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561946,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.day,360.9639396356195,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.day,85.71566041562158,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.day,85.71563541562148,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 @@ -1900,17 +1900,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.evening,28.106682968104625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082215,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082272,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.peak,125.070625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 @@ -1919,22 +1919,22 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,WNDFRM,GBR,winter.night,2.406250011e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,WNDFRM,GBR,winter.day,3.4375000110000007e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,WNDFRM,GBR,winter.peak,1.03125e-6,-0.0,0.0 diff --git a/tests/data/simple/debug_solver.csv b/tests/data/simple/debug_solver.csv index 0eb50cc51..3363a448d 100644 --- a/tests/data/simple/debug_solver.csv +++ b/tests/data/simple/debug_solver.csv @@ -1,22 +1,22 @@ milestone_year,run_description,objective_value 2020,final without candidates,4132.120065800383 -2020,final with candidates,4132.101429603424 +2020,final with candidates,4132.101429603423 2030,ironing out iteration 0; post RSHEAT|GBR investment,5324.82265531636 2030,ironing out iteration 0; post ELCTRI|GBR investment,4708.71265302254 2030,ironing out iteration 0; post GASNAT|GBR investment,4708.712653022539 2030,ironing out iteration 0; post GASPRD|GBR investment,4708.712653022539 2030,ironing out iteration 0; final without candidates,4708.712653022539 -2030,ironing out iteration 0; final with candidates,4708.694016825579 +2030,ironing out iteration 0; final with candidates,4708.694016825578 2030,final without candidates,4708.712653022538 -2030,final with candidates,4708.694016825577 +2030,final with candidates,4708.694016825575 2040,ironing out iteration 0; post RSHEAT|GBR investment,6613.816363708183 2040,ironing out iteration 0; post GASNAT|GBR investment,6613.816363708183 2040,ironing out iteration 0; post GASPRD|GBR investment,6613.816363708185 2040,ironing out iteration 0; final without candidates,6613.816363708185 -2040,ironing out iteration 0; final with candidates,6613.815807254493 +2040,ironing out iteration 0; final with candidates,6613.815807254492 2040,ironing out iteration 1; post RSHEAT|GBR investment,6613.816363708183 2040,ironing out iteration 1; post GASNAT|GBR investment,6613.816363708183 2040,ironing out iteration 1; post GASPRD|GBR investment,6613.816363708185 2040,ironing out iteration 1; final without candidates,6613.816363708185 -2040,ironing out iteration 1; final with candidates,6613.815807254493 +2040,ironing out iteration 1; final with candidates,6613.815807254492 2040,final without candidates,6613.816363708183 diff --git a/tests/data/simple_divisible/commodity_flows.csv b/tests/data/simple_divisible/commodity_flows.csv index 03b9efc40..d2e7c42cd 100644 --- a/tests/data/simple_divisible/commodity_flows.csv +++ b/tests/data/simple_divisible/commodity_flows.csv @@ -331,8 +331,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,peak.night,0.0 2030,0,GASPRD,peak.day,0.0 2030,0,CO2EMT,peak.day,0.0 -2030,0,GASPRD,peak.peak,44.963829236405275 -2030,0,CO2EMT,peak.peak,229.90005888574018 +2030,0,GASPRD,peak.peak,44.96382923640522 +2030,0,CO2EMT,peak.peak,229.9000588857399 2030,0,GASPRD,peak.evening,166.76083466742 2030,0,CO2EMT,peak.evening,852.6481476545185 2030,0,GASPRD,summer.night,0.0 @@ -349,8 +349,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.day,0.0 2030,0,GASPRD,autumn.peak,0.0 2030,0,CO2EMT,autumn.peak,0.0 -2030,0,GASPRD,autumn.evening,149.8615049192033 -2030,0,CO2EMT,autumn.evening,766.2418746518865 +2030,0,GASPRD,autumn.evening,149.86150491920327 +2030,0,CO2EMT,autumn.evening,766.2418746518864 2030,1,GASPRD,winter.night,-0.0 2030,1,GASNAT,winter.night,0.0 2030,1,CO2EMT,winter.night,0.0 @@ -369,9 +369,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,peak.day,-0.0 2030,1,GASNAT,peak.day,0.0 2030,1,CO2EMT,peak.day,0.0 -2030,1,GASPRD,peak.peak,-46.25647508007977 -2030,1,GASNAT,peak.peak,44.053785790552155 -2030,1,CO2EMT,peak.peak,112.6235033735466 +2030,1,GASPRD,peak.peak,-46.25647508007973 +2030,1,GASNAT,peak.peak,44.053785790552126 +2030,1,CO2EMT,peak.peak,112.62350337354653 2030,1,GASPRD,peak.evening,-165.4681888237455 2030,1,GASNAT,peak.evening,157.58875126070998 2030,1,CO2EMT,peak.evening,402.87564259800513 @@ -396,9 +396,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,autumn.peak,-0.0 2030,1,GASNAT,autumn.peak,0.0 2030,1,CO2EMT,autumn.peak,0.0 -2030,1,GASPRD,autumn.evening,-149.8615049192033 -2030,1,GASNAT,autumn.evening,142.7252427801936 -2030,1,CO2EMT,autumn.evening,364.877083167565 +2030,1,GASPRD,autumn.evening,-149.86150491920327 +2030,1,GASNAT,autumn.evening,142.72524278019358 +2030,1,CO2EMT,autumn.evening,364.87708316756493 2030,2,ELCTRI,winter.night,4.435312795545212 2030,2,ELCTRI,winter.day,7.075379933645912 2030,2,ELCTRI,winter.peak,1.9712501261051125 @@ -424,24 +424,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.peak,-3.592603125 2030,3,ELCTRI,winter.peak,2.39506875 2030,3,CO2EMT,winter.peak,183.68979778124998 -2030,3,GASNAT,winter.evening,-4.790137538321099 -2030,3,ELCTRI,winter.evening,3.1934250255473997 -2030,3,CO2EMT,winter.evening,244.9197323343578 +2030,3,GASNAT,winter.evening,-3.5229053092829044 +2030,3,ELCTRI,winter.evening,2.3486035395219362 +2030,3,CO2EMT,winter.evening,180.12614846363488 2030,3,GASNAT,peak.night,-8.382740663321101 2030,3,ELCTRI,peak.night,5.5884937755474 2030,3,CO2EMT,peak.night,428.6095301156078 -2030,3,GASNAT,peak.day,-11.975343788321101 -2030,3,ELCTRI,peak.day,7.9835625255474 -2030,3,CO2EMT,peak.day,612.2993278968578 -2030,3,GASNAT,peak.peak,-3.592603125 -2030,3,ELCTRI,peak.peak,2.39506875 -2030,3,CO2EMT,peak.peak,183.68979778124998 +2030,3,GASNAT,peak.day,-8.886465236074454 +2030,3,ELCTRI,peak.day,5.924310157382969 +2030,3,CO2EMT,peak.day,454.3649675204868 +2030,3,GASNAT,peak.peak,-2.8665846647895705 +2030,3,ELCTRI,peak.peak,1.911056443193047 +2030,3,CO2EMT,peak.peak,146.56847391069073 2030,3,GASNAT,peak.evening,-4.790137538321099 -2030,3,ELCTRI,peak.evening,3.1934250255473997 -2030,3,CO2EMT,peak.evening,244.9197323343578 -2030,3,GASNAT,summer.night,-0.44265925791417715 -2030,3,ELCTRI,summer.night,0.29510617194278477 -2030,3,CO2EMT,summer.night,22.633167857151875 +2030,3,ELCTRI,peak.evening,3.1934250255473993 +2030,3,CO2EMT,peak.evening,244.91973233435778 +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 @@ -451,15 +451,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-3.3878829022543346 -2030,3,ELCTRI,autumn.night,2.2585886015028898 -2030,3,CO2EMT,autumn.night,173.2224527922641 -2030,3,GASNAT,autumn.day,-11.975343788321101 -2030,3,ELCTRI,autumn.day,7.9835625255474 -2030,3,CO2EMT,autumn.day,612.2993278968578 -2030,3,GASNAT,autumn.peak,-3.2097933936726317 -2030,3,ELCTRI,autumn.peak,2.139862262448421 -2030,3,CO2EMT,autumn.peak,164.11673621848163 +2030,3,GASNAT,autumn.night,-8.382740663321101 +2030,3,ELCTRI,autumn.night,5.5884937755474 +2030,3,CO2EMT,autumn.night,428.6095301156078 +2030,3,GASNAT,autumn.day,-9.44087933068659 +2030,3,ELCTRI,autumn.day,6.29391955379106 +2030,3,CO2EMT,autumn.day,482.7121601780053 +2030,3,GASNAT,autumn.peak,-3.592603125 +2030,3,ELCTRI,autumn.peak,2.39506875 +2030,3,CO2EMT,autumn.peak,183.68979778124998 2030,3,GASNAT,autumn.evening,-4.790137538321099 2030,3,ELCTRI,autumn.evening,3.1934250255473997 2030,3,CO2EMT,autumn.evening,244.9197323343578 @@ -536,24 +536,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,9,GASNAT,winter.peak,-3.5952126517441387 2030,9,ELCTRI,winter.peak,2.3968084344960925 2030,9,CO2EMT,winter.peak,183.8232228836778 -2030,9,GASNAT,winter.evening,-4.881619151330547 -2030,9,ELCTRI,winter.evening,3.2544127675536982 -2030,9,CO2EMT,winter.evening,249.59718720753085 +2030,9,GASNAT,winter.evening,-6.148851380368743 +2030,9,ELCTRI,winter.evening,4.099234253579162 +2030,9,CO2EMT,winter.evening,314.3907710782538 2030,9,GASNAT,peak.night,-10.67427159737626 2030,9,ELCTRI,peak.night,7.116181064917506 2030,9,CO2EMT,peak.night,545.7755067738481 -2030,9,GASNAT,peak.day,-12.283249824889 -2030,9,ELCTRI,peak.day,8.188833216592666 -2030,9,CO2EMT,peak.day,628.0425635465745 -2030,9,GASNAT,peak.peak,-3.8856200381730193 -2030,9,ELCTRI,peak.peak,2.590413358782013 -2030,9,CO2EMT,peak.peak,198.67175255178645 -2030,9,GASNAT,peak.evening,-6.1488513803687415 -2030,9,ELCTRI,peak.evening,4.099234253579161 -2030,9,CO2EMT,peak.evening,314.39077107825375 -2030,9,GASNAT,summer.night,-0.0 -2030,9,ELCTRI,summer.night,0.0 -2030,9,CO2EMT,summer.night,0.0 +2030,9,GASNAT,peak.day,-15.372128377135644 +2030,9,ELCTRI,peak.day,10.248085584757096 +2030,9,CO2EMT,peak.day,785.9769239229454 +2030,9,GASNAT,peak.peak,-4.611638498383449 +2030,9,ELCTRI,peak.peak,3.0744256655889663 +2030,9,CO2EMT,peak.peak,235.79307642234576 +2030,9,GASNAT,peak.evening,-6.148851380368743 +2030,9,ELCTRI,peak.evening,4.099234253579162 +2030,9,CO2EMT,peak.evening,314.3907710782538 +2030,9,GASNAT,summer.night,-0.44265925791417715 +2030,9,ELCTRI,summer.night,0.29510617194278477 +2030,9,CO2EMT,summer.night,22.633167857151875 2030,9,GASNAT,summer.day,-0.0 2030,9,ELCTRI,summer.day,0.0 2030,9,CO2EMT,summer.day,0.0 @@ -563,15 +563,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,9,GASNAT,summer.evening,-0.0 2030,9,ELCTRI,summer.evening,0.0 2030,9,CO2EMT,summer.evening,0.0 -2030,9,GASNAT,autumn.night,-10.760489878752193 -2030,9,ELCTRI,autumn.night,7.173659919168129 -2030,9,CO2EMT,autumn.night,550.1838475005997 -2030,9,GASNAT,autumn.day,-12.837663919501132 -2030,9,ELCTRI,autumn.day,8.558442613000755 -2030,9,CO2EMT,autumn.day,656.3897562040929 -2030,9,GASNAT,autumn.peak,-4.611638498383449 -2030,9,ELCTRI,autumn.peak,3.0744256655889663 -2030,9,CO2EMT,autumn.peak,235.79307642234576 +2030,9,GASNAT,autumn.night,-5.765632117685428 +2030,9,ELCTRI,autumn.night,3.8437547451236185 +2030,9,CO2EMT,autumn.night,294.7967701772559 +2030,9,GASNAT,autumn.day,-15.372128377135644 +2030,9,ELCTRI,autumn.day,10.248085584757096 +2030,9,CO2EMT,autumn.day,785.9769239229454 +2030,9,GASNAT,autumn.peak,-4.228828767056082 +2030,9,ELCTRI,autumn.peak,2.819219178037388 +2030,9,CO2EMT,autumn.peak,216.22001485957745 2030,9,GASNAT,autumn.evening,-5.88484466403186 2030,9,ELCTRI,autumn.evening,3.9232297760212402 2030,9,CO2EMT,autumn.evening,300.892107671949 diff --git a/tests/data/simple_full/commodity_flows.csv b/tests/data/simple_full/commodity_flows.csv index f7217b32f..8777f8bfa 100644 --- a/tests/data/simple_full/commodity_flows.csv +++ b/tests/data/simple_full/commodity_flows.csv @@ -251,8 +251,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,20.534211026060376 -2030,0,CO2EMT,autumn.peak,104.99142097624672 +2030,0,GASPRD,autumn.peak,20.534211026060348 +2030,0,CO2EMT,autumn.peak,104.99142097624657 2030,0,GASPRD,autumn.evening,166.76083466742 2030,0,CO2EMT,autumn.evening,852.6481476545185 2030,1,GASPRD,winter.night,-0.0 @@ -297,9 +297,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,autumn.day,-0.0 2030,1,GASNAT,autumn.day,0.0 2030,1,CO2EMT,autumn.day,0.0 -2030,1,GASPRD,autumn.peak,-21.826856869734893 -2030,1,GASNAT,autumn.peak,20.78748273308085 -2030,1,CO2EMT,autumn.peak,53.1431996071212 +2030,1,GASPRD,autumn.peak,-21.826856869734865 +2030,1,GASNAT,autumn.peak,20.78748273308082 +2030,1,CO2EMT,autumn.peak,53.143199607121126 2030,1,GASPRD,autumn.evening,-165.4681888237455 2030,1,GASNAT,autumn.evening,157.58875126070998 2030,1,CO2EMT,autumn.evening,402.87564259800513 @@ -328,15 +328,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.peak,-2.468688831431171 2030,3,ELCTRI,winter.peak,1.6457925542874472 2030,3,CO2EMT,winter.peak,126.22405995107574 -2030,3,GASNAT,winter.evening,-3.3795873788970026 -2030,3,ELCTRI,winter.evening,2.253058252598002 -2030,3,CO2EMT,winter.evening,172.79830268300373 +2030,3,GASNAT,winter.evening,-4.395089526235901 +2030,3,ELCTRI,winter.evening,2.9300596841572673 +2030,3,CO2EMT,winter.evening,224.7209274764416 2030,3,GASNAT,peak.night,-8.382740663321101 -2030,3,ELCTRI,peak.night,5.588493775547401 -2030,3,CO2EMT,peak.night,428.60953011560787 -2030,3,GASNAT,peak.day,-11.066925767990737 -2030,3,ELCTRI,peak.day,7.3779505119938245 -2030,3,CO2EMT,peak.day,565.8519145173664 +2030,3,ELCTRI,peak.night,5.5884937755474 +2030,3,CO2EMT,peak.night,428.6095301156078 +2030,3,GASNAT,peak.day,-8.528170411829517 +2030,3,ELCTRI,peak.day,5.685446941219679 +2030,3,CO2EMT,peak.day,436.04535315684325 2030,3,GASNAT,peak.peak,-3.520722822271213 2030,3,ELCTRI,peak.peak,2.3471485481808085 2030,3,CO2EMT,peak.peak,180.0145579027271 @@ -355,15 +355,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-7.854727240273368 -2030,3,ELCTRI,autumn.night,5.236484826848912 -2030,3,CO2EMT,autumn.night,401.61220379517727 +2030,3,GASNAT,autumn.night,-8.382740663321101 +2030,3,ELCTRI,autumn.night,5.5884937755474 +2030,3,CO2EMT,autumn.night,428.6095301156078 2030,3,GASNAT,autumn.day,-11.621339862602872 2030,3,ELCTRI,autumn.day,7.747559908401914 2030,3,CO2EMT,autumn.day,594.1991071748848 -2030,3,GASNAT,autumn.peak,-3.592603125 -2030,3,ELCTRI,autumn.peak,2.39506875 -2030,3,CO2EMT,autumn.peak,183.68979778124998 +2030,3,GASNAT,autumn.peak,-3.102304946743114 +2030,3,ELCTRI,autumn.peak,2.0682032978287426 +2030,3,CO2EMT,autumn.peak,158.6208519269754 2030,3,GASNAT,autumn.evening,-4.3828128915983156 2030,3,ELCTRI,autumn.evening,2.921875261065544 2030,3,CO2EMT,autumn.evening,224.09322314742187 @@ -504,15 +504,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,winter.peak,-0.7616266044111606 2030,7,ELCTRI,winter.peak,0.5077510696074404 2030,7,CO2EMT,winter.peak,38.94196828354264 -2030,7,GASNAT,winter.evening,-1.0155021473388979 -2030,7,ELCTRI,winter.evening,0.6770014315592653 -2030,7,CO2EMT,winter.evening,51.92262479343785 -2030,7,GASNAT,peak.night,-1.7771287517500585 -2030,7,ELCTRI,peak.night,1.1847525011667057 -2030,7,CO2EMT,peak.night,90.86459307698048 -2030,7,GASNAT,peak.day,-0.0 -2030,7,ELCTRI,peak.day,0.0 -2030,7,CO2EMT,peak.day,0.0 +2030,7,GASNAT,winter.evening,-0.0 +2030,7,ELCTRI,winter.evening,0.0 +2030,7,CO2EMT,winter.evening,0.0 +2030,7,GASNAT,peak.night,-1.777128751750059 +2030,7,ELCTRI,peak.night,1.184752501166706 +2030,7,CO2EMT,peak.night,90.8645930769805 +2030,7,GASNAT,peak.day,-2.5387553561612193 +2030,7,ELCTRI,peak.day,1.6925035707741463 +2030,7,CO2EMT,peak.day,129.80656136052315 2030,7,GASNAT,peak.peak,-0.0 2030,7,ELCTRI,peak.peak,0.0 2030,7,CO2EMT,peak.peak,0.0 @@ -531,15 +531,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,summer.evening,-0.0 2030,7,ELCTRI,summer.evening,0.0 2030,7,CO2EMT,summer.evening,0.0 -2030,7,GASNAT,autumn.night,-1.7771287517500585 -2030,7,ELCTRI,autumn.night,1.1847525011667057 -2030,7,CO2EMT,autumn.night,90.86459307698048 +2030,7,GASNAT,autumn.night,-1.2491153287023264 +2030,7,ELCTRI,autumn.night,0.8327435524682176 +2030,7,CO2EMT,autumn.night,63.867266756549945 2030,7,GASNAT,autumn.day,-0.0 2030,7,ELCTRI,autumn.day,0.0 2030,7,CO2EMT,autumn.day,0.0 -2030,7,GASNAT,autumn.peak,-0.27132842615427455 -2030,7,ELCTRI,autumn.peak,0.18088561743618303 -2030,7,CO2EMT,autumn.peak,13.873022429268056 +2030,7,GASNAT,autumn.peak,-0.7616266044111606 +2030,7,ELCTRI,autumn.peak,0.5077510696074404 +2030,7,CO2EMT,autumn.peak,38.94196828354264 2030,7,GASNAT,autumn.evening,-1.0155021473388979 2030,7,ELCTRI,autumn.evening,0.6770014315592653 2030,7,CO2EMT,autumn.evening,51.92262479343785 diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv index 9667a6a19..b85359426 100644 --- a/tests/data/simple_full/commodity_prices.csv +++ b/tests/data/simple_full/commodity_prices.csv @@ -31,20 +31,20 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 -2020,GASPRD,GBR,winter.day,7.504534967942034 -2020,GASPRD,GBR,winter.peak,7.504534967942034 -2020,GASPRD,GBR,winter.evening,7.504534967942034 -2020,GASPRD,GBR,peak.peak,7.504534967942034 -2020,GASPRD,GBR,peak.evening,7.504534967942034 -2020,GASPRD,GBR,summer.evening,7.504534967942034 -2020,GASPRD,GBR,autumn.evening,7.504534967942034 -2020,GASNAT,GBR,winter.day,6.5982585862326335 -2020,GASNAT,GBR,winter.peak,6.5982585862326335 -2020,GASNAT,GBR,winter.evening,6.5982585862326335 -2020,GASNAT,GBR,peak.peak,6.5982585862326335 -2020,GASNAT,GBR,peak.evening,6.5982585862326335 -2020,GASNAT,GBR,summer.evening,6.5982585862326335 -2020,GASNAT,GBR,autumn.evening,6.5982585862326335 +2020,GASPRD,GBR,winter.day,7.504535286481447 +2020,GASPRD,GBR,winter.peak,7.504535286481447 +2020,GASPRD,GBR,winter.evening,7.504535286481447 +2020,GASPRD,GBR,peak.peak,7.504535286481447 +2020,GASPRD,GBR,peak.evening,7.504535286481447 +2020,GASPRD,GBR,summer.evening,7.504535286481447 +2020,GASPRD,GBR,autumn.evening,7.504535286481447 +2020,GASNAT,GBR,winter.day,6.598258237765183 +2020,GASNAT,GBR,winter.peak,6.598258237765183 +2020,GASNAT,GBR,winter.evening,6.598258237765183 +2020,GASNAT,GBR,peak.peak,6.598258237765183 +2020,GASNAT,GBR,peak.evening,6.598258237765183 +2020,GASNAT,GBR,summer.evening,6.598258237765183 +2020,GASNAT,GBR,autumn.evening,6.598258237765183 2020,GASPRD,GBR,winter.night,3.428609686103873 2020,GASPRD,GBR,peak.night,3.428609686103873 2020,GASPRD,GBR,peak.day,3.428609686103873 @@ -95,22 +95,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2030,GASPRD,GBR,winter.day,6.876080672233131 -2030,GASPRD,GBR,winter.peak,6.876080672233131 -2030,GASPRD,GBR,winter.evening,6.876080672233131 -2030,GASPRD,GBR,peak.peak,6.876080672233131 -2030,GASPRD,GBR,peak.evening,6.876080672233131 -2030,GASPRD,GBR,summer.evening,6.876080672233131 -2030,GASPRD,GBR,autumn.peak,6.876080672233131 -2030,GASPRD,GBR,autumn.evening,6.876080672233131 -2030,GASNAT,GBR,winter.day,6.161750462640322 -2030,GASNAT,GBR,winter.peak,6.161750462640322 -2030,GASNAT,GBR,winter.evening,6.161750462640322 -2030,GASNAT,GBR,peak.peak,6.161750462640322 -2030,GASNAT,GBR,peak.evening,6.161750462640322 -2030,GASNAT,GBR,summer.evening,6.161750462640322 -2030,GASNAT,GBR,autumn.peak,6.161750462640322 -2030,GASNAT,GBR,autumn.evening,6.161750462640322 +2030,GASPRD,GBR,winter.day,6.8760807959710935 +2030,GASPRD,GBR,winter.peak,6.8760807959710935 +2030,GASPRD,GBR,winter.evening,6.8760807959710935 +2030,GASPRD,GBR,peak.peak,6.8760807959710935 +2030,GASPRD,GBR,peak.evening,6.8760807959710935 +2030,GASPRD,GBR,summer.evening,6.8760807959710935 +2030,GASPRD,GBR,autumn.peak,6.8760807959710935 +2030,GASPRD,GBR,autumn.evening,6.8760807959710935 +2030,GASNAT,GBR,winter.day,6.161750372397898 +2030,GASNAT,GBR,winter.peak,6.161750372397898 +2030,GASNAT,GBR,winter.evening,6.161750372397898 +2030,GASNAT,GBR,peak.peak,6.161750372397898 +2030,GASNAT,GBR,peak.evening,6.161750372397898 +2030,GASNAT,GBR,summer.evening,6.161750372397898 +2030,GASNAT,GBR,autumn.peak,6.161750372397898 +2030,GASNAT,GBR,autumn.evening,6.161750372397898 2030,GASPRD,GBR,winter.night,3.428609686103873 2030,GASPRD,GBR,peak.night,3.428609686103873 2030,GASPRD,GBR,peak.day,3.428609686103873 diff --git a/tests/data/simple_marginal/commodity_flows.csv b/tests/data/simple_marginal/commodity_flows.csv index f7217b32f..8777f8bfa 100644 --- a/tests/data/simple_marginal/commodity_flows.csv +++ b/tests/data/simple_marginal/commodity_flows.csv @@ -251,8 +251,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,20.534211026060376 -2030,0,CO2EMT,autumn.peak,104.99142097624672 +2030,0,GASPRD,autumn.peak,20.534211026060348 +2030,0,CO2EMT,autumn.peak,104.99142097624657 2030,0,GASPRD,autumn.evening,166.76083466742 2030,0,CO2EMT,autumn.evening,852.6481476545185 2030,1,GASPRD,winter.night,-0.0 @@ -297,9 +297,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,autumn.day,-0.0 2030,1,GASNAT,autumn.day,0.0 2030,1,CO2EMT,autumn.day,0.0 -2030,1,GASPRD,autumn.peak,-21.826856869734893 -2030,1,GASNAT,autumn.peak,20.78748273308085 -2030,1,CO2EMT,autumn.peak,53.1431996071212 +2030,1,GASPRD,autumn.peak,-21.826856869734865 +2030,1,GASNAT,autumn.peak,20.78748273308082 +2030,1,CO2EMT,autumn.peak,53.143199607121126 2030,1,GASPRD,autumn.evening,-165.4681888237455 2030,1,GASNAT,autumn.evening,157.58875126070998 2030,1,CO2EMT,autumn.evening,402.87564259800513 @@ -328,15 +328,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.peak,-2.468688831431171 2030,3,ELCTRI,winter.peak,1.6457925542874472 2030,3,CO2EMT,winter.peak,126.22405995107574 -2030,3,GASNAT,winter.evening,-3.3795873788970026 -2030,3,ELCTRI,winter.evening,2.253058252598002 -2030,3,CO2EMT,winter.evening,172.79830268300373 +2030,3,GASNAT,winter.evening,-4.395089526235901 +2030,3,ELCTRI,winter.evening,2.9300596841572673 +2030,3,CO2EMT,winter.evening,224.7209274764416 2030,3,GASNAT,peak.night,-8.382740663321101 -2030,3,ELCTRI,peak.night,5.588493775547401 -2030,3,CO2EMT,peak.night,428.60953011560787 -2030,3,GASNAT,peak.day,-11.066925767990737 -2030,3,ELCTRI,peak.day,7.3779505119938245 -2030,3,CO2EMT,peak.day,565.8519145173664 +2030,3,ELCTRI,peak.night,5.5884937755474 +2030,3,CO2EMT,peak.night,428.6095301156078 +2030,3,GASNAT,peak.day,-8.528170411829517 +2030,3,ELCTRI,peak.day,5.685446941219679 +2030,3,CO2EMT,peak.day,436.04535315684325 2030,3,GASNAT,peak.peak,-3.520722822271213 2030,3,ELCTRI,peak.peak,2.3471485481808085 2030,3,CO2EMT,peak.peak,180.0145579027271 @@ -355,15 +355,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-7.854727240273368 -2030,3,ELCTRI,autumn.night,5.236484826848912 -2030,3,CO2EMT,autumn.night,401.61220379517727 +2030,3,GASNAT,autumn.night,-8.382740663321101 +2030,3,ELCTRI,autumn.night,5.5884937755474 +2030,3,CO2EMT,autumn.night,428.6095301156078 2030,3,GASNAT,autumn.day,-11.621339862602872 2030,3,ELCTRI,autumn.day,7.747559908401914 2030,3,CO2EMT,autumn.day,594.1991071748848 -2030,3,GASNAT,autumn.peak,-3.592603125 -2030,3,ELCTRI,autumn.peak,2.39506875 -2030,3,CO2EMT,autumn.peak,183.68979778124998 +2030,3,GASNAT,autumn.peak,-3.102304946743114 +2030,3,ELCTRI,autumn.peak,2.0682032978287426 +2030,3,CO2EMT,autumn.peak,158.6208519269754 2030,3,GASNAT,autumn.evening,-4.3828128915983156 2030,3,ELCTRI,autumn.evening,2.921875261065544 2030,3,CO2EMT,autumn.evening,224.09322314742187 @@ -504,15 +504,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,winter.peak,-0.7616266044111606 2030,7,ELCTRI,winter.peak,0.5077510696074404 2030,7,CO2EMT,winter.peak,38.94196828354264 -2030,7,GASNAT,winter.evening,-1.0155021473388979 -2030,7,ELCTRI,winter.evening,0.6770014315592653 -2030,7,CO2EMT,winter.evening,51.92262479343785 -2030,7,GASNAT,peak.night,-1.7771287517500585 -2030,7,ELCTRI,peak.night,1.1847525011667057 -2030,7,CO2EMT,peak.night,90.86459307698048 -2030,7,GASNAT,peak.day,-0.0 -2030,7,ELCTRI,peak.day,0.0 -2030,7,CO2EMT,peak.day,0.0 +2030,7,GASNAT,winter.evening,-0.0 +2030,7,ELCTRI,winter.evening,0.0 +2030,7,CO2EMT,winter.evening,0.0 +2030,7,GASNAT,peak.night,-1.777128751750059 +2030,7,ELCTRI,peak.night,1.184752501166706 +2030,7,CO2EMT,peak.night,90.8645930769805 +2030,7,GASNAT,peak.day,-2.5387553561612193 +2030,7,ELCTRI,peak.day,1.6925035707741463 +2030,7,CO2EMT,peak.day,129.80656136052315 2030,7,GASNAT,peak.peak,-0.0 2030,7,ELCTRI,peak.peak,0.0 2030,7,CO2EMT,peak.peak,0.0 @@ -531,15 +531,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,summer.evening,-0.0 2030,7,ELCTRI,summer.evening,0.0 2030,7,CO2EMT,summer.evening,0.0 -2030,7,GASNAT,autumn.night,-1.7771287517500585 -2030,7,ELCTRI,autumn.night,1.1847525011667057 -2030,7,CO2EMT,autumn.night,90.86459307698048 +2030,7,GASNAT,autumn.night,-1.2491153287023264 +2030,7,ELCTRI,autumn.night,0.8327435524682176 +2030,7,CO2EMT,autumn.night,63.867266756549945 2030,7,GASNAT,autumn.day,-0.0 2030,7,ELCTRI,autumn.day,0.0 2030,7,CO2EMT,autumn.day,0.0 -2030,7,GASNAT,autumn.peak,-0.27132842615427455 -2030,7,ELCTRI,autumn.peak,0.18088561743618303 -2030,7,CO2EMT,autumn.peak,13.873022429268056 +2030,7,GASNAT,autumn.peak,-0.7616266044111606 +2030,7,ELCTRI,autumn.peak,0.5077510696074404 +2030,7,CO2EMT,autumn.peak,38.94196828354264 2030,7,GASNAT,autumn.evening,-1.0155021473388979 2030,7,ELCTRI,autumn.evening,0.6770014315592653 2030,7,CO2EMT,autumn.evening,51.92262479343785 diff --git a/tests/data/simple_npv/assets.csv b/tests/data/simple_npv/assets.csv index 19ab193f0..657a6bc3d 100644 --- a/tests/data/simple_npv/assets.csv +++ b/tests/data/simple_npv/assets.csv @@ -9,9 +9,9 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 7,RGASBR,GBR,A0_RES,,2030,,3655.8184058764805 8,GASCGT,GBR,A0_ELC,,2030,,33.820477802912976 9,GASPRC,GBR,A0_GPR,,2030,,879.1648830751317 -10,GASDRV,GBR,A0_GEX,,2030,,923.1231272288879 +10,GASDRV,GBR,A0_GEX,,2030,,923.1231272288883 11,RGASBR,GBR,A0_RES,,2040,,4011.65737547648 12,RELCHP,GBR,A0_RES,,2040,,802.3314750952961 13,GASCGT,GBR,A0_ELC,,2040,,3.7231090668357614 14,GASPRC,GBR,A0_GPR,,2040,,94.9477829022087 -15,GASDRV,GBR,A0_GEX,,2040,,99.6951720473196 +15,GASDRV,GBR,A0_GEX,,2040,,99.69517204731909 diff --git a/tests/data/simple_npv/commodity_flows.csv b/tests/data/simple_npv/commodity_flows.csv index 665767434..599b09318 100644 --- a/tests/data/simple_npv/commodity_flows.csv +++ b/tests/data/simple_npv/commodity_flows.csv @@ -245,15 +245,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.day,-11.975343788321101 2030,3,ELCTRI,winter.day,7.9835625255474 2030,3,CO2EMT,winter.day,612.2993278968578 -2030,3,GASNAT,winter.peak,-3.592603124999987 -2030,3,ELCTRI,winter.peak,2.395068749999991 -2030,3,CO2EMT,winter.peak,183.6897977812493 +2030,3,GASNAT,winter.peak,-3.592603125 +2030,3,ELCTRI,winter.peak,2.39506875 +2030,3,CO2EMT,winter.peak,183.68979778124998 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,-0.0 -2030,3,ELCTRI,peak.night,0.0 -2030,3,CO2EMT,peak.night,0.0 +2030,3,GASNAT,peak.night,-8.382740663321101 +2030,3,ELCTRI,peak.night,5.5884937755474 +2030,3,CO2EMT,peak.night,428.6095301156078 2030,3,GASNAT,peak.day,-11.975343788321101 2030,3,ELCTRI,peak.day,7.9835625255474 2030,3,CO2EMT,peak.day,612.2993278968578 @@ -263,9 +263,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,peak.evening,-0.0 2030,3,ELCTRI,peak.evening,0.0 2030,3,CO2EMT,peak.evening,0.0 -2030,3,GASNAT,summer.night,-0.44265925791417715 -2030,3,ELCTRI,summer.night,0.29510617194278477 -2030,3,CO2EMT,summer.night,22.633167857151875 +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 @@ -275,15 +275,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-8.382740663321101 -2030,3,ELCTRI,autumn.night,5.5884937755474 -2030,3,CO2EMT,autumn.night,428.6095301156078 +2030,3,GASNAT,autumn.night,-0.0 +2030,3,ELCTRI,autumn.night,0.0 +2030,3,CO2EMT,autumn.night,0.0 2030,3,GASNAT,autumn.day,-0.0 2030,3,ELCTRI,autumn.day,0.0 2030,3,CO2EMT,autumn.day,0.0 -2030,3,GASNAT,autumn.peak,-0.0 -2030,3,ELCTRI,autumn.peak,0.0 -2030,3,CO2EMT,autumn.peak,0.0 +2030,3,GASNAT,autumn.peak,-3.592603125 +2030,3,ELCTRI,autumn.peak,2.39506875 +2030,3,CO2EMT,autumn.peak,183.68979778124998 2030,3,GASNAT,autumn.evening,-4.790137538321099 2030,3,ELCTRI,autumn.evening,3.1934250255473997 2030,3,CO2EMT,autumn.evening,244.9197323343578 @@ -453,15 +453,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,GASNAT,winter.day,-92.41990209966076 2030,8,ELCTRI,winter.day,61.613268066440504 2030,8,CO2EMT,winter.day,4725.429594355654 -2030,8,GASNAT,winter.peak,-50.00146265174415 -2030,8,ELCTRI,winter.peak,33.3343084344961 -2030,8,CO2EMT,winter.peak,2556.5747853836783 +2030,8,GASNAT,winter.peak,-50.00146265174414 +2030,8,ELCTRI,winter.peak,33.334308434496094 +2030,8,CO2EMT,winter.peak,2556.574785383678 2030,8,GASNAT,winter.evening,-35.1456239886199 2030,8,ELCTRI,winter.evening,23.43041599241327 2030,8,CO2EMT,winter.evening,1796.9957545381355 -2030,8,GASNAT,peak.night,-19.05701226069736 -2030,8,ELCTRI,peak.night,12.704674840464905 -2030,8,CO2EMT,peak.night,974.3850368894558 +2030,8,GASNAT,peak.night,-10.674271597376258 +2030,8,ELCTRI,peak.night,7.116181064917505 +2030,8,CO2EMT,peak.night,545.7755067738481 2030,8,GASNAT,peak.day,-40.504913969167234 2030,8,ELCTRI,peak.day,27.003275979444822 2030,8,CO2EMT,peak.day,2071.0162512435204 @@ -471,9 +471,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,GASNAT,peak.evening,-18.4335370492673 2030,8,ELCTRI,peak.evening,12.289024699511533 2030,8,CO2EMT,peak.evening,942.5067493290369 -2030,8,GASNAT,summer.night,-0.0 -2030,8,ELCTRI,summer.night,0.0 -2030,8,CO2EMT,summer.night,0.0 +2030,8,GASNAT,summer.night,-0.44265925791417715 +2030,8,ELCTRI,summer.night,0.29510617194278477 +2030,8,CO2EMT,summer.night,22.633167857151875 2030,8,GASNAT,summer.day,-0.0 2030,8,ELCTRI,summer.day,0.0 2030,8,CO2EMT,summer.day,0.0 @@ -483,21 +483,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,GASNAT,summer.evening,-0.0 2030,8,ELCTRI,summer.evening,0.0 2030,8,CO2EMT,summer.evening,0.0 -2030,8,GASNAT,autumn.night,-5.765632117685428 -2030,8,ELCTRI,autumn.night,3.8437547451236185 -2030,8,CO2EMT,autumn.night,294.7967701772559 +2030,8,GASNAT,autumn.night,-14.148372781006529 +2030,8,ELCTRI,autumn.night,9.432248520671019 +2030,8,CO2EMT,autumn.night,723.4063002928638 2030,8,GASNAT,autumn.day,-40.87981133800968 2030,8,ELCTRI,autumn.day,27.25320755867312 2030,8,CO2EMT,autumn.day,2090.184753712435 -2030,8,GASNAT,autumn.peak,-25.393174242868177 -2030,8,ELCTRI,autumn.peak,16.928782828578786 -2030,8,CO2EMT,autumn.peak,1298.35299903785 +2030,8,GASNAT,autumn.peak,-21.80057111786818 +2030,8,ELCTRI,autumn.peak,14.533714078578786 +2030,8,CO2EMT,autumn.peak,1114.6632012566 2030,8,GASNAT,autumn.evening,-8.948374211287213 2030,8,ELCTRI,autumn.evening,5.965582807524809 2030,8,CO2EMT,autumn.evening,457.5303734231152 -2030,9,GASPRD,winter.night,-67.31106166814747 -2030,9,GASNAT,winter.night,64.10577301728331 -2030,9,CO2EMT,winter.night,163.8864087186848 +2030,9,GASPRD,winter.night,-67.31106166814746 +2030,9,GASNAT,winter.night,64.1057730172833 +2030,9,CO2EMT,winter.night,163.88640871868478 2030,9,GASPRD,winter.day,-96.15865939405025 2030,9,GASNAT,winter.day,91.57967561338118 2030,9,CO2EMT,winter.day,234.12344070560903 @@ -534,31 +534,31 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,9,GASPRD,autumn.night,-0.0 2030,9,GASNAT,autumn.night,0.0 2030,9,CO2EMT,autumn.night,0.0 -2030,9,GASPRD,autumn.day,-31.556801948919844 -2030,9,GASNAT,autumn.day,30.054097094209375 -2030,9,CO2EMT,autumn.day,76.83329922134628 +2030,9,GASPRD,autumn.day,-31.556801948919876 +2030,9,GASNAT,autumn.day,30.054097094209403 +2030,9,CO2EMT,autumn.day,76.83329922134635 2030,9,GASPRD,autumn.peak,-28.84759772590276 2030,9,GASNAT,autumn.peak,27.473902596097865 2030,9,CO2EMT,autumn.peak,70.2370319869242 2030,9,GASPRD,autumn.evening,-38.46346394224472 2030,9,GASNAT,autumn.evening,36.63187042118545 2030,9,CO2EMT,autumn.evening,93.6493767317606 -2030,10,GASPRD,winter.night,67.31106166814757 -2030,10,CO2EMT,winter.night,344.1614583092386 -2030,10,GASPRD,winter.day,96.1586593940502 -2030,10,CO2EMT,winter.day,491.6592254817787 -2030,10,GASPRD,winter.peak,28.847597725902748 -2030,10,CO2EMT,winter.peak,147.49776717254076 -2030,10,GASPRD,winter.evening,38.4634639422447 -2030,10,CO2EMT,winter.evening,196.66369113669717 +2030,10,GASPRD,winter.night,67.31106166814747 +2030,10,CO2EMT,winter.night,344.16145830923807 +2030,10,GASPRD,winter.day,96.15865939405025 +2030,10,CO2EMT,winter.day,491.65922548177895 +2030,10,GASPRD,winter.peak,28.84759772590276 +2030,10,CO2EMT,winter.peak,147.49776717254082 +2030,10,GASPRD,winter.evening,38.463463942244715 +2030,10,CO2EMT,winter.evening,196.66369113669725 2030,10,GASPRD,peak.night,0.0 2030,10,CO2EMT,peak.night,0.0 -2030,10,GASPRD,peak.day,60.74150718530869 -2030,10,CO2EMT,peak.day,310.5713262384834 -2030,10,GASPRD,peak.peak,28.847597725902748 -2030,10,CO2EMT,peak.peak,147.49776717254076 -2030,10,GASPRD,peak.evening,38.4634639422447 -2030,10,CO2EMT,peak.evening,196.66369113669717 +2030,10,GASPRD,peak.day,60.74150718530866 +2030,10,CO2EMT,peak.day,310.5713262384832 +2030,10,GASPRD,peak.peak,28.84759772590276 +2030,10,CO2EMT,peak.peak,147.49776717254082 +2030,10,GASPRD,peak.evening,38.463463942244715 +2030,10,CO2EMT,peak.evening,196.66369113669725 2030,10,GASPRD,summer.night,0.0 2030,10,CO2EMT,summer.night,0.0 2030,10,GASPRD,summer.day,0.0 @@ -569,12 +569,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,10,CO2EMT,summer.evening,2.3764826250009476 2030,10,GASPRD,autumn.night,0.0 2030,10,CO2EMT,autumn.night,0.0 -2030,10,GASPRD,autumn.day,31.55680194891988 -2030,10,CO2EMT,autumn.day,161.34992836482735 -2030,10,GASPRD,autumn.peak,28.847597725902748 -2030,10,CO2EMT,autumn.peak,147.49776717254076 -2030,10,GASPRD,autumn.evening,38.4634639422447 -2030,10,CO2EMT,autumn.evening,196.66369113669717 +2030,10,GASPRD,autumn.day,31.556801948919897 +2030,10,CO2EMT,autumn.day,161.34992836482746 +2030,10,GASPRD,autumn.peak,28.84759772590276 +2030,10,CO2EMT,autumn.peak,147.49776717254082 +2030,10,GASPRD,autumn.evening,38.463463942244715 +2030,10,CO2EMT,autumn.evening,196.66369113669725 2040,2,ELCTRI,winter.night,4.435312795545212 2040,2,ELCTRI,winter.day,7.075379933645912 2040,2,ELCTRI,winter.peak,1.9712501261051125 @@ -594,30 +594,30 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,3,GASNAT,winter.night,-8.382740663321101 2040,3,ELCTRI,winter.night,5.5884937755474 2040,3,CO2EMT,winter.night,428.6095301156078 -2040,3,GASNAT,winter.day,-11.975343788321101 -2040,3,ELCTRI,winter.day,7.9835625255474 -2040,3,CO2EMT,winter.day,612.2993278968578 +2040,3,GASNAT,winter.day,-0.0 +2040,3,ELCTRI,winter.day,0.0 +2040,3,CO2EMT,winter.day,0.0 2040,3,GASNAT,winter.peak,-3.592603125 2040,3,ELCTRI,winter.peak,2.39506875 2040,3,CO2EMT,winter.peak,183.68979778124998 -2040,3,GASNAT,winter.evening,-0.0 -2040,3,ELCTRI,winter.evening,0.0 -2040,3,CO2EMT,winter.evening,0.0 +2040,3,GASNAT,winter.evening,-4.790137538321099 +2040,3,ELCTRI,winter.evening,3.1934250255473997 +2040,3,CO2EMT,winter.evening,244.9197323343578 2040,3,GASNAT,peak.night,-8.382740663321101 2040,3,ELCTRI,peak.night,5.5884937755474 2040,3,CO2EMT,peak.night,428.6095301156078 2040,3,GASNAT,peak.day,-11.975343788321101 2040,3,ELCTRI,peak.day,7.9835625255474 2040,3,CO2EMT,peak.day,612.2993278968578 -2040,3,GASNAT,peak.peak,-0.0 -2040,3,ELCTRI,peak.peak,0.0 -2040,3,CO2EMT,peak.peak,0.0 +2040,3,GASNAT,peak.peak,-3.592603125 +2040,3,ELCTRI,peak.peak,2.39506875 +2040,3,CO2EMT,peak.peak,183.68979778124998 2040,3,GASNAT,peak.evening,-0.0 2040,3,ELCTRI,peak.evening,0.0 2040,3,CO2EMT,peak.evening,0.0 -2040,3,GASNAT,summer.night,-0.7247283749141771 -2040,3,ELCTRI,summer.night,0.4831522499427847 -2040,3,CO2EMT,summer.night,37.05536180936187 +2040,3,GASNAT,summer.night,-0.0 +2040,3,ELCTRI,summer.night,0.0 +2040,3,CO2EMT,summer.night,0.0 2040,3,GASNAT,summer.day,-0.0 2040,3,ELCTRI,summer.day,0.0 2040,3,CO2EMT,summer.day,0.0 @@ -630,12 +630,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,3,GASNAT,autumn.night,-0.0 2040,3,ELCTRI,autumn.night,0.0 2040,3,CO2EMT,autumn.night,0.0 -2040,3,GASNAT,autumn.day,-11.975343788321101 -2040,3,ELCTRI,autumn.day,7.9835625255474 -2040,3,CO2EMT,autumn.day,612.2993278968578 -2040,3,GASNAT,autumn.peak,-0.0 -2040,3,ELCTRI,autumn.peak,0.0 -2040,3,CO2EMT,autumn.peak,0.0 +2040,3,GASNAT,autumn.day,-0.0 +2040,3,ELCTRI,autumn.day,0.0 +2040,3,CO2EMT,autumn.day,0.0 +2040,3,GASNAT,autumn.peak,-3.592603125 +2040,3,ELCTRI,autumn.peak,2.39506875 +2040,3,CO2EMT,autumn.peak,183.68979778124998 2040,3,GASNAT,autumn.evening,-4.790137538321099 2040,3,ELCTRI,autumn.evening,3.1934250255473997 2040,3,CO2EMT,autumn.evening,244.9197323343578 @@ -722,24 +722,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,8,GASNAT,winter.night,-8.672137770067362 2040,8,ELCTRI,winter.night,5.781425180044908 2040,8,CO2EMT,winter.night,443.4064041835442 -2040,8,GASNAT,winter.day,-85.26628597244733 -2040,8,ELCTRI,winter.day,56.84419064829822 -2040,8,CO2EMT,winter.day,4359.665201771232 +2040,8,GASNAT,winter.day,-115.58957668948185 +2040,8,ELCTRI,winter.day,77.0597177929879 +2040,8,CO2EMT,winter.day,5910.0950561332065 2040,8,GASNAT,winter.peak,-50.00146265174415 2040,8,ELCTRI,winter.peak,33.3343084344961 2040,8,CO2EMT,winter.peak,2556.5747853836783 -2040,8,GASNAT,winter.evening,-38.94169964011991 -2040,8,ELCTRI,winter.evening,25.961133093413274 -2040,8,CO2EMT,winter.evening,1991.0891025993308 +2040,8,GASNAT,winter.evening,-26.81238329508539 +2040,8,ELCTRI,winter.evening,17.874922196723592 +2040,8,CO2EMT,winter.evening,1370.9171578777157 2040,8,GASNAT,peak.night,-12.945478067876259 2040,8,ELCTRI,peak.night,8.630318711917505 2040,8,CO2EMT,peak.night,661.902293610513 2040,8,GASNAT,peak.day,-28.195365763953824 2040,8,ELCTRI,peak.day,18.79691050930255 2040,8,CO2EMT,peak.day,1441.6290515109588 -2040,8,GASNAT,peak.peak,-29.852340532029025 -2040,8,ELCTRI,peak.peak,19.901560354686016 -2040,8,CO2EMT,peak.peak,1526.3501714026438 +2040,8,GASNAT,peak.peak,-26.25973740702902 +2040,8,ELCTRI,peak.peak,17.506491604686016 +2040,8,CO2EMT,peak.peak,1342.6603736213938 2040,8,GASNAT,peak.evening,-20.4795962347673 2040,8,ELCTRI,peak.evening,13.653064156511533 2040,8,CO2EMT,peak.evening,1047.121755483652 @@ -758,15 +758,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,8,GASNAT,autumn.night,-15.993191152006526 2040,8,ELCTRI,autumn.night,10.662127434671017 2040,8,CO2EMT,autumn.night,817.7318636020937 -2040,8,GASNAT,autumn.day,-33.759773307188574 -2040,8,ELCTRI,autumn.day,22.506515538125715 -2040,8,CO2EMT,autumn.day,1726.1372091965516 -2040,8,GASNAT,autumn.peak,-28.090952408368175 -2040,8,ELCTRI,autumn.peak,18.727301605578784 -2040,8,CO2EMT,autumn.peak,1436.2903966398646 -2040,8,GASNAT,autumn.evening,-10.563140342287216 -2040,8,ELCTRI,autumn.evening,7.04209356152481 -2040,8,CO2EMT,autumn.evening,540.0933657011452 +2040,8,GASNAT,autumn.day,-45.73511709550968 +2040,8,ELCTRI,autumn.day,30.490078063673117 +2040,8,CO2EMT,autumn.day,2338.4365370934097 +2040,8,GASNAT,autumn.peak,-18.993965222368182 +2040,8,ELCTRI,autumn.peak,12.662643481578787 +2040,8,CO2EMT,autumn.peak,971.1614418196849 +2040,8,GASNAT,autumn.evening,-3.2239615355737916 +2040,8,ELCTRI,autumn.evening,2.149307690382528 +2040,8,CO2EMT,autumn.evening,164.84115331388796 2040,9,GASPRD,winter.night,-67.31106166814747 2040,9,GASNAT,winter.night,64.10577301728331 2040,9,CO2EMT,winter.night,163.8864087186848 @@ -782,9 +782,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,9,GASPRD,peak.night,-0.0 2040,9,GASNAT,peak.night,0.0 2040,9,CO2EMT,peak.night,0.0 -2040,9,GASPRD,peak.day,-75.15629417383364 -2040,9,GASNAT,peak.day,71.57742302269871 -2040,9,CO2EMT,peak.day,182.98768195752928 +2040,9,GASPRD,peak.day,-50.232501062308685 +2040,9,GASNAT,peak.day,47.84047720219875 +2040,9,CO2EMT,peak.day,122.3041799674211 2040,9,GASPRD,peak.peak,-28.84759772590276 2040,9,GASNAT,peak.peak,27.473902596097865 2040,9,CO2EMT,peak.peak,70.2370319869242 @@ -806,47 +806,47 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,9,GASPRD,autumn.night,-0.0 2040,9,GASNAT,autumn.night,0.0 2040,9,CO2EMT,autumn.night,0.0 -2040,9,GASPRD,autumn.day,-18.196310683644896 -2040,9,GASNAT,autumn.day,17.329819698709425 -2040,9,CO2EMT,autumn.day,44.30368405975065 +2040,9,GASPRD,autumn.day,-18.1963106836449 +2040,9,GASNAT,autumn.day,17.32981969870943 +2040,9,CO2EMT,autumn.day,44.30368405975066 2040,9,GASPRD,autumn.peak,-28.84759772590276 2040,9,GASNAT,autumn.peak,27.473902596097865 2040,9,CO2EMT,autumn.peak,70.2370319869242 2040,9,GASPRD,autumn.evening,-38.46346394224472 2040,9,GASNAT,autumn.evening,36.63187042118545 2040,9,CO2EMT,autumn.evening,93.6493767317606 -2040,10,GASPRD,winter.night,67.31106166814746 -2040,10,CO2EMT,winter.night,344.161458309238 -2040,10,GASPRD,winter.day,96.1586593940502 -2040,10,CO2EMT,winter.day,491.6592254817787 -2040,10,GASPRD,winter.peak,28.847597725902748 -2040,10,CO2EMT,winter.peak,147.49776717254076 -2040,10,GASPRD,winter.evening,38.4634639422447 -2040,10,CO2EMT,winter.evening,196.66369113669717 +2040,10,GASPRD,winter.night,67.31106166814749 +2040,10,CO2EMT,winter.night,344.1614583092381 +2040,10,GASPRD,winter.day,96.15865939405025 +2040,10,CO2EMT,winter.day,491.65922548177895 +2040,10,GASPRD,winter.peak,28.84759772590276 +2040,10,CO2EMT,winter.peak,147.49776717254082 +2040,10,GASPRD,winter.evening,38.463463942244715 +2040,10,CO2EMT,winter.evening,196.66369113669725 2040,10,GASPRD,peak.night,0.0 2040,10,CO2EMT,peak.night,0.0 -2040,10,GASPRD,peak.day,75.1562941738337 -2040,10,CO2EMT,peak.day,384.27413211081176 -2040,10,GASPRD,peak.peak,28.847597725902748 -2040,10,CO2EMT,peak.peak,147.49776717254076 -2040,10,GASPRD,peak.evening,38.4634639422447 -2040,10,CO2EMT,peak.evening,196.66369113669717 +2040,10,GASPRD,peak.day,50.232501062308714 +2040,10,CO2EMT,peak.day,256.8387779315845 +2040,10,GASPRD,peak.peak,28.84759772590276 +2040,10,CO2EMT,peak.peak,147.49776717254082 +2040,10,GASPRD,peak.evening,38.463463942244715 +2040,10,CO2EMT,peak.evening,196.66369113669725 2040,10,GASPRD,summer.night,0.0 2040,10,CO2EMT,summer.night,0.0 2040,10,GASPRD,summer.day,0.0 2040,10,CO2EMT,summer.day,0.0 2040,10,GASPRD,summer.peak,0.0 2040,10,CO2EMT,summer.peak,0.0 -2040,10,GASPRD,summer.evening,0.760964793659886 -2040,10,CO2EMT,summer.evening,3.8908129899829973 +2040,10,GASPRD,summer.evening,0.0 +2040,10,CO2EMT,summer.evening,0.0 2040,10,GASPRD,autumn.night,0.0 2040,10,CO2EMT,autumn.night,0.0 -2040,10,GASPRD,autumn.day,43.120103795169896 -2040,10,CO2EMT,autumn.day,220.4730907047037 -2040,10,GASPRD,autumn.peak,28.847597725902748 -2040,10,CO2EMT,autumn.peak,147.49776717254076 -2040,10,GASPRD,autumn.evening,38.4634639422447 -2040,10,CO2EMT,autumn.evening,196.66369113669717 +2040,10,GASPRD,autumn.day,18.19631068364491 +2040,10,CO2EMT,autumn.day,93.03773652547643 +2040,10,GASPRD,autumn.peak,28.84759772590276 +2040,10,CO2EMT,autumn.peak,147.49776717254082 +2040,10,GASPRD,autumn.evening,38.463463942244715 +2040,10,CO2EMT,autumn.evening,196.66369113669725 2040,11,GASNAT,winter.night,-0.0 2040,11,RSHEAT,winter.night,0.0 2040,11,CO2EMT,winter.night,0.0 @@ -930,15 +930,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,13,GASNAT,winter.night,-12.843562867713421 2040,13,ELCTRI,winter.night,8.562375245142281 2040,13,CO2EMT,winter.night,656.6913694261872 -2040,13,GASNAT,winter.day,-18.34794692871342 -2040,13,ELCTRI,winter.day,12.231964619142278 -2040,13,CO2EMT,winter.day,938.130526465117 +2040,13,GASNAT,winter.day,-0.0 +2040,13,ELCTRI,winter.day,0.0 +2040,13,CO2EMT,winter.day,0.0 2040,13,GASNAT,winter.peak,-5.504384060999996 2040,13,ELCTRI,winter.peak,3.6695893739999974 2040,13,CO2EMT,winter.peak,281.43915703892975 -2040,13,GASNAT,winter.evening,-0.0 -2040,13,ELCTRI,winter.evening,0.0 -2040,13,CO2EMT,winter.evening,0.0 +2040,13,GASNAT,winter.evening,-7.339178806713424 +2040,13,ELCTRI,winter.evening,4.892785871142283 +2040,13,CO2EMT,winter.evening,375.2522123872573 2040,13,GASNAT,peak.night,-0.0 2040,13,ELCTRI,peak.night,0.0 2040,13,CO2EMT,peak.night,0.0 @@ -951,9 +951,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,13,GASNAT,peak.evening,-0.0 2040,13,ELCTRI,peak.evening,0.0 2040,13,CO2EMT,peak.evening,0.0 -2040,13,GASNAT,summer.night,-0.0 -2040,13,ELCTRI,summer.night,0.0 -2040,13,CO2EMT,summer.night,0.0 +2040,13,GASNAT,summer.night,-0.7247283749141771 +2040,13,ELCTRI,summer.night,0.4831522499427847 +2040,13,CO2EMT,summer.night,37.05536180936187 2040,13,GASNAT,summer.day,-0.0 2040,13,ELCTRI,summer.day,0.0 2040,13,CO2EMT,summer.day,0.0 @@ -969,15 +969,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,13,GASNAT,autumn.day,-0.0 2040,13,ELCTRI,autumn.day,0.0 2040,13,CO2EMT,autumn.day,0.0 -2040,13,GASNAT,autumn.peak,-0.0 -2040,13,ELCTRI,autumn.peak,0.0 -2040,13,CO2EMT,autumn.peak,0.0 -2040,13,GASNAT,autumn.evening,-0.0 -2040,13,ELCTRI,autumn.evening,0.0 -2040,13,CO2EMT,autumn.evening,0.0 -2040,14,GASPRD,winter.night,-7.2694396616820685 -2040,14,GASNAT,winter.night,6.923275868268636 -2040,14,CO2EMT,winter.night,17.699354757228768 +2040,13,GASNAT,autumn.peak,-5.504384060999996 +2040,13,ELCTRI,autumn.peak,3.6695893739999974 +2040,13,CO2EMT,autumn.peak,281.43915703892975 +2040,13,GASNAT,autumn.evening,-7.339178806713424 +2040,13,ELCTRI,autumn.evening,4.892785871142283 +2040,13,CO2EMT,autumn.evening,375.2522123872573 +2040,14,GASPRD,winter.night,-7.269439661682072 +2040,14,GASNAT,winter.night,6.9232758682686395 +2040,14,CO2EMT,winter.night,17.69935475722878 2040,14,GASPRD,winter.day,-10.384913788160802 2040,14,GASNAT,winter.day,9.890394083962669 2040,14,CO2EMT,winter.day,25.284792475650566 @@ -987,18 +987,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,14,GASPRD,winter.evening,-4.153965535203355 2040,14,GASNAT,winter.evening,3.9561576525746234 2040,14,CO2EMT,winter.evening,10.113917038807026 -2040,14,GASPRD,peak.night,-0.0 -2040,14,GASNAT,peak.night,0.0 -2040,14,CO2EMT,peak.night,0.0 -2040,14,GASPRD,peak.day,-0.0 -2040,14,GASNAT,peak.day,0.0 -2040,14,CO2EMT,peak.day,0.0 -2040,14,GASPRD,peak.peak,-0.0 -2040,14,GASNAT,peak.peak,0.0 -2040,14,CO2EMT,peak.peak,0.0 -2040,14,GASPRD,peak.evening,-0.0 -2040,14,GASNAT,peak.evening,0.0 -2040,14,CO2EMT,peak.evening,0.0 +2040,14,GASPRD,peak.night,-7.269439661682078 +2040,14,GASNAT,peak.night,6.923275868268646 +2040,14,CO2EMT,peak.night,17.699354757228793 +2040,14,GASPRD,peak.day,-10.384913788160802 +2040,14,GASNAT,peak.day,9.890394083962669 +2040,14,CO2EMT,peak.day,25.284792475650566 +2040,14,GASPRD,peak.peak,-3.115474126478723 +2040,14,GASNAT,peak.peak,2.967118215694022 +2040,14,CO2EMT,peak.peak,7.585437718421768 +2040,14,GASPRD,peak.evening,-4.153965535203355 +2040,14,GASNAT,peak.evening,3.9561576525746234 +2040,14,CO2EMT,peak.evening,10.113917038807026 2040,14,GASPRD,summer.night,-0.0 2040,14,GASNAT,summer.night,0.0 2040,14,CO2EMT,summer.night,0.0 @@ -1023,35 +1023,35 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,14,GASPRD,autumn.evening,-4.153965535203355 2040,14,GASNAT,autumn.evening,3.9561576525746234 2040,14,CO2EMT,autumn.evening,10.113917038807026 -2040,15,GASPRD,winter.night,7.269439661682059 -2040,15,CO2EMT,winter.night,37.16864499018037 -2040,15,GASPRD,winter.day,10.38491378816085 -2040,15,CO2EMT,winter.day,53.09806419886643 -2040,15,GASPRD,winter.peak,3.1154741264787376 -2040,15,CO2EMT,winter.peak,15.929419208685786 -2040,15,GASPRD,winter.evening,4.1539655352033735 -2040,15,CO2EMT,winter.evening,21.239225781494852 -2040,15,GASPRD,peak.night,0.0 -2040,15,CO2EMT,peak.night,0.0 -2040,15,GASPRD,peak.day,0.0 -2040,15,CO2EMT,peak.day,0.0 -2040,15,GASPRD,peak.peak,0.0 -2040,15,CO2EMT,peak.peak,0.0 -2040,15,GASPRD,peak.evening,0.0 -2040,15,CO2EMT,peak.evening,0.0 +2040,15,GASPRD,winter.night,7.269439661682055 +2040,15,CO2EMT,winter.night,37.168644990180354 +2040,15,GASPRD,winter.day,10.384913788160796 +2040,15,CO2EMT,winter.day,53.098064198866155 +2040,15,GASPRD,winter.peak,3.1154741264787216 +2040,15,CO2EMT,winter.peak,15.929419208685704 +2040,15,GASPRD,winter.evening,4.153965535203352 +2040,15,CO2EMT,winter.evening,21.239225781494742 +2040,15,GASPRD,peak.night,7.269439661682075 +2040,15,CO2EMT,peak.night,37.168644990180454 +2040,15,GASPRD,peak.day,10.384913788160796 +2040,15,CO2EMT,peak.day,53.098064198866155 +2040,15,GASPRD,peak.peak,3.1154741264787216 +2040,15,CO2EMT,peak.peak,15.929419208685704 +2040,15,GASPRD,peak.evening,4.153965535203352 +2040,15,CO2EMT,peak.evening,21.239225781494742 2040,15,GASPRD,summer.night,0.0 2040,15,CO2EMT,summer.night,0.0 2040,15,GASPRD,summer.day,0.0 2040,15,CO2EMT,summer.day,0.0 2040,15,GASPRD,summer.peak,0.0 2040,15,CO2EMT,summer.peak,0.0 -2040,15,GASPRD,summer.evening,0.0 -2040,15,CO2EMT,summer.evening,0.0 -2040,15,GASPRD,autumn.night,0.0 -2040,15,CO2EMT,autumn.night,0.0 -2040,15,GASPRD,autumn.day,0.0 -2040,15,CO2EMT,autumn.day,0.0 -2040,15,GASPRD,autumn.peak,0.0 -2040,15,CO2EMT,autumn.peak,0.0 -2040,15,GASPRD,autumn.evening,0.0 -2040,15,CO2EMT,autumn.evening,0.0 +2040,15,GASPRD,summer.evening,0.760964793659886 +2040,15,CO2EMT,summer.evening,3.8908129899829973 +2040,15,GASPRD,autumn.night,7.269439661682075 +2040,15,CO2EMT,autumn.night,37.168644990180454 +2040,15,GASPRD,autumn.day,10.384913788160796 +2040,15,CO2EMT,autumn.day,53.098064198866155 +2040,15,GASPRD,autumn.peak,3.1154741264787216 +2040,15,CO2EMT,autumn.peak,15.929419208685704 +2040,15,GASPRD,autumn.evening,4.153965535203352 +2040,15,CO2EMT,autumn.evening,21.239225781494742 diff --git a/tests/data/two_outputs/commodity_flows.csv b/tests/data/two_outputs/commodity_flows.csv index d2043ae06..b35d424bc 100644 --- a/tests/data/two_outputs/commodity_flows.csv +++ b/tests/data/two_outputs/commodity_flows.csv @@ -654,9 +654,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,peak.night,-0.0 2030,2,GASNAT,peak.night,0.0 2030,2,CO2EMT,peak.night,0.0 -2030,2,GASPRD,peak.day,-56.01741644695821 -2030,2,GASNAT,peak.day,53.34992042567448 -2030,2,CO2EMT,peak.day,136.38907156823683 +2030,2,GASPRD,peak.day,-56.01741644695815 +2030,2,GASNAT,peak.day,53.349920425674426 +2030,2,CO2EMT,peak.day,136.3890715682367 2030,2,GASPRD,peak.peak,-124.3475625 2030,2,GASNAT,peak.peak,118.42625 2030,2,CO2EMT,peak.peak,302.756708125 @@ -706,12 +706,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,winter.night,-0.0 2030,6,ELCTRI,winter.night,0.0 2030,6,CO2EMT,winter.night,0.0 -2030,6,GASNAT,winter.day,-10.634542383009325 -2030,6,ELCTRI,winter.day,7.089694922006217 -2030,6,CO2EMT,winter.day,543.7441520432668 -2030,6,GASNAT,winter.peak,-4.4338340625 -2030,6,ELCTRI,winter.peak,2.955889375 -2030,6,CO2EMT,winter.peak,226.70193561562496 +2030,6,GASNAT,winter.day,-14.77944692229423 +2030,6,ELCTRI,winter.day,9.85296461486282 +2030,6,CO2EMT,winter.day,755.6731211369039 +2030,6,GASNAT,winter.peak,-3.4174082812344855 +2030,6,ELCTRI,winter.peak,2.278272187489657 +2030,6,CO2EMT,winter.peak,174.73208541951922 2030,6,GASNAT,winter.evening,-4.644546568256023 2030,6,ELCTRI,winter.evening,3.0963643788373485 2030,6,CO2EMT,winter.evening,237.4756660349304 @@ -721,12 +721,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,peak.day,-14.77944692229423 2030,6,ELCTRI,peak.day,9.85296461486282 2030,6,CO2EMT,peak.day,755.6731211369039 -2030,6,GASNAT,peak.peak,-4.4338340625 -2030,6,ELCTRI,peak.peak,2.955889375 -2030,6,CO2EMT,peak.peak,226.70193561562496 -2030,6,GASNAT,peak.evening,-5.911778797294223 -2030,6,ELCTRI,peak.evening,3.941185864862815 -2030,6,CO2EMT,peak.evening,302.26924990565357 +2030,6,GASNAT,peak.peak,-3.7078156676633673 +2030,6,ELCTRI,peak.peak,2.4718771117755782 +2030,6,CO2EMT,peak.peak,189.58061508762796 +2030,6,GASNAT,peak.evening,-5.911778797294229 +2030,6,ELCTRI,peak.evening,3.9411858648628195 +2030,6,CO2EMT,peak.evening,302.2692499056539 2030,6,GASNAT,summer.night,-4.808493968439487 2030,6,ELCTRI,summer.night,3.205662645626325 2030,6,CO2EMT,summer.night,245.85829660631097 @@ -745,9 +745,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,autumn.day,-14.77944692229423 2030,6,ELCTRI,autumn.day,9.85296461486282 2030,6,CO2EMT,autumn.day,755.6731211369039 -2030,6,GASNAT,autumn.peak,-4.4338340625 -2030,6,ELCTRI,autumn.peak,2.955889375 -2030,6,CO2EMT,autumn.peak,226.70193561562496 +2030,6,GASNAT,autumn.peak,-4.0510243965464285 +2030,6,ELCTRI,autumn.peak,2.7006829310309524 +2030,6,CO2EMT,autumn.peak,207.12887739541887 2030,6,GASNAT,autumn.evening,-5.647772080957336 2030,6,ELCTRI,autumn.evening,3.7651813873048905 2030,6,CO2EMT,autumn.evening,288.77058649934855 @@ -914,12 +914,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,GASNAT,winter.night,-15.047565402438797 2030,15,ELCTRI,winter.night,10.031710268292532 2030,15,CO2EMT,winter.night,769.3820190266956 -2030,15,GASNAT,winter.day,-103.14430160351442 -2030,15,ELCTRI,winter.day,68.76286773567628 -2030,15,CO2EMT,winter.day,5273.768140987692 -2030,15,GASNAT,winter.peak,-29.92686460077028 -2030,15,ELCTRI,winter.peak,19.951243067180187 -2030,15,CO2EMT,winter.peak,1530.1605870373842 +2030,15,GASNAT,winter.day,-98.9993970642295 +2030,15,ELCTRI,winter.day,65.99959804281967 +2030,15,CO2EMT,winter.day,5061.839171894054 +2030,15,GASNAT,winter.peak,-30.943290382035794 +2030,15,ELCTRI,winter.peak,20.62886025469053 +2030,15,CO2EMT,winter.peak,1582.13043723349 2030,15,GASNAT,winter.evening,-41.257720839442825 2030,15,ELCTRI,winter.evening,27.505147226295215 2030,15,CO2EMT,winter.evening,2109.5072665207113 @@ -929,12 +929,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,GASNAT,peak.day,-100.0554239166924 2030,15,ELCTRI,peak.day,66.7036159444616 2030,15,CO2EMT,peak.day,5115.833824860482 -2030,15,GASNAT,peak.peak,-30.21727198719916 -2030,15,ELCTRI,peak.peak,20.144847991466108 -2030,15,CO2EMT,peak.peak,1545.009116705493 -2030,15,GASNAT,peak.evening,-41.257720839442825 -2030,15,ELCTRI,peak.evening,27.505147226295215 -2030,15,CO2EMT,peak.evening,2109.5072665207113 +2030,15,GASNAT,peak.peak,-30.943290382035794 +2030,15,ELCTRI,peak.peak,20.62886025469053 +2030,15,CO2EMT,peak.peak,1582.13043723349 +2030,15,GASNAT,peak.evening,-41.25772083944281 +2030,15,ELCTRI,peak.evening,27.505147226295207 +2030,15,CO2EMT,peak.evening,2109.507266520711 2030,15,GASNAT,summer.night,-0.0 2030,15,ELCTRI,summer.night,0.0 2030,15,CO2EMT,summer.night,0.0 @@ -953,9 +953,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,GASNAT,autumn.day,-100.60983801130455 2030,15,ELCTRI,autumn.day,67.0732253408697 2030,15,CO2EMT,autumn.day,5144.181017518001 -2030,15,GASNAT,autumn.peak,-30.560480716082225 -2030,15,ELCTRI,autumn.peak,20.373653810721482 -2030,15,CO2EMT,autumn.peak,1562.557379013284 +2030,15,GASNAT,autumn.peak,-30.943290382035794 +2030,15,ELCTRI,autumn.peak,20.62886025469053 +2030,15,CO2EMT,autumn.peak,1582.13043723349 2030,15,GASNAT,autumn.evening,-41.257720839442825 2030,15,ELCTRI,autumn.evening,27.505147226295215 2030,15,CO2EMT,autumn.evening,2109.5072665207113 @@ -1083,8 +1083,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,0,CO2EMT,autumn.night,0.0 2040,0,GASPRD,autumn.day,0.0 2040,0,CO2EMT,autumn.day,0.0 -2040,0,GASPRD,autumn.peak,17.42207611641814 -2040,0,CO2EMT,autumn.peak,89.07907518324596 +2040,0,GASPRD,autumn.peak,17.42207611641811 +2040,0,CO2EMT,autumn.peak,89.0790751832458 2040,0,GASPRD,autumn.evening,167.09166800339997 2040,0,CO2EMT,autumn.evening,854.3396985013842 2040,1,OILCRD,winter.night,0.0 @@ -1177,9 +1177,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,2,GASPRD,autumn.day,-0.0 2040,2,GASNAT,autumn.day,0.0 2040,2,CO2EMT,autumn.day,0.0 -2040,2,GASPRD,autumn.peak,-40.766234868444144 -2040,2,GASNAT,autumn.peak,38.82498558899442 -2040,2,CO2EMT,autumn.peak,99.25607565826425 +2040,2,GASPRD,autumn.peak,-40.766234868444116 +2040,2,GASNAT,autumn.peak,38.824985588994394 +2040,2,CO2EMT,autumn.peak,99.25607565826418 2040,2,GASPRD,autumn.evening,-165.796751326374 2040,2,GASNAT,autumn.evening,157.90166792987998 2040,2,CO2EMT,autumn.evening,403.6756140627382 @@ -1211,42 +1211,42 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,6,GASNAT,winter.evening,-5.911778797294229 2040,6,ELCTRI,winter.evening,3.9411858648628195 2040,6,CO2EMT,winter.evening,302.2692499056539 -2040,6,GASNAT,peak.night,-0.0 -2040,6,ELCTRI,peak.night,0.0 -2040,6,CO2EMT,peak.night,0.0 +2040,6,GASNAT,peak.night,-4.253945503174984 +2040,6,ELCTRI,peak.night,2.835963668783323 +2040,6,CO2EMT,peak.night,217.50423357733695 2040,6,GASNAT,peak.day,-9.16799800186029 2040,6,ELCTRI,peak.day,6.11199866790686 2040,6,CO2EMT,peak.day,468.7597378351166 2040,6,GASNAT,peak.peak,-2.9510442661156464 2040,6,ELCTRI,peak.peak,1.9673628440770976 2040,6,CO2EMT,peak.peak,150.88689332649298 -2040,6,GASNAT,peak.evening,-4.9027502386198485 -2040,6,ELCTRI,peak.evening,3.268500159079899 -2040,6,CO2EMT,peak.evening,250.67761970063282 +2040,6,GASNAT,peak.evening,-5.911778797294229 +2040,6,ELCTRI,peak.evening,3.9411858648628195 +2040,6,CO2EMT,peak.evening,302.2692499056539 2040,6,GASNAT,summer.night,-0.0 2040,6,ELCTRI,summer.night,0.0 2040,6,CO2EMT,summer.night,0.0 -2040,6,GASNAT,summer.day,-14.77944692229423 -2040,6,ELCTRI,summer.day,9.85296461486282 -2040,6,CO2EMT,summer.day,755.6731211369039 +2040,6,GASNAT,summer.day,-11.887267157698844 +2040,6,ELCTRI,summer.day,7.924844771799229 +2040,6,CO2EMT,summer.day,607.7959697731418 2040,6,GASNAT,summer.peak,-3.611061049723789 2040,6,ELCTRI,summer.peak,2.4073740331491926 2040,6,CO2EMT,summer.peak,184.63355147237732 2040,6,GASNAT,summer.evening,-5.911778797294229 2040,6,ELCTRI,summer.evening,3.9411858648628195 2040,6,CO2EMT,summer.evening,302.2692499056539 -2040,6,GASNAT,autumn.night,-3.7259320801272513 -2040,6,ELCTRI,autumn.night,2.483954720084834 -2040,6,CO2EMT,autumn.night,190.50690725690635 +2040,6,GASNAT,autumn.night,-0.0 +2040,6,ELCTRI,autumn.night,0.0 +2040,6,CO2EMT,autumn.night,0.0 2040,6,GASNAT,autumn.day,-14.77944692229423 2040,6,ELCTRI,autumn.day,9.85296461486282 2040,6,CO2EMT,autumn.day,755.6731211369039 2040,6,GASNAT,autumn.peak,-4.4338340625 2040,6,ELCTRI,autumn.peak,2.955889375 2040,6,CO2EMT,autumn.peak,226.70193561562496 -2040,6,GASNAT,autumn.evening,-5.911778797294229 -2040,6,ELCTRI,autumn.evening,3.9411858648628195 -2040,6,CO2EMT,autumn.evening,302.2692499056539 +2040,6,GASNAT,autumn.evening,-4.638743522282962 +2040,6,ELCTRI,autumn.evening,3.0924956815219744 +2040,6,CO2EMT,autumn.evening,237.1789562943278 2040,14,BIOPEL,winter.night,-31.135860656527402 2040,14,RSHEAT,winter.night,25.94655054710617 2040,14,BIOPEL,winter.day,-44.47980087689542 @@ -1291,42 +1291,42 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,15,GASNAT,winter.evening,-38.981460051730245 2040,15,ELCTRI,winter.evening,25.98764003448683 2040,15,CO2EMT,winter.evening,1993.1220524449673 -2040,15,GASNAT,peak.night,-4.253945503174984 -2040,15,ELCTRI,peak.night,2.835963668783323 -2040,15,CO2EMT,peak.night,217.50423357733695 +2040,15,GASNAT,peak.night,-0.0 +2040,15,ELCTRI,peak.night,0.0 +2040,15,CO2EMT,peak.night,0.0 2040,15,GASNAT,peak.day,-103.14430160351442 2040,15,ELCTRI,peak.day,68.76286773567628 2040,15,CO2EMT,peak.day,5273.768140987692 2040,15,GASNAT,peak.peak,-30.943290382035794 2040,15,ELCTRI,peak.peak,20.62886025469053 2040,15,CO2EMT,peak.peak,1582.13043723349 -2040,15,GASNAT,peak.evening,-41.257720839442825 -2040,15,ELCTRI,peak.evening,27.505147226295215 -2040,15,CO2EMT,peak.evening,2109.5072665207113 +2040,15,GASNAT,peak.evening,-40.24869228076844 +2040,15,ELCTRI,peak.evening,26.832461520512293 +2040,15,CO2EMT,peak.evening,2057.9156363156903 2040,15,GASNAT,summer.night,-6.0755918427801054 2040,15,ELCTRI,summer.night,4.050394561853404 2040,15,CO2EMT,summer.night,310.64501092134674 -2040,15,GASNAT,summer.day,-100.25212183891902 -2040,15,ELCTRI,summer.day,66.83474789261268 -2040,15,CO2EMT,summer.day,5125.890989623929 +2040,15,GASNAT,summer.day,-103.14430160351442 +2040,15,ELCTRI,summer.day,68.76286773567628 +2040,15,CO2EMT,summer.day,5273.768140987692 2040,15,GASNAT,summer.peak,-30.943290382035794 2040,15,ELCTRI,summer.peak,20.62886025469053 2040,15,CO2EMT,summer.peak,1582.13043723349 2040,15,GASNAT,summer.evening,-41.251917801285444 2040,15,ELCTRI,summer.evening,27.5012785341903 2040,15,CO2EMT,summer.evening,2109.2105571797247 -2040,15,GASNAT,autumn.night,-0.0 -2040,15,ELCTRI,autumn.night,0.0 -2040,15,CO2EMT,autumn.night,0.0 +2040,15,GASNAT,autumn.night,-3.7259320801272513 +2040,15,ELCTRI,autumn.night,2.483954720084834 +2040,15,CO2EMT,autumn.night,190.50690725690635 2040,15,GASNAT,autumn.day,-98.0872667776926 2040,15,ELCTRI,autumn.day,65.39151118512841 2040,15,CO2EMT,autumn.day,5015.201950343423 2040,15,GASNAT,autumn.peak,-29.8037093145345 2040,15,ELCTRI,autumn.peak,19.869139543023 2040,15,CO2EMT,autumn.peak,1523.8636572521489 -2040,15,GASNAT,autumn.evening,-39.98468556443156 -2040,15,ELCTRI,autumn.evening,26.656457042954372 -2040,15,CO2EMT,autumn.evening,2044.4169729093853 +2040,15,GASNAT,autumn.evening,-41.257720839442825 +2040,15,ELCTRI,autumn.evening,27.505147226295215 +2040,15,CO2EMT,autumn.evening,2109.5072665207113 2040,16,OILCRD,winter.night,-44.9532572198336 2040,16,GASOLI,winter.night,34.315463526590534 2040,16,CO2EMT,winter.night,754.9401975849918 diff --git a/tests/data/two_regions/assets.csv b/tests/data/two_regions/assets.csv index bbf314e6e..53877674a 100644 --- a/tests/data/two_regions/assets.csv +++ b/tests/data/two_regions/assets.csv @@ -14,29 +14,30 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 12,windturbine,R1,A1_PWR,,2030,,11.951976096047806 13,gasCCGT,R2,A1_PWR,,2030,,0.5025589948820103 14,windturbine,R2,A1_PWR,,2030,,0.6926386147227713 -15,gassupply1,R2,A1_GAS,,2030,,2.425210605578789 +15,gassupply1,R2,A1_GAS,,2030,,5.464509710980579 16,heatpump,R1,A1_RES,,2035,,6.119987760024477 17,gasboiler,R2,A1_RES,,2035,,4.4359531280937405 18,windturbine,R1,A1_PWR,,2035,,12.95997408005184 19,windturbine,R2,A1_PWR,,2035,,0.5025589948820103 20,gasCCGT,R2,A1_PWR,,2035,,0.532030935938128 -21,gassupply1,R2,A1_GAS,,2035,,10.365247128705743 +21,gassupply1,R2,A1_GAS,,2035,,3.0512018335963322 22,heatpump,R1,A1_RES,,2040,,5.939988120023761 23,heatpump,R2,A1_RES,,2040,,4.193991612016776 24,gasboiler,R2,A1_RES,,2040,,1.7459965080069861 25,windturbine,R1,A1_PWR,,2040,,7.696784606430788 26,gasCCGT,R2,A1_PWR,,2040,,1.167885664228672 27,windturbine,R2,A1_PWR,,2040,,0.6703186593626813 -28,gassupply1,R2,A1_GAS,,2040,,3.839745936508127 +28,gassupply1,R2,A1_GAS,,2040,,7.857190205619588 29,heatpump,R1,A1_RES,,2045,,5.939988120023761 30,gasboiler,R2,A1_RES,,2045,,5.939988120023761 31,windturbine,R1,A1_PWR,,2045,,8.683182633634738 32,windturbine,R2,A1_PWR,,2045,,0.6703186593626813 33,gasCCGT,R2,A1_PWR,,2045,,1.0852778294443406 -34,gassupply1,R2,A1_GAS,,2045,,9.207676432647135 +34,gassupply1,R2,A1_GAS,,2045,,4.110991474017053 35,heatpump,R1,A1_RES,,2050,,6.119987760024477 36,heatpump,R2,A1_RES,,2050,,5.3999892000216 37,gasboiler,R2,A1_RES,,2050,,0.7199985600028752 38,windturbine,R1,A1_PWR,,2050,,4.355991288017403 39,windturbine,R2,A1_PWR,,2050,,1.772636454727091 40,gasCCGT,R2,A1_PWR,,2050,,0.2818554362891272 +41,gassupply1,R2,A1_GAS,,2050,,4.793545788908421 diff --git a/tests/data/two_regions/commodity_flows.csv b/tests/data/two_regions/commodity_flows.csv index c32aee2a4..25c7eaf21 100644 --- a/tests/data/two_regions/commodity_flows.csv +++ b/tests/data/two_regions/commodity_flows.csv @@ -51,8 +51,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,0,gas,all-year.morning,0.0 2025,0,gas,all-year.afternoon,0.7818272000000002 2025,0,gas,all-year.early-peak,1.33266 -2025,0,gas,all-year.late-peak,1.3885199999999995 -2025,0,gas,all-year.evening,1.4925792000000002 +2025,0,gas,all-year.late-peak,2.8810991999999995 +2025,0,gas,all-year.evening,0.0 2025,1,gas,all-year.night,-0.0 2025,1,heat,all-year.night,0.0 2025,1,CO2f,all-year.night,0.0 @@ -71,12 +71,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,1,gas,all-year.evening,-0.0 2025,1,heat,all-year.evening,0.0 2025,1,CO2f,all-year.evening,0.0 -2025,2,gas,all-year.night,0.88844 -2025,2,gas,all-year.morning,1.0172265600000003 -2025,2,gas,all-year.afternoon,0.88844 +2025,2,gas,all-year.night,0.37669856000000024 +2025,2,gas,all-year.morning,1.5289679999999999 +2025,2,gas,all-year.afternoon,0.37669856000000024 2025,2,gas,all-year.early-peak,1.528968 -2025,2,gas,all-year.late-peak,3.638471424 -2025,2,gas,all-year.evening,1.7886265600000004 +2025,2,gas,all-year.late-peak,3.8431680000000004 +2025,2,gas,all-year.evening,2.095671424 2025,3,gas,all-year.night,-0.0 2025,3,heat,all-year.night,0.0 2025,3,CO2f,all-year.night,0.0 @@ -127,10 +127,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,6,electricity,all-year.afternoon,0.0638399999999999 2025,6,wind,all-year.early-peak,-0.0 2025,6,electricity,all-year.early-peak,0.0 -2025,6,wind,all-year.late-peak,-1.1172000000000002 -2025,6,electricity,all-year.late-peak,1.1172000000000002 -2025,6,wind,all-year.evening,-0.17023999999999995 -2025,6,electricity,all-year.evening,0.17023999999999995 +2025,6,wind,all-year.late-peak,-0.22344000000000008 +2025,6,electricity,all-year.late-peak,0.22344000000000008 +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 @@ -143,48 +143,48 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,7,gas,all-year.early-peak,-1.33266 2025,7,electricity,all-year.early-peak,0.798 2025,7,CO2f,all-year.early-peak,73.15266000000001 -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.4925792000000002 -2025,7,electricity,all-year.evening,0.8937600000000001 -2025,7,CO2f,all-year.evening,81.93097920000001 -2025,8,gas,all-year.night,-0.88844 -2025,8,electricity,all-year.night,0.532 -2025,8,CO2f,all-year.night,48.768440000000005 -2025,8,gas,all-year.morning,-0.5543865600000003 -2025,8,electricity,all-year.morning,0.3319680000000002 -2025,8,CO2f,all-year.morning,30.43150656000002 -2025,8,gas,all-year.afternoon,-0.88844 -2025,8,electricity,all-year.afternoon,0.532 -2025,8,CO2f,all-year.afternoon,48.768440000000005 +2025,7,gas,all-year.late-peak,-1.4925792000000002 +2025,7,electricity,all-year.late-peak,0.8937600000000001 +2025,7,CO2f,all-year.late-peak,81.93097920000001 +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.37669856000000024 +2025,8,electricity,all-year.night,0.22556800000000016 +2025,8,CO2f,all-year.night,20.677818560000016 +2025,8,gas,all-year.morning,-1.066128 +2025,8,electricity,all-year.morning,0.6384 +2025,8,CO2f,all-year.morning,58.522127999999995 +2025,8,gas,all-year.afternoon,-0.37669856000000024 +2025,8,electricity,all-year.afternoon,0.22556800000000016 +2025,8,CO2f,all-year.afternoon,20.677818560000016 2025,8,gas,all-year.early-peak,-1.0661280000000002 2025,8,electricity,all-year.early-peak,0.6384000000000001 2025,8,CO2f,all-year.early-peak,58.52212800000001 -2025,8,gas,all-year.late-peak,-0.8614314240000001 -2025,8,electricity,all-year.late-peak,0.5158272 -2025,8,CO2f,all-year.late-peak,47.28587942400001 -2025,8,gas,all-year.evening,-0.5543865600000003 -2025,8,electricity,all-year.evening,0.3319680000000002 -2025,8,CO2f,all-year.evening,30.43150656000002 -2025,9,wind,all-year.night,-0.0 -2025,9,electricity,all-year.night,0.0 -2025,9,wind,all-year.morning,-0.30643199999999987 -2025,9,electricity,all-year.morning,0.30643199999999987 -2025,9,wind,all-year.afternoon,-0.0 -2025,9,electricity,all-year.afternoon,0.0 +2025,8,gas,all-year.late-peak,-1.0661280000000002 +2025,8,electricity,all-year.late-peak,0.6384000000000001 +2025,8,CO2f,all-year.late-peak,58.52212800000001 +2025,8,gas,all-year.evening,-0.8614314240000001 +2025,8,electricity,all-year.evening,0.5158272 +2025,8,CO2f,all-year.evening,47.28587942400001 +2025,9,wind,all-year.night,-0.30643199999999987 +2025,9,electricity,all-year.night,0.30643199999999987 +2025,9,wind,all-year.morning,0.0 +2025,9,electricity,all-year.morning,-0.0 +2025,9,wind,all-year.afternoon,-0.30643199999999987 +2025,9,electricity,all-year.afternoon,0.30643199999999987 2025,9,wind,all-year.early-peak,-0.0 2025,9,electricity,all-year.early-peak,0.0 -2025,9,wind,all-year.late-peak,-0.12257280000000004 -2025,9,electricity,all-year.late-peak,0.12257280000000004 -2025,9,wind,all-year.evening,-0.30643199999999987 -2025,9,electricity,all-year.evening,0.30643199999999987 -2030,2,gas,all-year.night,0.8700850495999999 -2030,2,gas,all-year.morning,0.9422079840000003 -2030,2,gas,all-year.afternoon,0.7046774240000002 -2030,2,gas,all-year.early-peak,1.261164624 -2030,2,gas,all-year.late-peak,4.000008 -2030,2,gas,all-year.evening,1.8498680319999998 +2025,9,wind,all-year.late-peak,-0.0 +2025,9,electricity,all-year.late-peak,0.0 +2025,9,wind,all-year.evening,-0.12257280000000004 +2025,9,electricity,all-year.evening,0.12257280000000004 +2030,2,gas,all-year.night,0.0 +2030,2,gas,all-year.morning,0.24287232000000014 +2030,2,gas,all-year.afternoon,1.1088800000000003 +2030,2,gas,all-year.early-peak,1.6653672 +2030,2,gas,all-year.late-peak,3.433157984 +2030,2,gas,all-year.evening,1.7174137599999995 2030,3,gas,all-year.night,-0.0 2030,3,heat,all-year.night,0.0 2030,3,CO2f,all-year.night,0.0 @@ -227,16 +227,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,5,heat,all-year.late-peak,1.596 2030,5,electricity,all-year.evening,-0.6384000000000001 2030,5,heat,all-year.evening,1.596 -2030,6,wind,all-year.night,-0.6640000000000001 -2030,6,electricity,all-year.night,0.6640000000000001 -2030,6,wind,all-year.morning,-0.5312000000000008 -2030,6,electricity,all-year.morning,0.5312000000000008 -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.0 -2030,6,electricity,all-year.late-peak,0.0 +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.0 +2030,6,electricity,all-year.afternoon,0.0 +2030,6,wind,all-year.early-peak,-0.9960000000000002 +2030,6,electricity,all-year.early-peak,0.9960000000000002 +2030,6,wind,all-year.late-peak,-0.8632000000000011 +2030,6,electricity,all-year.late-peak,0.8632000000000011 2030,6,wind,all-year.evening,-0.0 2030,6,electricity,all-year.evening,0.0 2030,7,gas,all-year.night,-0.0 @@ -257,36 +257,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,gas,all-year.evening,-0.0 2030,7,electricity,all-year.evening,0.0 2030,7,CO2f,all-year.evening,0.0 -2030,8,gas,all-year.night,-1.0317660800000001 -2030,8,electricity,all-year.night,0.6178240000000002 -2030,8,CO2f,all-year.night,56.63592608000001 -2030,8,gas,all-year.morning,-0.7471713600000003 -2030,8,electricity,all-year.morning,0.4474080000000002 -2030,8,CO2f,all-year.morning,41.01389136000002 +2030,8,gas,all-year.night,-0.9107534400000002 +2030,8,electricity,all-year.night,0.5453613413173655 +2030,8,CO2f,all-year.night,49.99327415856289 +2030,8,gas,all-year.morning,-0.5543865600000003 +2030,8,electricity,all-year.morning,0.3319680000000002 +2030,8,CO2f,all-year.morning,30.43150656000002 2030,8,gas,all-year.afternoon,-1.066128 2030,8,electricity,all-year.afternoon,0.6384 2030,8,CO2f,all-year.afternoon,58.522127999999995 2030,8,gas,all-year.early-peak,-1.066128 2030,8,electricity,all-year.early-peak,0.6384 2030,8,CO2f,all-year.early-peak,58.522127999999995 -2030,8,gas,all-year.late-peak,-0.9165713760000004 -2030,8,electricity,all-year.late-peak,0.5488451353293415 -2030,8,CO2f,all-year.late-peak,50.31263355564074 -2030,8,gas,all-year.evening,-0.8319106079999999 -2030,8,electricity,all-year.evening,0.4981500646706587 -2030,8,CO2f,all-year.evening,45.665416428359286 -2030,9,wind,all-year.night,-0.0 -2030,9,electricity,all-year.night,0.0 +2030,8,gas,all-year.late-peak,-0.9961514240000001 +2030,8,electricity,all-year.late-peak,0.5964978586826348 +2030,8,CO2f,all-year.late-peak,54.680958705437135 +2030,8,gas,all-year.evening,-1.066128 +2030,8,electricity,all-year.evening,0.6384 +2030,8,CO2f,all-year.evening,58.522127999999995 +2030,9,wind,all-year.night,-0.07246265868263461 +2030,9,electricity,all-year.night,0.07246265868263461 2030,9,wind,all-year.morning,-0.30643199999999987 2030,9,electricity,all-year.morning,0.30643199999999987 2030,9,wind,all-year.afternoon,-0.0 2030,9,electricity,all-year.afternoon,0.0 -2030,9,wind,all-year.early-peak,-0.11544000000000014 -2030,9,electricity,all-year.early-peak,0.11544000000000014 -2030,9,wind,all-year.late-peak,-0.08955486467065843 -2030,9,electricity,all-year.late-peak,0.08955486467065843 -2030,9,wind,all-year.evening,-0.22400993532934133 -2030,9,electricity,all-year.evening,0.22400993532934133 +2030,9,wind,all-year.early-peak,-0.0 +2030,9,electricity,all-year.early-peak,0.0 +2030,9,wind,all-year.late-peak,-0.24110214131736524 +2030,9,electricity,all-year.late-peak,0.24110214131736524 +2030,9,wind,all-year.evening,-0.11544000000000003 +2030,9,electricity,all-year.evening,0.11544000000000003 2030,10,electricity,all-year.night,-0.6640000000000001 2030,10,heat,all-year.night,1.6600000000000001 2030,10,electricity,all-year.morning,-0.8748 @@ -311,16 +311,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,11,heat,all-year.late-peak,0.49800000000000005 2030,11,electricity,all-year.evening,-0.19920000000000004 2030,11,heat,all-year.evening,0.49800000000000005 -2030,12,wind,all-year.night,-0.0 -2030,12,electricity,all-year.night,0.0 -2030,12,wind,all-year.morning,-0.46479999999999944 -2030,12,electricity,all-year.morning,0.46479999999999944 -2030,12,wind,all-year.afternoon,-0.0 -2030,12,electricity,all-year.afternoon,0.0 -2030,12,wind,all-year.early-peak,-0.9960000000000002 -2030,12,electricity,all-year.early-peak,0.9960000000000002 -2030,12,wind,all-year.late-peak,-1.9920000000000002 -2030,12,electricity,all-year.late-peak,1.9920000000000002 +2030,12,wind,all-year.night,-0.6640000000000001 +2030,12,electricity,all-year.night,0.6640000000000001 +2030,12,wind,all-year.morning,-0.9960000000000002 +2030,12,electricity,all-year.morning,0.9960000000000002 +2030,12,wind,all-year.afternoon,-0.6640000000000001 +2030,12,electricity,all-year.afternoon,0.6640000000000001 +2030,12,wind,all-year.early-peak,-0.0 +2030,12,electricity,all-year.early-peak,0.0 +2030,12,wind,all-year.late-peak,-1.1287999999999991 +2030,12,electricity,all-year.late-peak,1.1287999999999991 2030,12,wind,all-year.evening,-1.3280000000000003 2030,12,electricity,all-year.evening,1.3280000000000003 2030,13,gas,all-year.night,-0.0 @@ -335,36 +335,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,13,gas,all-year.early-peak,-0.1398792 2030,13,electricity,all-year.early-peak,0.08376000000000001 2030,13,CO2f,all-year.early-peak,7.678279200000001 -2030,13,gas,all-year.late-peak,-0.1398792 -2030,13,electricity,all-year.late-peak,0.08376000000000001 -2030,13,CO2f,all-year.late-peak,7.678279200000001 -2030,13,gas,all-year.evening,-0.0 -2030,13,electricity,all-year.evening,0.0 -2030,13,CO2f,all-year.evening,0.0 +2030,13,gas,all-year.late-peak,-0.0 +2030,13,electricity,all-year.late-peak,0.0 +2030,13,CO2f,all-year.late-peak,0.0 +2030,13,gas,all-year.evening,-0.1398792 +2030,13,electricity,all-year.evening,0.08376000000000001 +2030,13,CO2f,all-year.evening,7.678279200000001 2030,14,wind,all-year.night,-0.046176000000000064 2030,14,electricity,all-year.night,0.046176000000000064 -2030,14,wind,all-year.morning,-0.0 -2030,14,electricity,all-year.morning,0.0 +2030,14,wind,all-year.morning,-0.11544000000000014 +2030,14,electricity,all-year.morning,0.11544000000000014 2030,14,wind,all-year.afternoon,-0.0 2030,14,electricity,all-year.afternoon,0.0 -2030,14,wind,all-year.early-peak,-0.0 -2030,14,electricity,all-year.early-peak,0.0 -2030,14,wind,all-year.late-peak,-0.11544000000000014 -2030,14,electricity,all-year.late-peak,0.11544000000000014 -2030,14,wind,all-year.evening,-0.11544000000000014 -2030,14,electricity,all-year.evening,0.11544000000000014 -2030,15,gas,all-year.night,0.16168103040000026 -2030,15,gas,all-year.morning,0.4042025760000001 -2030,15,gas,all-year.afternoon,0.4042025760000001 -2030,15,gas,all-year.early-peak,0.4042025760000001 -2030,15,gas,all-year.late-peak,0.4042025760000001 -2030,15,gas,all-year.evening,0.4042025760000001 -2035,2,gas,all-year.night,0.6834403680000004 -2035,2,gas,all-year.morning,2.40504944 -2035,2,gas,all-year.afternoon,1.336 -2035,2,gas,all-year.early-peak,2.40504944 -2035,2,gas,all-year.late-peak,4.000008 -2035,2,gas,all-year.evening,1.0378019167999997 +2030,14,wind,all-year.early-peak,-0.11544000000000014 +2030,14,electricity,all-year.early-peak,0.11544000000000014 +2030,14,wind,all-year.late-peak,-0.0 +2030,14,electricity,all-year.late-peak,0.0 +2030,14,wind,all-year.evening,-0.0 +2030,14,electricity,all-year.evening,0.0 +2030,15,gas,all-year.night,0.9107534400000002 +2030,15,gas,all-year.morning,0.9107534400000002 +2030,15,gas,all-year.afternoon,0.0 +2030,15,gas,all-year.early-peak,0.0 +2030,15,gas,all-year.late-peak,0.9107534400000002 +2030,15,gas,all-year.evening,0.9107534400000002 +2035,2,gas,all-year.night,0.0 +2035,2,gas,all-year.morning,0.7374042880000004 +2035,2,gas,all-year.afternoon,0.42524655999999994 +2035,2,gas,all-year.early-peak,0.18605846400000003 +2035,2,gas,all-year.late-peak,3.666058463999999 +2035,2,gas,all-year.evening,3.56504944 2035,3,gas,all-year.night,-0.0 2035,3,heat,all-year.night,0.0 2035,3,CO2f,all-year.night,0.0 @@ -409,12 +409,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,5,heat,all-year.evening,1.596 2035,6,wind,all-year.night,-0.0 2035,6,electricity,all-year.night,0.0 -2035,6,wind,all-year.morning,-1.1172 -2035,6,electricity,all-year.morning,1.1172 -2035,6,wind,all-year.afternoon,-0.8 -2035,6,electricity,all-year.afternoon,0.8 -2035,6,wind,all-year.early-peak,-0.0 -2035,6,electricity,all-year.early-peak,0.0 +2035,6,wind,all-year.morning,-0.0 +2035,6,electricity,all-year.morning,0.0 +2035,6,wind,all-year.afternoon,-0.0 +2035,6,electricity,all-year.afternoon,0.0 +2035,6,wind,all-year.early-peak,-1.1172 +2035,6,electricity,all-year.early-peak,1.1172 2035,6,wind,all-year.late-peak,-0.40800000000000036 2035,6,electricity,all-year.late-peak,0.40800000000000036 2035,6,wind,all-year.evening,-0.0 @@ -440,33 +440,33 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,8,gas,all-year.night,-1.066128 2035,8,electricity,all-year.night,0.6384 2035,8,CO2f,all-year.night,58.522127999999995 -2035,8,gas,all-year.morning,-1.066128 -2035,8,electricity,all-year.morning,0.6384 -2035,8,CO2f,all-year.morning,58.522127999999995 +2035,8,gas,all-year.morning,-0.8177709440000005 +2035,8,electricity,all-year.morning,0.4896832000000003 +2035,8,CO2f,all-year.morning,44.88925894400003 2035,8,gas,all-year.afternoon,-1.066128 2035,8,electricity,all-year.afternoon,0.6384 2035,8,CO2f,all-year.afternoon,58.522127999999995 -2035,8,gas,all-year.early-peak,-1.066128 -2035,8,electricity,all-year.early-peak,0.6384 -2035,8,CO2f,all-year.early-peak,58.522127999999995 -2035,8,gas,all-year.late-peak,-0.2664251200000003 -2035,8,electricity,all-year.late-peak,0.15953600000000018 -2035,8,CO2f,all-year.late-peak,14.624665120000017 -2035,8,gas,all-year.evening,-0.40630432000000016 -2035,8,electricity,all-year.evening,0.24329600000000012 -2035,8,CO2f,all-year.evening,22.302944320000012 -2035,9,wind,all-year.night,-0.12257280000000004 -2035,9,electricity,all-year.night,0.12257280000000004 -2035,9,wind,all-year.morning,-0.0 -2035,9,electricity,all-year.morning,0.0 +2035,8,gas,all-year.early-peak,-0.2664251200000002 +2035,8,electricity,all-year.early-peak,0.15953600000000012 +2035,8,CO2f,all-year.early-peak,14.624665120000012 +2035,8,gas,all-year.late-peak,-0.55438656 +2035,8,electricity,all-year.late-peak,0.331968 +2035,8,CO2f,all-year.late-peak,30.43150656 +2035,8,gas,all-year.evening,-1.066128 +2035,8,electricity,all-year.evening,0.6384 +2035,8,CO2f,all-year.evening,58.522127999999995 +2035,9,wind,all-year.night,-0.0 +2035,9,electricity,all-year.night,0.0 +2035,9,wind,all-year.morning,-0.12257280000000004 +2035,9,electricity,all-year.morning,0.12257280000000004 2035,9,wind,all-year.afternoon,-0.0 2035,9,electricity,all-year.afternoon,0.0 -2035,9,wind,all-year.early-peak,-0.0 -2035,9,electricity,all-year.early-peak,0.0 +2035,9,wind,all-year.early-peak,-0.30643199999999987 +2035,9,electricity,all-year.early-peak,0.30643199999999987 2035,9,wind,all-year.late-peak,-0.30643199999999987 2035,9,electricity,all-year.late-peak,0.30643199999999987 -2035,9,wind,all-year.evening,-0.30643199999999987 -2035,9,electricity,all-year.evening,0.30643199999999987 +2035,9,wind,all-year.evening,-0.0 +2035,9,electricity,all-year.evening,0.0 2035,10,electricity,all-year.night,-0.3920000000000002 2035,10,heat,all-year.night,0.9800000000000004 2035,10,electricity,all-year.morning,-0.7920000000000003 @@ -491,8 +491,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,11,heat,all-year.late-peak,0.49800000000000005 2035,11,electricity,all-year.evening,-0.19920000000000004 2035,11,heat,all-year.evening,0.49800000000000005 -2035,12,wind,all-year.night,-0.0 -2035,12,electricity,all-year.night,0.0 +2035,12,wind,all-year.night,-0.8 +2035,12,electricity,all-year.night,0.8 2035,12,wind,all-year.morning,-0.0 2035,12,electricity,all-year.morning,0.0 2035,12,wind,all-year.afternoon,-0.0 @@ -501,11 +501,11 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,12,electricity,all-year.early-peak,0.0 2035,12,wind,all-year.late-peak,-1.9919999999999998 2035,12,electricity,all-year.late-peak,1.9919999999999998 -2035,12,wind,all-year.evening,-0.0 -2035,12,electricity,all-year.evening,0.0 -2035,13,gas,all-year.night,-0.0 -2035,13,electricity,all-year.night,0.0 -2035,13,CO2f,all-year.night,0.0 +2035,12,wind,all-year.evening,-1.6 +2035,12,electricity,all-year.evening,1.6 +2035,13,gas,all-year.night,-0.1398792 +2035,13,electricity,all-year.night,0.08376000000000001 +2035,13,CO2f,all-year.night,7.678279200000001 2035,13,gas,all-year.morning,-0.1398792 2035,13,electricity,all-year.morning,0.08376000000000001 2035,13,CO2f,all-year.morning,7.678279200000001 @@ -515,29 +515,29 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,13,gas,all-year.early-peak,-0.1398792 2035,13,electricity,all-year.early-peak,0.08376000000000001 2035,13,CO2f,all-year.early-peak,7.678279200000001 -2035,13,gas,all-year.late-peak,-0.1398792 -2035,13,electricity,all-year.late-peak,0.08376000000000001 -2035,13,CO2f,all-year.late-peak,7.678279200000001 -2035,13,gas,all-year.evening,-0.0 -2035,13,electricity,all-year.evening,0.0 -2035,13,CO2f,all-year.evening,0.0 -2035,14,wind,all-year.night,-0.01940799999999991 -2035,14,electricity,all-year.night,0.01940799999999991 -2035,14,wind,all-year.morning,-0.0 -2035,14,electricity,all-year.morning,0.0 +2035,13,gas,all-year.late-peak,-0.0 +2035,13,electricity,all-year.late-peak,0.0 +2035,13,CO2f,all-year.late-peak,0.0 +2035,13,gas,all-year.evening,-0.1398792 +2035,13,electricity,all-year.evening,0.08376000000000001 +2035,13,CO2f,all-year.evening,7.678279200000001 +2035,14,wind,all-year.night,-0.0 +2035,14,electricity,all-year.night,0.0 +2035,14,wind,all-year.morning,-0.019407999999999884 +2035,14,electricity,all-year.morning,0.019407999999999884 2035,14,wind,all-year.afternoon,-0.0 2035,14,electricity,all-year.afternoon,0.0 -2035,14,wind,all-year.early-peak,-0.026768000000000153 -2035,14,electricity,all-year.early-peak,0.026768000000000153 +2035,14,wind,all-year.early-peak,-0.11544000000000014 +2035,14,electricity,all-year.early-peak,0.11544000000000014 2035,14,wind,all-year.late-peak,-0.11544000000000014 2035,14,electricity,all-year.late-peak,0.11544000000000014 -2035,14,wind,all-year.evening,-0.11544000000000014 -2035,14,electricity,all-year.evening,0.11544000000000014 -2035,15,gas,all-year.night,0.4042025760000001 -2035,15,gas,all-year.morning,0.0 -2035,15,gas,all-year.afternoon,0.0 -2035,15,gas,all-year.early-peak,0.0 -2035,15,gas,all-year.late-peak,0.4042025760000001 +2035,14,wind,all-year.evening,-0.026768000000000153 +2035,14,electricity,all-year.evening,0.026768000000000153 +2035,15,gas,all-year.night,0.827465344 +2035,15,gas,all-year.morning,0.9107534400000002 +2035,15,gas,all-year.afternoon,0.9107534400000002 +2035,15,gas,all-year.early-peak,0.9107534400000002 +2035,15,gas,all-year.late-peak,0.9107534400000002 2035,15,gas,all-year.evening,0.0 2035,16,electricity,all-year.night,-0.40799999999999986 2035,16,heat,all-year.night,1.0199999999999996 @@ -569,33 +569,33 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,17,gas,all-year.evening,-0.8576193199999994 2035,17,heat,all-year.evening,0.7393269999999995 2035,17,CO2f,all-year.evening,47.841850169999965 -2035,18,wind,all-year.night,-0.8 -2035,18,electricity,all-year.night,0.8 -2035,18,wind,all-year.morning,-0.0828000000000002 -2035,18,electricity,all-year.morning,0.0828000000000002 -2035,18,wind,all-year.afternoon,-0.0 -2035,18,electricity,all-year.afternoon,0.0 -2035,18,wind,all-year.early-peak,-1.2000000000000002 -2035,18,electricity,all-year.early-peak,1.2000000000000002 +2035,18,wind,all-year.night,-0.0 +2035,18,electricity,all-year.night,0.0 +2035,18,wind,all-year.morning,-1.2000000000000002 +2035,18,electricity,all-year.morning,1.2000000000000002 +2035,18,wind,all-year.afternoon,-0.8 +2035,18,electricity,all-year.afternoon,0.8 +2035,18,wind,all-year.early-peak,-0.0828000000000002 +2035,18,electricity,all-year.early-peak,0.0828000000000002 2035,18,wind,all-year.late-peak,-0.0 2035,18,electricity,all-year.late-peak,0.0 -2035,18,wind,all-year.evening,-1.6 -2035,18,electricity,all-year.evening,1.6 -2035,19,wind,all-year.night,-0.006735999999999853 -2035,19,electricity,all-year.night,0.006735999999999853 -2035,19,wind,all-year.morning,-0.026768000000000153 -2035,19,electricity,all-year.morning,0.026768000000000153 +2035,18,wind,all-year.evening,-0.0 +2035,18,electricity,all-year.evening,0.0 +2035,19,wind,all-year.night,-0.0 +2035,19,electricity,all-year.night,0.0 +2035,19,wind,all-year.morning,-0.033504000000000006 +2035,19,electricity,all-year.morning,0.033504000000000006 2035,19,wind,all-year.afternoon,-0.0 2035,19,electricity,all-year.afternoon,0.0 -2035,19,wind,all-year.early-peak,-0.0 -2035,19,electricity,all-year.early-peak,0.0 +2035,19,wind,all-year.early-peak,-0.08376000000000001 +2035,19,electricity,all-year.early-peak,0.08376000000000001 2035,19,wind,all-year.late-peak,-0.08376000000000001 2035,19,electricity,all-year.late-peak,0.08376000000000001 -2035,19,wind,all-year.evening,-0.08376000000000001 -2035,19,electricity,all-year.evening,0.08376000000000001 -2035,20,gas,all-year.night,-0.02151494400000053 -2035,20,electricity,all-year.night,0.012883200000000317 -2035,20,CO2f,all-year.night,1.1810029440000291 +2035,19,wind,all-year.evening,-0.0 +2035,19,electricity,all-year.evening,0.0 +2035,20,gas,all-year.night,-0.12999280000000002 +2035,20,electricity,all-year.night,0.07784000000000002 +2035,20,CO2f,all-year.night,7.135592800000002 2035,20,gas,all-year.morning,-0.14808223999999998 2035,20,electricity,all-year.morning,0.08867199999999999 2035,20,CO2f,all-year.morning,8.128562239999999 @@ -605,24 +605,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,20,gas,all-year.early-peak,-0.14808223999999998 2035,20,electricity,all-year.early-peak,0.08867199999999999 2035,20,CO2f,all-year.early-peak,8.128562239999999 -2035,20,gas,all-year.late-peak,-0.14808223999999998 -2035,20,electricity,all-year.late-peak,0.08867199999999999 -2035,20,CO2f,all-year.late-peak,8.128562239999999 +2035,20,gas,all-year.late-peak,-0.0 +2035,20,electricity,all-year.late-peak,0.0 +2035,20,CO2f,all-year.late-peak,0.0 2035,20,gas,all-year.evening,-0.14808223999999998 2035,20,electricity,all-year.evening,0.08867199999999999 2035,20,CO2f,all-year.evening,8.128562239999999 -2035,21,gas,all-year.night,0.0 -2035,21,gas,all-year.morning,0.0 +2035,21,gas,all-year.night,0.5085346559999999 +2035,21,gas,all-year.morning,0.5085346559999999 2035,21,gas,all-year.afternoon,0.0 -2035,21,gas,all-year.early-peak,0.0 -2035,21,gas,all-year.late-peak,0.6811359839999991 -2035,21,gas,all-year.evening,1.7275446432000001 -2040,2,gas,all-year.night,0.0 -2040,2,gas,all-year.morning,0.6183879567999997 -2040,2,gas,all-year.afternoon,0.0 -2040,2,gas,all-year.early-peak,0.1259680207999998 -2040,2,gas,all-year.late-peak,4.000008 -2040,2,gas,all-year.evening,3.6401750240000004 +2035,21,gas,all-year.early-peak,0.5085346559999999 +2035,21,gas,all-year.late-peak,0.5085346559999999 +2035,21,gas,all-year.evening,0.0 +2040,2,gas,all-year.night,0.09790556800000028 +2040,2,gas,all-year.morning,1.1839372799999999 +2040,2,gas,all-year.afternoon,1.5564400000000003 +2040,2,gas,all-year.early-peak,0.22977806399999956 +2040,2,gas,all-year.late-peak,2.9744437439999993 +2040,2,gas,all-year.evening,3.8448716000000003 2040,3,gas,all-year.night,-0.0 2040,3,heat,all-year.night,0.0 2040,3,CO2f,all-year.night,0.0 @@ -665,48 +665,48 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,5,heat,all-year.late-peak,1.596 2040,5,electricity,all-year.evening,-0.6384000000000001 2040,5,heat,all-year.evening,1.596 -2040,6,wind,all-year.night,-0.0 -2040,6,electricity,all-year.night,0.0 +2040,6,wind,all-year.night,-0.9320000000000002 +2040,6,electricity,all-year.night,0.9320000000000002 2040,6,wind,all-year.morning,-0.0 2040,6,electricity,all-year.morning,0.0 2040,6,wind,all-year.afternoon,-0.0 2040,6,electricity,all-year.afternoon,0.0 2040,6,wind,all-year.early-peak,-0.0 2040,6,electricity,all-year.early-peak,0.0 -2040,6,wind,all-year.late-peak,-0.0 -2040,6,electricity,all-year.late-peak,0.0 -2040,6,wind,all-year.evening,-1.1172 -2040,6,electricity,all-year.evening,1.1172 -2040,8,gas,all-year.night,-0.43113791199999996 -2040,8,electricity,all-year.night,0.2581664143712575 -2040,8,CO2f,all-year.night,23.666115205413174 -2040,8,gas,all-year.morning,-0.28527113279999966 -2040,8,electricity,all-year.morning,0.17082103760479023 -2040,8,CO2f,all-year.morning,15.65916451723112 +2040,6,wind,all-year.late-peak,-1.1172 +2040,6,electricity,all-year.late-peak,1.1172 +2040,6,wind,all-year.evening,-0.63208 +2040,6,electricity,all-year.evening,0.63208 +2040,8,gas,all-year.night,-0.9041700640000003 +2040,8,electricity,all-year.night,0.5414192000000002 +2040,8,CO2f,all-year.night,49.63189806400002 +2040,8,gas,all-year.morning,-1.066128 +2040,8,electricity,all-year.morning,0.6384 +2040,8,CO2f,all-year.morning,58.522127999999995 2040,8,gas,all-year.afternoon,-1.066128 2040,8,electricity,all-year.afternoon,0.6384 2040,8,CO2f,all-year.afternoon,58.522127999999995 -2040,8,gas,all-year.early-peak,-1.066128 -2040,8,electricity,all-year.early-peak,0.6384 -2040,8,CO2f,all-year.early-peak,58.522127999999995 -2040,8,gas,all-year.late-peak,-0.8859679792000001 -2040,8,electricity,all-year.late-peak,0.5305197480239522 -2040,8,CO2f,all-year.late-peak,48.6327453013557 +2040,8,gas,all-year.early-peak,-0.5227767999999998 +2040,8,electricity,all-year.early-peak,0.31303999999999993 +2040,8,CO2f,all-year.early-peak,28.696376799999992 +2040,8,gas,all-year.late-peak,-0.22172255999999999 +2040,8,electricity,all-year.late-peak,0.132768 +2040,8,CO2f,all-year.late-peak,12.17084256 2040,8,gas,all-year.evening,-1.066128 2040,8,electricity,all-year.evening,0.6384 2040,8,CO2f,all-year.evening,58.522127999999995 -2040,9,wind,all-year.night,-0.30643199999999987 -2040,9,electricity,all-year.night,0.30643199999999987 -2040,9,wind,all-year.morning,-0.30643199999999987 -2040,9,electricity,all-year.morning,0.30643199999999987 +2040,9,wind,all-year.night,-0.0 +2040,9,electricity,all-year.night,0.0 +2040,9,wind,all-year.morning,-0.010852799999999913 +2040,9,electricity,all-year.morning,0.010852799999999913 2040,9,wind,all-year.afternoon,-0.0 2040,9,electricity,all-year.afternoon,0.0 -2040,9,wind,all-year.early-peak,-0.0 -2040,9,electricity,all-year.early-peak,0.0 -2040,9,wind,all-year.late-peak,-0.0 -2040,9,electricity,all-year.late-peak,0.0 -2040,9,wind,all-year.evening,-0.12257280000000004 -2040,9,electricity,all-year.evening,0.12257280000000004 +2040,9,wind,all-year.early-peak,-0.30643199999999987 +2040,9,electricity,all-year.early-peak,0.30643199999999987 +2040,9,wind,all-year.late-peak,-0.30643199999999987 +2040,9,electricity,all-year.late-peak,0.30643199999999987 +2040,9,wind,all-year.evening,-0.11172000000000012 +2040,9,electricity,all-year.evening,0.11172000000000012 2040,10,electricity,all-year.night,-0.1280000000000001 2040,10,heat,all-year.night,0.3200000000000003 2040,10,electricity,all-year.morning,-0.5940000000000002 @@ -731,53 +731,53 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,11,heat,all-year.late-peak,0.49800000000000005 2040,11,electricity,all-year.evening,-0.19920000000000004 2040,11,heat,all-year.evening,0.49800000000000005 -2040,12,wind,all-year.night,-0.9320000000000002 -2040,12,electricity,all-year.night,0.9320000000000002 -2040,12,wind,all-year.morning,-0.0 -2040,12,electricity,all-year.morning,0.0 -2040,12,wind,all-year.afternoon,-0.0 -2040,12,electricity,all-year.afternoon,0.0 +2040,12,wind,all-year.night,-0.0 +2040,12,electricity,all-year.night,0.0 +2040,12,wind,all-year.morning,-0.9380799999999991 +2040,12,electricity,all-year.morning,0.9380799999999991 +2040,12,wind,all-year.afternoon,-0.9320000000000002 +2040,12,electricity,all-year.afternoon,0.9320000000000002 2040,12,wind,all-year.early-peak,-0.0 2040,12,electricity,all-year.early-peak,0.0 -2040,12,wind,all-year.late-peak,-1.5132 -2040,12,electricity,all-year.late-peak,1.5132 -2040,12,wind,all-year.evening,-0.0 -2040,12,electricity,all-year.evening,0.0 +2040,12,wind,all-year.late-peak,-1.6788000000000003 +2040,12,electricity,all-year.late-peak,1.6788000000000003 +2040,12,wind,all-year.evening,-1.2319200000000003 +2040,12,electricity,all-year.evening,1.2319200000000003 2040,13,gas,all-year.night,-0.1398792 2040,13,electricity,all-year.night,0.08376000000000001 2040,13,CO2f,all-year.night,7.678279200000001 2040,13,gas,all-year.morning,-0.1398792 2040,13,electricity,all-year.morning,0.08376000000000001 2040,13,CO2f,all-year.morning,7.678279200000001 -2040,13,gas,all-year.afternoon,-0.0559516800000001 -2040,13,electricity,all-year.afternoon,0.03350400000000006 -2040,13,CO2f,all-year.afternoon,3.0713116800000058 -2040,13,gas,all-year.early-peak,-0.1398792 -2040,13,electricity,all-year.early-peak,0.08376000000000001 -2040,13,CO2f,all-year.early-peak,7.678279200000001 +2040,13,gas,all-year.afternoon,-0.1398792 +2040,13,electricity,all-year.afternoon,0.08376000000000001 +2040,13,CO2f,all-year.afternoon,7.678279200000001 +2040,13,gas,all-year.early-peak,-0.0 +2040,13,electricity,all-year.early-peak,0.0 +2040,13,CO2f,all-year.early-peak,0.0 2040,13,gas,all-year.late-peak,-0.1398792 2040,13,electricity,all-year.late-peak,0.08376000000000001 2040,13,CO2f,all-year.late-peak,7.678279200000001 2040,13,gas,all-year.evening,-0.1398792 2040,13,electricity,all-year.evening,0.08376000000000001 2040,13,CO2f,all-year.evening,7.678279200000001 -2040,14,wind,all-year.night,-0.00032158562874262664 -2040,14,electricity,all-year.night,0.00032158562874262664 -2040,14,wind,all-year.morning,-0.11544000000000014 -2040,14,electricity,all-year.morning,0.11544000000000014 +2040,14,wind,all-year.night,-0.0 +2040,14,electricity,all-year.night,0.0 +2040,14,wind,all-year.morning,-0.046176000000000064 +2040,14,electricity,all-year.morning,0.046176000000000064 2040,14,wind,all-year.afternoon,-0.0 2040,14,electricity,all-year.afternoon,0.0 -2040,14,wind,all-year.early-peak,-0.04585441437125744 -2040,14,electricity,all-year.early-peak,0.04585441437125744 +2040,14,wind,all-year.early-peak,-0.11544000000000014 +2040,14,electricity,all-year.early-peak,0.11544000000000014 2040,14,wind,all-year.late-peak,-0.11544000000000014 2040,14,electricity,all-year.late-peak,0.11544000000000014 2040,14,wind,all-year.evening,-0.0 2040,14,electricity,all-year.evening,0.0 -2040,15,gas,all-year.night,0.4042025760000001 -2040,15,gas,all-year.morning,0.4042025760000001 +2040,15,gas,all-year.night,0.9107534400000002 +2040,15,gas,all-year.morning,0.0 2040,15,gas,all-year.afternoon,0.0 -2040,15,gas,all-year.early-peak,0.0 -2040,15,gas,all-year.late-peak,0.0 +2040,15,gas,all-year.early-peak,0.9107534400000002 +2040,15,gas,all-year.late-peak,0.9107534400000002 2040,15,gas,all-year.evening,0.0 2040,16,electricity,all-year.night,-0.40799999999999986 2040,16,heat,all-year.night,1.0199999999999996 @@ -811,51 +811,51 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,17,CO2f,all-year.evening,47.841850169999965 2040,18,wind,all-year.night,-0.0 2040,18,electricity,all-year.night,0.0 -2040,18,wind,all-year.morning,-1.3980000000000001 -2040,18,electricity,all-year.morning,1.3980000000000001 +2040,18,wind,all-year.morning,-0.4599200000000011 +2040,18,electricity,all-year.morning,0.4599200000000011 2040,18,wind,all-year.afternoon,-0.0 2040,18,electricity,all-year.afternoon,0.0 -2040,18,wind,all-year.early-peak,-1.2808799999999996 -2040,18,electricity,all-year.early-peak,1.2808799999999996 +2040,18,wind,all-year.early-peak,-0.11519999999999997 +2040,18,electricity,all-year.early-peak,0.11519999999999997 2040,18,wind,all-year.late-peak,-0.0 2040,18,electricity,all-year.late-peak,0.0 2040,18,wind,all-year.evening,-0.0 2040,18,electricity,all-year.evening,0.0 2040,19,wind,all-year.night,-0.0 2040,19,electricity,all-year.night,0.0 -2040,19,wind,all-year.morning,-0.07568616239520966 -2040,19,electricity,all-year.morning,0.07568616239520966 +2040,19,wind,all-year.morning,-0.033504000000000006 +2040,19,electricity,all-year.morning,0.033504000000000006 2040,19,wind,all-year.afternoon,-0.0 2040,19,electricity,all-year.afternoon,0.0 -2040,19,wind,all-year.early-peak,-0.06586558562874266 -2040,19,electricity,all-year.early-peak,0.06586558562874266 -2040,19,wind,all-year.late-peak,-0.05947225197604773 -2040,19,electricity,all-year.late-peak,0.05947225197604773 +2040,19,wind,all-year.early-peak,-0.08376000000000001 +2040,19,electricity,all-year.early-peak,0.08376000000000001 +2040,19,wind,all-year.late-peak,-0.08376000000000001 +2040,19,electricity,all-year.late-peak,0.08376000000000001 2040,19,wind,all-year.evening,-0.0 2040,19,electricity,all-year.evening,0.0 2040,20,gas,all-year.night,-0.14808223999999998 2040,20,electricity,all-year.night,0.08867199999999999 2040,20,CO2f,all-year.night,8.128562239999999 -2040,20,gas,all-year.morning,-0.09801697600000014 -2040,20,electricity,all-year.morning,0.05869280000000009 -2040,20,CO2f,all-year.morning,5.380368976000008 -2040,20,gas,all-year.afternoon,-0.10929815999999996 -2040,20,electricity,all-year.afternoon,0.06544799999999998 -2040,20,CO2f,all-year.afternoon,5.999618159999998 -2040,20,gas,all-year.early-peak,-0.14808223999999998 -2040,20,electricity,all-year.early-peak,0.08867199999999999 -2040,20,CO2f,all-year.early-peak,8.128562239999999 +2040,20,gas,all-year.morning,-0.14808223999999998 +2040,20,electricity,all-year.morning,0.08867199999999999 +2040,20,CO2f,all-year.morning,8.128562239999999 +2040,20,gas,all-year.afternoon,-0.14808223999999998 +2040,20,electricity,all-year.afternoon,0.08867199999999999 +2040,20,CO2f,all-year.afternoon,8.128562239999999 +2040,20,gas,all-year.early-peak,-0.05923289600000008 +2040,20,electricity,all-year.early-peak,0.03546880000000005 +2040,20,CO2f,all-year.early-peak,3.2514248960000045 2040,20,gas,all-year.late-peak,-0.14808223999999998 2040,20,electricity,all-year.late-peak,0.08867199999999999 2040,20,CO2f,all-year.late-peak,8.128562239999999 2040,20,gas,all-year.evening,-0.14808223999999998 2040,20,electricity,all-year.evening,0.08867199999999999 2040,20,CO2f,all-year.evening,8.128562239999999 -2040,21,gas,all-year.night,0.0 +2040,21,gas,all-year.night,0.5085346559999999 2040,21,gas,all-year.morning,0.0 -2040,21,gas,all-year.afternoon,1.5564400000000003 -2040,21,gas,all-year.early-peak,1.7275446432000001 -2040,21,gas,all-year.late-peak,1.7275446432000001 +2040,21,gas,all-year.afternoon,0.0 +2040,21,gas,all-year.early-peak,0.5085346559999999 +2040,21,gas,all-year.late-peak,0.5085346559999999 2040,21,gas,all-year.evening,0.0 2040,22,electricity,all-year.night,-0.39600000000000013 2040,22,heat,all-year.night,0.9900000000000002 @@ -903,56 +903,56 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,25,electricity,all-year.night,0.0 2040,25,wind,all-year.morning,-0.0 2040,25,electricity,all-year.morning,0.0 -2040,25,wind,all-year.afternoon,-0.9320000000000002 -2040,25,electricity,all-year.afternoon,0.9320000000000002 -2040,25,wind,all-year.early-peak,-0.11712000000000056 -2040,25,electricity,all-year.early-peak,0.11712000000000056 -2040,25,wind,all-year.late-peak,-1.2828000000000002 -2040,25,electricity,all-year.late-peak,1.2828000000000002 -2040,25,wind,all-year.evening,-0.7468000000000004 -2040,25,electricity,all-year.evening,0.7468000000000004 +2040,25,wind,all-year.afternoon,-0.0 +2040,25,electricity,all-year.afternoon,0.0 +2040,25,wind,all-year.early-peak,-1.2828000000000002 +2040,25,electricity,all-year.early-peak,1.2828000000000002 +2040,25,wind,all-year.late-peak,-0.0 +2040,25,electricity,all-year.late-peak,0.0 +2040,25,wind,all-year.evening,-0.0 +2040,25,electricity,all-year.evening,0.0 2040,26,gas,all-year.night,-0.3250621600000001 2040,26,electricity,all-year.night,0.19464800000000007 2040,26,CO2f,all-year.night,17.843382160000008 2040,26,gas,all-year.morning,-0.3250621600000001 2040,26,electricity,all-year.morning,0.19464800000000007 2040,26,CO2f,all-year.morning,17.843382160000008 -2040,26,gas,all-year.afternoon,-0.3250621600000001 -2040,26,electricity,all-year.afternoon,0.19464800000000007 -2040,26,CO2f,all-year.afternoon,17.843382160000008 -2040,26,gas,all-year.early-peak,-0.3250621600000001 -2040,26,electricity,all-year.early-peak,0.19464800000000007 -2040,26,CO2f,all-year.early-peak,17.843382160000008 +2040,26,gas,all-year.afternoon,-0.20235056000000018 +2040,26,electricity,all-year.afternoon,0.12116800000000011 +2040,26,CO2f,all-year.afternoon,11.10747056000001 +2040,26,gas,all-year.early-peak,-0.25273646399999994 +2040,26,electricity,all-year.early-peak,0.15133919999999998 +2040,26,CO2f,all-year.early-peak,13.873264463999998 2040,26,gas,all-year.late-peak,-0.3250621600000001 2040,26,electricity,all-year.late-peak,0.19464800000000007 2040,26,CO2f,all-year.late-peak,17.843382160000008 -2040,26,gas,all-year.evening,-0.12036558400000019 -2040,26,electricity,all-year.evening,0.07207520000000012 -2040,26,CO2f,all-year.evening,6.607133584000011 -2040,27,wind,all-year.night,-0.0 -2040,27,electricity,all-year.night,0.0 -2040,27,wind,all-year.morning,-0.11172000000000001 -2040,27,electricity,all-year.morning,0.11172000000000001 +2040,26,gas,all-year.evening,-0.3250621600000001 +2040,26,electricity,all-year.evening,0.19464800000000007 +2040,26,CO2f,all-year.evening,17.843382160000008 +2040,27,wind,all-year.night,-0.023500799999999863 +2040,27,electricity,all-year.night,0.023500799999999863 +2040,27,wind,all-year.morning,-0.021187200000000142 +2040,27,electricity,all-year.morning,0.021187200000000142 2040,27,wind,all-year.afternoon,-0.0 2040,27,electricity,all-year.afternoon,0.0 -2040,27,wind,all-year.early-peak,-0.0 -2040,27,electricity,all-year.early-peak,0.0 -2040,27,wind,all-year.late-peak,-0.044688000000000005 -2040,27,electricity,all-year.late-peak,0.044688000000000005 -2040,27,wind,all-year.evening,-0.11172000000000001 -2040,27,electricity,all-year.evening,0.11172000000000001 -2040,28,gas,all-year.night,0.639958936 -2040,28,gas,all-year.morning,0.639958936 +2040,27,wind,all-year.early-peak,-0.11172000000000001 +2040,27,electricity,all-year.early-peak,0.11172000000000001 +2040,27,wind,all-year.late-peak,-0.11172000000000001 +2040,27,electricity,all-year.late-peak,0.11172000000000001 +2040,27,wind,all-year.evening,-0.0 +2040,27,electricity,all-year.evening,0.0 +2040,28,gas,all-year.night,0.0 +2040,28,gas,all-year.morning,1.30953432 2040,28,gas,all-year.afternoon,0.0 -2040,28,gas,all-year.early-peak,0.639958936 -2040,28,gas,all-year.late-peak,0.639958936 +2040,28,gas,all-year.early-peak,0.0 +2040,28,gas,all-year.late-peak,1.30953432 2040,28,gas,all-year.evening,0.0 2045,2,gas,all-year.night,0.0 -2045,2,gas,all-year.morning,0.0 -2045,2,gas,all-year.afternoon,0.0 -2045,2,gas,all-year.early-peak,3.2542440000000004 -2045,2,gas,all-year.late-peak,2.3587717967999993 -2045,2,gas,all-year.evening,0.0 +2045,2,gas,all-year.morning,1.3513149279999992 +2045,2,gas,all-year.afternoon,0.4673456799999999 +2045,2,gas,all-year.early-peak,0.0 +2045,2,gas,all-year.late-peak,4.000008 +2045,2,gas,all-year.evening,0.6740393839999997 2045,3,gas,all-year.night,-0.0 2045,3,heat,all-year.night,0.0 2045,3,CO2f,all-year.night,0.0 @@ -968,9 +968,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,3,gas,all-year.late-peak,-3.67334068 2045,3,heat,all-year.late-peak,3.1666730000000003 2045,3,CO2f,all-year.late-peak,204.91540983 -2045,3,gas,all-year.evening,-0.5877406799999999 -2045,3,heat,all-year.evening,0.5066729999999999 -2045,3,CO2f,all-year.evening,32.786809829999996 +2045,3,gas,all-year.evening,-0.5877406800000001 +2045,3,heat,all-year.evening,0.5066730000000002 +2045,3,CO2f,all-year.evening,32.78680983000001 2045,4,electricity,all-year.night,-0.0 2045,4,heat,all-year.night,0.0 2045,4,electricity,all-year.morning,-0.0 @@ -1001,40 +1001,40 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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.0 -2045,6,electricity,all-year.early-peak,0.0 +2045,6,wind,all-year.early-peak,-1.1172 +2045,6,electricity,all-year.early-peak,1.1172 2045,6,wind,all-year.late-peak,-0.0 2045,6,electricity,all-year.late-peak,0.0 2045,6,wind,all-year.evening,-0.0 2045,6,electricity,all-year.evening,0.0 -2045,8,gas,all-year.night,-1.066128 -2045,8,electricity,all-year.night,0.6384 -2045,8,CO2f,all-year.night,58.522127999999995 -2045,8,gas,all-year.morning,-0.9100417552000004 -2045,8,electricity,all-year.morning,0.5449351827544913 -2045,8,CO2f,all-year.morning,49.954208203104216 -2045,8,gas,all-year.afternoon,-1.066128 -2045,8,electricity,all-year.afternoon,0.6384 -2045,8,CO2f,all-year.afternoon,58.522127999999995 -2045,8,gas,all-year.early-peak,-0.9506308000000003 -2045,8,electricity,all-year.early-peak,0.5692400000000002 -2045,8,CO2f,all-year.early-peak,52.18223080000002 -2045,8,gas,all-year.late-peak,-0.2448634447999993 -2045,8,electricity,all-year.late-peak,0.14662481724550858 -2045,8,CO2f,all-year.late-peak,13.441096996895771 -2045,8,gas,all-year.evening,-0.0 -2045,8,electricity,all-year.evening,0.0 -2045,8,CO2f,all-year.evening,0.0 -2045,9,wind,all-year.night,-0.0 -2045,9,electricity,all-year.night,0.0 -2045,9,wind,all-year.morning,-0.1198888172455086 -2045,9,electricity,all-year.morning,0.1198888172455086 -2045,9,wind,all-year.afternoon,-0.002683982754491443 -2045,9,electricity,all-year.afternoon,0.002683982754491443 +2045,8,gas,all-year.night,-0.9756900479999987 +2045,8,electricity,all-year.night,0.5842455377245501 +2045,8,CO2f,all-year.night,53.55778844320951 +2045,8,gas,all-year.morning,-0.9506308000000003 +2045,8,electricity,all-year.morning,0.5692400000000002 +2045,8,CO2f,all-year.morning,52.18223080000002 +2045,8,gas,all-year.afternoon,-0.8617868000000001 +2045,8,electricity,all-year.afternoon,0.51604 +2045,8,CO2f,all-year.afternoon,47.30538680000001 +2045,8,gas,all-year.early-peak,-1.066128 +2045,8,electricity,all-year.early-peak,0.6384 +2045,8,CO2f,all-year.early-peak,58.522127999999995 +2045,8,gas,all-year.late-peak,-0.0 +2045,8,electricity,all-year.late-peak,0.0 +2045,8,CO2f,all-year.late-peak,0.0 +2045,8,gas,all-year.evening,-0.021042000000000092 +2045,8,electricity,all-year.evening,0.012600000000000056 +2045,8,CO2f,all-year.evening,1.155042000000005 +2045,9,wind,all-year.night,-0.16073846227544974 +2045,9,electricity,all-year.night,0.16073846227544974 +2045,9,wind,all-year.morning,-0.0 +2045,9,electricity,all-year.morning,0.0 +2045,9,wind,all-year.afternoon,-0.0 +2045,9,electricity,all-year.afternoon,0.0 2045,9,wind,all-year.early-peak,-0.0 2045,9,electricity,all-year.early-peak,0.0 -2045,9,wind,all-year.late-peak,-0.30643199999999987 -2045,9,electricity,all-year.late-peak,0.30643199999999987 +2045,9,wind,all-year.late-peak,-0.26826633772455016 +2045,9,electricity,all-year.late-peak,0.26826633772455016 2045,9,wind,all-year.evening,-0.30643199999999987 2045,9,electricity,all-year.evening,0.30643199999999987 2045,10,electricity,all-year.night,-0.0 @@ -1067,34 +1067,34 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,12,electricity,all-year.morning,0.0 2045,12,wind,all-year.afternoon,-0.0 2045,12,electricity,all-year.afternoon,0.0 -2045,12,wind,all-year.early-peak,-1.5960000000000003 -2045,12,electricity,all-year.early-peak,1.5960000000000003 -2045,12,wind,all-year.late-peak,-1.9919999999999998 -2045,12,electricity,all-year.late-peak,1.9919999999999998 -2045,12,wind,all-year.evening,-0.0 -2045,12,electricity,all-year.evening,0.0 +2045,12,wind,all-year.early-peak,-0.3015199999999984 +2045,12,electricity,all-year.early-peak,0.3015199999999984 +2045,12,wind,all-year.late-peak,-0.0 +2045,12,electricity,all-year.late-peak,0.0 +2045,12,wind,all-year.evening,-1.9919999999999998 +2045,12,electricity,all-year.evening,1.9919999999999998 2045,13,gas,all-year.night,-0.0 2045,13,electricity,all-year.night,0.0 2045,13,CO2f,all-year.night,0.0 -2045,13,gas,all-year.morning,-0.0 -2045,13,electricity,all-year.morning,0.0 -2045,13,CO2f,all-year.morning,0.0 -2045,13,gas,all-year.afternoon,-0.0 -2045,13,electricity,all-year.afternoon,0.0 -2045,13,CO2f,all-year.afternoon,0.0 +2045,13,gas,all-year.morning,-0.1398792 +2045,13,electricity,all-year.morning,0.08376000000000001 +2045,13,CO2f,all-year.morning,7.678279200000001 +2045,13,gas,all-year.afternoon,-0.1398792 +2045,13,electricity,all-year.afternoon,0.08376000000000001 +2045,13,CO2f,all-year.afternoon,7.678279200000001 2045,13,gas,all-year.early-peak,-0.1398792 2045,13,electricity,all-year.early-peak,0.08376000000000001 2045,13,CO2f,all-year.early-peak,7.678279200000001 2045,13,gas,all-year.late-peak,-0.1398792 2045,13,electricity,all-year.late-peak,0.08376000000000001 2045,13,CO2f,all-year.late-peak,7.678279200000001 -2045,13,gas,all-year.evening,-0.1398792 -2045,13,electricity,all-year.evening,0.08376000000000001 -2045,13,CO2f,all-year.evening,7.678279200000001 -2045,14,wind,all-year.night,-0.0 -2045,14,electricity,all-year.night,0.0 -2045,14,wind,all-year.morning,-0.046176000000000064 -2045,14,electricity,all-year.morning,0.046176000000000064 +2045,13,gas,all-year.evening,-0.0 +2045,13,electricity,all-year.evening,0.0 +2045,13,CO2f,all-year.evening,0.0 +2045,14,wind,all-year.night,-0.046176000000000064 +2045,14,electricity,all-year.night,0.046176000000000064 +2045,14,wind,all-year.morning,-0.0 +2045,14,electricity,all-year.morning,0.0 2045,14,wind,all-year.afternoon,-0.0 2045,14,electricity,all-year.afternoon,0.0 2045,14,wind,all-year.early-peak,-0.0 @@ -1103,12 +1103,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,14,electricity,all-year.late-peak,0.11544000000000014 2045,14,wind,all-year.evening,-0.11544000000000014 2045,14,electricity,all-year.evening,0.11544000000000014 -2045,15,gas,all-year.night,0.24226419199999982 -2045,15,gas,all-year.morning,0.4042025760000001 +2045,15,gas,all-year.night,0.0 +2045,15,gas,all-year.morning,0.0 2045,15,gas,all-year.afternoon,0.0 -2045,15,gas,all-year.early-peak,0.0 -2045,15,gas,all-year.late-peak,0.4042025760000001 -2045,15,gas,all-year.evening,0.0 +2045,15,gas,all-year.early-peak,0.9107534400000002 +2045,15,gas,all-year.late-peak,0.9107534400000002 +2045,15,gas,all-year.evening,0.9107534400000002 2045,16,electricity,all-year.night,-0.2719999999999999 2045,16,heat,all-year.night,0.6799999999999997 2045,16,electricity,all-year.morning,-0.40799999999999986 @@ -1141,20 +1141,20 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,17,CO2f,all-year.evening,47.841850169999965 2045,18,wind,all-year.night,-0.0 2045,18,electricity,all-year.night,0.0 -2045,18,wind,all-year.morning,-0.14879999999999938 -2045,18,electricity,all-year.morning,0.14879999999999938 +2045,18,wind,all-year.morning,-1.5960000000000003 +2045,18,electricity,all-year.morning,1.5960000000000003 2045,18,wind,all-year.afternoon,-0.0 2045,18,electricity,all-year.afternoon,0.0 2045,18,wind,all-year.early-peak,-0.0 2045,18,electricity,all-year.early-peak,0.0 -2045,18,wind,all-year.late-peak,-1.2000000000000006 -2045,18,electricity,all-year.late-peak,1.2000000000000006 +2045,18,wind,all-year.late-peak,-2.16 +2045,18,electricity,all-year.late-peak,2.16 2045,18,wind,all-year.evening,-0.0 2045,18,electricity,all-year.evening,0.0 -2045,19,wind,all-year.night,-0.0 -2045,19,electricity,all-year.night,0.0 -2045,19,wind,all-year.morning,-0.033504000000000006 -2045,19,electricity,all-year.morning,0.033504000000000006 +2045,19,wind,all-year.night,-0.033504000000000006 +2045,19,electricity,all-year.night,0.033504000000000006 +2045,19,wind,all-year.morning,-0.0 +2045,19,electricity,all-year.morning,0.0 2045,19,wind,all-year.afternoon,-0.0 2045,19,electricity,all-year.afternoon,0.0 2045,19,wind,all-year.early-peak,-0.0 @@ -1163,9 +1163,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,19,electricity,all-year.late-peak,0.08376000000000001 2045,19,wind,all-year.evening,-0.08376000000000001 2045,19,electricity,all-year.evening,0.08376000000000001 -2045,20,gas,all-year.night,-0.14808223999999998 -2045,20,electricity,all-year.night,0.08867199999999999 -2045,20,CO2f,all-year.night,8.128562239999999 +2045,20,gas,all-year.night,-0.0 +2045,20,electricity,all-year.night,0.0 +2045,20,CO2f,all-year.night,0.0 2045,20,gas,all-year.morning,-0.14808223999999998 2045,20,electricity,all-year.morning,0.08867199999999999 2045,20,CO2f,all-year.morning,8.128562239999999 @@ -1175,18 +1175,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,20,gas,all-year.early-peak,-0.14808223999999998 2045,20,electricity,all-year.early-peak,0.08867199999999999 2045,20,CO2f,all-year.early-peak,8.128562239999999 -2045,20,gas,all-year.late-peak,-0.0 -2045,20,electricity,all-year.late-peak,0.0 -2045,20,CO2f,all-year.late-peak,0.0 -2045,20,gas,all-year.evening,-0.14808223999999998 -2045,20,electricity,all-year.evening,0.08867199999999999 -2045,20,CO2f,all-year.evening,8.128562239999999 +2045,20,gas,all-year.late-peak,-0.14808223999999998 +2045,20,electricity,all-year.late-peak,0.08867199999999999 +2045,20,CO2f,all-year.late-peak,8.128562239999999 +2045,20,gas,all-year.evening,-0.0 +2045,20,electricity,all-year.evening,0.0 +2045,20,CO2f,all-year.evening,0.0 2045,21,gas,all-year.night,0.0 -2045,21,gas,all-year.morning,1.7275446432000001 -2045,21,gas,all-year.afternoon,1.7275446432000001 -2045,21,gas,all-year.early-peak,0.0 -2045,21,gas,all-year.late-peak,1.7275446432000001 -2045,21,gas,all-year.evening,1.7275446432000001 +2045,21,gas,all-year.morning,0.0 +2045,21,gas,all-year.afternoon,0.0 +2045,21,gas,all-year.early-peak,0.5085346559999999 +2045,21,gas,all-year.late-peak,0.5085346559999999 +2045,21,gas,all-year.evening,0.0 2045,22,electricity,all-year.night,-0.39600000000000013 2045,22,heat,all-year.night,0.9900000000000002 2045,22,electricity,all-year.morning,-0.39600000000000013 @@ -1229,54 +1229,54 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,24,gas,all-year.evening,-0.3375600000000004 2045,24,heat,all-year.evening,0.29100000000000037 2045,24,CO2f,all-year.evening,18.83061000000002 -2045,25,wind,all-year.night,-1.064 -2045,25,electricity,all-year.night,1.064 +2045,25,wind,all-year.night,-0.0 +2045,25,electricity,all-year.night,0.0 2045,25,wind,all-year.morning,-0.0 2045,25,electricity,all-year.morning,0.0 -2045,25,wind,all-year.afternoon,-1.064 -2045,25,electricity,all-year.afternoon,1.064 +2045,25,wind,all-year.afternoon,-0.0 +2045,25,electricity,all-year.afternoon,0.0 2045,25,wind,all-year.early-peak,-0.0 2045,25,electricity,all-year.early-peak,0.0 2045,25,wind,all-year.late-peak,-0.0 2045,25,electricity,all-year.late-peak,0.0 -2045,25,wind,all-year.evening,-0.6807999999999994 -2045,25,electricity,all-year.evening,0.6807999999999994 -2045,26,gas,all-year.night,-0.2606001600000002 -2045,26,electricity,all-year.night,0.15604800000000013 -2045,26,CO2f,all-year.night,14.304920160000012 +2045,25,wind,all-year.evening,-0.0 +2045,25,electricity,all-year.evening,0.0 +2045,26,gas,all-year.night,-0.3250621600000001 +2045,26,electricity,all-year.night,0.19464800000000007 +2045,26,CO2f,all-year.night,17.843382160000008 2045,26,gas,all-year.morning,-0.3250621600000001 2045,26,electricity,all-year.morning,0.19464800000000007 2045,26,CO2f,all-year.morning,17.843382160000008 -2045,26,gas,all-year.afternoon,-0.2561179087999995 -2045,26,electricity,all-year.afternoon,0.1533640172455087 -2045,26,CO2f,all-year.afternoon,14.058879460895781 -2045,26,gas,all-year.early-peak,-0.3250621600000001 -2045,26,electricity,all-year.early-peak,0.19464800000000007 -2045,26,CO2f,all-year.early-peak,17.843382160000008 -2045,26,gas,all-year.late-peak,-0.2634311152000007 -2045,26,electricity,all-year.late-peak,0.15774318275449142 -2045,26,CO2f,all-year.late-peak,14.46031756310423 +2045,26,gas,all-year.afternoon,-0.3250621600000001 +2045,26,electricity,all-year.afternoon,0.19464800000000007 +2045,26,CO2f,all-year.afternoon,17.843382160000008 +2045,26,gas,all-year.early-peak,-0.13493600000000042 +2045,26,electricity,all-year.early-peak,0.08080000000000026 +2045,26,CO2f,all-year.early-peak,7.406936000000024 +2045,26,gas,all-year.late-peak,-0.12187937600000122 +2045,26,electricity,all-year.late-peak,0.07298166227544983 +2045,26,CO2f,all-year.late-peak,6.6902289807904864 2045,26,gas,all-year.evening,-0.3250621600000001 2045,26,electricity,all-year.evening,0.19464800000000007 2045,26,CO2f,all-year.evening,17.843382160000008 2045,27,wind,all-year.night,-0.0 2045,27,electricity,all-year.night,0.0 -2045,27,wind,all-year.morning,-0.044688000000000005 -2045,27,electricity,all-year.morning,0.044688000000000005 +2045,27,wind,all-year.morning,-0.0 +2045,27,electricity,all-year.morning,0.0 2045,27,wind,all-year.afternoon,-0.0 2045,27,electricity,all-year.afternoon,0.0 -2045,27,wind,all-year.early-peak,-0.0 -2045,27,electricity,all-year.early-peak,0.0 +2045,27,wind,all-year.early-peak,-0.044688000000000005 +2045,27,electricity,all-year.early-peak,0.044688000000000005 2045,27,wind,all-year.late-peak,-0.11172000000000001 2045,27,electricity,all-year.late-peak,0.11172000000000001 2045,27,wind,all-year.evening,-0.11172000000000001 2045,27,electricity,all-year.evening,0.11172000000000001 -2045,28,gas,all-year.night,0.0 -2045,28,gas,all-year.morning,0.639958936 -2045,28,gas,all-year.afternoon,0.0 -2045,28,gas,all-year.early-peak,0.0 -2045,28,gas,all-year.late-peak,0.639958936 -2045,28,gas,all-year.evening,0.639958936 +2045,28,gas,all-year.night,0.6155855919999986 +2045,28,gas,all-year.morning,1.2177624560000009 +2045,28,gas,all-year.afternoon,1.30953432 +2045,28,gas,all-year.early-peak,1.30953432 +2045,28,gas,all-year.late-peak,1.30953432 +2045,28,gas,all-year.evening,1.30953432 2045,29,electricity,all-year.night,-0.39600000000000013 2045,29,heat,all-year.night,0.9900000000000002 2045,29,electricity,all-year.morning,-0.39600000000000013 @@ -1307,22 +1307,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,30,gas,all-year.evening,-1.1484 2045,30,heat,all-year.evening,0.9900000000000002 2045,30,CO2f,all-year.evening,64.06290000000001 -2045,31,wind,all-year.night,-0.0 -2045,31,electricity,all-year.night,0.0 -2045,31,wind,all-year.morning,-1.447200000000001 -2045,31,electricity,all-year.morning,1.447200000000001 -2045,31,wind,all-year.afternoon,-0.0 -2045,31,electricity,all-year.afternoon,0.0 -2045,31,wind,all-year.early-peak,-0.0 -2045,31,electricity,all-year.early-peak,0.0 -2045,31,wind,all-year.late-peak,-0.0 -2045,31,electricity,all-year.late-peak,0.0 -2045,31,wind,all-year.evening,-1.447200000000001 -2045,31,electricity,all-year.evening,1.447200000000001 -2045,32,wind,all-year.night,-0.0 -2045,32,electricity,all-year.night,0.0 -2045,32,wind,all-year.morning,-0.044688000000000005 -2045,32,electricity,all-year.morning,0.044688000000000005 +2045,31,wind,all-year.night,-1.064 +2045,31,electricity,all-year.night,1.064 +2045,31,wind,all-year.morning,-0.0 +2045,31,electricity,all-year.morning,0.0 +2045,31,wind,all-year.afternoon,-1.064 +2045,31,electricity,all-year.afternoon,1.064 +2045,31,wind,all-year.early-peak,-0.17728000000000188 +2045,31,electricity,all-year.early-peak,0.17728000000000188 +2045,31,wind,all-year.late-peak,-1.032 +2045,31,electricity,all-year.late-peak,1.032 +2045,31,wind,all-year.evening,-0.13600000000000062 +2045,31,electricity,all-year.evening,0.13600000000000062 +2045,32,wind,all-year.night,-0.044688000000000005 +2045,32,electricity,all-year.night,0.044688000000000005 +2045,32,wind,all-year.morning,-0.0 +2045,32,electricity,all-year.morning,0.0 2045,32,wind,all-year.afternoon,-0.0 2045,32,electricity,all-year.afternoon,0.0 2045,32,wind,all-year.early-peak,-0.0 @@ -1331,36 +1331,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,32,electricity,all-year.late-peak,0.11172000000000001 2045,32,wind,all-year.evening,-0.11172000000000001 2045,32,electricity,all-year.evening,0.11172000000000001 -2045,33,gas,all-year.night,-0.3020695999999999 -2045,33,electricity,all-year.night,0.18087999999999993 -2045,33,CO2f,all-year.night,16.581269599999995 -2045,33,gas,all-year.morning,-0.0 -2045,33,electricity,all-year.morning,0.0 -2045,33,CO2f,all-year.morning,0.0 +2045,33,gas,all-year.night,-0.0 +2045,33,electricity,all-year.night,0.0 +2045,33,CO2f,all-year.night,0.0 +2045,33,gas,all-year.morning,-0.3020695999999999 +2045,33,electricity,all-year.morning,0.18087999999999993 +2045,33,CO2f,all-year.morning,16.581269599999995 2045,33,gas,all-year.afternoon,-0.3020695999999999 2045,33,electricity,all-year.afternoon,0.18087999999999993 2045,33,CO2f,all-year.afternoon,16.581269599999995 2045,33,gas,all-year.early-peak,-0.3020695999999999 2045,33,electricity,all-year.early-peak,0.18087999999999993 2045,33,CO2f,all-year.early-peak,16.581269599999995 -2045,33,gas,all-year.late-peak,-0.0 -2045,33,electricity,all-year.late-peak,0.0 -2045,33,CO2f,all-year.late-peak,0.0 -2045,33,gas,all-year.evening,-0.03515016000000016 -2045,33,electricity,all-year.evening,0.021048000000000094 -2045,33,CO2f,all-year.evening,1.9294701600000086 -2045,34,gas,all-year.night,1.534615808 -2045,34,gas,all-year.morning,0.0 -2045,34,gas,all-year.afternoon,0.044853105599999166 -2045,34,gas,all-year.early-peak,0.0 -2045,34,gas,all-year.late-peak,1.534615808 -2045,34,gas,all-year.evening,1.2119901808 +2045,33,gas,all-year.late-peak,-0.3020695999999999 +2045,33,electricity,all-year.late-peak,0.18087999999999993 +2045,33,CO2f,all-year.late-peak,16.581269599999995 +2045,33,gas,all-year.evening,-0.3020695999999999 +2045,33,electricity,all-year.evening,0.18087999999999993 +2045,33,CO2f,all-year.evening,16.581269599999995 +2045,34,gas,all-year.night,0.6851666160000002 +2045,34,gas,all-year.morning,0.6851666160000002 +2045,34,gas,all-year.afternoon,0.0 +2045,34,gas,all-year.early-peak,0.450792624 +2045,34,gas,all-year.late-peak,0.0 +2045,34,gas,all-year.evening,0.6851666160000002 2050,2,gas,all-year.night,0.0 -2050,2,gas,all-year.morning,1.2682464767999992 -2050,2,gas,all-year.afternoon,2.004 -2050,2,gas,all-year.early-peak,0.6282875407999993 -2050,2,gas,all-year.late-peak,4.000008 -2050,2,gas,all-year.evening,1.4736306687999994 +2050,2,gas,all-year.morning,2.9957911199999994 +2050,2,gas,all-year.afternoon,0.18593102399999983 +2050,2,gas,all-year.early-peak,2.4872564639999997 +2050,2,gas,all-year.late-peak,3.4981199279999986 +2050,2,gas,all-year.evening,1.5299577360000003 2050,3,gas,all-year.night,-0.0 2050,3,heat,all-year.night,0.0 2050,3,CO2f,all-year.night,0.0 @@ -1373,9 +1373,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,3,gas,all-year.early-peak,-0.0 2050,3,heat,all-year.early-peak,0.0 2050,3,CO2f,all-year.early-peak,0.0 -2050,3,gas,all-year.late-peak,-3.673340680000001 -2050,3,heat,all-year.late-peak,3.1666730000000007 -2050,3,CO2f,all-year.late-peak,204.91540983000002 +2050,3,gas,all-year.late-peak,-3.67334068 +2050,3,heat,all-year.late-peak,3.1666730000000003 +2050,3,CO2f,all-year.late-peak,204.91540983 2050,3,gas,all-year.evening,-0.1933406800000006 2050,3,heat,all-year.evening,0.16667300000000052 2050,3,CO2f,all-year.evening,10.785409830000033 @@ -1405,19 +1405,19 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,5,heat,all-year.evening,1.596 2050,6,wind,all-year.night,-1.1172 2050,6,electricity,all-year.night,1.1172 -2050,6,wind,all-year.morning,-0.3527999999999993 -2050,6,electricity,all-year.morning,0.3527999999999993 +2050,6,wind,all-year.morning,-0.0 +2050,6,electricity,all-year.morning,0.0 2050,6,wind,all-year.afternoon,-0.0 2050,6,electricity,all-year.afternoon,0.0 2050,6,wind,all-year.early-peak,-0.0 2050,6,electricity,all-year.early-peak,0.0 2050,6,wind,all-year.late-peak,-0.0 2050,6,electricity,all-year.late-peak,0.0 -2050,6,wind,all-year.evening,-0.2112000000000005 -2050,6,electricity,all-year.evening,0.2112000000000005 -2050,8,gas,all-year.night,-0.612120464000001 -2050,8,electricity,all-year.night,0.3665392000000006 -2050,8,CO2f,all-year.night,33.60064846400006 +2050,6,wind,all-year.evening,-0.4080000000000006 +2050,6,electricity,all-year.evening,0.4080000000000006 +2050,8,gas,all-year.night,-1.066128 +2050,8,electricity,all-year.night,0.6384 +2050,8,CO2f,all-year.night,58.522127999999995 2050,8,gas,all-year.morning,-1.066128 2050,8,electricity,all-year.morning,0.6384 2050,8,CO2f,all-year.morning,58.522127999999995 @@ -1427,24 +1427,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,8,gas,all-year.early-peak,-1.066128 2050,8,electricity,all-year.early-peak,0.6384 2050,8,CO2f,all-year.early-peak,58.522127999999995 -2050,8,gas,all-year.late-peak,-0.0 -2050,8,electricity,all-year.late-peak,0.0 -2050,8,CO2f,all-year.late-peak,0.0 -2050,8,gas,all-year.evening,-1.066128 -2050,8,electricity,all-year.evening,0.6384 -2050,8,CO2f,all-year.evening,58.522127999999995 -2050,9,wind,all-year.night,-0.30058079999999976 -2050,9,electricity,all-year.night,0.30058079999999976 +2050,8,gas,all-year.late-peak,-0.2910475999999998 +2050,8,electricity,all-year.late-peak,0.17427999999999988 +2050,8,CO2f,all-year.late-peak,15.97624759999999 +2050,8,gas,all-year.evening,-0.21838780800000093 +2050,8,electricity,all-year.evening,0.13077114251497063 +2050,8,CO2f,all-year.evening,11.987790634347357 +2050,9,wind,all-year.night,-0.0 +2050,9,electricity,all-year.night,0.0 2050,9,wind,all-year.morning,-0.0 2050,9,electricity,all-year.morning,0.0 2050,9,wind,all-year.afternoon,-0.0 2050,9,electricity,all-year.afternoon,0.0 -2050,9,wind,all-year.early-peak,-0.0 -2050,9,electricity,all-year.early-peak,0.0 +2050,9,wind,all-year.early-peak,-0.12257280000000004 +2050,9,electricity,all-year.early-peak,0.12257280000000004 2050,9,wind,all-year.late-peak,-0.30643199999999987 2050,9,electricity,all-year.late-peak,0.30643199999999987 -2050,9,wind,all-year.evening,-0.12842400000000012 -2050,9,electricity,all-year.evening,0.12842400000000012 +2050,9,wind,all-year.evening,-0.30643199999999987 +2050,9,electricity,all-year.evening,0.30643199999999987 2050,10,electricity,all-year.night,-0.0 2050,10,heat,all-year.night,0.0 2050,10,electricity,all-year.morning,-0.19200000000000017 @@ -1469,54 +1469,54 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,11,heat,all-year.late-peak,0.49800000000000005 2050,11,electricity,all-year.evening,-0.19920000000000004 2050,11,heat,all-year.evening,0.49800000000000005 -2050,12,wind,all-year.night,-0.08280000000000015 -2050,12,electricity,all-year.night,0.08280000000000015 -2050,12,wind,all-year.morning,-0.0 -2050,12,electricity,all-year.morning,0.0 +2050,12,wind,all-year.night,-0.0 +2050,12,electricity,all-year.night,0.0 +2050,12,wind,all-year.morning,-0.5172000000000001 +2050,12,electricity,all-year.morning,0.5172000000000001 2050,12,wind,all-year.afternoon,-0.0 2050,12,electricity,all-year.afternoon,0.0 -2050,12,wind,all-year.early-peak,-1.8000000000000003 -2050,12,electricity,all-year.early-peak,1.8000000000000003 +2050,12,wind,all-year.early-peak,-0.0 +2050,12,electricity,all-year.early-peak,0.0 2050,12,wind,all-year.late-peak,-1.9919999999999998 2050,12,electricity,all-year.late-peak,1.9919999999999998 -2050,12,wind,all-year.evening,-0.9059999999999997 -2050,12,electricity,all-year.evening,0.9059999999999997 +2050,12,wind,all-year.evening,-1.9919999999999998 +2050,12,electricity,all-year.evening,1.9919999999999998 2050,13,gas,all-year.night,-0.1398792 2050,13,electricity,all-year.night,0.08376000000000001 2050,13,CO2f,all-year.night,7.678279200000001 2050,13,gas,all-year.morning,-0.1398792 2050,13,electricity,all-year.morning,0.08376000000000001 2050,13,CO2f,all-year.morning,7.678279200000001 -2050,13,gas,all-year.afternoon,-0.08420808000000013 -2050,13,electricity,all-year.afternoon,0.05042400000000008 -2050,13,CO2f,all-year.afternoon,4.622368080000007 +2050,13,gas,all-year.afternoon,-0.1398792 +2050,13,electricity,all-year.afternoon,0.08376000000000001 +2050,13,CO2f,all-year.afternoon,7.678279200000001 2050,13,gas,all-year.early-peak,-0.1398792 2050,13,electricity,all-year.early-peak,0.08376000000000001 2050,13,CO2f,all-year.early-peak,7.678279200000001 -2050,13,gas,all-year.late-peak,-0.1116228 -2050,13,electricity,all-year.late-peak,0.06684 -2050,13,CO2f,all-year.late-peak,6.1272228 -2050,13,gas,all-year.evening,-0.1398792 -2050,13,electricity,all-year.evening,0.08376000000000001 -2050,13,CO2f,all-year.evening,7.678279200000001 +2050,13,gas,all-year.late-peak,-0.1398792 +2050,13,electricity,all-year.late-peak,0.08376000000000001 +2050,13,CO2f,all-year.late-peak,7.678279200000001 +2050,13,gas,all-year.evening,-0.0 +2050,13,electricity,all-year.evening,0.0 +2050,13,CO2f,all-year.evening,0.0 2050,14,wind,all-year.night,-0.0 2050,14,electricity,all-year.night,0.0 -2050,14,wind,all-year.morning,-0.046176000000000064 -2050,14,electricity,all-year.morning,0.046176000000000064 +2050,14,wind,all-year.morning,-0.0 +2050,14,electricity,all-year.morning,0.0 2050,14,wind,all-year.afternoon,-0.0 2050,14,electricity,all-year.afternoon,0.0 -2050,14,wind,all-year.early-peak,-0.0 -2050,14,electricity,all-year.early-peak,0.0 +2050,14,wind,all-year.early-peak,-0.06976314251497022 +2050,14,electricity,all-year.early-peak,0.06976314251497022 2050,14,wind,all-year.late-peak,-0.11544000000000014 2050,14,electricity,all-year.late-peak,0.11544000000000014 -2050,14,wind,all-year.evening,-0.11544000000000014 -2050,14,electricity,all-year.evening,0.11544000000000014 +2050,14,wind,all-year.evening,-0.09185285748502998 +2050,14,electricity,all-year.evening,0.09185285748502998 2050,15,gas,all-year.night,0.0 2050,15,gas,all-year.morning,0.0 2050,15,gas,all-year.afternoon,0.0 2050,15,gas,all-year.early-peak,0.0 -2050,15,gas,all-year.late-peak,0.0 -2050,15,gas,all-year.evening,0.0 +2050,15,gas,all-year.late-peak,0.9107534400000002 +2050,15,gas,all-year.evening,0.9107534400000002 2050,16,electricity,all-year.night,-0.0 2050,16,heat,all-year.night,0.0 2050,16,electricity,all-year.morning,-0.40799999999999986 @@ -1559,8 +1559,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,18,electricity,all-year.late-peak,0.0 2050,18,wind,all-year.evening,-0.0 2050,18,electricity,all-year.evening,0.0 -2050,19,wind,all-year.night,-0.08376000000000001 -2050,19,electricity,all-year.night,0.08376000000000001 +2050,19,wind,all-year.night,-0.0 +2050,19,electricity,all-year.night,0.0 2050,19,wind,all-year.morning,-0.033504000000000006 2050,19,electricity,all-year.morning,0.033504000000000006 2050,19,wind,all-year.afternoon,-0.0 @@ -1569,32 +1569,32 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,19,electricity,all-year.early-peak,0.0 2050,19,wind,all-year.late-peak,-0.08376000000000001 2050,19,electricity,all-year.late-peak,0.08376000000000001 -2050,19,wind,all-year.evening,-0.0 -2050,19,electricity,all-year.evening,0.0 -2050,20,gas,all-year.night,-0.0 -2050,20,electricity,all-year.night,0.0 -2050,20,CO2f,all-year.night,0.0 +2050,19,wind,all-year.evening,-0.08376000000000001 +2050,19,electricity,all-year.evening,0.08376000000000001 +2050,20,gas,all-year.night,-0.14808223999999998 +2050,20,electricity,all-year.night,0.08867199999999999 +2050,20,CO2f,all-year.night,8.128562239999999 2050,20,gas,all-year.morning,-0.14808223999999998 2050,20,electricity,all-year.morning,0.08867199999999999 2050,20,CO2f,all-year.morning,8.128562239999999 -2050,20,gas,all-year.afternoon,-0.14808223999999998 -2050,20,electricity,all-year.afternoon,0.08867199999999999 -2050,20,CO2f,all-year.afternoon,8.128562239999999 +2050,20,gas,all-year.afternoon,-0.09241112000000004 +2050,20,electricity,all-year.afternoon,0.055336000000000024 +2050,20,CO2f,all-year.afternoon,5.072651120000002 2050,20,gas,all-year.early-peak,-0.14808223999999998 2050,20,electricity,all-year.early-peak,0.08867199999999999 2050,20,CO2f,all-year.early-peak,8.128562239999999 -2050,20,gas,all-year.late-peak,-0.14808223999999998 -2050,20,electricity,all-year.late-peak,0.08867199999999999 -2050,20,CO2f,all-year.late-peak,8.128562239999999 +2050,20,gas,all-year.late-peak,-0.0 +2050,20,electricity,all-year.late-peak,0.0 +2050,20,CO2f,all-year.late-peak,0.0 2050,20,gas,all-year.evening,-0.14808223999999998 2050,20,electricity,all-year.evening,0.08867199999999999 2050,20,CO2f,all-year.evening,8.128562239999999 -2050,21,gas,all-year.night,0.8304495840000009 -2050,21,gas,all-year.morning,1.7275446432000001 -2050,21,gas,all-year.afternoon,0.0 -2050,21,gas,all-year.early-peak,1.7275446432000001 -2050,21,gas,all-year.late-peak,1.7275446432000001 -2050,21,gas,all-year.evening,1.7275446432000001 +2050,21,gas,all-year.night,0.5085346559999999 +2050,21,gas,all-year.morning,0.0 +2050,21,gas,all-year.afternoon,0.5085346559999999 +2050,21,gas,all-year.early-peak,0.5085346559999999 +2050,21,gas,all-year.late-peak,0.5085346559999999 +2050,21,gas,all-year.evening,0.5085346559999999 2050,22,electricity,all-year.night,-0.39600000000000013 2050,22,heat,all-year.night,0.9900000000000002 2050,22,electricity,all-year.morning,-0.39600000000000013 @@ -1637,21 +1637,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,24,gas,all-year.evening,-0.3375600000000004 2050,24,heat,all-year.evening,0.29100000000000037 2050,24,CO2f,all-year.evening,18.83061000000002 -2050,25,wind,all-year.night,-0.0 -2050,25,electricity,all-year.night,0.0 -2050,25,wind,all-year.morning,-0.0 -2050,25,electricity,all-year.morning,0.0 -2050,25,wind,all-year.afternoon,-0.0 -2050,25,electricity,all-year.afternoon,0.0 -2050,25,wind,all-year.early-peak,-0.0 -2050,25,electricity,all-year.early-peak,0.0 -2050,25,wind,all-year.late-peak,-1.2828000000000002 -2050,25,electricity,all-year.late-peak,1.2828000000000002 -2050,25,wind,all-year.evening,-1.2828000000000002 -2050,25,electricity,all-year.evening,1.2828000000000002 -2050,26,gas,all-year.night,-0.0 -2050,26,electricity,all-year.night,0.0 -2050,26,CO2f,all-year.night,0.0 +2050,25,wind,all-year.night,-0.08280000000000015 +2050,25,electricity,all-year.night,0.08280000000000015 +2050,25,wind,all-year.morning,-1.2828000000000002 +2050,25,electricity,all-year.morning,1.2828000000000002 +2050,25,wind,all-year.afternoon,-1.2000000000000002 +2050,25,electricity,all-year.afternoon,1.2000000000000002 +2050,25,wind,all-year.early-peak,-0.35279999999999934 +2050,25,electricity,all-year.early-peak,0.35279999999999934 +2050,25,wind,all-year.late-peak,-0.0 +2050,25,electricity,all-year.late-peak,0.0 +2050,25,wind,all-year.evening,-0.0 +2050,25,electricity,all-year.evening,0.0 +2050,26,gas,all-year.night,-0.08346001600000026 +2050,26,electricity,all-year.night,0.0499760574850301 +2050,26,CO2f,all-year.night,4.581305189652709 2050,26,gas,all-year.morning,-0.3250621600000001 2050,26,electricity,all-year.morning,0.19464800000000007 2050,26,CO2f,all-year.morning,17.843382160000008 @@ -1667,23 +1667,23 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,26,gas,all-year.evening,-0.3250621600000001 2050,26,electricity,all-year.evening,0.19464800000000007 2050,26,CO2f,all-year.evening,17.843382160000008 -2050,27,wind,all-year.night,-0.044688000000000005 -2050,27,electricity,all-year.night,0.044688000000000005 +2050,27,wind,all-year.night,-0.0 +2050,27,electricity,all-year.night,0.0 2050,27,wind,all-year.morning,-0.11172000000000001 2050,27,electricity,all-year.morning,0.11172000000000001 2050,27,wind,all-year.afternoon,-0.0 2050,27,electricity,all-year.afternoon,0.0 -2050,27,wind,all-year.early-peak,-0.0 -2050,27,electricity,all-year.early-peak,0.0 +2050,27,wind,all-year.early-peak,-0.044688000000000005 +2050,27,electricity,all-year.early-peak,0.044688000000000005 2050,27,wind,all-year.late-peak,-0.11172000000000001 2050,27,electricity,all-year.late-peak,0.11172000000000001 2050,27,wind,all-year.evening,-0.0 2050,27,electricity,all-year.evening,0.0 -2050,28,gas,all-year.night,0.0 +2050,28,gas,all-year.night,1.30953432 2050,28,gas,all-year.morning,0.0 -2050,28,gas,all-year.afternoon,0.0 -2050,28,gas,all-year.early-peak,0.639958936 -2050,28,gas,all-year.late-peak,0.639958936 +2050,28,gas,all-year.afternoon,1.30953432 +2050,28,gas,all-year.early-peak,0.0 +2050,28,gas,all-year.late-peak,1.30953432 2050,28,gas,all-year.evening,0.0 2050,29,electricity,all-year.night,-0.39600000000000013 2050,29,heat,all-year.night,0.9900000000000002 @@ -1717,31 +1717,31 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,30,CO2f,all-year.evening,64.06290000000001 2050,31,wind,all-year.night,-0.0 2050,31,electricity,all-year.night,0.0 -2050,31,wind,all-year.morning,-1.447200000000001 -2050,31,electricity,all-year.morning,1.447200000000001 -2050,31,wind,all-year.afternoon,-1.2000000000000002 -2050,31,electricity,all-year.afternoon,1.2000000000000002 -2050,31,wind,all-year.early-peak,-0.0 -2050,31,electricity,all-year.early-peak,0.0 -2050,31,wind,all-year.late-peak,-0.3252000000000003 -2050,31,electricity,all-year.late-peak,0.3252000000000003 +2050,31,wind,all-year.morning,-0.0 +2050,31,electricity,all-year.morning,0.0 +2050,31,wind,all-year.afternoon,-0.0 +2050,31,electricity,all-year.afternoon,0.0 +2050,31,wind,all-year.early-peak,-1.447200000000001 +2050,31,electricity,all-year.early-peak,1.447200000000001 +2050,31,wind,all-year.late-peak,-1.447200000000001 +2050,31,electricity,all-year.late-peak,1.447200000000001 2050,31,wind,all-year.evening,-0.0 2050,31,electricity,all-year.evening,0.0 -2050,32,wind,all-year.night,-0.044688000000000005 -2050,32,electricity,all-year.night,0.044688000000000005 -2050,32,wind,all-year.morning,-0.0 -2050,32,electricity,all-year.morning,0.0 +2050,32,wind,all-year.night,-0.0 +2050,32,electricity,all-year.night,0.0 +2050,32,wind,all-year.morning,-0.09864000000000026 +2050,32,electricity,all-year.morning,0.09864000000000026 2050,32,wind,all-year.afternoon,-0.0 2050,32,electricity,all-year.afternoon,0.0 -2050,32,wind,all-year.early-peak,-0.11172000000000001 -2050,32,electricity,all-year.early-peak,0.11172000000000001 +2050,32,wind,all-year.early-peak,-0.0 +2050,32,electricity,all-year.early-peak,0.0 2050,32,wind,all-year.late-peak,-0.11172000000000001 2050,32,electricity,all-year.late-peak,0.11172000000000001 -2050,32,wind,all-year.evening,-0.0 -2050,32,electricity,all-year.evening,0.0 -2050,33,gas,all-year.night,-0.0 -2050,33,electricity,all-year.night,0.0 -2050,33,CO2f,all-year.night,0.0 +2050,32,wind,all-year.evening,-0.057767999999999764 +2050,32,electricity,all-year.evening,0.057767999999999764 +2050,33,gas,all-year.night,-0.3020695999999999 +2050,33,electricity,all-year.night,0.18087999999999993 +2050,33,CO2f,all-year.night,16.581269599999995 2050,33,gas,all-year.morning,-0.3020695999999999 2050,33,electricity,all-year.morning,0.18087999999999993 2050,33,CO2f,all-year.morning,16.581269599999995 @@ -1751,9 +1751,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,33,gas,all-year.early-peak,-0.3020695999999999 2050,33,electricity,all-year.early-peak,0.18087999999999993 2050,33,CO2f,all-year.early-peak,16.581269599999995 -2050,33,gas,all-year.late-peak,-0.13984179200000024 -2050,33,electricity,all-year.late-peak,0.08373760000000015 -2050,33,CO2f,all-year.late-peak,7.676225792000014 +2050,33,gas,all-year.late-peak,-0.0 +2050,33,electricity,all-year.late-peak,0.0 +2050,33,CO2f,all-year.late-peak,0.0 2050,33,gas,all-year.evening,-0.3020695999999999 2050,33,electricity,all-year.evening,0.18087999999999993 2050,33,CO2f,all-year.evening,16.581269599999995 @@ -1761,8 +1761,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,34,gas,all-year.morning,0.0 2050,34,gas,all-year.afternoon,0.0 2050,34,gas,all-year.early-peak,0.0 -2050,34,gas,all-year.late-peak,0.5445973808000002 -2050,34,gas,all-year.evening,1.534615808 +2050,34,gas,all-year.late-peak,0.6851666160000002 +2050,34,gas,all-year.evening,0.0 2050,35,electricity,all-year.night,-0.40799999999999986 2050,35,heat,all-year.night,1.0199999999999996 2050,35,electricity,all-year.morning,-0.40799999999999986 @@ -1813,22 +1813,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,38,electricity,all-year.afternoon,0.0 2050,38,wind,all-year.early-peak,-0.0 2050,38,electricity,all-year.early-peak,0.0 -2050,38,wind,all-year.late-peak,-0.0 -2050,38,electricity,all-year.late-peak,0.0 +2050,38,wind,all-year.late-peak,-0.16079999999999955 +2050,38,electricity,all-year.late-peak,0.16079999999999955 2050,38,wind,all-year.evening,-0.0 2050,38,electricity,all-year.evening,0.0 -2050,39,wind,all-year.night,-0.2290079999999997 -2050,39,electricity,all-year.night,0.2290079999999997 -2050,39,wind,all-year.morning,-0.05246400000000019 -2050,39,electricity,all-year.morning,0.05246400000000019 +2050,39,wind,all-year.night,-0.11133594251497007 +2050,39,electricity,all-year.night,0.11133594251497007 +2050,39,wind,all-year.morning,-0.0 +2050,39,electricity,all-year.morning,0.0 2050,39,wind,all-year.afternoon,-0.0 2050,39,electricity,all-year.afternoon,0.0 -2050,39,wind,all-year.early-peak,-0.13214400000000026 -2050,39,electricity,all-year.early-peak,0.13214400000000026 +2050,39,wind,all-year.early-peak,-0.006840057485029985 +2050,39,electricity,all-year.early-peak,0.006840057485029985 2050,39,wind,all-year.late-peak,-0.2954400000000001 2050,39,electricity,all-year.late-peak,0.2954400000000001 -2050,39,wind,all-year.evening,-0.0 -2050,39,electricity,all-year.evening,0.0 +2050,39,wind,all-year.evening,-0.2954400000000001 +2050,39,electricity,all-year.evening,0.2954400000000001 2050,40,gas,all-year.night,-0.07844991999999994 2050,40,electricity,all-year.night,0.04697599999999996 2050,40,CO2f,all-year.night,4.306289919999997 @@ -1841,9 +1841,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,40,gas,all-year.early-peak,-0.07844991999999994 2050,40,electricity,all-year.early-peak,0.04697599999999996 2050,40,CO2f,all-year.early-peak,4.306289919999997 -2050,40,gas,all-year.late-peak,-0.03137996799999997 -2050,40,electricity,all-year.late-peak,0.018790399999999985 -2050,40,CO2f,all-year.late-peak,1.7225159679999986 +2050,40,gas,all-year.late-peak,-0.0 +2050,40,electricity,all-year.late-peak,0.0 +2050,40,CO2f,all-year.late-peak,0.0 2050,40,gas,all-year.evening,-0.07844991999999994 2050,40,electricity,all-year.evening,0.04697599999999996 2050,40,CO2f,all-year.evening,4.306289919999997 +2050,41,gas,all-year.night,0.0 +2050,41,gas,all-year.morning,0.0 +2050,41,gas,all-year.afternoon,0.0 +2050,41,gas,all-year.early-peak,0.0 +2050,41,gas,all-year.late-peak,0.0 +2050,41,gas,all-year.evening,0.7989258959999999 diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv index 11a49d2bf..dc5aab4db 100644 --- a/tests/data/two_regions/commodity_prices.csv +++ b/tests/data/two_regions/commodity_prices.csv @@ -52,7 +52,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2025,gas,R1,all-year.afternoon,2.55 2025,gas,R1,all-year.early-peak,2.5500000000000007 2025,gas,R1,all-year.late-peak,2.55 -2025,gas,R1,all-year.evening,2.5500000000000007 +2025,gas,R1,all-year.evening,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.55 @@ -93,7 +93,7 @@ milestone_year,commodity_id,region_id,time_slice,price 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.5500000000000003 +2030,gas,R2,all-year.late-peak,2.55 2030,gas,R2,all-year.evening,2.55 2030,heat,R1,all-year.night,-0.0 2030,heat,R1,all-year.morning,-0.0 @@ -105,7 +105,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,heat,R2,all-year.morning,2.9579999999999997 2030,heat,R2,all-year.afternoon,1.7034 2030,heat,R2,all-year.early-peak,2.9579999999999997 -2030,heat,R2,all-year.late-peak,2.958 +2030,heat,R2,all-year.late-peak,2.9579999999999997 2030,heat,R2,all-year.evening,2.9579999999999997 2035,electricity,R1,all-year.night,-0.0 2035,electricity,R1,all-year.morning,-0.0 @@ -197,10 +197,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,gas,R1,all-year.early-peak,-0.0 2045,gas,R1,all-year.late-peak,-0.0 2045,gas,R1,all-year.evening,-0.0 -2045,gas,R2,all-year.night,2.5500000000000003 +2045,gas,R2,all-year.night,2.55 2045,gas,R2,all-year.morning,2.55 2045,gas,R2,all-year.afternoon,2.55 -2045,gas,R2,all-year.early-peak,2.5500000000000003 +2045,gas,R2,all-year.early-peak,2.55 2045,gas,R2,all-year.late-peak,2.55 2045,gas,R2,all-year.evening,2.55 2045,heat,R1,all-year.night,-0.0 @@ -212,7 +212,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,heat,R2,all-year.night,1.7034 2045,heat,R2,all-year.morning,2.9579999999999997 2045,heat,R2,all-year.afternoon,1.7034 -2045,heat,R2,all-year.early-peak,2.958 +2045,heat,R2,all-year.early-peak,2.9579999999999997 2045,heat,R2,all-year.late-peak,2.9579999999999997 2045,heat,R2,all-year.evening,2.9579999999999997 2050,electricity,R1,all-year.night,-0.0 @@ -227,7 +227,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2050,electricity,R2,all-year.early-peak,4.2585 2050,electricity,R2,all-year.late-peak,4.2585 2050,electricity,R2,all-year.evening,4.2585 -2050,gas,R2,all-year.night,2.55 +2050,gas,R2,all-year.night,2.5500000000000003 2050,gas,R2,all-year.morning,2.55 2050,gas,R2,all-year.afternoon,2.55 2050,gas,R2,all-year.early-peak,2.55 From 0e5641eed1b62ccfdf2dcd28e6d46c54282a0014 Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Fri, 13 Mar 2026 11:43:06 +0000 Subject: [PATCH 10/14] test disabling randomness --- src/simulation/optimisation.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/simulation/optimisation.rs b/src/simulation/optimisation.rs index e8bae687e..1c4fa4c83 100644 --- a/src/simulation/optimisation.rs +++ b/src/simulation/optimisation.rs @@ -677,6 +677,8 @@ impl<'model, 'run> DispatchRun<'model, 'run> { model.set_option("simplex_max_concurrency", 1); model.set_option("solver", "simplex"); model.set_option("presolve", "on"); + model.set_option("mip_heuristic_run_rins", false); + model.set_option("mip_heuristic_run_rens", false); // Solve model let solution = solve_optimal(model)?; From ff76b029172b89cd7131096f27873368a46b736c Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Fri, 13 Mar 2026 11:49:28 +0000 Subject: [PATCH 11/14] update regression data --- tests/data/simple_full/assets.csv | 2 +- tests/data/simple_full/commodity_flows.csv | 208 ++++++++---------- tests/data/simple_full/commodity_prices.csv | 199 +++++++++-------- .../data/simple_marginal/commodity_prices.csv | 64 +++--- tests/data/two_regions/commodity_prices.csv | 8 +- 5 files changed, 227 insertions(+), 254 deletions(-) diff --git a/tests/data/simple_full/assets.csv b/tests/data/simple_full/assets.csv index 5f4559fa2..8aaac8226 100644 --- a/tests/data/simple_full/assets.csv +++ b/tests/data/simple_full/assets.csv @@ -6,5 +6,5 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 4,RGASBR,GBR,A0_RES,,2020,2035,2900.0 5,RELCHP,GBR,A0_RES,,2020,2035,399.98 6,RGASBR,GBR,A0_RES,,2030,,355.83840587648046 -7,GASCGT,GBR,A0_ELC,,2030,2040,0.5151564434825014 +7,WNDFRM,GBR,A0_ELC,,2030,2040,5.353359296518287 8,RGASBR,GBR,A0_RES,,2040,,3655.8189696 diff --git a/tests/data/simple_full/commodity_flows.csv b/tests/data/simple_full/commodity_flows.csv index 8777f8bfa..981ef4e22 100644 --- a/tests/data/simple_full/commodity_flows.csv +++ b/tests/data/simple_full/commodity_flows.csv @@ -225,8 +225,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2020,5,RSHEAT,autumn.evening,15.437192051273913 2030,0,GASPRD,winter.night,0.0 2030,0,CO2EMT,winter.night,0.0 -2030,0,GASPRD,winter.day,209.007363584943 -2030,0,CO2EMT,winter.day,1068.6546500098136 +2030,0,GASPRD,winter.day,182.31624506589384 +2030,0,CO2EMT,winter.day,932.1829610219153 2030,0,GASPRD,winter.peak,125.070625 2030,0,CO2EMT,winter.peak,639.486105625 2030,0,GASPRD,winter.evening,166.76083466742 @@ -235,8 +235,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,peak.night,0.0 2030,0,GASPRD,peak.day,0.0 2030,0,CO2EMT,peak.day,0.0 -2030,0,GASPRD,peak.peak,88.48378530453337 -2030,0,CO2EMT,peak.peak,452.41759426207915 +2030,0,GASPRD,peak.peak,63.43529638170452 +2030,0,CO2EMT,peak.peak,324.34467039965523 2030,0,GASPRD,peak.evening,166.76083466742 2030,0,CO2EMT,peak.evening,852.6481476545185 2030,0,GASPRD,summer.night,0.0 @@ -245,22 +245,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,summer.day,0.0 2030,0,GASPRD,summer.peak,0.0 2030,0,CO2EMT,summer.peak,0.0 -2030,0,GASPRD,summer.evening,0.464792220809886 -2030,0,CO2EMT,summer.evening,2.3764826250009476 +2030,0,GASPRD,summer.evening,0.0 +2030,0,CO2EMT,summer.evening,0.0 2030,0,GASPRD,autumn.night,0.0 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,20.534211026060348 -2030,0,CO2EMT,autumn.peak,104.99142097624657 -2030,0,GASPRD,autumn.evening,166.76083466742 -2030,0,CO2EMT,autumn.evening,852.6481476545185 +2030,0,GASPRD,autumn.peak,0.0 +2030,0,CO2EMT,autumn.peak,0.0 +2030,0,GASPRD,autumn.evening,160.94459622561885 +2030,0,CO2EMT,autumn.evening,822.9097205015893 2030,1,GASPRD,winter.night,-0.0 2030,1,GASNAT,winter.night,0.0 2030,1,CO2EMT,winter.night,0.0 -2030,1,GASPRD,winter.day,-211.26949380361748 -2030,1,GASNAT,winter.day,201.2090417177309 -2030,1,CO2EMT,winter.day,514.3909151513791 +2030,1,GASPRD,winter.day,-184.57837528456835 +2030,1,GASNAT,winter.day,175.78892884244604 +2030,1,CO2EMT,winter.day,449.40439658571336 2030,1,GASPRD,winter.peak,-124.10114062500001 2030,1,GASNAT,winter.peak,118.1915625 2030,1,CO2EMT,winter.peak,302.15672953125005 @@ -273,9 +273,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,peak.day,-0.0 2030,1,GASNAT,peak.day,0.0 2030,1,CO2EMT,peak.day,0.0 -2030,1,GASPRD,peak.peak,-89.77643114820788 -2030,1,GASNAT,peak.peak,85.50136299829322 -2030,1,CO2EMT,peak.peak,218.58423450513664 +2030,1,GASPRD,peak.peak,-64.72794222537904 +2030,1,GASNAT,peak.peak,61.64565926226575 +2030,1,CO2EMT,peak.peak,157.5971279039824 2030,1,GASPRD,peak.evening,-165.4681888237455 2030,1,GASNAT,peak.evening,157.58875126070998 2030,1,CO2EMT,peak.evening,402.87564259800513 @@ -288,61 +288,61 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,summer.peak,-0.0 2030,1,GASNAT,summer.peak,0.0 2030,1,CO2EMT,summer.peak,0.0 -2030,1,GASPRD,summer.evening,-0.464792220809886 -2030,1,GASNAT,summer.evening,0.44265925791417715 -2030,1,CO2EMT,summer.evening,1.131658392857594 +2030,1,GASPRD,summer.evening,-0.0 +2030,1,GASNAT,summer.evening,0.0 +2030,1,CO2EMT,summer.evening,0.0 2030,1,GASPRD,autumn.night,-0.0 2030,1,GASNAT,autumn.night,0.0 2030,1,CO2EMT,autumn.night,0.0 2030,1,GASPRD,autumn.day,-0.0 2030,1,GASNAT,autumn.day,0.0 2030,1,CO2EMT,autumn.day,0.0 -2030,1,GASPRD,autumn.peak,-21.826856869734865 -2030,1,GASNAT,autumn.peak,20.78748273308082 -2030,1,CO2EMT,autumn.peak,53.143199607121126 -2030,1,GASPRD,autumn.evening,-165.4681888237455 -2030,1,GASNAT,autumn.evening,157.58875126070998 -2030,1,CO2EMT,autumn.evening,402.87564259800513 -2030,2,ELCTRI,winter.night,4.435312795545212 -2030,2,ELCTRI,winter.day,7.075379933645912 -2030,2,ELCTRI,winter.peak,1.9712501261051125 -2030,2,ELCTRI,winter.evening,2.5696653598405335 +2030,1,GASPRD,autumn.peak,-0.0 +2030,1,GASNAT,autumn.peak,0.0 +2030,1,CO2EMT,autumn.peak,0.0 +2030,1,GASPRD,autumn.evening,-160.94459622561885 +2030,1,GASNAT,autumn.evening,153.2805678339227 +2030,1,CO2EMT,autumn.evening,391.8617716674234 +2030,2,ELCTRI,winter.night,3.6359293344885586 +2030,2,ELCTRI,winter.day,4.1960865042892355 +2030,2,ELCTRI,winter.peak,1.4631984417488688 +2030,2,ELCTRI,winter.evening,2.0301454229475584 2030,2,ELCTRI,peak.night,2.851272517283696 -2030,2,ELCTRI,peak.day,6.3713620320039785 -2030,2,ELCTRI,peak.peak,1.7776452018191917 +2030,2,ELCTRI,peak.day,5.146656256509029 +2030,2,ELCTRI,peak.peak,1.724605125411014 2030,2,ELCTRI,peak.evening,1.72484387381507 -2030,2,ELCTRI,summer.night,1.6368416242136155 -2030,2,ELCTRI,summer.day,3.2188600626534005 -2030,2,ELCTRI,summer.peak,1.0599640039494003 -2030,2,ELCTRI,summer.evening,0.7892279633502001 +2030,2,ELCTRI,summer.night,0.0 +2030,2,ELCTRI,summer.day,0.0 +2030,2,ELCTRI,summer.peak,0.0 +2030,2,ELCTRI,summer.evening,0.0 2030,2,ELCTRI,autumn.night,3.203281465982185 -2030,2,ELCTRI,autumn.day,6.001752635595889 +2030,2,ELCTRI,autumn.day,5.645705373786219 2030,2,ELCTRI,autumn.peak,1.5488393825638174 2030,2,ELCTRI,autumn.evening,1.9008483513729915 -2030,3,GASNAT,winter.night,-7.783808997678887 -2030,3,ELCTRI,winter.night,5.189205998452591 -2030,3,CO2EMT,winter.night,397.9861540513214 -2030,3,GASNAT,winter.day,-10.010898915527838 -2030,3,ELCTRI,winter.day,6.6739326103518914 -2030,3,CO2EMT,winter.day,511.8572615509383 -2030,3,GASNAT,winter.peak,-2.468688831431171 -2030,3,ELCTRI,winter.peak,1.6457925542874472 -2030,3,CO2EMT,winter.peak,126.22405995107574 -2030,3,GASNAT,winter.evening,-4.395089526235901 -2030,3,ELCTRI,winter.evening,2.9300596841572673 -2030,3,CO2EMT,winter.evening,224.7209274764416 -2030,3,GASNAT,peak.night,-8.382740663321101 -2030,3,ELCTRI,peak.night,5.5884937755474 -2030,3,CO2EMT,peak.night,428.6095301156078 -2030,3,GASNAT,peak.day,-8.528170411829517 -2030,3,ELCTRI,peak.day,5.685446941219679 -2030,3,CO2EMT,peak.day,436.04535315684325 -2030,3,GASNAT,peak.peak,-3.520722822271213 -2030,3,ELCTRI,peak.peak,2.3471485481808085 -2030,3,CO2EMT,peak.peak,180.0145579027271 -2030,3,GASNAT,peak.evening,-4.646819607935198 -2030,3,ELCTRI,peak.evening,3.0978797386234653 -2030,3,CO2EMT,peak.evening,237.59188655372665 +2030,3,GASNAT,winter.night,-0.0 +2030,3,ELCTRI,winter.night,0.0 +2030,3,CO2EMT,winter.night,0.0 +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,-4.385158138672478 +2030,3,ELCTRI,peak.night,2.923438759114985 +2030,3,CO2EMT,peak.night,224.21313563032376 +2030,3,GASNAT,peak.day,-0.0 +2030,3,ELCTRI,peak.day,0.0 +2030,3,CO2EMT,peak.day,0.0 +2030,3,GASNAT,peak.peak,-0.0 +2030,3,ELCTRI,peak.peak,0.0 +2030,3,CO2EMT,peak.peak,0.0 +2030,3,GASNAT,peak.evening,-2.1689778859072866 +2030,3,ELCTRI,peak.evening,1.4459852572715244 +2030,3,CO2EMT,peak.evening,110.89983930643955 2030,3,GASNAT,summer.night,-0.0 2030,3,ELCTRI,summer.night,0.0 2030,3,CO2EMT,summer.night,0.0 @@ -355,18 +355,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-8.382740663321101 -2030,3,ELCTRI,autumn.night,5.5884937755474 -2030,3,CO2EMT,autumn.night,428.6095301156078 -2030,3,GASNAT,autumn.day,-11.621339862602872 -2030,3,ELCTRI,autumn.day,7.747559908401914 -2030,3,CO2EMT,autumn.day,594.1991071748848 -2030,3,GASNAT,autumn.peak,-3.102304946743114 -2030,3,ELCTRI,autumn.peak,2.0682032978287426 -2030,3,CO2EMT,autumn.peak,158.6208519269754 -2030,3,GASNAT,autumn.evening,-4.3828128915983156 -2030,3,ELCTRI,autumn.evening,2.921875261065544 -2030,3,CO2EMT,autumn.evening,224.09322314742187 +2030,3,GASNAT,autumn.night,-3.1442174057585746 +2030,3,ELCTRI,autumn.night,2.096144937172383 +2030,3,CO2EMT,autumn.night,160.7638359564359 +2030,3,GASNAT,autumn.day,-0.0 +2030,3,ELCTRI,autumn.day,0.0 +2030,3,CO2EMT,autumn.day,0.0 +2030,3,GASNAT,autumn.peak,-0.7270513709523598 +2030,3,ELCTRI,autumn.peak,0.4847009139682399 +2030,3,CO2EMT,autumn.peak,37.174136596794156 +2030,3,GASNAT,autumn.evening,-1.548507508138754 +2030,3,ELCTRI,autumn.evening,1.0323383387591694 +2030,3,CO2EMT,autumn.evening,79.17518889113448 2030,4,GASNAT,winter.night,-43.845148578709995 2030,4,RSHEAT,winter.night,38.1262161554 2030,4,CO2EMT,winter.night,2241.8024468294425 @@ -495,54 +495,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,autumn.evening,-0.0 2030,6,RSHEAT,autumn.evening,0.0 2030,6,CO2EMT,autumn.evening,0.0 -2030,7,GASNAT,winter.night,-0.0 -2030,7,ELCTRI,winter.night,0.0 -2030,7,CO2EMT,winter.night,0.0 -2030,7,GASNAT,winter.day,-0.0 -2030,7,ELCTRI,winter.day,0.0 -2030,7,CO2EMT,winter.day,0.0 -2030,7,GASNAT,winter.peak,-0.7616266044111606 -2030,7,ELCTRI,winter.peak,0.5077510696074404 -2030,7,CO2EMT,winter.peak,38.94196828354264 -2030,7,GASNAT,winter.evening,-0.0 -2030,7,ELCTRI,winter.evening,0.0 -2030,7,CO2EMT,winter.evening,0.0 -2030,7,GASNAT,peak.night,-1.777128751750059 -2030,7,ELCTRI,peak.night,1.184752501166706 -2030,7,CO2EMT,peak.night,90.8645930769805 -2030,7,GASNAT,peak.day,-2.5387553561612193 -2030,7,ELCTRI,peak.day,1.6925035707741463 -2030,7,CO2EMT,peak.day,129.80656136052315 -2030,7,GASNAT,peak.peak,-0.0 -2030,7,ELCTRI,peak.peak,0.0 -2030,7,CO2EMT,peak.peak,0.0 -2030,7,GASNAT,peak.evening,-1.0155021473388979 -2030,7,ELCTRI,peak.evening,0.6770014315592653 -2030,7,CO2EMT,peak.evening,51.92262479343785 -2030,7,GASNAT,summer.night,-0.44265925791417715 -2030,7,ELCTRI,summer.night,0.29510617194278477 -2030,7,CO2EMT,summer.night,22.633167857151875 -2030,7,GASNAT,summer.day,-0.0 -2030,7,ELCTRI,summer.day,0.0 -2030,7,CO2EMT,summer.day,0.0 -2030,7,GASNAT,summer.peak,-0.0 -2030,7,ELCTRI,summer.peak,0.0 -2030,7,CO2EMT,summer.peak,0.0 -2030,7,GASNAT,summer.evening,-0.0 -2030,7,ELCTRI,summer.evening,0.0 -2030,7,CO2EMT,summer.evening,0.0 -2030,7,GASNAT,autumn.night,-1.2491153287023264 -2030,7,ELCTRI,autumn.night,0.8327435524682176 -2030,7,CO2EMT,autumn.night,63.867266756549945 -2030,7,GASNAT,autumn.day,-0.0 -2030,7,ELCTRI,autumn.day,0.0 -2030,7,CO2EMT,autumn.day,0.0 -2030,7,GASNAT,autumn.peak,-0.7616266044111606 -2030,7,ELCTRI,autumn.peak,0.5077510696074404 -2030,7,CO2EMT,autumn.peak,38.94196828354264 -2030,7,GASNAT,autumn.evening,-1.0155021473388979 -2030,7,ELCTRI,autumn.evening,0.6770014315592653 -2030,7,CO2EMT,autumn.evening,51.92262479343785 +2030,7,ELCTRI,winter.night,5.988589459509244 +2030,7,ELCTRI,winter.day,9.553226039708568 +2030,7,ELCTRI,winter.peak,2.6615953082511314 +2030,7,ELCTRI,winter.evening,3.4695796210502423 +2030,7,ELCTRI,peak.night,3.8498075175991215 +2030,7,ELCTRI,peak.day,8.602656287488774 +2030,7,ELCTRI,peak.peak,2.4001886245889863 +2030,7,ELCTRI,peak.evening,2.3288959129112063 +2030,7,ELCTRI,summer.night,1.9319477961564002 +2030,7,ELCTRI,summer.day,3.2188600626534005 +2030,7,ELCTRI,summer.peak,1.0599640039494003 +2030,7,ELCTRI,summer.evening,0.7892279633502001 +2030,7,ELCTRI,autumn.night,4.325092390843235 +2030,7,ELCTRI,autumn.day,8.103607170211584 +2030,7,ELCTRI,autumn.peak,2.0912534534679432 +2030,7,ELCTRI,autumn.evening,2.5665383538656403 2040,0,GASPRD,winter.night,0.0 2040,0,CO2EMT,winter.night,0.0 2040,0,GASPRD,winter.day,360.96396982311984 diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv index b85359426..812041beb 100644 --- a/tests/data/simple_full/commodity_prices.csv +++ b/tests/data/simple_full/commodity_prices.csv @@ -1,4 +1,36 @@ milestone_year,commodity_id,region_id,time_slice,price +2020,GASPRD,GBR,winter.night,8.94778881206003 +2020,GASPRD,GBR,winter.day,8.94778881206003 +2020,GASPRD,GBR,winter.peak,8.94778881206003 +2020,GASPRD,GBR,winter.evening,8.94778881206003 +2020,GASPRD,GBR,peak.night,8.94778881206003 +2020,GASPRD,GBR,peak.day,8.94778881206003 +2020,GASPRD,GBR,peak.peak,8.94778881206003 +2020,GASPRD,GBR,peak.evening,8.94778881206003 +2020,GASPRD,GBR,summer.night,8.94778881206003 +2020,GASPRD,GBR,summer.day,8.94778881206003 +2020,GASPRD,GBR,summer.peak,8.94778881206003 +2020,GASPRD,GBR,summer.evening,8.94778881206003 +2020,GASPRD,GBR,autumn.night,8.94778881206003 +2020,GASPRD,GBR,autumn.day,8.94778881206003 +2020,GASPRD,GBR,autumn.peak,8.94778881206003 +2020,GASPRD,GBR,autumn.evening,8.94778881206003 +2020,GASNAT,GBR,winter.night,14.681136706809944 +2020,GASNAT,GBR,winter.day,14.681136706809944 +2020,GASNAT,GBR,winter.peak,14.681136706809944 +2020,GASNAT,GBR,winter.evening,14.681136706809944 +2020,GASNAT,GBR,peak.night,14.681136706809944 +2020,GASNAT,GBR,peak.day,14.681136706809944 +2020,GASNAT,GBR,peak.peak,14.681136706809944 +2020,GASNAT,GBR,peak.evening,14.681136706809944 +2020,GASNAT,GBR,summer.night,14.681136706809944 +2020,GASNAT,GBR,summer.day,14.681136706809944 +2020,GASNAT,GBR,summer.peak,14.681136706809944 +2020,GASNAT,GBR,summer.evening,14.681136706809944 +2020,GASNAT,GBR,autumn.night,14.681136706809944 +2020,GASNAT,GBR,autumn.day,14.681136706809944 +2020,GASNAT,GBR,autumn.peak,14.681136706809944 +2020,GASNAT,GBR,autumn.evening,14.681136706809944 2020,ELCTRI,GBR,winter.night,7.993308999999999 2020,ELCTRI,GBR,winter.day,7.993308999999999 2020,ELCTRI,GBR,winter.peak,7.993308999999999 @@ -31,52 +63,52 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 -2020,GASPRD,GBR,winter.day,7.504535286481447 -2020,GASPRD,GBR,winter.peak,7.504535286481447 -2020,GASPRD,GBR,winter.evening,7.504535286481447 -2020,GASPRD,GBR,peak.peak,7.504535286481447 -2020,GASPRD,GBR,peak.evening,7.504535286481447 -2020,GASPRD,GBR,summer.evening,7.504535286481447 -2020,GASPRD,GBR,autumn.evening,7.504535286481447 -2020,GASNAT,GBR,winter.day,6.598258237765183 -2020,GASNAT,GBR,winter.peak,6.598258237765183 -2020,GASNAT,GBR,winter.evening,6.598258237765183 -2020,GASNAT,GBR,peak.peak,6.598258237765183 -2020,GASNAT,GBR,peak.evening,6.598258237765183 -2020,GASNAT,GBR,summer.evening,6.598258237765183 -2020,GASNAT,GBR,autumn.evening,6.598258237765183 -2020,GASPRD,GBR,winter.night,3.428609686103873 -2020,GASPRD,GBR,peak.night,3.428609686103873 -2020,GASPRD,GBR,peak.day,3.428609686103873 -2020,GASPRD,GBR,summer.night,3.428609686103873 -2020,GASPRD,GBR,summer.day,3.428609686103873 -2020,GASPRD,GBR,summer.peak,3.428609686103873 -2020,GASPRD,GBR,autumn.night,3.428609686103873 -2020,GASPRD,GBR,autumn.day,3.428609686103873 -2020,GASPRD,GBR,autumn.peak,3.428609686103873 -2020,GASNAT,GBR,winter.night,3.7738687802727107 -2020,GASNAT,GBR,peak.night,3.7738687802727107 -2020,GASNAT,GBR,peak.day,3.7738687802727107 -2020,GASNAT,GBR,summer.night,3.7738687802727107 -2020,GASNAT,GBR,summer.day,3.7738687802727107 -2020,GASNAT,GBR,summer.peak,3.7738687802727107 -2020,GASNAT,GBR,autumn.night,3.7738687802727107 -2020,GASNAT,GBR,autumn.day,3.7738687802727107 -2020,GASNAT,GBR,autumn.peak,3.7738687802727107 -2030,ELCTRI,GBR,winter.night,7.993308999999999 -2030,ELCTRI,GBR,winter.day,7.993308999999999 -2030,ELCTRI,GBR,winter.peak,7.993308999999999 -2030,ELCTRI,GBR,winter.evening,7.993308999999999 +2030,GASPRD,GBR,winter.night,8.687785038509922 +2030,GASPRD,GBR,winter.day,8.687785038509922 +2030,GASPRD,GBR,winter.peak,8.687785038509922 +2030,GASPRD,GBR,winter.evening,8.687785038509922 +2030,GASPRD,GBR,peak.night,8.687785038509922 +2030,GASPRD,GBR,peak.day,8.687785038509922 +2030,GASPRD,GBR,peak.peak,8.687785038509922 +2030,GASPRD,GBR,peak.evening,8.687785038509922 +2030,GASPRD,GBR,summer.night,8.687785038509922 +2030,GASPRD,GBR,summer.day,8.687785038509922 +2030,GASPRD,GBR,summer.peak,8.687785038509922 +2030,GASPRD,GBR,summer.evening,8.687785038509922 +2030,GASPRD,GBR,autumn.night,8.687785038509922 +2030,GASPRD,GBR,autumn.day,8.687785038509922 +2030,GASPRD,GBR,autumn.peak,8.687785038509922 +2030,GASPRD,GBR,autumn.evening,8.687785038509922 +2030,GASNAT,GBR,winter.night,14.227541461097879 +2030,GASNAT,GBR,winter.day,14.227541461097879 +2030,GASNAT,GBR,winter.peak,14.227541461097879 +2030,GASNAT,GBR,winter.evening,14.227541461097879 +2030,GASNAT,GBR,peak.night,14.227541461097879 +2030,GASNAT,GBR,peak.day,14.227541461097879 +2030,GASNAT,GBR,peak.peak,14.227541461097879 +2030,GASNAT,GBR,peak.evening,14.227541461097879 +2030,GASNAT,GBR,summer.night,14.227541461097879 +2030,GASNAT,GBR,summer.day,14.227541461097879 +2030,GASNAT,GBR,summer.peak,14.227541461097879 +2030,GASNAT,GBR,summer.evening,14.227541461097879 +2030,GASNAT,GBR,autumn.night,14.227541461097879 +2030,GASNAT,GBR,autumn.day,14.227541461097879 +2030,GASNAT,GBR,autumn.peak,14.227541461097879 +2030,GASNAT,GBR,autumn.evening,14.227541461097879 +2030,ELCTRI,GBR,winter.night,0.4 +2030,ELCTRI,GBR,winter.day,0.4 +2030,ELCTRI,GBR,winter.peak,0.4 +2030,ELCTRI,GBR,winter.evening,0.4 2030,ELCTRI,GBR,peak.night,7.993308999999999 -2030,ELCTRI,GBR,peak.day,7.993308999999999 -2030,ELCTRI,GBR,peak.peak,7.993308999999999 +2030,ELCTRI,GBR,peak.day,0.4 +2030,ELCTRI,GBR,peak.peak,0.4 2030,ELCTRI,GBR,peak.evening,7.993308999999999 -2030,ELCTRI,GBR,summer.night,7.993308999999999 +2030,ELCTRI,GBR,summer.night,0.4 2030,ELCTRI,GBR,summer.day,0.4 2030,ELCTRI,GBR,summer.peak,0.4 2030,ELCTRI,GBR,summer.evening,0.4 2030,ELCTRI,GBR,autumn.night,7.993308999999999 -2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,autumn.day,0.4 2030,ELCTRI,GBR,autumn.peak,7.993308999999999 2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,RSHEAT,GBR,winter.night,5.8665369 @@ -87,7 +119,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,peak.day,5.8665369 2030,RSHEAT,GBR,peak.peak,5.8665369 2030,RSHEAT,GBR,peak.evening,5.8665369 -2030,RSHEAT,GBR,summer.night,2.80779197 +2030,RSHEAT,GBR,summer.night,0.30200000000000005 2030,RSHEAT,GBR,summer.day,0.30200000000000005 2030,RSHEAT,GBR,summer.peak,0.30200000000000005 2030,RSHEAT,GBR,summer.evening,0.30200000000000005 @@ -95,38 +127,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2030,GASPRD,GBR,winter.day,6.8760807959710935 -2030,GASPRD,GBR,winter.peak,6.8760807959710935 -2030,GASPRD,GBR,winter.evening,6.8760807959710935 -2030,GASPRD,GBR,peak.peak,6.8760807959710935 -2030,GASPRD,GBR,peak.evening,6.8760807959710935 -2030,GASPRD,GBR,summer.evening,6.8760807959710935 -2030,GASPRD,GBR,autumn.peak,6.8760807959710935 -2030,GASPRD,GBR,autumn.evening,6.8760807959710935 -2030,GASNAT,GBR,winter.day,6.161750372397898 -2030,GASNAT,GBR,winter.peak,6.161750372397898 -2030,GASNAT,GBR,winter.evening,6.161750372397898 -2030,GASNAT,GBR,peak.peak,6.161750372397898 -2030,GASNAT,GBR,peak.evening,6.161750372397898 -2030,GASNAT,GBR,summer.evening,6.161750372397898 -2030,GASNAT,GBR,autumn.peak,6.161750372397898 -2030,GASNAT,GBR,autumn.evening,6.161750372397898 -2030,GASPRD,GBR,winter.night,3.428609686103873 -2030,GASPRD,GBR,peak.night,3.428609686103873 -2030,GASPRD,GBR,peak.day,3.428609686103873 -2030,GASPRD,GBR,summer.night,3.428609686103873 -2030,GASPRD,GBR,summer.day,3.428609686103873 -2030,GASPRD,GBR,summer.peak,3.428609686103873 -2030,GASPRD,GBR,autumn.night,3.428609686103873 -2030,GASPRD,GBR,autumn.day,3.428609686103873 -2030,GASNAT,GBR,winter.night,3.7738687802727107 -2030,GASNAT,GBR,peak.night,3.7738687802727107 -2030,GASNAT,GBR,peak.day,3.7738687802727107 -2030,GASNAT,GBR,summer.night,3.7738687802727107 -2030,GASNAT,GBR,summer.day,3.7738687802727107 -2030,GASNAT,GBR,summer.peak,3.7738687802727107 -2030,GASNAT,GBR,autumn.night,3.7738687802727107 -2030,GASNAT,GBR,autumn.day,3.7738687802727107 +2040,GASPRD,GBR,winter.night,6.325466094838786 +2040,GASPRD,GBR,winter.day,6.325466094838786 +2040,GASPRD,GBR,winter.peak,6.325466094838786 +2040,GASPRD,GBR,winter.evening,6.325466094838786 +2040,GASPRD,GBR,peak.night,6.325466094838786 +2040,GASPRD,GBR,peak.day,6.325466094838786 +2040,GASPRD,GBR,peak.peak,6.325466094838786 +2040,GASPRD,GBR,peak.evening,6.325466094838786 +2040,GASPRD,GBR,summer.night,6.325466094838786 +2040,GASPRD,GBR,summer.day,6.325466094838786 +2040,GASPRD,GBR,summer.peak,6.325466094838786 +2040,GASPRD,GBR,summer.evening,6.325466094838786 +2040,GASPRD,GBR,autumn.night,6.325466094838786 +2040,GASPRD,GBR,autumn.day,6.325466094838786 +2040,GASPRD,GBR,autumn.peak,6.325466094838786 +2040,GASPRD,GBR,autumn.evening,6.325466094838786 +2040,GASNAT,GBR,winter.night,10.106301219664724 +2040,GASNAT,GBR,winter.day,10.106301219664724 +2040,GASNAT,GBR,winter.peak,10.106301219664724 +2040,GASNAT,GBR,winter.evening,10.106301219664724 +2040,GASNAT,GBR,peak.night,10.106301219664724 +2040,GASNAT,GBR,peak.day,10.106301219664724 +2040,GASNAT,GBR,peak.peak,10.106301219664724 +2040,GASNAT,GBR,peak.evening,10.106301219664724 +2040,GASNAT,GBR,summer.night,10.106301219664724 +2040,GASNAT,GBR,summer.day,10.106301219664724 +2040,GASNAT,GBR,summer.peak,10.106301219664724 +2040,GASNAT,GBR,summer.evening,10.106301219664724 +2040,GASNAT,GBR,autumn.night,10.106301219664724 +2040,GASNAT,GBR,autumn.day,10.106301219664724 +2040,GASNAT,GBR,autumn.peak,10.106301219664724 +2040,GASNAT,GBR,autumn.evening,10.106301219664724 2040,RSHEAT,GBR,winter.night,5.8665369 2040,RSHEAT,GBR,winter.day,5.8665369 2040,RSHEAT,GBR,winter.peak,5.8665369 @@ -143,24 +175,3 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,RSHEAT,GBR,autumn.day,5.8665369 2040,RSHEAT,GBR,autumn.peak,5.8665369 2040,RSHEAT,GBR,autumn.evening,5.8665369 -2040,GASPRD,GBR,winter.day,5.443465073396721 -2040,GASPRD,GBR,winter.peak,5.443465073396721 -2040,GASPRD,GBR,winter.evening,5.443465073396721 -2040,GASPRD,GBR,peak.day,5.443465073396721 -2040,GASPRD,GBR,peak.peak,5.443465073396721 -2040,GASPRD,GBR,peak.evening,5.443465073396721 -2040,GASPRD,GBR,summer.evening,5.443465073396721 -2040,GASPRD,GBR,autumn.day,5.443465073396721 -2040,GASPRD,GBR,autumn.peak,5.443465073396721 -2040,GASPRD,GBR,autumn.evening,5.443465073396721 -2040,GASNAT,GBR,winter.night,5.166692883880049 -2040,GASNAT,GBR,winter.day,5.166692883880049 -2040,GASNAT,GBR,winter.peak,5.166692883880049 -2040,GASNAT,GBR,winter.evening,5.166692883880049 -2040,GASNAT,GBR,peak.day,5.166692883880049 -2040,GASNAT,GBR,peak.peak,5.166692883880049 -2040,GASNAT,GBR,peak.evening,5.166692883880049 -2040,GASNAT,GBR,summer.evening,5.166692883880049 -2040,GASNAT,GBR,autumn.day,5.166692883880049 -2040,GASNAT,GBR,autumn.peak,5.166692883880049 -2040,GASNAT,GBR,autumn.evening,5.166692883880049 diff --git a/tests/data/simple_marginal/commodity_prices.csv b/tests/data/simple_marginal/commodity_prices.csv index a9b8ee0fc..93a05c2cb 100644 --- a/tests/data/simple_marginal/commodity_prices.csv +++ b/tests/data/simple_marginal/commodity_prices.csv @@ -31,6 +31,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASNAT,GBR,autumn.day,2.9170059999999998 2020,GASNAT,GBR,autumn.peak,2.9170059999999998 2020,GASNAT,GBR,autumn.evening,2.9170059999999998 +2020,ELCTRI,GBR,winter.night,7.993308999999999 +2020,ELCTRI,GBR,winter.day,7.993308999999999 +2020,ELCTRI,GBR,winter.peak,7.993308999999999 +2020,ELCTRI,GBR,winter.evening,7.993308999999999 +2020,ELCTRI,GBR,peak.night,7.993308999999999 +2020,ELCTRI,GBR,peak.day,7.993308999999999 +2020,ELCTRI,GBR,peak.peak,7.993308999999999 +2020,ELCTRI,GBR,peak.evening,7.993308999999999 +2020,ELCTRI,GBR,summer.night,7.993308999999999 +2020,ELCTRI,GBR,summer.day,7.993308999999999 +2020,ELCTRI,GBR,summer.peak,7.993308999999999 +2020,ELCTRI,GBR,summer.evening,7.993308999999999 +2020,ELCTRI,GBR,autumn.night,7.993308999999999 +2020,ELCTRI,GBR,autumn.day,7.993308999999999 +2020,ELCTRI,GBR,autumn.peak,7.993308999999999 +2020,ELCTRI,GBR,autumn.evening,7.993308999999999 2020,RSHEAT,GBR,winter.night,5.8665369 2020,RSHEAT,GBR,winter.day,5.8665369 2020,RSHEAT,GBR,winter.peak,5.8665369 @@ -47,22 +63,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 -2020,ELCTRI,GBR,winter.night,7.993308999999999 -2020,ELCTRI,GBR,winter.day,7.993308999999999 -2020,ELCTRI,GBR,winter.peak,7.993308999999999 -2020,ELCTRI,GBR,winter.evening,7.993308999999999 -2020,ELCTRI,GBR,peak.night,7.993308999999999 -2020,ELCTRI,GBR,peak.day,7.993308999999999 -2020,ELCTRI,GBR,peak.peak,7.993308999999999 -2020,ELCTRI,GBR,peak.evening,7.993308999999999 -2020,ELCTRI,GBR,summer.night,7.993308999999999 -2020,ELCTRI,GBR,summer.day,0.4 -2020,ELCTRI,GBR,summer.peak,0.4 -2020,ELCTRI,GBR,summer.evening,0.4 -2020,ELCTRI,GBR,autumn.night,7.993308999999999 -2020,ELCTRI,GBR,autumn.day,7.993308999999999 -2020,ELCTRI,GBR,autumn.peak,7.993308999999999 -2020,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,GASPRD,GBR,winter.night,2.20452 2030,GASPRD,GBR,winter.day,2.20452 2030,GASPRD,GBR,winter.peak,2.20452 @@ -95,6 +95,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,autumn.day,2.9170059999999998 2030,GASNAT,GBR,autumn.peak,2.9170059999999998 2030,GASNAT,GBR,autumn.evening,2.9170059999999998 +2030,ELCTRI,GBR,winter.night,7.993308999999999 +2030,ELCTRI,GBR,winter.day,7.993308999999999 +2030,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,ELCTRI,GBR,winter.evening,7.993308999999999 +2030,ELCTRI,GBR,peak.night,7.993308999999999 +2030,ELCTRI,GBR,peak.day,7.993308999999999 +2030,ELCTRI,GBR,peak.peak,7.993308999999999 +2030,ELCTRI,GBR,peak.evening,7.993308999999999 +2030,ELCTRI,GBR,summer.night,7.993308999999999 +2030,ELCTRI,GBR,summer.day,7.993308999999999 +2030,ELCTRI,GBR,summer.peak,7.993308999999999 +2030,ELCTRI,GBR,summer.evening,7.993308999999999 +2030,ELCTRI,GBR,autumn.night,7.993308999999999 +2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,autumn.peak,7.993308999999999 +2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,RSHEAT,GBR,winter.night,5.8665369 2030,RSHEAT,GBR,winter.day,5.8665369 2030,RSHEAT,GBR,winter.peak,5.8665369 @@ -111,22 +127,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2030,ELCTRI,GBR,winter.night,7.993308999999999 -2030,ELCTRI,GBR,winter.day,7.993308999999999 -2030,ELCTRI,GBR,winter.peak,7.993308999999999 -2030,ELCTRI,GBR,winter.evening,7.993308999999999 -2030,ELCTRI,GBR,peak.night,7.993308999999999 -2030,ELCTRI,GBR,peak.day,7.993308999999999 -2030,ELCTRI,GBR,peak.peak,7.993308999999999 -2030,ELCTRI,GBR,peak.evening,7.993308999999999 -2030,ELCTRI,GBR,summer.night,7.993308999999999 -2030,ELCTRI,GBR,summer.day,0.4 -2030,ELCTRI,GBR,summer.peak,0.4 -2030,ELCTRI,GBR,summer.evening,0.4 -2030,ELCTRI,GBR,autumn.night,7.993308999999999 -2030,ELCTRI,GBR,autumn.day,7.993308999999999 -2030,ELCTRI,GBR,autumn.peak,7.993308999999999 -2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2040,GASPRD,GBR,winter.night,2.20452 2040,GASPRD,GBR,winter.day,2.20452 2040,GASPRD,GBR,winter.peak,2.20452 diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv index 03f82a03e..023694298 100644 --- a/tests/data/two_regions/commodity_prices.csv +++ b/tests/data/two_regions/commodity_prices.csv @@ -215,7 +215,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,heat,R2,all-year.early-peak,2.9579999999999997 2045,heat,R2,all-year.late-peak,2.9579999999999997 2045,heat,R2,all-year.evening,2.9579999999999997 -2050,gas,R2,all-year.night,2.55 +2050,gas,R2,all-year.night,2.5500000000000003 2050,gas,R2,all-year.morning,2.55 2050,gas,R2,all-year.afternoon,2.55 2050,gas,R2,all-year.early-peak,2.55 @@ -233,12 +233,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2050,electricity,R2,all-year.early-peak,4.2585 2050,electricity,R2,all-year.late-peak,4.2585 2050,electricity,R2,all-year.evening,4.2585 -2050,gas,R2,all-year.night,2.5500000000000003 -2050,gas,R2,all-year.morning,2.55 -2050,gas,R2,all-year.afternoon,2.55 -2050,gas,R2,all-year.early-peak,2.55 -2050,gas,R2,all-year.late-peak,2.55 -2050,gas,R2,all-year.evening,2.55 2050,heat,R1,all-year.night,-0.0 2050,heat,R1,all-year.morning,-0.0 2050,heat,R1,all-year.afternoon,-0.0 From c502b1a2c3d573024c1717d5775b897a7764779c Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Fri, 13 Mar 2026 16:56:59 +0000 Subject: [PATCH 12/14] Revert "update regression data" This reverts commit ff76b029172b89cd7131096f27873368a46b736c. --- tests/data/simple_full/assets.csv | 2 +- tests/data/simple_full/commodity_flows.csv | 208 ++++++++++-------- tests/data/simple_full/commodity_prices.csv | 199 ++++++++--------- .../data/simple_marginal/commodity_prices.csv | 64 +++--- tests/data/two_regions/commodity_prices.csv | 8 +- 5 files changed, 254 insertions(+), 227 deletions(-) diff --git a/tests/data/simple_full/assets.csv b/tests/data/simple_full/assets.csv index 8aaac8226..5f4559fa2 100644 --- a/tests/data/simple_full/assets.csv +++ b/tests/data/simple_full/assets.csv @@ -6,5 +6,5 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 4,RGASBR,GBR,A0_RES,,2020,2035,2900.0 5,RELCHP,GBR,A0_RES,,2020,2035,399.98 6,RGASBR,GBR,A0_RES,,2030,,355.83840587648046 -7,WNDFRM,GBR,A0_ELC,,2030,2040,5.353359296518287 +7,GASCGT,GBR,A0_ELC,,2030,2040,0.5151564434825014 8,RGASBR,GBR,A0_RES,,2040,,3655.8189696 diff --git a/tests/data/simple_full/commodity_flows.csv b/tests/data/simple_full/commodity_flows.csv index 981ef4e22..8777f8bfa 100644 --- a/tests/data/simple_full/commodity_flows.csv +++ b/tests/data/simple_full/commodity_flows.csv @@ -225,8 +225,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2020,5,RSHEAT,autumn.evening,15.437192051273913 2030,0,GASPRD,winter.night,0.0 2030,0,CO2EMT,winter.night,0.0 -2030,0,GASPRD,winter.day,182.31624506589384 -2030,0,CO2EMT,winter.day,932.1829610219153 +2030,0,GASPRD,winter.day,209.007363584943 +2030,0,CO2EMT,winter.day,1068.6546500098136 2030,0,GASPRD,winter.peak,125.070625 2030,0,CO2EMT,winter.peak,639.486105625 2030,0,GASPRD,winter.evening,166.76083466742 @@ -235,8 +235,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,peak.night,0.0 2030,0,GASPRD,peak.day,0.0 2030,0,CO2EMT,peak.day,0.0 -2030,0,GASPRD,peak.peak,63.43529638170452 -2030,0,CO2EMT,peak.peak,324.34467039965523 +2030,0,GASPRD,peak.peak,88.48378530453337 +2030,0,CO2EMT,peak.peak,452.41759426207915 2030,0,GASPRD,peak.evening,166.76083466742 2030,0,CO2EMT,peak.evening,852.6481476545185 2030,0,GASPRD,summer.night,0.0 @@ -245,22 +245,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,summer.day,0.0 2030,0,GASPRD,summer.peak,0.0 2030,0,CO2EMT,summer.peak,0.0 -2030,0,GASPRD,summer.evening,0.0 -2030,0,CO2EMT,summer.evening,0.0 +2030,0,GASPRD,summer.evening,0.464792220809886 +2030,0,CO2EMT,summer.evening,2.3764826250009476 2030,0,GASPRD,autumn.night,0.0 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,0.0 -2030,0,CO2EMT,autumn.peak,0.0 -2030,0,GASPRD,autumn.evening,160.94459622561885 -2030,0,CO2EMT,autumn.evening,822.9097205015893 +2030,0,GASPRD,autumn.peak,20.534211026060348 +2030,0,CO2EMT,autumn.peak,104.99142097624657 +2030,0,GASPRD,autumn.evening,166.76083466742 +2030,0,CO2EMT,autumn.evening,852.6481476545185 2030,1,GASPRD,winter.night,-0.0 2030,1,GASNAT,winter.night,0.0 2030,1,CO2EMT,winter.night,0.0 -2030,1,GASPRD,winter.day,-184.57837528456835 -2030,1,GASNAT,winter.day,175.78892884244604 -2030,1,CO2EMT,winter.day,449.40439658571336 +2030,1,GASPRD,winter.day,-211.26949380361748 +2030,1,GASNAT,winter.day,201.2090417177309 +2030,1,CO2EMT,winter.day,514.3909151513791 2030,1,GASPRD,winter.peak,-124.10114062500001 2030,1,GASNAT,winter.peak,118.1915625 2030,1,CO2EMT,winter.peak,302.15672953125005 @@ -273,9 +273,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,peak.day,-0.0 2030,1,GASNAT,peak.day,0.0 2030,1,CO2EMT,peak.day,0.0 -2030,1,GASPRD,peak.peak,-64.72794222537904 -2030,1,GASNAT,peak.peak,61.64565926226575 -2030,1,CO2EMT,peak.peak,157.5971279039824 +2030,1,GASPRD,peak.peak,-89.77643114820788 +2030,1,GASNAT,peak.peak,85.50136299829322 +2030,1,CO2EMT,peak.peak,218.58423450513664 2030,1,GASPRD,peak.evening,-165.4681888237455 2030,1,GASNAT,peak.evening,157.58875126070998 2030,1,CO2EMT,peak.evening,402.87564259800513 @@ -288,61 +288,61 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,summer.peak,-0.0 2030,1,GASNAT,summer.peak,0.0 2030,1,CO2EMT,summer.peak,0.0 -2030,1,GASPRD,summer.evening,-0.0 -2030,1,GASNAT,summer.evening,0.0 -2030,1,CO2EMT,summer.evening,0.0 +2030,1,GASPRD,summer.evening,-0.464792220809886 +2030,1,GASNAT,summer.evening,0.44265925791417715 +2030,1,CO2EMT,summer.evening,1.131658392857594 2030,1,GASPRD,autumn.night,-0.0 2030,1,GASNAT,autumn.night,0.0 2030,1,CO2EMT,autumn.night,0.0 2030,1,GASPRD,autumn.day,-0.0 2030,1,GASNAT,autumn.day,0.0 2030,1,CO2EMT,autumn.day,0.0 -2030,1,GASPRD,autumn.peak,-0.0 -2030,1,GASNAT,autumn.peak,0.0 -2030,1,CO2EMT,autumn.peak,0.0 -2030,1,GASPRD,autumn.evening,-160.94459622561885 -2030,1,GASNAT,autumn.evening,153.2805678339227 -2030,1,CO2EMT,autumn.evening,391.8617716674234 -2030,2,ELCTRI,winter.night,3.6359293344885586 -2030,2,ELCTRI,winter.day,4.1960865042892355 -2030,2,ELCTRI,winter.peak,1.4631984417488688 -2030,2,ELCTRI,winter.evening,2.0301454229475584 +2030,1,GASPRD,autumn.peak,-21.826856869734865 +2030,1,GASNAT,autumn.peak,20.78748273308082 +2030,1,CO2EMT,autumn.peak,53.143199607121126 +2030,1,GASPRD,autumn.evening,-165.4681888237455 +2030,1,GASNAT,autumn.evening,157.58875126070998 +2030,1,CO2EMT,autumn.evening,402.87564259800513 +2030,2,ELCTRI,winter.night,4.435312795545212 +2030,2,ELCTRI,winter.day,7.075379933645912 +2030,2,ELCTRI,winter.peak,1.9712501261051125 +2030,2,ELCTRI,winter.evening,2.5696653598405335 2030,2,ELCTRI,peak.night,2.851272517283696 -2030,2,ELCTRI,peak.day,5.146656256509029 -2030,2,ELCTRI,peak.peak,1.724605125411014 +2030,2,ELCTRI,peak.day,6.3713620320039785 +2030,2,ELCTRI,peak.peak,1.7776452018191917 2030,2,ELCTRI,peak.evening,1.72484387381507 -2030,2,ELCTRI,summer.night,0.0 -2030,2,ELCTRI,summer.day,0.0 -2030,2,ELCTRI,summer.peak,0.0 -2030,2,ELCTRI,summer.evening,0.0 +2030,2,ELCTRI,summer.night,1.6368416242136155 +2030,2,ELCTRI,summer.day,3.2188600626534005 +2030,2,ELCTRI,summer.peak,1.0599640039494003 +2030,2,ELCTRI,summer.evening,0.7892279633502001 2030,2,ELCTRI,autumn.night,3.203281465982185 -2030,2,ELCTRI,autumn.day,5.645705373786219 +2030,2,ELCTRI,autumn.day,6.001752635595889 2030,2,ELCTRI,autumn.peak,1.5488393825638174 2030,2,ELCTRI,autumn.evening,1.9008483513729915 -2030,3,GASNAT,winter.night,-0.0 -2030,3,ELCTRI,winter.night,0.0 -2030,3,CO2EMT,winter.night,0.0 -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,-4.385158138672478 -2030,3,ELCTRI,peak.night,2.923438759114985 -2030,3,CO2EMT,peak.night,224.21313563032376 -2030,3,GASNAT,peak.day,-0.0 -2030,3,ELCTRI,peak.day,0.0 -2030,3,CO2EMT,peak.day,0.0 -2030,3,GASNAT,peak.peak,-0.0 -2030,3,ELCTRI,peak.peak,0.0 -2030,3,CO2EMT,peak.peak,0.0 -2030,3,GASNAT,peak.evening,-2.1689778859072866 -2030,3,ELCTRI,peak.evening,1.4459852572715244 -2030,3,CO2EMT,peak.evening,110.89983930643955 +2030,3,GASNAT,winter.night,-7.783808997678887 +2030,3,ELCTRI,winter.night,5.189205998452591 +2030,3,CO2EMT,winter.night,397.9861540513214 +2030,3,GASNAT,winter.day,-10.010898915527838 +2030,3,ELCTRI,winter.day,6.6739326103518914 +2030,3,CO2EMT,winter.day,511.8572615509383 +2030,3,GASNAT,winter.peak,-2.468688831431171 +2030,3,ELCTRI,winter.peak,1.6457925542874472 +2030,3,CO2EMT,winter.peak,126.22405995107574 +2030,3,GASNAT,winter.evening,-4.395089526235901 +2030,3,ELCTRI,winter.evening,2.9300596841572673 +2030,3,CO2EMT,winter.evening,224.7209274764416 +2030,3,GASNAT,peak.night,-8.382740663321101 +2030,3,ELCTRI,peak.night,5.5884937755474 +2030,3,CO2EMT,peak.night,428.6095301156078 +2030,3,GASNAT,peak.day,-8.528170411829517 +2030,3,ELCTRI,peak.day,5.685446941219679 +2030,3,CO2EMT,peak.day,436.04535315684325 +2030,3,GASNAT,peak.peak,-3.520722822271213 +2030,3,ELCTRI,peak.peak,2.3471485481808085 +2030,3,CO2EMT,peak.peak,180.0145579027271 +2030,3,GASNAT,peak.evening,-4.646819607935198 +2030,3,ELCTRI,peak.evening,3.0978797386234653 +2030,3,CO2EMT,peak.evening,237.59188655372665 2030,3,GASNAT,summer.night,-0.0 2030,3,ELCTRI,summer.night,0.0 2030,3,CO2EMT,summer.night,0.0 @@ -355,18 +355,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-3.1442174057585746 -2030,3,ELCTRI,autumn.night,2.096144937172383 -2030,3,CO2EMT,autumn.night,160.7638359564359 -2030,3,GASNAT,autumn.day,-0.0 -2030,3,ELCTRI,autumn.day,0.0 -2030,3,CO2EMT,autumn.day,0.0 -2030,3,GASNAT,autumn.peak,-0.7270513709523598 -2030,3,ELCTRI,autumn.peak,0.4847009139682399 -2030,3,CO2EMT,autumn.peak,37.174136596794156 -2030,3,GASNAT,autumn.evening,-1.548507508138754 -2030,3,ELCTRI,autumn.evening,1.0323383387591694 -2030,3,CO2EMT,autumn.evening,79.17518889113448 +2030,3,GASNAT,autumn.night,-8.382740663321101 +2030,3,ELCTRI,autumn.night,5.5884937755474 +2030,3,CO2EMT,autumn.night,428.6095301156078 +2030,3,GASNAT,autumn.day,-11.621339862602872 +2030,3,ELCTRI,autumn.day,7.747559908401914 +2030,3,CO2EMT,autumn.day,594.1991071748848 +2030,3,GASNAT,autumn.peak,-3.102304946743114 +2030,3,ELCTRI,autumn.peak,2.0682032978287426 +2030,3,CO2EMT,autumn.peak,158.6208519269754 +2030,3,GASNAT,autumn.evening,-4.3828128915983156 +2030,3,ELCTRI,autumn.evening,2.921875261065544 +2030,3,CO2EMT,autumn.evening,224.09322314742187 2030,4,GASNAT,winter.night,-43.845148578709995 2030,4,RSHEAT,winter.night,38.1262161554 2030,4,CO2EMT,winter.night,2241.8024468294425 @@ -495,22 +495,54 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,autumn.evening,-0.0 2030,6,RSHEAT,autumn.evening,0.0 2030,6,CO2EMT,autumn.evening,0.0 -2030,7,ELCTRI,winter.night,5.988589459509244 -2030,7,ELCTRI,winter.day,9.553226039708568 -2030,7,ELCTRI,winter.peak,2.6615953082511314 -2030,7,ELCTRI,winter.evening,3.4695796210502423 -2030,7,ELCTRI,peak.night,3.8498075175991215 -2030,7,ELCTRI,peak.day,8.602656287488774 -2030,7,ELCTRI,peak.peak,2.4001886245889863 -2030,7,ELCTRI,peak.evening,2.3288959129112063 -2030,7,ELCTRI,summer.night,1.9319477961564002 -2030,7,ELCTRI,summer.day,3.2188600626534005 -2030,7,ELCTRI,summer.peak,1.0599640039494003 -2030,7,ELCTRI,summer.evening,0.7892279633502001 -2030,7,ELCTRI,autumn.night,4.325092390843235 -2030,7,ELCTRI,autumn.day,8.103607170211584 -2030,7,ELCTRI,autumn.peak,2.0912534534679432 -2030,7,ELCTRI,autumn.evening,2.5665383538656403 +2030,7,GASNAT,winter.night,-0.0 +2030,7,ELCTRI,winter.night,0.0 +2030,7,CO2EMT,winter.night,0.0 +2030,7,GASNAT,winter.day,-0.0 +2030,7,ELCTRI,winter.day,0.0 +2030,7,CO2EMT,winter.day,0.0 +2030,7,GASNAT,winter.peak,-0.7616266044111606 +2030,7,ELCTRI,winter.peak,0.5077510696074404 +2030,7,CO2EMT,winter.peak,38.94196828354264 +2030,7,GASNAT,winter.evening,-0.0 +2030,7,ELCTRI,winter.evening,0.0 +2030,7,CO2EMT,winter.evening,0.0 +2030,7,GASNAT,peak.night,-1.777128751750059 +2030,7,ELCTRI,peak.night,1.184752501166706 +2030,7,CO2EMT,peak.night,90.8645930769805 +2030,7,GASNAT,peak.day,-2.5387553561612193 +2030,7,ELCTRI,peak.day,1.6925035707741463 +2030,7,CO2EMT,peak.day,129.80656136052315 +2030,7,GASNAT,peak.peak,-0.0 +2030,7,ELCTRI,peak.peak,0.0 +2030,7,CO2EMT,peak.peak,0.0 +2030,7,GASNAT,peak.evening,-1.0155021473388979 +2030,7,ELCTRI,peak.evening,0.6770014315592653 +2030,7,CO2EMT,peak.evening,51.92262479343785 +2030,7,GASNAT,summer.night,-0.44265925791417715 +2030,7,ELCTRI,summer.night,0.29510617194278477 +2030,7,CO2EMT,summer.night,22.633167857151875 +2030,7,GASNAT,summer.day,-0.0 +2030,7,ELCTRI,summer.day,0.0 +2030,7,CO2EMT,summer.day,0.0 +2030,7,GASNAT,summer.peak,-0.0 +2030,7,ELCTRI,summer.peak,0.0 +2030,7,CO2EMT,summer.peak,0.0 +2030,7,GASNAT,summer.evening,-0.0 +2030,7,ELCTRI,summer.evening,0.0 +2030,7,CO2EMT,summer.evening,0.0 +2030,7,GASNAT,autumn.night,-1.2491153287023264 +2030,7,ELCTRI,autumn.night,0.8327435524682176 +2030,7,CO2EMT,autumn.night,63.867266756549945 +2030,7,GASNAT,autumn.day,-0.0 +2030,7,ELCTRI,autumn.day,0.0 +2030,7,CO2EMT,autumn.day,0.0 +2030,7,GASNAT,autumn.peak,-0.7616266044111606 +2030,7,ELCTRI,autumn.peak,0.5077510696074404 +2030,7,CO2EMT,autumn.peak,38.94196828354264 +2030,7,GASNAT,autumn.evening,-1.0155021473388979 +2030,7,ELCTRI,autumn.evening,0.6770014315592653 +2030,7,CO2EMT,autumn.evening,51.92262479343785 2040,0,GASPRD,winter.night,0.0 2040,0,CO2EMT,winter.night,0.0 2040,0,GASPRD,winter.day,360.96396982311984 diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv index 812041beb..b85359426 100644 --- a/tests/data/simple_full/commodity_prices.csv +++ b/tests/data/simple_full/commodity_prices.csv @@ -1,36 +1,4 @@ milestone_year,commodity_id,region_id,time_slice,price -2020,GASPRD,GBR,winter.night,8.94778881206003 -2020,GASPRD,GBR,winter.day,8.94778881206003 -2020,GASPRD,GBR,winter.peak,8.94778881206003 -2020,GASPRD,GBR,winter.evening,8.94778881206003 -2020,GASPRD,GBR,peak.night,8.94778881206003 -2020,GASPRD,GBR,peak.day,8.94778881206003 -2020,GASPRD,GBR,peak.peak,8.94778881206003 -2020,GASPRD,GBR,peak.evening,8.94778881206003 -2020,GASPRD,GBR,summer.night,8.94778881206003 -2020,GASPRD,GBR,summer.day,8.94778881206003 -2020,GASPRD,GBR,summer.peak,8.94778881206003 -2020,GASPRD,GBR,summer.evening,8.94778881206003 -2020,GASPRD,GBR,autumn.night,8.94778881206003 -2020,GASPRD,GBR,autumn.day,8.94778881206003 -2020,GASPRD,GBR,autumn.peak,8.94778881206003 -2020,GASPRD,GBR,autumn.evening,8.94778881206003 -2020,GASNAT,GBR,winter.night,14.681136706809944 -2020,GASNAT,GBR,winter.day,14.681136706809944 -2020,GASNAT,GBR,winter.peak,14.681136706809944 -2020,GASNAT,GBR,winter.evening,14.681136706809944 -2020,GASNAT,GBR,peak.night,14.681136706809944 -2020,GASNAT,GBR,peak.day,14.681136706809944 -2020,GASNAT,GBR,peak.peak,14.681136706809944 -2020,GASNAT,GBR,peak.evening,14.681136706809944 -2020,GASNAT,GBR,summer.night,14.681136706809944 -2020,GASNAT,GBR,summer.day,14.681136706809944 -2020,GASNAT,GBR,summer.peak,14.681136706809944 -2020,GASNAT,GBR,summer.evening,14.681136706809944 -2020,GASNAT,GBR,autumn.night,14.681136706809944 -2020,GASNAT,GBR,autumn.day,14.681136706809944 -2020,GASNAT,GBR,autumn.peak,14.681136706809944 -2020,GASNAT,GBR,autumn.evening,14.681136706809944 2020,ELCTRI,GBR,winter.night,7.993308999999999 2020,ELCTRI,GBR,winter.day,7.993308999999999 2020,ELCTRI,GBR,winter.peak,7.993308999999999 @@ -63,52 +31,52 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 -2030,GASPRD,GBR,winter.night,8.687785038509922 -2030,GASPRD,GBR,winter.day,8.687785038509922 -2030,GASPRD,GBR,winter.peak,8.687785038509922 -2030,GASPRD,GBR,winter.evening,8.687785038509922 -2030,GASPRD,GBR,peak.night,8.687785038509922 -2030,GASPRD,GBR,peak.day,8.687785038509922 -2030,GASPRD,GBR,peak.peak,8.687785038509922 -2030,GASPRD,GBR,peak.evening,8.687785038509922 -2030,GASPRD,GBR,summer.night,8.687785038509922 -2030,GASPRD,GBR,summer.day,8.687785038509922 -2030,GASPRD,GBR,summer.peak,8.687785038509922 -2030,GASPRD,GBR,summer.evening,8.687785038509922 -2030,GASPRD,GBR,autumn.night,8.687785038509922 -2030,GASPRD,GBR,autumn.day,8.687785038509922 -2030,GASPRD,GBR,autumn.peak,8.687785038509922 -2030,GASPRD,GBR,autumn.evening,8.687785038509922 -2030,GASNAT,GBR,winter.night,14.227541461097879 -2030,GASNAT,GBR,winter.day,14.227541461097879 -2030,GASNAT,GBR,winter.peak,14.227541461097879 -2030,GASNAT,GBR,winter.evening,14.227541461097879 -2030,GASNAT,GBR,peak.night,14.227541461097879 -2030,GASNAT,GBR,peak.day,14.227541461097879 -2030,GASNAT,GBR,peak.peak,14.227541461097879 -2030,GASNAT,GBR,peak.evening,14.227541461097879 -2030,GASNAT,GBR,summer.night,14.227541461097879 -2030,GASNAT,GBR,summer.day,14.227541461097879 -2030,GASNAT,GBR,summer.peak,14.227541461097879 -2030,GASNAT,GBR,summer.evening,14.227541461097879 -2030,GASNAT,GBR,autumn.night,14.227541461097879 -2030,GASNAT,GBR,autumn.day,14.227541461097879 -2030,GASNAT,GBR,autumn.peak,14.227541461097879 -2030,GASNAT,GBR,autumn.evening,14.227541461097879 -2030,ELCTRI,GBR,winter.night,0.4 -2030,ELCTRI,GBR,winter.day,0.4 -2030,ELCTRI,GBR,winter.peak,0.4 -2030,ELCTRI,GBR,winter.evening,0.4 +2020,GASPRD,GBR,winter.day,7.504535286481447 +2020,GASPRD,GBR,winter.peak,7.504535286481447 +2020,GASPRD,GBR,winter.evening,7.504535286481447 +2020,GASPRD,GBR,peak.peak,7.504535286481447 +2020,GASPRD,GBR,peak.evening,7.504535286481447 +2020,GASPRD,GBR,summer.evening,7.504535286481447 +2020,GASPRD,GBR,autumn.evening,7.504535286481447 +2020,GASNAT,GBR,winter.day,6.598258237765183 +2020,GASNAT,GBR,winter.peak,6.598258237765183 +2020,GASNAT,GBR,winter.evening,6.598258237765183 +2020,GASNAT,GBR,peak.peak,6.598258237765183 +2020,GASNAT,GBR,peak.evening,6.598258237765183 +2020,GASNAT,GBR,summer.evening,6.598258237765183 +2020,GASNAT,GBR,autumn.evening,6.598258237765183 +2020,GASPRD,GBR,winter.night,3.428609686103873 +2020,GASPRD,GBR,peak.night,3.428609686103873 +2020,GASPRD,GBR,peak.day,3.428609686103873 +2020,GASPRD,GBR,summer.night,3.428609686103873 +2020,GASPRD,GBR,summer.day,3.428609686103873 +2020,GASPRD,GBR,summer.peak,3.428609686103873 +2020,GASPRD,GBR,autumn.night,3.428609686103873 +2020,GASPRD,GBR,autumn.day,3.428609686103873 +2020,GASPRD,GBR,autumn.peak,3.428609686103873 +2020,GASNAT,GBR,winter.night,3.7738687802727107 +2020,GASNAT,GBR,peak.night,3.7738687802727107 +2020,GASNAT,GBR,peak.day,3.7738687802727107 +2020,GASNAT,GBR,summer.night,3.7738687802727107 +2020,GASNAT,GBR,summer.day,3.7738687802727107 +2020,GASNAT,GBR,summer.peak,3.7738687802727107 +2020,GASNAT,GBR,autumn.night,3.7738687802727107 +2020,GASNAT,GBR,autumn.day,3.7738687802727107 +2020,GASNAT,GBR,autumn.peak,3.7738687802727107 +2030,ELCTRI,GBR,winter.night,7.993308999999999 +2030,ELCTRI,GBR,winter.day,7.993308999999999 +2030,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,ELCTRI,GBR,winter.evening,7.993308999999999 2030,ELCTRI,GBR,peak.night,7.993308999999999 -2030,ELCTRI,GBR,peak.day,0.4 -2030,ELCTRI,GBR,peak.peak,0.4 +2030,ELCTRI,GBR,peak.day,7.993308999999999 +2030,ELCTRI,GBR,peak.peak,7.993308999999999 2030,ELCTRI,GBR,peak.evening,7.993308999999999 -2030,ELCTRI,GBR,summer.night,0.4 +2030,ELCTRI,GBR,summer.night,7.993308999999999 2030,ELCTRI,GBR,summer.day,0.4 2030,ELCTRI,GBR,summer.peak,0.4 2030,ELCTRI,GBR,summer.evening,0.4 2030,ELCTRI,GBR,autumn.night,7.993308999999999 -2030,ELCTRI,GBR,autumn.day,0.4 +2030,ELCTRI,GBR,autumn.day,7.993308999999999 2030,ELCTRI,GBR,autumn.peak,7.993308999999999 2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,RSHEAT,GBR,winter.night,5.8665369 @@ -119,7 +87,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,peak.day,5.8665369 2030,RSHEAT,GBR,peak.peak,5.8665369 2030,RSHEAT,GBR,peak.evening,5.8665369 -2030,RSHEAT,GBR,summer.night,0.30200000000000005 +2030,RSHEAT,GBR,summer.night,2.80779197 2030,RSHEAT,GBR,summer.day,0.30200000000000005 2030,RSHEAT,GBR,summer.peak,0.30200000000000005 2030,RSHEAT,GBR,summer.evening,0.30200000000000005 @@ -127,38 +95,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2040,GASPRD,GBR,winter.night,6.325466094838786 -2040,GASPRD,GBR,winter.day,6.325466094838786 -2040,GASPRD,GBR,winter.peak,6.325466094838786 -2040,GASPRD,GBR,winter.evening,6.325466094838786 -2040,GASPRD,GBR,peak.night,6.325466094838786 -2040,GASPRD,GBR,peak.day,6.325466094838786 -2040,GASPRD,GBR,peak.peak,6.325466094838786 -2040,GASPRD,GBR,peak.evening,6.325466094838786 -2040,GASPRD,GBR,summer.night,6.325466094838786 -2040,GASPRD,GBR,summer.day,6.325466094838786 -2040,GASPRD,GBR,summer.peak,6.325466094838786 -2040,GASPRD,GBR,summer.evening,6.325466094838786 -2040,GASPRD,GBR,autumn.night,6.325466094838786 -2040,GASPRD,GBR,autumn.day,6.325466094838786 -2040,GASPRD,GBR,autumn.peak,6.325466094838786 -2040,GASPRD,GBR,autumn.evening,6.325466094838786 -2040,GASNAT,GBR,winter.night,10.106301219664724 -2040,GASNAT,GBR,winter.day,10.106301219664724 -2040,GASNAT,GBR,winter.peak,10.106301219664724 -2040,GASNAT,GBR,winter.evening,10.106301219664724 -2040,GASNAT,GBR,peak.night,10.106301219664724 -2040,GASNAT,GBR,peak.day,10.106301219664724 -2040,GASNAT,GBR,peak.peak,10.106301219664724 -2040,GASNAT,GBR,peak.evening,10.106301219664724 -2040,GASNAT,GBR,summer.night,10.106301219664724 -2040,GASNAT,GBR,summer.day,10.106301219664724 -2040,GASNAT,GBR,summer.peak,10.106301219664724 -2040,GASNAT,GBR,summer.evening,10.106301219664724 -2040,GASNAT,GBR,autumn.night,10.106301219664724 -2040,GASNAT,GBR,autumn.day,10.106301219664724 -2040,GASNAT,GBR,autumn.peak,10.106301219664724 -2040,GASNAT,GBR,autumn.evening,10.106301219664724 +2030,GASPRD,GBR,winter.day,6.8760807959710935 +2030,GASPRD,GBR,winter.peak,6.8760807959710935 +2030,GASPRD,GBR,winter.evening,6.8760807959710935 +2030,GASPRD,GBR,peak.peak,6.8760807959710935 +2030,GASPRD,GBR,peak.evening,6.8760807959710935 +2030,GASPRD,GBR,summer.evening,6.8760807959710935 +2030,GASPRD,GBR,autumn.peak,6.8760807959710935 +2030,GASPRD,GBR,autumn.evening,6.8760807959710935 +2030,GASNAT,GBR,winter.day,6.161750372397898 +2030,GASNAT,GBR,winter.peak,6.161750372397898 +2030,GASNAT,GBR,winter.evening,6.161750372397898 +2030,GASNAT,GBR,peak.peak,6.161750372397898 +2030,GASNAT,GBR,peak.evening,6.161750372397898 +2030,GASNAT,GBR,summer.evening,6.161750372397898 +2030,GASNAT,GBR,autumn.peak,6.161750372397898 +2030,GASNAT,GBR,autumn.evening,6.161750372397898 +2030,GASPRD,GBR,winter.night,3.428609686103873 +2030,GASPRD,GBR,peak.night,3.428609686103873 +2030,GASPRD,GBR,peak.day,3.428609686103873 +2030,GASPRD,GBR,summer.night,3.428609686103873 +2030,GASPRD,GBR,summer.day,3.428609686103873 +2030,GASPRD,GBR,summer.peak,3.428609686103873 +2030,GASPRD,GBR,autumn.night,3.428609686103873 +2030,GASPRD,GBR,autumn.day,3.428609686103873 +2030,GASNAT,GBR,winter.night,3.7738687802727107 +2030,GASNAT,GBR,peak.night,3.7738687802727107 +2030,GASNAT,GBR,peak.day,3.7738687802727107 +2030,GASNAT,GBR,summer.night,3.7738687802727107 +2030,GASNAT,GBR,summer.day,3.7738687802727107 +2030,GASNAT,GBR,summer.peak,3.7738687802727107 +2030,GASNAT,GBR,autumn.night,3.7738687802727107 +2030,GASNAT,GBR,autumn.day,3.7738687802727107 2040,RSHEAT,GBR,winter.night,5.8665369 2040,RSHEAT,GBR,winter.day,5.8665369 2040,RSHEAT,GBR,winter.peak,5.8665369 @@ -175,3 +143,24 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,RSHEAT,GBR,autumn.day,5.8665369 2040,RSHEAT,GBR,autumn.peak,5.8665369 2040,RSHEAT,GBR,autumn.evening,5.8665369 +2040,GASPRD,GBR,winter.day,5.443465073396721 +2040,GASPRD,GBR,winter.peak,5.443465073396721 +2040,GASPRD,GBR,winter.evening,5.443465073396721 +2040,GASPRD,GBR,peak.day,5.443465073396721 +2040,GASPRD,GBR,peak.peak,5.443465073396721 +2040,GASPRD,GBR,peak.evening,5.443465073396721 +2040,GASPRD,GBR,summer.evening,5.443465073396721 +2040,GASPRD,GBR,autumn.day,5.443465073396721 +2040,GASPRD,GBR,autumn.peak,5.443465073396721 +2040,GASPRD,GBR,autumn.evening,5.443465073396721 +2040,GASNAT,GBR,winter.night,5.166692883880049 +2040,GASNAT,GBR,winter.day,5.166692883880049 +2040,GASNAT,GBR,winter.peak,5.166692883880049 +2040,GASNAT,GBR,winter.evening,5.166692883880049 +2040,GASNAT,GBR,peak.day,5.166692883880049 +2040,GASNAT,GBR,peak.peak,5.166692883880049 +2040,GASNAT,GBR,peak.evening,5.166692883880049 +2040,GASNAT,GBR,summer.evening,5.166692883880049 +2040,GASNAT,GBR,autumn.day,5.166692883880049 +2040,GASNAT,GBR,autumn.peak,5.166692883880049 +2040,GASNAT,GBR,autumn.evening,5.166692883880049 diff --git a/tests/data/simple_marginal/commodity_prices.csv b/tests/data/simple_marginal/commodity_prices.csv index 93a05c2cb..a9b8ee0fc 100644 --- a/tests/data/simple_marginal/commodity_prices.csv +++ b/tests/data/simple_marginal/commodity_prices.csv @@ -31,22 +31,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASNAT,GBR,autumn.day,2.9170059999999998 2020,GASNAT,GBR,autumn.peak,2.9170059999999998 2020,GASNAT,GBR,autumn.evening,2.9170059999999998 -2020,ELCTRI,GBR,winter.night,7.993308999999999 -2020,ELCTRI,GBR,winter.day,7.993308999999999 -2020,ELCTRI,GBR,winter.peak,7.993308999999999 -2020,ELCTRI,GBR,winter.evening,7.993308999999999 -2020,ELCTRI,GBR,peak.night,7.993308999999999 -2020,ELCTRI,GBR,peak.day,7.993308999999999 -2020,ELCTRI,GBR,peak.peak,7.993308999999999 -2020,ELCTRI,GBR,peak.evening,7.993308999999999 -2020,ELCTRI,GBR,summer.night,7.993308999999999 -2020,ELCTRI,GBR,summer.day,7.993308999999999 -2020,ELCTRI,GBR,summer.peak,7.993308999999999 -2020,ELCTRI,GBR,summer.evening,7.993308999999999 -2020,ELCTRI,GBR,autumn.night,7.993308999999999 -2020,ELCTRI,GBR,autumn.day,7.993308999999999 -2020,ELCTRI,GBR,autumn.peak,7.993308999999999 -2020,ELCTRI,GBR,autumn.evening,7.993308999999999 2020,RSHEAT,GBR,winter.night,5.8665369 2020,RSHEAT,GBR,winter.day,5.8665369 2020,RSHEAT,GBR,winter.peak,5.8665369 @@ -63,6 +47,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 +2020,ELCTRI,GBR,winter.night,7.993308999999999 +2020,ELCTRI,GBR,winter.day,7.993308999999999 +2020,ELCTRI,GBR,winter.peak,7.993308999999999 +2020,ELCTRI,GBR,winter.evening,7.993308999999999 +2020,ELCTRI,GBR,peak.night,7.993308999999999 +2020,ELCTRI,GBR,peak.day,7.993308999999999 +2020,ELCTRI,GBR,peak.peak,7.993308999999999 +2020,ELCTRI,GBR,peak.evening,7.993308999999999 +2020,ELCTRI,GBR,summer.night,7.993308999999999 +2020,ELCTRI,GBR,summer.day,0.4 +2020,ELCTRI,GBR,summer.peak,0.4 +2020,ELCTRI,GBR,summer.evening,0.4 +2020,ELCTRI,GBR,autumn.night,7.993308999999999 +2020,ELCTRI,GBR,autumn.day,7.993308999999999 +2020,ELCTRI,GBR,autumn.peak,7.993308999999999 +2020,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,GASPRD,GBR,winter.night,2.20452 2030,GASPRD,GBR,winter.day,2.20452 2030,GASPRD,GBR,winter.peak,2.20452 @@ -95,22 +95,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,autumn.day,2.9170059999999998 2030,GASNAT,GBR,autumn.peak,2.9170059999999998 2030,GASNAT,GBR,autumn.evening,2.9170059999999998 -2030,ELCTRI,GBR,winter.night,7.993308999999999 -2030,ELCTRI,GBR,winter.day,7.993308999999999 -2030,ELCTRI,GBR,winter.peak,7.993308999999999 -2030,ELCTRI,GBR,winter.evening,7.993308999999999 -2030,ELCTRI,GBR,peak.night,7.993308999999999 -2030,ELCTRI,GBR,peak.day,7.993308999999999 -2030,ELCTRI,GBR,peak.peak,7.993308999999999 -2030,ELCTRI,GBR,peak.evening,7.993308999999999 -2030,ELCTRI,GBR,summer.night,7.993308999999999 -2030,ELCTRI,GBR,summer.day,7.993308999999999 -2030,ELCTRI,GBR,summer.peak,7.993308999999999 -2030,ELCTRI,GBR,summer.evening,7.993308999999999 -2030,ELCTRI,GBR,autumn.night,7.993308999999999 -2030,ELCTRI,GBR,autumn.day,7.993308999999999 -2030,ELCTRI,GBR,autumn.peak,7.993308999999999 -2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2030,RSHEAT,GBR,winter.night,5.8665369 2030,RSHEAT,GBR,winter.day,5.8665369 2030,RSHEAT,GBR,winter.peak,5.8665369 @@ -127,6 +111,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 +2030,ELCTRI,GBR,winter.night,7.993308999999999 +2030,ELCTRI,GBR,winter.day,7.993308999999999 +2030,ELCTRI,GBR,winter.peak,7.993308999999999 +2030,ELCTRI,GBR,winter.evening,7.993308999999999 +2030,ELCTRI,GBR,peak.night,7.993308999999999 +2030,ELCTRI,GBR,peak.day,7.993308999999999 +2030,ELCTRI,GBR,peak.peak,7.993308999999999 +2030,ELCTRI,GBR,peak.evening,7.993308999999999 +2030,ELCTRI,GBR,summer.night,7.993308999999999 +2030,ELCTRI,GBR,summer.day,0.4 +2030,ELCTRI,GBR,summer.peak,0.4 +2030,ELCTRI,GBR,summer.evening,0.4 +2030,ELCTRI,GBR,autumn.night,7.993308999999999 +2030,ELCTRI,GBR,autumn.day,7.993308999999999 +2030,ELCTRI,GBR,autumn.peak,7.993308999999999 +2030,ELCTRI,GBR,autumn.evening,7.993308999999999 2040,GASPRD,GBR,winter.night,2.20452 2040,GASPRD,GBR,winter.day,2.20452 2040,GASPRD,GBR,winter.peak,2.20452 diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv index 023694298..03f82a03e 100644 --- a/tests/data/two_regions/commodity_prices.csv +++ b/tests/data/two_regions/commodity_prices.csv @@ -215,7 +215,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,heat,R2,all-year.early-peak,2.9579999999999997 2045,heat,R2,all-year.late-peak,2.9579999999999997 2045,heat,R2,all-year.evening,2.9579999999999997 -2050,gas,R2,all-year.night,2.5500000000000003 +2050,gas,R2,all-year.night,2.55 2050,gas,R2,all-year.morning,2.55 2050,gas,R2,all-year.afternoon,2.55 2050,gas,R2,all-year.early-peak,2.55 @@ -233,6 +233,12 @@ milestone_year,commodity_id,region_id,time_slice,price 2050,electricity,R2,all-year.early-peak,4.2585 2050,electricity,R2,all-year.late-peak,4.2585 2050,electricity,R2,all-year.evening,4.2585 +2050,gas,R2,all-year.night,2.5500000000000003 +2050,gas,R2,all-year.morning,2.55 +2050,gas,R2,all-year.afternoon,2.55 +2050,gas,R2,all-year.early-peak,2.55 +2050,gas,R2,all-year.late-peak,2.55 +2050,gas,R2,all-year.evening,2.55 2050,heat,R1,all-year.night,-0.0 2050,heat,R1,all-year.morning,-0.0 2050,heat,R1,all-year.afternoon,-0.0 From 506dd932458b5cfd4e2d9ec3b5a02173f742fedd Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Fri, 13 Mar 2026 17:07:39 +0000 Subject: [PATCH 13/14] Revert "Merge branch 'main' into add-regression-tests-for-pricing-strategies" This reverts commit dccbe59a91bca4054dbe4012e533490a7e3747a5, reversing changes made to cdbe3c7597e677ce4e5d60a7aa2cbc8181e4f005. --- .github/actions/generate-docs/action.yml | 6 +- .github/dependabot.yml | 6 - .github/workflows/deploy-docs.yml | 10 - .github/workflows/pre-commit-autoupdate.yml | 5 +- .lycheeignore | 1 - .pre-commit-config.yaml | 10 +- Cargo.lock | 18 +- Cargo.toml | 8 +- build-docs.just | 19 +- docs/.gitignore | 1 - docs/SUMMARY.md | 1 - docs/build_old_docs.py | 86 ------ docs/generate_versions_docs.py | 31 -- docs/model/investment.md | 277 +++--------------- docs/release/__init__.py | 23 -- .../0001-remove-unrecognised-parameter.patch | 23 -- docs/templates/versions.md.jinja | 8 - rust-toolchain.toml | 2 +- src/asset.rs | 32 +- src/graph/investment.rs | 55 +--- src/input.rs | 3 +- src/simulation/investment.rs | 13 +- src/simulation/investment/appraisal.rs | 148 ---------- src/simulation/optimisation.rs | 16 - src/simulation/prices.rs | 274 ++++++++--------- tests/data/circularity/commodity_prices.csv | 192 ++++++------ .../missing_commodity/commodity_prices.csv | 64 ++-- tests/data/muse1_default/commodity_prices.csv | 72 ++--- tests/data/two_outputs/commodity_prices.csv | 192 ++++++------ tests/data/two_regions/commodity_prices.csv | 150 +++++----- 30 files changed, 569 insertions(+), 1177 deletions(-) delete mode 100755 docs/build_old_docs.py delete mode 100644 docs/generate_versions_docs.py delete mode 100644 docs/release/__init__.py delete mode 100644 docs/release/patches/v2.0.0/0001-remove-unrecognised-parameter.patch delete mode 100644 docs/templates/versions.md.jinja diff --git a/.github/actions/generate-docs/action.yml b/.github/actions/generate-docs/action.yml index 4f2328b5d..9784ab9e5 100644 --- a/.github/actions/generate-docs/action.yml +++ b/.github/actions/generate-docs/action.yml @@ -1,9 +1,5 @@ name: Generate documentation description: Generate all documentation -inputs: - build: - description: Just subcommand for `build-docs` to run - default: all runs: using: composite @@ -22,4 +18,4 @@ runs: enable-cache: true - name: Build documentation shell: bash - run: just build-docs::${{ inputs.build }} + run: just build-docs diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 14f254db1..822574943 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,13 +9,7 @@ updates: directory: "/" schedule: interval: "weekly" - groups: - rust: - patterns: ["*"] - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" - groups: - github-actions: - patterns: ["*"] diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 103bc3d0a..a0b3d4aad 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -23,17 +23,7 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v6 - with: - fetch-tags: true - fetch-depth: 0 - - name: Set user name and email for git - run: | - # Needed so we can apply patches - git config --global user.name "GitHub Actions" - git config --global user.email "github-actions[bot]@users.noreply.github.com" - uses: ./.github/actions/generate-docs - with: - build: all_with_old - name: Setup pages uses: actions/configure-pages@v5 - name: Upload artifact diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index bcf789263..bc8476281 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -16,10 +16,9 @@ jobs: - uses: actions/checkout@v6 with: persist-credentials: false - - uses: actions/setup-python@v6 - - uses: actions-rust-lang/setup-rust-toolchain@v1 + - uses: actions/setup-python@v5 - uses: browniebroke/pre-commit-autoupdate-action@main - - uses: peter-evans/create-pull-request@v8 + - uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} branch: update/pre-commit-hooks diff --git a/.lycheeignore b/.lycheeignore index 097724f09..a1358272f 100644 --- a/.lycheeignore +++ b/.lycheeignore @@ -1,6 +1,5 @@ # For some reason these spurious links appear in some cargo doc-generated files ^file://.+/MUSE2/book/api/index\.html$ -^file://.+/MUSE2/book/README\.html$ # Some of these links give a 404, even though they're generated in the API docs. No idea why. ^https://docs.rs/erased-serde/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8edd70794..076379741 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: files: /settings\.toml$ types_or: [toml] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.48.0 + rev: v0.47.0 hooks: - id: markdownlint-fix - repo: https://github.com/pre-commit/mirrors-prettier @@ -53,7 +53,7 @@ repos: - id: clippy args: ["--all-targets", "--", "-D", "warnings"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.5 + rev: v0.15.4 hooks: - id: ruff-check types_or: [python] @@ -65,12 +65,12 @@ repos: hooks: - id: nbstripout - repo: https://github.com/codespell-project/codespell - rev: v2.4.2 + rev: v2.4.1 hooks: - id: codespell args: [--ignore-words, .codespell_ignore.txt] exclude: \.svg$ - - repo: https://github.com/EnergySystemsModellingLab/cffconvert - rev: 2.1.0 + - repo: https://github.com/citation-file-format/cffconvert + rev: b6045d78aac9e02b039703b030588d54d53262ac hooks: - id: validate-cff diff --git a/Cargo.lock b/Cargo.lock index ef2fef354..2875291ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -99,9 +99,9 @@ checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "assert_cmd" -version = "2.2.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a686bbee5efb88a82df0621b236e74d925f470e5445d3220a5648b892ec99c9" +checksum = "9c5bcfa8749ac45dd12cb11055aeeb6b27a3895560d60d71e3c23bf979e60514" dependencies = [ "anstyle", "bstr", @@ -467,9 +467,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "erased-serde" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec" +checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" dependencies = [ "serde", "serde_core", @@ -1020,7 +1020,7 @@ dependencies = [ "serde_string_enum", "strum 0.28.0", "tempfile", - "toml 1.0.6+spec-1.1.0", + "toml 1.0.3+spec-1.1.0", "unicase", "yaml-rust2", ] @@ -1565,9 +1565,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.27.0" +version = "3.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" +checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" dependencies = [ "fastrand", "getrandom 0.3.3", @@ -1626,9 +1626,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.0.6+spec-1.1.0" +version = "1.0.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399b1124a3c9e16766831c6bba21e50192572cdd98706ea114f9502509686ffc" +checksum = "c7614eaf19ad818347db24addfa201729cf2a9b6fdfd9eb0ab870fcacc606c0c" dependencies = [ "indexmap", "serde_core", diff --git a/Cargo.toml b/Cargo.toml index 7c86b5593..6c2c1950f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,8 @@ float-cmp = "0.10.0" itertools = "0.14.0" serde = {version = "1.0.228", features = ["derive", "rc"]} serde_string_enum = "0.2.1" -tempfile = "3.27.0" -toml = "1.0.6" +tempfile = "3.26.0" +toml = "1.0.3" unicase = "2.9.0" fern = {version = "0.7.1", features = ["chrono", "colored"]} chrono = "0.4" @@ -37,10 +37,10 @@ strum = {version = "0.28.0", features = ["derive"]} documented = "0.9.2" dirs = "6.0.0" edit = "0.1.5" -erased-serde = "0.4.10" +erased-serde = "0.4.9" [dev-dependencies] -assert_cmd = "2.2.0" +assert_cmd = "2.1.2" map-macro = "0.3.0" rstest = {version = "0.26.1", default-features = false, features = ["crate-name"]} yaml-rust2 = {version = "0.11.0", default-features = false} diff --git a/build-docs.just b/build-docs.just index 1a5cf67cd..d84474184 100644 --- a/build-docs.just +++ b/build-docs.just @@ -1,11 +1,8 @@ # Make rustdoc warnings fatal export RUSTDOCFLAGS := "-D warnings" -# Build all documentation, except old docs -all: cli-help file-format examples versions book api - -# Build all documentation, including old docs -all_with_old: all old +# Build all documentation +all: cli-help file-format examples book api # Build book book: @@ -36,15 +33,3 @@ file-format *ARGS: examples: @echo Building docs for examples @uv run docs/generate_example_docs.py - -# Build TOC for old versions -versions: - @echo Building TOC for old versions of documentation - @uv run docs/generate_versions_docs.py - -# Build documentation for previous releases -old: - @# Clean output dir - @rm -rf book/release - - @uv run docs/build_old_docs.py diff --git a/docs/.gitignore b/docs/.gitignore index 9eece75fc..ab9fc47fa 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,4 +1,3 @@ # Generated documentation files command_line_help.md examples.md -versions.md diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index 9b0c9a264..4df0560d3 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -23,4 +23,3 @@ - [Release notes](release_notes/README.md) - [MUSE2 v2.0.0 (October 14, 2025)](release_notes/v2.0.0.md) - [Next unreleased version](release_notes/upcoming.md) -- [Other versions of documentation](versions.md) diff --git a/docs/build_old_docs.py b/docs/build_old_docs.py deleted file mode 100755 index 71fa35ae2..000000000 --- a/docs/build_old_docs.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python3 -# -# A script to generate documentation for previous releases of MUSE2. - -import os -import shutil -import subprocess as sp -from pathlib import Path -from tempfile import TemporaryDirectory - -from release import get_releases - -DOCS_SITE_ROOT = "https://energysystemsmodellinglab.github.io/MUSE2" -REPO_ROOT = Path(__file__).parent.parent.absolute() -DOCS_DIR = REPO_ROOT / "docs" - - -def clone_repo_to(dest: Path): - """Clone this repo somewhere else.""" - print("Making a copy of repo") - sp.run(("git", "clone", REPO_ROOT, dest), check=True, capture_output=True) - - # Add a symlink to cargo cache dir - try: - os.symlink(REPO_ROOT / "target", dest / "target") - except (NotImplementedError, OSError): - # Only newer versions of Windows support symlinks and these require the user to have - # additional privileges (or to be in developer mode) - print( - "WARN: Could not create symlink to cache directory; cache will not be stored" - ) - - -def apply_patches_for_release(release: str, repo_path: Path) -> None: - """Apply patches (if any) for the given release.""" - patches_dir = DOCS_DIR / "release" / "patches" / release - for patch_path in sorted(patches_dir.glob("*.patch")): - sp.run(("git", "-C", str(repo_path), "am", str(patch_path)), check=True) - - -def build_docs_for_release(release: str, repo_path: Path, outdir: Path) -> None: - """Build documentation for a given release.""" - print(f"Building docs for {release}") - - # Check out release - sp.run( - ("git", "-C", str(repo_path), "checkout", release), - check=True, - capture_output=True, - ) - - # Apply patches, if any - apply_patches_for_release(release, repo_path) - - # Build docs - sp.run(("just", f"{repo_path!s}/build-docs"), check=True) - - # Patch versions.html to redirect to main versions page - with (repo_path / "book" / "versions.html").open("w", encoding="utf-8") as f: - f.write(f""" - -""") - - # Move to output directory - release_outdir = outdir / release - print(f"Copying to {release_outdir}") - shutil.move((repo_path / "book"), release_outdir) - - -def build_old_docs() -> None: - """Build documentation for previous releases.""" - outdir = REPO_ROOT / "book" / "release" - outdir.mkdir(parents=True, exist_ok=True) - - # Clone this repo to a temporary directory - with TemporaryDirectory() as tmpdir: - repo_path = Path(tmpdir) - clone_repo_to(repo_path) - - # Generate documentation for each previous release - for release in get_releases(): - build_docs_for_release(release, repo_path, outdir) - - -if __name__ == "__main__": - build_old_docs() diff --git a/docs/generate_versions_docs.py b/docs/generate_versions_docs.py deleted file mode 100644 index a4cd5a67d..000000000 --- a/docs/generate_versions_docs.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 -# /// script -# dependencies = [ -# "jinja2", -# ] -# /// -# -# A script to generate the versions.md file, listing links to old versions of documentation. - -from pathlib import Path - -from jinja2 import Environment, FileSystemLoader -from release import get_releases - -DOCS_DIR = Path(__file__).parent.absolute() - - -def generate_versions_md() -> None: - """Write the versions.md file.""" - path = DOCS_DIR / "versions.md" - print(f"Writing {path}") - env = Environment(loader=FileSystemLoader(DOCS_DIR / "templates")) - template = env.get_template("versions.md.jinja") - out = template.render(releases=get_releases()) - - with path.open("w", encoding="utf-8") as f: - f.write(out) - - -if __name__ == "__main__": - generate_versions_md() diff --git a/docs/model/investment.md b/docs/model/investment.md index cc753cdab..6dccf743a 100644 --- a/docs/model/investment.md +++ b/docs/model/investment.md @@ -41,6 +41,12 @@ investments. - \\( \text{FOM}_{opt,r} \\): Annual fixed Operations & Maintenance costs per unit of capacity for \\( opt \\) in \\( r \\). + - \\( FinancingInDecomDec_{ex} \\) (binary flag). This user-defined option specifies whether to + include estimated financing costs in the economic viability threshold when considering the + decommissioning of an existing asset. This can only be used on profit-evaluable assets. Used + with \\( PercentDebt_{ex} \\). Where financing costs are included, the percentage debt is + multiplied by the original capex, and the result is annualised. + - For new candidate assets: - \\( \text{CAPEX}_{ca,r} \\): Upfront capital expenditure required per unit of new capacity for @@ -63,48 +69,33 @@ providing investment and dynamic decommissioning decisions. ### Pre-calculation of metrics for each supply option +> Note: This section contains a reference to "scopes", a feature that is not yet implemented + - Annualised fixed costs per unit of capacity (\\( AFC_{opt,r} \\)): For new candidates, this is their annualised CAPEX plus FOM. For existing assets, the relevant fixed cost is its FOM. -- Calculate the specific process and commodity flow costs (\\(\text{SPCF}\_{t})\\): - - \\[ - \text{SPCF}\_{t} = \sum\_{c} \Big( cost\_{\text{input}}[c] \cdot input\_{\text{coeff}}[c] + - cost\_{\text{output}}[c] \cdot output\_{\text{coeff}}[c] \Big) - \\] - -#### Coefficients of activity - -- Calculate net revenue per unit of activity \\(AC\_{t}^{NPV} \\) (Tool A): - \\[ - \begin{aligned} - AC\_{t}^{NPV} = &-cost\_{\text{var}}[t] \\\\ - &- \text{SPCF}\_{t} \\\\ - &+ \sum\_{c} \Big( output\_{\text{coeff}}[c] - input\_{\text{coeff}}[c] \Big) - \cdot \lambda\_{c,r,t} \\\\ - &+ \varepsilon \\\\ - \end{aligned} - \\] - \\(\varepsilon \approx 1\times 10^{-14}\\) is added to - each \\(AC\_{t}^{NPV} \\) to allow assets which are breakeven (or very close to breakeven) to be - dispatched. +- Costs per unit of activity in each time slice, calculated as follows: -- Calculate cost per unit of activity \\( AC\_{t}^{LCOX} \\) (Tool B). Note that the commodity - of interest (primary output \\( c\_{primary} \\)) is excluded from the price term: \\[ \begin{aligned} - AC\_{t}^{LCOX} = & \quad cost\_{\text{var}}[t] \\\\ - &+ \text{SPCF}\_{t} \\\\ - &- \sum\_{c \neq c\_{primary}} \Big( output\_{\text{coeff}}[c] - input\_{\text{coeff}} - [c] \Big) + AC_t = & \quad cost\_{\text{var}}[t] \\\\ + &+ \sum\_{c} \Big( cost\_{\text{input}}[c] \cdot input\_{\text{coeff}}[c] + + cost\_{\text{output}}[c] \cdot output\_{\text{coeff}}[c] \Big) \\\\ + &+ \sum\_{c} \Big( input\_{\text{coeff}}[c] - output\_{\text{coeff}}[c] \Big) \cdot \lambda\_{c,r,t} \\\\ + &+ \sum\_{s,c} in\\_scope[s] \cdot \Big\\{ \\\\ + &\quad \quad (cost\_{\text{prod}}[s,c] - \mu\_{s,c}^{\text{prod}}) + \cdot output\_{\text{coeff}}[c] \\\\ + &\quad \quad + (cost\_{\text{cons}}[s,c] - \mu\_{s,c}^{\text{cons}}) + \cdot input\_{\text{coeff}}[c] \\\\ + &\quad \quad + (cost\_{\text{net}}[s,c] - \mu\_{s,c}^{\text{net}}) + \cdot (output\_{\text{coeff}}[c] - input\_{\text{coeff}}[c]) \\\\ + &\Big\\} \end{aligned} \\] -- The third term in both activity coefficients accounts for commodity price flow costs, which are - the net costs or revenues associated with the commodity flows. In the LCOX case the commodity of - interest is excluded from this term because the cost of production shouldn't depend on the market - price of the commodity being produced. + When using the LCOX objective, the calculation is adjusted to exclude the commodity of interest + (\\( \lambda\_{c,r,t} \\) are set to zero). ### Initialise demand profiles for commodity of interest @@ -139,8 +130,8 @@ providing investment and dynamic decommissioning decisions. #### Tool A: NPV -This method is used when the decision rule is `single` and the objective is annualised profit for -agents serving commodity \\( c \\). It iteratively builds a supply portfolio by selecting +This method is used when decision rule is single objective and objective is annualised profit for +agents' serving commodity \\( c \\). This method iteratively builds a supply portfolio by selecting options that offer the highest annualised profit for serving the current commodity demand. The economic evaluation uses \\( \pi_{prevMSY} \\) prices and takes account of asset-specific operational constraints (e.g., minimum load levels) and the balance level of the target commodity @@ -148,10 +139,11 @@ operational constraints (e.g., minimum load levels) and the balance level of the - **Optimise capacity and dispatch to maximise annualised profit:** Solve a small optimisation sub-problem to maximise the asset's surplus, subject to its operational rules and the specific - demand tranche it is being asked to serve. + demand tranche it is being asked to serve. \\(\varepsilon \approx 1×10^{-14}\\) is added to each + \\(AC_t \\) to allow assets which are breakeven (or very close to breakeven) to be dispatched. \\[ - maximise \Big\\{\sum_t act_t AC\_{t}^{NPV} + maximise \Big\\{ - \sum_t act_t \* (AC_t + \varepsilon) \Big\\} \\] @@ -163,25 +155,12 @@ operational constraints (e.g., minimum load levels) and the balance level of the - A demand constraint, where output cannot exceed demand in the tranche, which adapts based on the commodity's balance level (time slice, season, annual). - - Capacity is constrained up to \\( CapMaxBuild \\) for candidates, and to known capacity for + - Capacity is constrained to \\( CapMaxBuild \\) for candidates, and to known capacity for existing assets. -- **Decide on metric:** The type of metric used to compare profitability is dependent on the value of - \\(\text{AFC}\\). If \\(\text{AFC} = 0\\) within the tolerance provided by the `float_cmp` crate, - the associated investment option is always prioritised over options with \\(\text{AFC} > 0\\). - -- **If \\(\text{AFC} > 0\\), Use the profitability index \\(\text{PI}\\) metric:** This is the total - annualised surplus divided by the annualised fixed cost. - \\[ - \text{PI} = - \frac{\sum\_t act\_t \cdot \text{AC}\_t^{\text{NPV}}}{\text{AFC} \cdot \text{cap}} - \\] - -- **If \\(\text{AFC} = 0\\), Use the total annualised surplus metric \\(\text{TAS}\\):** - \\[ - \text{TAS} = - \sum\_t act\_t \cdot \text{AC}\_t^{\text{NPV}} - \\] +- **Calculate a profitability index:** This is the total annualised surplus (\\( - \sum_t + act_t \* AC \\)) divided by the annualised fixed cost (\\( + AFC \* cap \\)). #### Tool B: LCOX @@ -196,12 +175,12 @@ commodities are set to zero, and the commodity of interest is assumed to have ze For each asset option: - **Optimise capacity and dispatch to minimise annualised cost:** Solve a small optimisation - sub-problem to minimise the asset's annualised cost, subject to its operational rules and the specific + sub-problem to maximise the asset's surplus, subject to its operational rules and the specific demand tranche it is being asked to serve. \\[ minimise \Big\\{ - \text{AFC} \times cap + \sum\_t act\_t \times AC\_{t}^{LCOX} + VoLL \times UnmetD\_t + AF \* cap + \sum_t act_t \* AC_t + VoLL \* UnmetD_t \Big\\} \\] @@ -214,195 +193,15 @@ For each asset option: each timeslice of the tranche, which adapts based on the commodity's balance level (time slice, season, annual). - - Capacity is constrained up to \\( CapMaxBuild \\) for candidates, and to known capacity for + - Capacity is constrained to \\( CapMaxBuild \\) for candidates, and to known capacity for existing assets. - VoLL variables are active to ensure a feasible solution alongside maximum operation of the asset. -- **Calculate a Cost Index Metric:** This is the total annualised cost divided by the annual output. - \\[ - \text{Cost Index} = \frac{\text{AFC} \times \text{cap}_r + \sum_t act_t - \times \text{AC}_t^{\text{LCOX}}}{\sum_t act_t} - \\] - -#### Equal-Metric Fallback - -If two or more investment options from the same tool have equal metrics, the following tie-breaking -rules are applied in order: - -1. Assets which are already commissioned are preferred over new candidate assets. -2. Newer (commissioned later) assets are preferred over older assets. -3. If there is still a tie, the first option in the data structure storing the metrics is selected, - which is an arbitrary choice. A `debug` level log message is emitted in this case. - -## Example: Gas Power Plant - -The following is an illustrative example of how the NPV and LCOX approaches work, using a simple -gas combined-cycle power plant as the supply option under consideration. -This example demonstrates the evaluation across two time periods -\\(t\_0\\) (peak period) and \\(t\_1\\) (off-peak period) with variable operating costs - \\( cost\_{var}[t] \\) constant in all time periods. - -### Model Parameters - -#### Asset Parameters - -| Parameter | Notation | Value | Description | -|--------------------------------|--------------------------------------|---------------------------|-----------------------------------| -| Primary output (Electricity) | \\( output\_{coeff}[c_{primary}] \\) | 1.0 MWh per unit activity | Main commodity produced | -| By-product output (Waste heat) | \\( output\_{coeff}[c_{heat}] \\) | 0.5 MWh per unit activity | Co-product from generation | -| Input (Natural gas) | \\( input\_{coeff}[c_{gas}] \\) | 2.5 MWh per unit activity | Fuel consumption | -| Variable operating cost | \\( cost\_{var}[t] \\) | £5/MWh of activity | Operating costs per unit activity | - - -All per-flow costs represented in the general formulas as \\( cost\_{input} \\) and -\\( cost\_{output} \\) are assumed to be zero. - -#### Investment Parameters - -| Parameter | Notation | Value | -|-----------------------|----------------------|-----------| -| Annualised fixed cost | \\( AFC\_{opt,r} \\) | £1,000/MW | -| Capacity | \\( cap \\) | 100 MW | - -#### Market Prices by Time Period - -| Commodity | Notation | \\(t_0\\) (Peak) | \\(t_1\\) (Off-peak) | -|-------------|-------------------------------------|------------------|----------------------| -| Electricity | \\( \lambda\_{c\_{primary},r,t} \\) | £90/MWh | £50/MWh | -| Heat | \\( \lambda\_{c\_{heat},r,t} \\) | £25/MWh | £15/MWh | -| Natural gas | \\( \lambda\_{c\_{gas},r,t} \\) | £35/MWh | £25/MWh | - -### NPV Approach (Tool A) - -#### Calculate Net Revenue per Unit of Activity - -**For \\(t\_0\\) (peak period):** - -\\[ -\begin{aligned} -AC_{t_{0}}^{NPV} &= (1.0 \times 90) + (0.5 \times 25) + (-2.5 \times 35) - 5 \\\\ -&= 90 + 12.5 - 87.5 - 5 \\\\ -&= \text{£10/MWh} -\end{aligned} -\\] - -The asset earns £10 profit for every MWh it operates during peak periods. - -**For \\(t\_1\\) (off-peak period):** - -\\[ -\begin{aligned} -AC_{t\_1}^{NPV} &= (1.0 \times 50) + (0.5 \times 15) + (-2.5 \times 25) - 5 \\\\ -&= 50 + 7.5 - 62.5 - 5 \\\\ -&= \text{£} -10 \text{/MWh} -\end{aligned} -\\] - -The asset loses £10 for every MWh it operates during off-peak periods. - -#### Dispatch Optimisation - -The optimisation maximises total net revenue across all time periods: - -\\[ -\max \sum\_t act\_t \cdot AC\_t^{NPV} = act\_{t_{0}} \cdot 10 + act\_{t\_1} \cdot (-10) -\\] - -where \\( act\_t \\) is the activity (operational level) in each time slice, subject to operational - constraints and demand requirements. - -In this case, the optimiser will prefer to dispatch the asset during \\(t\_0\\) (profitable) and -minimise operation during \\(t\_1\\) (unprofitable), subject to technical constraints such as minimum -load requirements. - -#### Profitability Index - -The profitability index is calculated as: - -\\[ -\text{PI} = \frac{\sum\_t act\_t \cdot AC\_t^{NPV}}{AFC \times cap} -\\] - -Suppose the dispatch optimiser determines \\( act\_{t\_{0}} = 80 \\) MWh and \\( act\_{t\_1} = 20 \\) -MWh are the optimal activity levels: - -\\[ -\begin{aligned} -\text{PI} &= \frac{(80 \times 10) + (20 \times (-10))}{1{,}000 \times 100} \\\\ -&= \frac{800 - 200}{100{,}000} \\\\ -&= \frac{600}{100{,}000} \\\\ -&= 0.006 -\end{aligned} -\\] - -The profitability index is then compared against all other options to determine which asset provides - the best return on investment for serving the demand. - -### LCOX Approach (Tool B) - -#### Net Cost per Unit of Activity - -**For \\(t\_0\\) (peak period):** - -\\[ -\begin{aligned} -AC\_{t\_{0}}^{LCOX} &= 5 + (2.5 \times 35) - (0.5 \times 25) \\\\ -&= 5 + 87.5 - 12.5 \\\\ -&= \text{£80/MWh} -\end{aligned} -\\] - -It costs £80 per MWh to operate during peak periods (net of heat by-product sales). - -**For \\(t_1\\) (off-peak period):** - -\\[ -\begin{aligned} -AC\_{t\_1}^{LCOX} &= 5 + (2.5 \times 25) - (0.5 \times 15) \\\\ -&= 5 + 62.5 - 7.5 \\\\ -&= \text{£60/MWh} -\end{aligned} -\\] - -It costs £60 per MWh to operate during off-peak periods, reflecting lower gas prices - and lower heat by-product value. - -#### Capacity and Dispatch Optimisation - -The optimiser determines the most cost-effective capacity and dispatch pattern to meet demand across -both time periods by minimising the total annualised cost with respect to decision variables -\\( cap \\) and \\( act\_t \\): - -\\[ -AFC \cdot cap + \sum\_t act\_t \cdot AC\_t^{LCOX} = 1{,}000 \cdot cap + act\_{t\_{0}} - \cdot 80 + act\_{t\_1} \cdot 60 -\\] - -#### Cost Index (Levelised Cost of X) - -The Cost Index is calculated as: - -\\[ -\text{Cost Index} = \frac{AFC \cdot cap + \sum\_t act\_t \cdot AC\_t^{LCOX}}{\sum\_t act\_t} -\\] - -Suppose the optimiser determines \\( cap = 100 \\) MW, \\( act\_{t\_{0}} = 150 \\) MWh, - and \\( act\_{t\_1} = 80 \\) MWh are the optimal capacity and activity levels: - -\\[ -\begin{aligned} -\text{Cost Index} &= \frac{(1{,}000 \times 100) + (150 \times 80) + (80 \times 60)}{150 + 80} \\\\ -&= \frac{100{,}000 + 12{,}000 + 4{,}800}{230} \\\\ -&= \frac{116{,}800}{230} \\\\ -&= \text{£508/MWh} -\end{aligned} -\\] - -The Cost Index is £508 per MWh of electricity produced. - This metric is compared across all supply options to identify - the lowest-cost solution for meeting demand. +- **Calculate a cost index:** This is the total annualised cost (\\( + AFC \* cap_r + \sum_{t} act_t \* AC_t \\)), divided by the annual output + \\( \sum_t act_t \\). [framework-overview]: https://energysystemsmodellinglab.github.io/MUSE2/model/index.html#framework-overview [Dispatch Optimisation Formulation]: ./dispatch_optimisation.md diff --git a/docs/release/__init__.py b/docs/release/__init__.py deleted file mode 100644 index f2505b426..000000000 --- a/docs/release/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -"""Common functionality for working with different versions.""" - -import re -import subprocess as sp - - -def is_release_tag(tag: str) -> bool: - """Whether the git tag indicates a version. - - We don't include pre-releases. - """ - return re.match(r"^v[0-9]+\.[0-9]+\.[0-9]+$", tag) is not None - - -def get_releases() -> list[str]: - """Get all release tags for this repo, sorted by semantic version.""" - ret = sp.run( - ("git", "tag", "-l", "--sort=-version:refname"), - capture_output=True, - check=True, - encoding="utf-8", - ) - return [tag for tag in ret.stdout.splitlines() if is_release_tag(tag)] diff --git a/docs/release/patches/v2.0.0/0001-remove-unrecognised-parameter.patch b/docs/release/patches/v2.0.0/0001-remove-unrecognised-parameter.patch deleted file mode 100644 index 91602f9dd..000000000 --- a/docs/release/patches/v2.0.0/0001-remove-unrecognised-parameter.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3129c56aea05dd2b7e88c76bb2050fded0529243 Mon Sep 17 00:00:00 2001 -From: Aurash Karimi -Date: Wed, 19 Nov 2025 09:48:11 +0000 -Subject: [PATCH] remove unrecognised parameter - ---- - book.toml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/book.toml b/book.toml -index 41fba09c..84d181ee 100644 ---- a/book.toml -+++ b/book.toml -@@ -1,7 +1,6 @@ - [book] - authors = ["Alex Dewar"] - language = "en" --multilingual = false - src = "docs" - title = "MUSE2" - --- -2.53.0 diff --git a/docs/templates/versions.md.jinja b/docs/templates/versions.md.jinja deleted file mode 100644 index 66360aa2d..000000000 --- a/docs/templates/versions.md.jinja +++ /dev/null @@ -1,8 +0,0 @@ -# Other versions of documentation - -The MUSE2 documentation for different releases is available below. - -- [Current development version](./README.md) -{%- for release in releases %} -- [{{ release }}](release/{{ release }}/index.html) -{%- endfor %} diff --git a/rust-toolchain.toml b/rust-toolchain.toml index cc6d07f37..71223b651 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.94.0" +channel = "1.93.1" profile = "default" diff --git a/src/asset.rs b/src/asset.rs index 7a59d54e4..c4cc85e57 100644 --- a/src/asset.rs +++ b/src/asset.rs @@ -10,7 +10,7 @@ use crate::simulation::CommodityPrices; use crate::time_slice::{TimeSliceID, TimeSliceSelection}; use crate::units::{ Activity, ActivityPerCapacity, Capacity, Dimensionless, FlowPerActivity, MoneyPerActivity, - MoneyPerCapacity, MoneyPerFlow, Year, + MoneyPerCapacity, MoneyPerFlow, }; use anyhow::{Context, Result, ensure}; use indexmap::IndexMap; @@ -611,35 +611,33 @@ impl Asset { annual_capital_cost(capital_cost, lifetime, discount_rate) } - /// Get the annual fixed costs (AFC) per unit of activity for this asset + /// Get the annual capital cost per unit of activity for this asset /// - /// Total capital costs and fixed opex are shared equally over the year in accordance with the - /// annual activity. - pub fn get_annual_fixed_costs_per_activity( + /// Total capital costs (cost per capacity * capacity) are shared equally over the year in + /// accordance with the annual activity. + pub fn get_annual_capital_cost_per_activity( &self, annual_activity: Activity, ) -> MoneyPerActivity { let annual_capital_cost_per_capacity = self.get_annual_capital_cost_per_capacity(); - let annual_fixed_opex = self.process_parameter.fixed_operating_cost * Year(1.0); - let total_annual_fixed_costs = - (annual_capital_cost_per_capacity + annual_fixed_opex) * self.total_capacity(); + let total_annual_capital_cost = annual_capital_cost_per_capacity * self.total_capacity(); assert!( annual_activity > Activity::EPSILON, - "Cannot calculate annual fixed costs per activity for an asset with zero annual activity" + "Cannot calculate annual capital cost per activity for an asset with zero annual activity" ); - total_annual_fixed_costs / annual_activity + total_annual_capital_cost / annual_activity } - /// Get the annual fixed costs (AFC) per unit of output flow for this asset + /// Get the annual capital cost per unit of output flow for this asset /// - /// Total capital costs and fixed opex are shared equally across all output flows in accordance - /// with the annual activity and total output per unit of activity. - pub fn get_annual_fixed_costs_per_flow(&self, annual_activity: Activity) -> MoneyPerFlow { - let annual_fixed_costs_per_activity = - self.get_annual_fixed_costs_per_activity(annual_activity); + /// Total capital costs (cost per capacity * capacity) are shared equally across all output + /// flows in accordance with the annual activity and total output per unit of activity. + pub fn get_annual_capital_cost_per_flow(&self, annual_activity: Activity) -> MoneyPerFlow { + let annual_capital_cost_per_activity = + self.get_annual_capital_cost_per_activity(annual_activity); let total_output_per_activity = self.get_total_output_per_activity(); assert!(total_output_per_activity > FlowPerActivity::EPSILON); // input checks should guarantee this - annual_fixed_costs_per_activity / total_output_per_activity + annual_capital_cost_per_activity / total_output_per_activity } /// Maximum activity for this asset diff --git a/src/graph/investment.rs b/src/graph/investment.rs index 4af0d9797..8d014b78a 100644 --- a/src/graph/investment.rs +++ b/src/graph/investment.rs @@ -1,9 +1,8 @@ //! Module for solving the investment order of commodities use super::{CommoditiesGraph, GraphEdge, GraphNode}; -use crate::commodity::{CommodityMap, CommodityType, PricingStrategy}; +use crate::commodity::{CommodityMap, CommodityType}; use crate::region::RegionID; use crate::simulation::investment::InvestmentSet; -use anyhow::{Result, ensure}; use highs::{Col, HighsModelStatus, RowProblem, Sense}; use indexmap::IndexMap; use log::warn; @@ -42,14 +41,14 @@ fn solve_investment_order_for_year( graphs: &IndexMap<(RegionID, u32), CommoditiesGraph>, commodities: &CommodityMap, year: u32, -) -> Result> { +) -> Vec { // Initialise InvestmentGraph for this year from the set of original `CommodityGraph`s let mut investment_graph = init_investment_graph_for_year(graphs, year, commodities); // TODO: condense sibling commodities (commodities that share at least one producer) // Condense strongly connected components - investment_graph = compress_cycles(&investment_graph, commodities)?; + investment_graph = compress_cycles(&investment_graph); // Perform a topological sort on the condensed graph // We can safely unwrap because `toposort` will only return an error in case of cycles, which @@ -57,7 +56,7 @@ fn solve_investment_order_for_year( let order = toposort(&investment_graph, None).unwrap(); // Compute layers for investment - Ok(compute_layers(&investment_graph, &order)) + compute_layers(&investment_graph, &order) } /// Initialise an `InvestmentGraph` for the given year from a set of `CommodityGraph`s @@ -118,39 +117,15 @@ fn init_investment_graph_for_year( } /// Compresses cycles into `InvestmentSet::Cycle` nodes -fn compress_cycles(graph: &InvestmentGraph, commodities: &CommodityMap) -> Result { +fn compress_cycles(graph: &InvestmentGraph) -> InvestmentGraph { // Detect strongly connected components let mut condensed_graph = condensation(graph.clone(), true); // Order nodes within each strongly connected component order_sccs(&mut condensed_graph, graph); - // Pre-scan SCCs for offending pricing strategies (FullCost / MarginalCost). - for node_weight in condensed_graph.node_weights() { - if node_weight.len() <= 1 { - continue; - } - let offenders: Vec<_> = node_weight - .iter() - .flat_map(|s| s.iter_markets()) - .filter(|(cid, _)| { - matches!( - &commodities[cid].pricing_strategy, - PricingStrategy::MarginalCost | PricingStrategy::FullCost - ) - }) - .map(|(cid, _)| cid.clone()) - .collect(); - - ensure!( - offenders.is_empty(), - "Cannot use FullCost/MarginalCost pricing strategies for commodities with circular \ - dependencies. Offending commodities: {offenders:?}" - ); - } - // Map to a new InvestmentGraph - let mapped = condensed_graph.map( + condensed_graph.map( // Map nodes to InvestmentSet // If only one member, keep as-is; if multiple members, create Cycle |_, node_weight| match node_weight.len() { @@ -166,9 +141,7 @@ fn compress_cycles(graph: &InvestmentGraph, commodities: &CommodityMap) -> Resul }, // Keep edges the same |_, edge_weight| edge_weight.clone(), - ); - - Ok(mapped) + ) } /// Order the members of each strongly connected component using a mixed-integer linear program. @@ -517,13 +490,13 @@ pub fn solve_investment_order_for_model( commodity_graphs: &IndexMap<(RegionID, u32), CommoditiesGraph>, commodities: &CommodityMap, years: &[u32], -) -> Result>> { +) -> HashMap> { let mut investment_orders = HashMap::new(); for year in years { - let order = solve_investment_order_for_year(commodity_graphs, commodities, *year)?; + let order = solve_investment_order_for_year(commodity_graphs, commodities, *year); investment_orders.insert(*year, order); } - Ok(investment_orders) + investment_orders } #[cfg(test)] @@ -595,7 +568,7 @@ mod tests { commodities.insert("C".into(), Rc::new(svd_commodity)); let graphs = IndexMap::from([(("GBR".into(), 2020), graph)]); - let result = solve_investment_order_for_year(&graphs, &commodities, 2020).unwrap(); + let result = solve_investment_order_for_year(&graphs, &commodities, 2020); // Expected order: C, B, A (leaf nodes first) // No cycles or layers, so all investment sets should be `Single` @@ -623,7 +596,7 @@ mod tests { commodities.insert("B".into(), Rc::new(sed_commodity)); let graphs = IndexMap::from([(("GBR".into(), 2020), graph)]); - let result = solve_investment_order_for_year(&graphs, &commodities, 2020).unwrap(); + let result = solve_investment_order_for_year(&graphs, &commodities, 2020); // Should be a single `Cycle` investment set containing both commodities assert_eq!(result.len(), 1); @@ -662,7 +635,7 @@ mod tests { commodities.insert("D".into(), Rc::new(svd_commodity)); let graphs = IndexMap::from([(("GBR".into(), 2020), graph)]); - let result = solve_investment_order_for_year(&graphs, &commodities, 2020).unwrap(); + let result = solve_investment_order_for_year(&graphs, &commodities, 2020); // Expected order: D, Layer(B, C), A assert_eq!(result.len(), 3); @@ -701,7 +674,7 @@ mod tests { (("GBR".into(), 2020), graph.clone()), (("FRA".into(), 2020), graph), ]); - let result = solve_investment_order_for_year(&graphs, &commodities, 2020).unwrap(); + let result = solve_investment_order_for_year(&graphs, &commodities, 2020); // Expected order: Should have three layers, each with two commodities (one per region) assert_eq!(result.len(), 3); diff --git a/src/input.rs b/src/input.rs index 8ef1e1f04..7cdfcca23 100644 --- a/src/input.rs +++ b/src/input.rs @@ -263,8 +263,7 @@ pub fn load_model>(model_dir: P) -> Result { )?; // Solve investment order for each region/year - let investment_order = - solve_investment_order_for_model(&commodity_graphs, &commodities, years)?; + let investment_order = solve_investment_order_for_model(&commodity_graphs, &commodities, years); let model_path = model_dir .as_ref() diff --git a/src/simulation/investment.rs b/src/simulation/investment.rs index 5e9716a7f..688bd524d 100644 --- a/src/simulation/investment.rs +++ b/src/simulation/investment.rs @@ -19,8 +19,7 @@ use std::fmt::Display; pub mod appraisal; use appraisal::coefficients::calculate_coefficients_for_assets; use appraisal::{ - AppraisalOutput, appraise_investment, count_equal_and_best_appraisal_outputs, - sort_appraisal_outputs_by_investment_priority, + AppraisalOutput, appraise_investment, sort_appraisal_outputs_by_investment_priority, }; /// A map of demand across time slices for a specific market @@ -652,7 +651,7 @@ fn get_candidate_assets<'a>( } /// Print debug message if there are multiple equally good outputs -fn log_on_equal_appraisal_outputs( +fn warn_on_equal_appraisal_outputs( outputs: &[AppraisalOutput], agent_id: &AgentID, commodity_id: &CommodityID, @@ -662,7 +661,11 @@ fn log_on_equal_appraisal_outputs( return; } - let num_identical = count_equal_and_best_appraisal_outputs(outputs); + // Count the number of identical (or nearly identical) appraisal outputs + let num_identical = outputs[1..] + .iter() + .take_while(|output| outputs[0].compare_metric(output).is_eq()) + .count(); if num_identical > 0 { let asset_details = outputs[..=num_identical] @@ -826,7 +829,7 @@ fn select_best_assets( } // Warn if there are multiple equally good assets - log_on_equal_appraisal_outputs(&outputs_for_opts, &agent.id, &commodity.id, region_id); + warn_on_equal_appraisal_outputs(&outputs_for_opts, &agent.id, &commodity.id, region_id); let best_output = outputs_for_opts.into_iter().next().unwrap(); diff --git a/src/simulation/investment/appraisal.rs b/src/simulation/investment/appraisal.rs index acbb303cb..7fbf42d68 100644 --- a/src/simulation/investment/appraisal.rs +++ b/src/simulation/investment/appraisal.rs @@ -378,21 +378,6 @@ pub fn sort_appraisal_outputs_by_investment_priority(outputs_for_opts: &mut Vec< }); } -/// Counts the number of top appraisal outputs in a sorted slice that are indistinguishable -/// by both metric and fallback ordering. Excludes the first element from the count. -pub fn count_equal_and_best_appraisal_outputs(outputs: &[AppraisalOutput]) -> usize { - if outputs.is_empty() { - return 0; - } - outputs[1..] - .iter() - .take_while(|output| { - output.compare_metric(&outputs[0]).is_eq() - && compare_asset_fallback(&output.asset, &outputs[0].asset).is_eq() - }) - .count() -} - #[cfg(test)] mod tests { use super::*; @@ -958,137 +943,4 @@ mod tests { // The invalid output should have been filtered out assert_eq!(outputs.len(), 0); } - - /// Tests for counting number of equal metrics using identical assets so only metric values - /// affect the count. - #[rstest] - #[case(vec![5.0], 0, "single_element")] - #[case(vec![5.0, 5.0, 5.0], 2, "all_equal_returns_len_minus_one")] - #[case(vec![1.0, 2.0, 3.0], 0, "none_equal_to_best")] - #[case(vec![5.0, 5.0, 9.0], 1, "partial_equality_stops_at_first_difference")] - #[case(vec![5.0, 5.0, 9.0, 5.0], 1, "equality_does_not_resume_after_gap")] - fn count_equal_best_lcox_metric( - asset: Asset, - #[case] metric_values: Vec, - #[case] expected_count: usize, - #[case] description: &str, - ) { - let metrics: Vec> = metric_values - .into_iter() - .map(|v| Box::new(LCOXMetric::new(MoneyPerActivity(v))) as Box) - .collect(); - - let outputs = - appraisal_outputs_with_investment_priority_invariant_to_assets(metrics, &asset); - - assert_eq!( - count_equal_and_best_appraisal_outputs(&outputs), - expected_count, - "Failed for case: {description}" - ); - } - - /// Empty slice count should return 0. - #[test] - fn count_equal_best_empty_slice_returns_zero() { - let outputs: Vec = vec![]; - assert_eq!(count_equal_and_best_appraisal_outputs(&outputs), 0); - } - - /// Equal metrics but differing asset fallback (commissioned vs. candidate) → - /// outputs are distinguishable, so count should be 0. - #[rstest] - fn count_equal_best_equal_metric_different_fallback_returns_zero( - process: Process, - region_id: RegionID, - agent_id: AgentID, - ) { - let process_rc = Rc::new(process); - let capacity = Capacity(10.0); - - let commissioned = Asset::new_commissioned( - agent_id.clone(), - process_rc.clone(), - region_id.clone(), - capacity, - 2020, - ) - .unwrap(); - let candidate = - Asset::new_candidate(process_rc.clone(), region_id.clone(), capacity, 2020).unwrap(); - - let metric_value = MoneyPerActivity(5.0); - let outputs = appraisal_outputs( - vec![commissioned, candidate], - vec![ - Box::new(LCOXMetric::new(metric_value)), - Box::new(LCOXMetric::new(metric_value)), - ], - ); - - assert_eq!(count_equal_and_best_appraisal_outputs(&outputs), 0); - } - - /// Equal metrics and equal asset fallback (same commissioned status and commission year) → - /// the second element is indistinguishable, so count should be 1. - #[rstest] - fn count_equal_best_equal_metric_and_equal_fallback_returns_one( - process: Process, - region_id: RegionID, - agent_id: AgentID, - ) { - let process_rc = Rc::new(process); - let capacity = Capacity(10.0); - let year = 2020; - - let asset1 = Asset::new_commissioned( - agent_id.clone(), - process_rc.clone(), - region_id.clone(), - capacity, - year, - ) - .unwrap(); - let asset2 = Asset::new_commissioned( - agent_id.clone(), - process_rc.clone(), - region_id.clone(), - capacity, - year, - ) - .unwrap(); - - let metric_value = MoneyPerActivity(5.0); - let outputs = appraisal_outputs( - vec![asset1, asset2], - vec![ - Box::new(LCOXMetric::new(metric_value)), - Box::new(LCOXMetric::new(metric_value)), - ], - ); - - assert_eq!(count_equal_and_best_appraisal_outputs(&outputs), 1); - } - - /// Equal NPV metrics and identical assets → second element should be counted. - #[rstest] - fn count_equal_best_equal_npv_metrics(asset: Asset) { - let make_npv = |surplus: f64, fixed_cost: f64| { - Box::new(NPVMetric::new(ProfitabilityIndex { - total_annualised_surplus: Money(surplus), - annualised_fixed_cost: Money(fixed_cost), - })) as Box - }; - - let metrics = vec![ - make_npv(200.0, 100.0), - make_npv(200.0, 100.0), // Equal to best - make_npv(100.0, 100.0), // Worse - ]; - - let outputs = - appraisal_outputs_with_investment_priority_invariant_to_assets(metrics, &asset); - - assert_eq!(count_equal_and_best_appraisal_outputs(&outputs), 1); - } } diff --git a/src/simulation/optimisation.rs b/src/simulation/optimisation.rs index 1c4fa4c83..eb30778ec 100644 --- a/src/simulation/optimisation.rs +++ b/src/simulation/optimisation.rs @@ -263,14 +263,6 @@ impl Solution<'_> { .map(|((asset, time_slice), &value)| (asset, time_slice, Activity(value))) } - /// Iterate over the keys for activity for each existing asset - pub fn iter_activity_keys_for_existing( - &self, - ) -> impl Iterator { - self.iter_activity_for_existing() - .map(|(asset, time_slice, _activity)| (asset, time_slice)) - } - /// Activity for each candidate asset pub fn iter_activity_for_candidates( &self, @@ -283,14 +275,6 @@ impl Solution<'_> { .map(|((asset, time_slice), &value)| (asset, time_slice, Activity(value))) } - /// Iterate over the keys for activity for each candidate asset - pub fn iter_activity_keys_for_candidates( - &self, - ) -> impl Iterator { - self.iter_activity_for_candidates() - .map(|(asset, time_slice, _activity)| (asset, time_slice)) - } - /// Iterate over unmet demand pub fn iter_unmet_demand( &self, diff --git a/src/simulation/prices.rs b/src/simulation/prices.rs index ce2f74da8..46dabd86d 100644 --- a/src/simulation/prices.rs +++ b/src/simulation/prices.rs @@ -8,8 +8,12 @@ use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceSelection}; use crate::units::{Activity, Dimensionless, MoneyPerActivity, MoneyPerFlow, Year}; use anyhow::Result; use indexmap::IndexMap; +use itertools::iproduct; use std::collections::{HashMap, HashSet}; +/// Iterator item type for asset activity iterators +type Item<'a> = (&'a AssetRef, &'a TimeSliceID, Activity); + /// Calculate commodity prices. /// /// Calculate prices for each commodity/region/time-slice according to the commodity's configured @@ -26,81 +30,73 @@ use std::collections::{HashMap, HashSet}; /// A `CommodityPrices` mapping `(commodity, region, time_slice)` to `MoneyPerFlow` representing /// endogenous prices computed from the optimisation solution. pub fn calculate_prices(model: &Model, solution: &Solution, year: u32) -> Result { - // Collect shadow prices for all SED/SVD commodities + // Compute shadow prices for all SED/SVD commodities (needed by all strategies) let shadow_prices = CommodityPrices::from_iter(solution.iter_commodity_balance_duals()); + // Partition markets by pricing strategy into a map keyed by `PricingStrategy`. + // For now, commodities use a single strategy for all regions, but this may change in the future. + let mut pricing_sets = HashMap::new(); + for ((commodity_id, commodity), region_id) in + iproduct!(&model.commodities, model.iter_regions()) + { + if commodity.pricing_strategy == PricingStrategy::Unpriced { + continue; + } + pricing_sets + .entry(&commodity.pricing_strategy) + .or_insert_with(HashSet::new) + .insert((commodity_id.clone(), region_id.clone())); + } + // Set up empty prices map let mut result = CommodityPrices::default(); - // Get investment order for the year - prices will be calculated in the reverse of this order - let investment_order = &model.investment_order[&year]; - - // Iterate over investment sets in reverse order. Markets within the same set can be priced - // simultaneously, since they are independent (apart from Cycle sets when using the "marginal" - // and "full" strategies, which get flagged at the validation stage). - for investment_set in investment_order.iter().rev() { - // Partition markets by pricing strategy into a map keyed by `PricingStrategy`. - // For now, commodities use a single strategy for all regions, but this may change in the future. - let mut pricing_sets = HashMap::new(); - for (commodity_id, region_id) in investment_set.iter_markets() { - let commodity = &model.commodities[commodity_id]; - if commodity.pricing_strategy == PricingStrategy::Unpriced { - continue; - } - pricing_sets - .entry(&commodity.pricing_strategy) - .or_insert_with(HashSet::new) - .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, time_slice) in shadow_prices.keys() { - if shadow_set.contains(&(commodity_id.clone(), region_id.clone())) { - let price = shadow_prices - .get(commodity_id, region_id, time_slice) - .unwrap(); - result.insert(commodity_id, region_id, time_slice, price); - } + // Add prices for shadow-priced commodities + if let Some(shadow_set) = pricing_sets.get(&PricingStrategy::Shadow) { + for (commodity_id, region_id, time_slice) in shadow_prices.keys() { + if shadow_set.contains(&(commodity_id.clone(), region_id.clone())) { + let price = shadow_prices + .get(commodity_id, region_id, time_slice) + .unwrap(); + result.insert(commodity_id, region_id, time_slice, price); } } + } - // Add prices for scarcity-adjusted commodities - if let Some(scarcity_set) = pricing_sets.get(&PricingStrategy::ScarcityAdjusted) { - let scarcity_prices = calculate_scarcity_adjusted_prices( - solution.iter_activity_duals(), - &shadow_prices, - scarcity_set, - ); - result.extend(scarcity_prices); - } + // Add prices for scarcity-adjusted commodities + if let Some(scarcity_set) = pricing_sets.get(&PricingStrategy::ScarcityAdjusted) { + let scarcity_prices = calculate_scarcity_adjusted_prices( + solution.iter_activity_duals(), + &shadow_prices, + scarcity_set, + ); + result.extend(scarcity_prices); + } - // Add prices for marginal cost commodities - if let Some(marginal_set) = pricing_sets.get(&PricingStrategy::MarginalCost) { - let marginal_cost_prices = calculate_marginal_cost_prices( - solution.iter_activity_keys_for_existing(), - solution.iter_activity_keys_for_candidates(), - &result, - year, - marginal_set, - ); - result.extend(marginal_cost_prices); - } + // Add prices for marginal cost commodities + if let Some(marginal_set) = pricing_sets.get(&PricingStrategy::MarginalCost) { + let marginal_cost_prices = calculate_marginal_cost_prices( + solution.iter_activity_for_existing(), + solution.iter_activity_for_candidates(), + &shadow_prices, + year, + marginal_set, + ); + result.extend(marginal_cost_prices); + } - // Add prices for full cost commodities - if let Some(fullcost_set) = pricing_sets.get(&PricingStrategy::FullCost) { - let annual_activities = - calculate_annual_activities(solution.iter_activity_for_existing()); - let full_cost_prices = calculate_full_cost_prices( - solution.iter_activity_keys_for_existing(), - solution.iter_activity_keys_for_candidates(), - &annual_activities, - &result, - year, - fullcost_set, - ); - result.extend(full_cost_prices); - } + // Add prices for full cost commodities + if let Some(fullcost_set) = pricing_sets.get(&PricingStrategy::FullCost) { + let annual_activities = calculate_annual_activities(solution.iter_activity_for_existing()); + let full_cost_prices = calculate_full_cost_prices( + solution.iter_activity_for_existing(), + solution.iter_activity_for_candidates(), + &annual_activities, + &shadow_prices, + year, + fullcost_set, + ); + result.extend(full_cost_prices); } // Return the completed prices map @@ -349,12 +345,13 @@ where /// /// --- /// -/// For each region, the price in each time slice is taken from the installed asset with the highest -/// marginal cost. If there are no producers of the commodity in that region (in particular, this -/// may occur when there's no demand for the commodity), then candidate assets are considered: we -/// take the price from the candidate asset with the _lowest_ marginal cost, assuming full -/// utilisation (i.e. the single candidate asset that would be most competitive if a small amount of -/// demand was added). +/// If any existing assets produce a given commodity in a particular region and time slice, the +/// price is taken from the asset with the highest marginal cost among those existing assets. If _no_ +/// existing assets produce the commodity in that region and time slice (in particular, this will +/// occur when there's no demand for the commodity), then candidate assets are considered: we +/// take the price from the candidate asset with the _lowest_ marginal cost, assuming full utilisation +/// (i.e. the single candidate asset that would be most competitive if a small amount of demand was +/// added). /// /// Note: this should be similar to the "shadow price" strategy, which is also based on marginal /// costs of the most expensive producer, but may be more successful in cases where there are @@ -362,27 +359,29 @@ where /// /// # Arguments /// -/// * `activity_keys_for_existing` - Iterator over activity keys from optimisation solution for -/// existing assets -/// * `activity_keys_for_candidates` - Iterator over activity keys from optimisation solution for -/// candidate assets -/// * `upstream_prices` - Prices for commodities upstream of the ones we are calculating prices for +/// * `activity_for_existing` - Iterator over activity from optimisation solution for existing +/// assets +/// * `activity_for_candidates` - Iterator over activity from optimisation solution for candidate +/// assets. Note: we only need the keys, since we assume full utilisation for candidates. +/// * `annual_activities` - Map of annual activities for each asset computed by +/// `calculate_annual_activities`. This only needs to include existing assets. +/// * `shadow_prices` - Shadow prices for all commodities /// * `year` - The year for which prices are being calculated -/// * `markets_to_price` - Set of markets to calculate marginal prices for +/// * `markets_to_price` - Set of markets to calculate full cost prices for /// /// # Returns /// /// A map of marginal cost prices for the specified markets in all time slices fn calculate_marginal_cost_prices<'a, I, J>( - activity_keys_for_existing: I, - activity_keys_for_candidates: J, - upstream_prices: &CommodityPrices, + activity_for_existing: I, + activity_for_candidates: J, + shadow_prices: &CommodityPrices, year: u32, markets_to_price: &HashSet<(CommodityID, RegionID)>, ) -> IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> where - I: Iterator, - J: Iterator, + I: Iterator>, + J: Iterator>, { let mut prices: IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> = IndexMap::new(); @@ -390,12 +389,17 @@ where // Calculate highest marginal cost for each commodity/region/time slice // Keep track of keys with prices - missing keys will be handled by candidates later let mut priced_by_existing = HashSet::new(); - for (asset, time_slice) in activity_keys_for_existing { + for (asset, time_slice, activity) in activity_for_existing { let region_id = asset.region_id(); + // Only proceed if the asset has non-zero activity in this time slice + if activity < Activity::EPSILON { + continue; + } + // Iterate over all the SED/SVD marginal costs for commodities we need prices for for (commodity_id, marginal_cost) in asset.iter_marginal_costs_with_filter( - upstream_prices, + shadow_prices, year, time_slice, |commodity_id: &CommodityID| { @@ -414,7 +418,7 @@ where // Next, look at candidate assets for any markets not covered by existing assets // For these, we take the _lowest_ marginal cost - for (asset, time_slice) in activity_keys_for_candidates { + for (asset, time_slice, _activity) in activity_for_candidates { let region_id = asset.region_id(); // Only consider markets not already priced by existing assets @@ -429,7 +433,7 @@ where // Iterate over all the SED/SVD marginal costs for markets we need prices for for (commodity_id, marginal_cost) in asset.iter_marginal_costs_with_filter( - upstream_prices, + shadow_prices, year, time_slice, |cid: &CommodityID| should_process(cid), @@ -447,10 +451,10 @@ where prices } -/// Calculate annual activities for each asset by summing across all time slices +/// Calculated annual activities for each asset by summing across all time slices fn calculate_annual_activities<'a, I>(activities: I) -> HashMap where - I: IntoIterator, + I: IntoIterator>, { activities .into_iter() @@ -496,23 +500,23 @@ where /// /// --- /// -/// For each region, the price in each time slice is taken from the installed asset with the highest -/// full cost (excluding assets with zero annual activity, as the full cost of these as calculated -/// above would be infinite). If there are no producers of the commodity in that region (in -/// particular, this may occur when there's no demand for the commodity), then candidate assets are -/// considered: we take the price from the candidate asset with the _lowest_ full cost, assuming -/// maximum possible dispatch (i.e. the single candidate asset that would be most competitive if a -/// small amount of demand was added). +/// If any existing assets produce a given commodity in a particular region and time slice, the +/// price is taken from the asset with the highest full cost among those existing assets. If _no_ +/// existing assets produce the commodity in that region and time slice (in particular, this will +/// occur when there's no demand for the commodity), then candidate assets are considered: we +/// take the price from the candidate asset with the _lowest_ full cost, assuming maximum +/// possible dispatch (i.e. the single candidate asset that would be most competitive if a small +/// amount of demand was added). /// /// # Arguments /// -/// * `activity_keys_for_existing` - Iterator over activity keys from optimisation solution for -/// existing assets -/// * `activity_keys_for_candidates` - Iterator over activity keys from optimisation solution for -/// candidate assets +/// * `activity_for_existing` - Iterator over activity from optimisation solution for existing +/// assets +/// * `activity_for_candidates` - Iterator over activity from optimisation solution for candidate +/// assets. Note: we only need the keys, since we assume full dispatch for candidates. /// * `annual_activities` - Map of annual activities for each asset computed by /// `calculate_annual_activities`. This only needs to include existing assets. -/// * `upstream_prices` - Prices for commodities upstream of the ones we are calculating prices for +/// * `shadow_prices` - Shadow prices for all commodities /// * `year` - The year for which prices are being calculated /// * `markets_to_price` - Set of markets to calculate full cost prices for /// @@ -520,31 +524,30 @@ where /// /// A map of full cost prices for the specified markets in all time slices fn calculate_full_cost_prices<'a, I, J>( - activity_keys_for_existing: I, - activity_keys_for_candidates: J, + activity_for_existing: I, + activity_for_candidates: J, annual_activities: &HashMap, - upstream_prices: &CommodityPrices, + shadow_prices: &CommodityPrices, year: u32, markets_to_price: &HashSet<(CommodityID, RegionID)>, ) -> IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> where - I: Iterator, - J: Iterator, + I: Iterator>, + J: Iterator>, { let mut prices: IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow> = IndexMap::new(); // Start by looking at existing assets // Calculate highest full cost for each commodity/region/time slice // Keep track of keys with prices - missing keys will be handled by candidates later - let mut annual_fixed_costs_cache = HashMap::new(); + let mut annual_capital_costs_cache = HashMap::new(); let mut priced_by_existing = HashSet::new(); - for (asset, time_slice) in activity_keys_for_existing { + for (asset, time_slice, activity) in activity_for_existing { let annual_activity = annual_activities[asset]; let region_id = asset.region_id(); - // If annual activity is zero, we can't calculate a capital cost per flow, so skip this - // asset. - if annual_activity < Activity::EPSILON { + // Only proceed if the asset has non-zero activity in this time slice + if activity < Activity::EPSILON { continue; } @@ -556,20 +559,20 @@ where continue; } - // Calculate/cache annual fixed costs for this asset - let annual_fixed_costs_per_flow = *annual_fixed_costs_cache + // Calculate/cache annual capital cost for this asset + let annual_capital_cost_per_flow = *annual_capital_costs_cache .entry(asset.clone()) - .or_insert_with(|| asset.get_annual_fixed_costs_per_flow(annual_activity)); + .or_insert_with(|| asset.get_annual_capital_cost_per_flow(annual_activity)); // Iterate over all the SED/SVD marginal costs for commodities we need prices for for (commodity_id, marginal_cost) in asset.iter_marginal_costs_with_filter( - upstream_prices, + shadow_prices, year, time_slice, |cid: &CommodityID| markets_to_price.contains(&(cid.clone(), region_id.clone())), ) { - // Add annual fixed costs per flow to marginal cost to get full cost - let marginal_cost = marginal_cost + annual_fixed_costs_per_flow; + // Add capital cost per flow to marginal cost to get full cost + let marginal_cost = marginal_cost + annual_capital_cost_per_flow; // Update the highest cost for this commodity/region/time slice let key = (commodity_id.clone(), region_id.clone(), time_slice.clone()); @@ -583,7 +586,7 @@ where // Next, look at candidate assets for any markets not covered by existing assets // For these we assume full utilisation, and take the _lowest_ full cost - for (asset, time_slice) in activity_keys_for_candidates { + for (asset, time_slice, _activity) in activity_for_candidates { let region_id = asset.region_id(); // Only consider markets not already priced by existing assets @@ -604,12 +607,12 @@ where continue; } - // Calculate/cache annual fixed cost per flow for this asset assuming full dispatch + // Calculate/cache annual capital cost per flow for this asset assuming full dispatch // (bound by the activity limits of the asset) - let annual_fixed_costs_per_flow = *annual_fixed_costs_cache + let annual_capital_cost_per_flow = *annual_capital_costs_cache .entry(asset.clone()) .or_insert_with(|| { - asset.get_annual_fixed_costs_per_flow( + asset.get_annual_capital_cost_per_flow( *asset .get_activity_limits_for_selection(&TimeSliceSelection::Annual) .end(), @@ -618,13 +621,13 @@ where // Iterate over all the SED/SVD marginal costs for markets we need prices for for (commodity_id, marginal_cost) in asset.iter_marginal_costs_with_filter( - upstream_prices, + shadow_prices, year, time_slice, |cid: &CommodityID| should_process(cid), ) { - // Add annual fixed costs per flow to marginal cost to get full cost - let full_cost = marginal_cost + annual_fixed_costs_per_flow; + // Add capital cost per flow to marginal cost to get full cost + let full_cost = marginal_cost + annual_capital_cost_per_flow; // Update the _lowest_ cost for this commodity/region/time slice let key = (commodity_id.clone(), region_id.clone(), time_slice.clone()); @@ -677,7 +680,6 @@ mod tests { year: u32, time_slice_info: &TimeSliceInfo, variable_operating_cost: MoneyPerActivity, - fixed_operating_cost: MoneyPerCapacityPerYear, capital_cost: MoneyPerCapacity, lifetime: u32, discount_rate: Dimensionless, @@ -688,7 +690,7 @@ mod tests { let mut process_parameter_map = HashMap::new(); let proc_param = ProcessParameter { capital_cost, - fixed_operating_cost, + fixed_operating_cost: MoneyPerCapacityPerYear(0.0), variable_operating_cost, lifetime, discount_rate, @@ -813,11 +815,10 @@ mod tests { ®ion_id, 2015u32, &time_slice_info, - MoneyPerActivity(5.0), // variable operating cost - MoneyPerCapacityPerYear(0.0), // fixed operating cost - MoneyPerCapacity(0.0), // capital cost - 5, // lifetime - Dimensionless(1.0), // discount rate + MoneyPerActivity(5.0), // variable operating cost + MoneyPerCapacity(0.0), // capital cost + 5, // lifetime + Dimensionless(1.0), // discount rate ); let asset = @@ -830,7 +831,7 @@ mod tests { markets.insert((b.id.clone(), region_id.clone())); markets.insert((c.id.clone(), region_id.clone())); - let existing = vec![(&asset_ref, &time_slice)]; + let existing = vec![(&asset_ref, &time_slice, Activity(1.0))]; let candidates = Vec::new(); let prices = calculate_marginal_cost_prices( @@ -889,11 +890,10 @@ mod tests { ®ion_id, 2015u32, &time_slice_info, - MoneyPerActivity(5.0), // variable operating cost - MoneyPerCapacityPerYear(1.0), // fixed operating cost - MoneyPerCapacity(1.5), // capital cost per capacity so annualised=1.5 - 1, // lifetime so annualised = capital_cost - Dimensionless(0.0), // discount rate + MoneyPerActivity(5.0), // variable operating cost + MoneyPerCapacity(2.5), // capital cost per capacity so annualised=2.5 + 1, // lifetime so annualised = capital_cost + Dimensionless(0.0), // discount rate ); let asset = @@ -906,7 +906,7 @@ mod tests { markets.insert((b.id.clone(), region_id.clone())); markets.insert((c.id.clone(), region_id.clone())); - let existing = vec![(&asset_ref, &time_slice)]; + let existing = vec![(&asset_ref, &time_slice, Activity(2.0))]; let candidates = Vec::new(); let mut annual_activities = HashMap::new(); diff --git a/tests/data/circularity/commodity_prices.csv b/tests/data/circularity/commodity_prices.csv index 43a01f6c3..aad5936e7 100644 --- a/tests/data/circularity/commodity_prices.csv +++ b/tests/data/circularity/commodity_prices.csv @@ -31,22 +31,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASPRD,GBR,autumn.day,2.20452 2020,GASPRD,GBR,autumn.peak,2.20452 2020,GASPRD,GBR,autumn.evening,2.20452 -2020,BIOPRD,GBR,winter.night,3.5869398412698414 -2020,BIOPRD,GBR,winter.day,3.5869398412698414 -2020,BIOPRD,GBR,winter.peak,3.5869398412698414 -2020,BIOPRD,GBR,winter.evening,3.5869398412698414 -2020,BIOPRD,GBR,peak.night,3.5869398412698414 -2020,BIOPRD,GBR,peak.day,3.5869398412698414 -2020,BIOPRD,GBR,peak.peak,3.5869398412698414 -2020,BIOPRD,GBR,peak.evening,3.5869398412698414 -2020,BIOPRD,GBR,summer.night,0.25 -2020,BIOPRD,GBR,summer.day,0.25 -2020,BIOPRD,GBR,summer.peak,0.25 -2020,BIOPRD,GBR,summer.evening,0.25 -2020,BIOPRD,GBR,autumn.night,3.586939841269842 -2020,BIOPRD,GBR,autumn.day,3.586939841269842 -2020,BIOPRD,GBR,autumn.peak,3.586939841269842 -2020,BIOPRD,GBR,autumn.evening,3.586939841269842 2020,GASOLI,GBR,winter.night,8.66986824186952 2020,GASOLI,GBR,winter.day,8.66986824186952 2020,GASOLI,GBR,winter.peak,8.66986824186952 @@ -95,22 +79,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASNAT,GBR,autumn.day,2.9170059999999998 2020,GASNAT,GBR,autumn.peak,2.9170059999999998 2020,GASNAT,GBR,autumn.evening,2.9170059999999998 -2020,BIOPEL,GBR,winter.night,4.7221140833333335 -2020,BIOPEL,GBR,winter.day,4.7221140833333335 -2020,BIOPEL,GBR,winter.peak,4.7221140833333335 -2020,BIOPEL,GBR,winter.evening,4.7221140833333335 -2020,BIOPEL,GBR,peak.night,4.7221140833333335 -2020,BIOPEL,GBR,peak.day,4.7221140833333335 -2020,BIOPEL,GBR,peak.peak,4.7221140833333335 -2020,BIOPEL,GBR,peak.evening,4.7221140833333335 -2020,BIOPEL,GBR,summer.night,1.21832725 -2020,BIOPEL,GBR,summer.day,1.21832725 -2020,BIOPEL,GBR,summer.peak,1.21832725 -2020,BIOPEL,GBR,summer.evening,1.21832725 -2020,BIOPEL,GBR,autumn.night,4.7221140833333335 -2020,BIOPEL,GBR,autumn.day,4.7221140833333335 -2020,BIOPEL,GBR,autumn.peak,4.7221140833333335 -2020,BIOPEL,GBR,autumn.evening,4.7221140833333335 2020,ELCTRI,GBR,winter.night,7.993308999999999 2020,ELCTRI,GBR,winter.day,17.26223303030303 2020,ELCTRI,GBR,winter.peak,17.482621345499997 @@ -175,6 +143,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 +2020,BIOPRD,GBR,winter.night,3.5869398412698414 +2020,BIOPRD,GBR,winter.day,3.5869398412698414 +2020,BIOPRD,GBR,winter.peak,3.5869398412698414 +2020,BIOPRD,GBR,winter.evening,3.5869398412698414 +2020,BIOPRD,GBR,peak.night,3.5869398412698414 +2020,BIOPRD,GBR,peak.day,3.5869398412698414 +2020,BIOPRD,GBR,peak.peak,3.5869398412698414 +2020,BIOPRD,GBR,peak.evening,3.5869398412698414 +2020,BIOPRD,GBR,summer.night,0.25 +2020,BIOPRD,GBR,summer.day,0.25 +2020,BIOPRD,GBR,summer.peak,0.25 +2020,BIOPRD,GBR,summer.evening,0.25 +2020,BIOPRD,GBR,autumn.night,3.586939841269842 +2020,BIOPRD,GBR,autumn.day,3.586939841269842 +2020,BIOPRD,GBR,autumn.peak,3.586939841269842 +2020,BIOPRD,GBR,autumn.evening,3.586939841269842 +2020,BIOPEL,GBR,winter.night,4.7221140833333335 +2020,BIOPEL,GBR,winter.day,4.7221140833333335 +2020,BIOPEL,GBR,winter.peak,4.7221140833333335 +2020,BIOPEL,GBR,winter.evening,4.7221140833333335 +2020,BIOPEL,GBR,peak.night,4.7221140833333335 +2020,BIOPEL,GBR,peak.day,4.7221140833333335 +2020,BIOPEL,GBR,peak.peak,4.7221140833333335 +2020,BIOPEL,GBR,peak.evening,4.7221140833333335 +2020,BIOPEL,GBR,summer.night,1.21832725 +2020,BIOPEL,GBR,summer.day,1.21832725 +2020,BIOPEL,GBR,summer.peak,1.21832725 +2020,BIOPEL,GBR,summer.evening,1.21832725 +2020,BIOPEL,GBR,autumn.night,4.7221140833333335 +2020,BIOPEL,GBR,autumn.day,4.7221140833333335 +2020,BIOPEL,GBR,autumn.peak,4.7221140833333335 +2020,BIOPEL,GBR,autumn.evening,4.7221140833333335 2030,OILCRD,GBR,winter.night,3.072868 2030,OILCRD,GBR,winter.day,3.072868 2030,OILCRD,GBR,winter.peak,3.072868 @@ -207,22 +207,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASPRD,GBR,autumn.day,2.20452 2030,GASPRD,GBR,autumn.peak,2.20452 2030,GASPRD,GBR,autumn.evening,2.20452 -2030,BIOPRD,GBR,winter.night,4.249632460317461 -2030,BIOPRD,GBR,winter.day,4.249632460317461 -2030,BIOPRD,GBR,winter.peak,4.249632460317461 -2030,BIOPRD,GBR,winter.evening,4.249632460317461 -2030,BIOPRD,GBR,peak.night,1.822057119047619 -2030,BIOPRD,GBR,peak.day,1.822057119047619 -2030,BIOPRD,GBR,peak.peak,1.822057119047619 -2030,BIOPRD,GBR,peak.evening,1.822057119047619 -2030,BIOPRD,GBR,summer.night,0.25 -2030,BIOPRD,GBR,summer.day,0.25 -2030,BIOPRD,GBR,summer.peak,0.25 -2030,BIOPRD,GBR,summer.evening,0.25 -2030,BIOPRD,GBR,autumn.night,1.822057119047619 -2030,BIOPRD,GBR,autumn.day,1.822057119047619 -2030,BIOPRD,GBR,autumn.peak,1.822057119047619 -2030,BIOPRD,GBR,autumn.evening,1.822057119047619 2030,GASOLI,GBR,winter.night,5.585457080000001 2030,GASOLI,GBR,winter.day,5.585457080000001 2030,GASOLI,GBR,winter.peak,5.585457080000001 @@ -271,22 +255,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,autumn.day,2.9170059999999998 2030,GASNAT,GBR,autumn.peak,2.9170059999999998 2030,GASNAT,GBR,autumn.evening,2.9170059999999998 -2030,BIOPEL,GBR,winter.night,4.7221140833333335 -2030,BIOPEL,GBR,winter.day,4.7221140833333335 -2030,BIOPEL,GBR,winter.peak,4.7221140833333335 -2030,BIOPEL,GBR,winter.evening,4.7221140833333335 -2030,BIOPEL,GBR,peak.night,2.173159975 -2030,BIOPEL,GBR,peak.day,2.173159975 -2030,BIOPEL,GBR,peak.peak,2.173159975 -2030,BIOPEL,GBR,peak.evening,2.173159975 -2030,BIOPEL,GBR,summer.night,0.5225 -2030,BIOPEL,GBR,summer.day,0.5225 -2030,BIOPEL,GBR,summer.peak,0.5225 -2030,BIOPEL,GBR,summer.evening,0.5225 -2030,BIOPEL,GBR,autumn.night,2.173159975 -2030,BIOPEL,GBR,autumn.day,2.173159975 -2030,BIOPEL,GBR,autumn.peak,2.173159975 -2030,BIOPEL,GBR,autumn.evening,2.173159975 2030,ELCTRI,GBR,winter.night,7.993308999999999 2030,ELCTRI,GBR,winter.day,17.26223303030303 2030,ELCTRI,GBR,winter.peak,17.482621345499997 @@ -351,6 +319,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 +2030,BIOPRD,GBR,winter.night,4.249632460317461 +2030,BIOPRD,GBR,winter.day,4.249632460317461 +2030,BIOPRD,GBR,winter.peak,4.249632460317461 +2030,BIOPRD,GBR,winter.evening,4.249632460317461 +2030,BIOPRD,GBR,peak.night,1.822057119047619 +2030,BIOPRD,GBR,peak.day,1.822057119047619 +2030,BIOPRD,GBR,peak.peak,1.822057119047619 +2030,BIOPRD,GBR,peak.evening,1.822057119047619 +2030,BIOPRD,GBR,summer.night,0.25 +2030,BIOPRD,GBR,summer.day,0.25 +2030,BIOPRD,GBR,summer.peak,0.25 +2030,BIOPRD,GBR,summer.evening,0.25 +2030,BIOPRD,GBR,autumn.night,1.822057119047619 +2030,BIOPRD,GBR,autumn.day,1.822057119047619 +2030,BIOPRD,GBR,autumn.peak,1.822057119047619 +2030,BIOPRD,GBR,autumn.evening,1.822057119047619 +2030,BIOPEL,GBR,winter.night,4.7221140833333335 +2030,BIOPEL,GBR,winter.day,4.7221140833333335 +2030,BIOPEL,GBR,winter.peak,4.7221140833333335 +2030,BIOPEL,GBR,winter.evening,4.7221140833333335 +2030,BIOPEL,GBR,peak.night,2.173159975 +2030,BIOPEL,GBR,peak.day,2.173159975 +2030,BIOPEL,GBR,peak.peak,2.173159975 +2030,BIOPEL,GBR,peak.evening,2.173159975 +2030,BIOPEL,GBR,summer.night,0.5225 +2030,BIOPEL,GBR,summer.day,0.5225 +2030,BIOPEL,GBR,summer.peak,0.5225 +2030,BIOPEL,GBR,summer.evening,0.5225 +2030,BIOPEL,GBR,autumn.night,2.173159975 +2030,BIOPEL,GBR,autumn.day,2.173159975 +2030,BIOPEL,GBR,autumn.peak,2.173159975 +2030,BIOPEL,GBR,autumn.evening,2.173159975 2040,OILCRD,GBR,winter.night,3.072868 2040,OILCRD,GBR,winter.day,3.072868 2040,OILCRD,GBR,winter.peak,3.072868 @@ -383,22 +383,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,2.20452 2040,GASPRD,GBR,autumn.peak,2.20452 2040,GASPRD,GBR,autumn.evening,2.20452 -2040,BIOPRD,GBR,winter.night,0.25 -2040,BIOPRD,GBR,winter.day,0.25 -2040,BIOPRD,GBR,winter.peak,0.25 -2040,BIOPRD,GBR,winter.evening,0.25 -2040,BIOPRD,GBR,peak.night,0.25 -2040,BIOPRD,GBR,peak.day,0.25 -2040,BIOPRD,GBR,peak.peak,0.25 -2040,BIOPRD,GBR,peak.evening,0.25 -2040,BIOPRD,GBR,summer.night,0.25 -2040,BIOPRD,GBR,summer.day,0.25 -2040,BIOPRD,GBR,summer.peak,0.25 -2040,BIOPRD,GBR,summer.evening,0.25 -2040,BIOPRD,GBR,autumn.night,0.25 -2040,BIOPRD,GBR,autumn.day,0.25 -2040,BIOPRD,GBR,autumn.peak,0.25 -2040,BIOPRD,GBR,autumn.evening,0.25 2040,GASOLI,GBR,winter.night,5.585457080000001 2040,GASOLI,GBR,winter.day,5.585457080000001 2040,GASOLI,GBR,winter.peak,5.585457080000001 @@ -431,22 +415,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASNAT,GBR,autumn.day,2.9170059999999998 2040,GASNAT,GBR,autumn.peak,2.9170059999999998 2040,GASNAT,GBR,autumn.evening,2.9170059999999998 -2040,BIOPEL,GBR,winter.night,0.5225 -2040,BIOPEL,GBR,winter.day,0.5225 -2040,BIOPEL,GBR,winter.peak,0.5225 -2040,BIOPEL,GBR,winter.evening,0.5225 -2040,BIOPEL,GBR,peak.night,0.5225 -2040,BIOPEL,GBR,peak.day,0.5225 -2040,BIOPEL,GBR,peak.peak,0.5225 -2040,BIOPEL,GBR,peak.evening,0.5225 -2040,BIOPEL,GBR,summer.night,0.5225 -2040,BIOPEL,GBR,summer.day,0.5225 -2040,BIOPEL,GBR,summer.peak,0.5225 -2040,BIOPEL,GBR,summer.evening,0.5225 -2040,BIOPEL,GBR,autumn.night,0.5225 -2040,BIOPEL,GBR,autumn.day,0.5225 -2040,BIOPEL,GBR,autumn.peak,0.5225 -2040,BIOPEL,GBR,autumn.evening,0.5225 2040,ELCTRI,GBR,winter.night,7.993308999999999 2040,ELCTRI,GBR,winter.day,7.993308999999999 2040,ELCTRI,GBR,winter.peak,7.993308999999999 @@ -511,3 +479,35 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,RSHEAT,GBR,autumn.day,0.827 2040,RSHEAT,GBR,autumn.peak,0.827 2040,RSHEAT,GBR,autumn.evening,0.827 +2040,BIOPRD,GBR,winter.night,0.25 +2040,BIOPRD,GBR,winter.day,0.25 +2040,BIOPRD,GBR,winter.peak,0.25 +2040,BIOPRD,GBR,winter.evening,0.25 +2040,BIOPRD,GBR,peak.night,0.25 +2040,BIOPRD,GBR,peak.day,0.25 +2040,BIOPRD,GBR,peak.peak,0.25 +2040,BIOPRD,GBR,peak.evening,0.25 +2040,BIOPRD,GBR,summer.night,0.25 +2040,BIOPRD,GBR,summer.day,0.25 +2040,BIOPRD,GBR,summer.peak,0.25 +2040,BIOPRD,GBR,summer.evening,0.25 +2040,BIOPRD,GBR,autumn.night,0.25 +2040,BIOPRD,GBR,autumn.day,0.25 +2040,BIOPRD,GBR,autumn.peak,0.25 +2040,BIOPRD,GBR,autumn.evening,0.25 +2040,BIOPEL,GBR,winter.night,0.5225 +2040,BIOPEL,GBR,winter.day,0.5225 +2040,BIOPEL,GBR,winter.peak,0.5225 +2040,BIOPEL,GBR,winter.evening,0.5225 +2040,BIOPEL,GBR,peak.night,0.5225 +2040,BIOPEL,GBR,peak.day,0.5225 +2040,BIOPEL,GBR,peak.peak,0.5225 +2040,BIOPEL,GBR,peak.evening,0.5225 +2040,BIOPEL,GBR,summer.night,0.5225 +2040,BIOPEL,GBR,summer.day,0.5225 +2040,BIOPEL,GBR,summer.peak,0.5225 +2040,BIOPEL,GBR,summer.evening,0.5225 +2040,BIOPEL,GBR,autumn.night,0.5225 +2040,BIOPEL,GBR,autumn.day,0.5225 +2040,BIOPEL,GBR,autumn.peak,0.5225 +2040,BIOPEL,GBR,autumn.evening,0.5225 diff --git a/tests/data/missing_commodity/commodity_prices.csv b/tests/data/missing_commodity/commodity_prices.csv index 55a52dd42..8bafd7e4b 100644 --- a/tests/data/missing_commodity/commodity_prices.csv +++ b/tests/data/missing_commodity/commodity_prices.csv @@ -15,22 +15,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASPRD,GBR,autumn.day,2.20452 2020,GASPRD,GBR,autumn.peak,2.20452 2020,GASPRD,GBR,autumn.evening,2.20452 -2020,BIOPRD,GBR,winter.night,4.249632460317461 -2020,BIOPRD,GBR,winter.day,4.249632460317461 -2020,BIOPRD,GBR,winter.peak,4.249632460317461 -2020,BIOPRD,GBR,winter.evening,4.249632460317461 -2020,BIOPRD,GBR,peak.night,4.249632460317461 -2020,BIOPRD,GBR,peak.day,4.249632460317461 -2020,BIOPRD,GBR,peak.peak,4.249632460317461 -2020,BIOPRD,GBR,peak.evening,4.249632460317461 -2020,BIOPRD,GBR,summer.night,0.25 -2020,BIOPRD,GBR,summer.day,0.25 -2020,BIOPRD,GBR,summer.peak,0.25 -2020,BIOPRD,GBR,summer.evening,0.25 -2020,BIOPRD,GBR,autumn.night,4.249632460317461 -2020,BIOPRD,GBR,autumn.day,4.249632460317461 -2020,BIOPRD,GBR,autumn.peak,4.249632460317461 -2020,BIOPRD,GBR,autumn.evening,4.249632460317461 2020,GASNAT,GBR,winter.night,2.9170059999999998 2020,GASNAT,GBR,winter.day,2.9170059999999998 2020,GASNAT,GBR,winter.peak,2.9170059999999998 @@ -47,6 +31,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASNAT,GBR,autumn.day,2.9170059999999998 2020,GASNAT,GBR,autumn.peak,2.9170059999999998 2020,GASNAT,GBR,autumn.evening,2.9170059999999998 +2020,BIOPRD,GBR,winter.night,4.249632460317461 +2020,BIOPRD,GBR,winter.day,4.249632460317461 +2020,BIOPRD,GBR,winter.peak,4.249632460317461 +2020,BIOPRD,GBR,winter.evening,4.249632460317461 +2020,BIOPRD,GBR,peak.night,4.249632460317461 +2020,BIOPRD,GBR,peak.day,4.249632460317461 +2020,BIOPRD,GBR,peak.peak,4.249632460317461 +2020,BIOPRD,GBR,peak.evening,4.249632460317461 +2020,BIOPRD,GBR,summer.night,0.25 +2020,BIOPRD,GBR,summer.day,0.25 +2020,BIOPRD,GBR,summer.peak,0.25 +2020,BIOPRD,GBR,summer.evening,0.25 +2020,BIOPRD,GBR,autumn.night,4.249632460317461 +2020,BIOPRD,GBR,autumn.day,4.249632460317461 +2020,BIOPRD,GBR,autumn.peak,4.249632460317461 +2020,BIOPRD,GBR,autumn.evening,4.249632460317461 2020,BIOPEL,GBR,winter.night,4.7221140833333335 2020,BIOPEL,GBR,winter.day,4.7221140833333335 2020,BIOPEL,GBR,winter.peak,4.7221140833333335 @@ -111,22 +111,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASPRD,GBR,autumn.day,2.20452 2030,GASPRD,GBR,autumn.peak,2.20452 2030,GASPRD,GBR,autumn.evening,2.20452 -2030,BIOPRD,GBR,winter.night,4.249632460317461 -2030,BIOPRD,GBR,winter.day,4.249632460317461 -2030,BIOPRD,GBR,winter.peak,4.249632460317461 -2030,BIOPRD,GBR,winter.evening,4.249632460317461 -2030,BIOPRD,GBR,peak.night,1.822057119047619 -2030,BIOPRD,GBR,peak.day,1.822057119047619 -2030,BIOPRD,GBR,peak.peak,1.822057119047619 -2030,BIOPRD,GBR,peak.evening,1.822057119047619 -2030,BIOPRD,GBR,summer.night,0.25 -2030,BIOPRD,GBR,summer.day,0.25 -2030,BIOPRD,GBR,summer.peak,0.25 -2030,BIOPRD,GBR,summer.evening,0.25 -2030,BIOPRD,GBR,autumn.night,1.822057119047619 -2030,BIOPRD,GBR,autumn.day,1.822057119047619 -2030,BIOPRD,GBR,autumn.peak,1.822057119047619 -2030,BIOPRD,GBR,autumn.evening,1.822057119047619 2030,GASNAT,GBR,winter.night,2.9170059999999998 2030,GASNAT,GBR,winter.day,2.9170059999999998 2030,GASNAT,GBR,winter.peak,2.9170059999999998 @@ -143,6 +127,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,autumn.day,2.9170059999999998 2030,GASNAT,GBR,autumn.peak,2.9170059999999998 2030,GASNAT,GBR,autumn.evening,2.9170059999999998 +2030,BIOPRD,GBR,winter.night,4.249632460317461 +2030,BIOPRD,GBR,winter.day,4.249632460317461 +2030,BIOPRD,GBR,winter.peak,4.249632460317461 +2030,BIOPRD,GBR,winter.evening,4.249632460317461 +2030,BIOPRD,GBR,peak.night,1.822057119047619 +2030,BIOPRD,GBR,peak.day,1.822057119047619 +2030,BIOPRD,GBR,peak.peak,1.822057119047619 +2030,BIOPRD,GBR,peak.evening,1.822057119047619 +2030,BIOPRD,GBR,summer.night,0.25 +2030,BIOPRD,GBR,summer.day,0.25 +2030,BIOPRD,GBR,summer.peak,0.25 +2030,BIOPRD,GBR,summer.evening,0.25 +2030,BIOPRD,GBR,autumn.night,1.822057119047619 +2030,BIOPRD,GBR,autumn.day,1.822057119047619 +2030,BIOPRD,GBR,autumn.peak,1.822057119047619 +2030,BIOPRD,GBR,autumn.evening,1.822057119047619 2030,BIOPEL,GBR,winter.night,4.7221140833333335 2030,BIOPEL,GBR,winter.day,4.7221140833333335 2030,BIOPEL,GBR,winter.peak,4.7221140833333335 diff --git a/tests/data/muse1_default/commodity_prices.csv b/tests/data/muse1_default/commodity_prices.csv index 593c350f2..5a9fc6535 100644 --- a/tests/data/muse1_default/commodity_prices.csv +++ b/tests/data/muse1_default/commodity_prices.csv @@ -1,106 +1,106 @@ milestone_year,commodity_id,region_id,time_slice,price -2020,gas,R1,all-year.night,2.55 -2020,gas,R1,all-year.morning,2.55 -2020,gas,R1,all-year.afternoon,2.55 -2020,gas,R1,all-year.early-peak,2.55 -2020,gas,R1,all-year.late-peak,2.55 -2020,gas,R1,all-year.evening,2.55 2020,electricity,R1,all-year.night,-0.0 2020,electricity,R1,all-year.morning,-0.0 2020,electricity,R1,all-year.afternoon,-0.0 2020,electricity,R1,all-year.early-peak,-0.0 2020,electricity,R1,all-year.late-peak,-0.0 2020,electricity,R1,all-year.evening,-0.0 +2020,gas,R1,all-year.night,2.55 +2020,gas,R1,all-year.morning,2.55 +2020,gas,R1,all-year.afternoon,2.55 +2020,gas,R1,all-year.early-peak,2.55 +2020,gas,R1,all-year.late-peak,2.55 +2020,gas,R1,all-year.evening,2.55 2020,heat,R1,all-year.night,8.3380664049 2020,heat,R1,all-year.morning,8.3380664049 2020,heat,R1,all-year.afternoon,8.3380664049 2020,heat,R1,all-year.early-peak,8.3380664049 2020,heat,R1,all-year.late-peak,8.3380664049 2020,heat,R1,all-year.evening,8.3380664049 -2025,gas,R1,all-year.night,2.55 -2025,gas,R1,all-year.morning,2.55 -2025,gas,R1,all-year.afternoon,2.5500000000000007 -2025,gas,R1,all-year.early-peak,2.5500000000000007 -2025,gas,R1,all-year.late-peak,2.55 -2025,gas,R1,all-year.evening,2.55 2025,electricity,R1,all-year.night,15.26529810765 2025,electricity,R1,all-year.morning,15.26529810765 2025,electricity,R1,all-year.afternoon,15.26529810765 2025,electricity,R1,all-year.early-peak,15.26529810765 2025,electricity,R1,all-year.late-peak,15.26529810765 2025,electricity,R1,all-year.evening,15.26529810765 +2025,gas,R1,all-year.night,2.55 +2025,gas,R1,all-year.morning,2.55 +2025,gas,R1,all-year.afternoon,2.5500000000000007 +2025,gas,R1,all-year.early-peak,2.5500000000000007 +2025,gas,R1,all-year.late-peak,2.55 +2025,gas,R1,all-year.evening,2.55 2025,heat,R1,all-year.night,6.10611924306 2025,heat,R1,all-year.morning,6.10611924306 2025,heat,R1,all-year.afternoon,6.10611924306 2025,heat,R1,all-year.early-peak,6.10611924306 2025,heat,R1,all-year.late-peak,10.727716434449999 2025,heat,R1,all-year.evening,6.10611924306 -2030,gas,R1,all-year.night,-0.0 -2030,gas,R1,all-year.morning,-0.0 -2030,gas,R1,all-year.afternoon,-0.0 -2030,gas,R1,all-year.early-peak,-0.0 -2030,gas,R1,all-year.late-peak,-0.0 -2030,gas,R1,all-year.evening,-0.0 2030,electricity,R1,all-year.night,-0.0 2030,electricity,R1,all-year.morning,-0.0 2030,electricity,R1,all-year.afternoon,-0.0 2030,electricity,R1,all-year.early-peak,-0.0 2030,electricity,R1,all-year.late-peak,-0.0 2030,electricity,R1,all-year.evening,-0.0 +2030,gas,R1,all-year.night,-0.0 +2030,gas,R1,all-year.morning,-0.0 +2030,gas,R1,all-year.afternoon,-0.0 +2030,gas,R1,all-year.early-peak,-0.0 +2030,gas,R1,all-year.late-peak,-0.0 +2030,gas,R1,all-year.evening,-0.0 2030,heat,R1,all-year.night,-0.0 2030,heat,R1,all-year.morning,-0.0 2030,heat,R1,all-year.afternoon,-0.0 2030,heat,R1,all-year.early-peak,-0.0 2030,heat,R1,all-year.late-peak,-0.0 2030,heat,R1,all-year.evening,-0.0 -2035,gas,R1,all-year.night,-0.0 -2035,gas,R1,all-year.morning,-0.0 -2035,gas,R1,all-year.afternoon,-0.0 -2035,gas,R1,all-year.early-peak,-0.0 -2035,gas,R1,all-year.late-peak,-0.0 -2035,gas,R1,all-year.evening,-0.0 2035,electricity,R1,all-year.night,-0.0 2035,electricity,R1,all-year.morning,-0.0 2035,electricity,R1,all-year.afternoon,-0.0 2035,electricity,R1,all-year.early-peak,-0.0 2035,electricity,R1,all-year.late-peak,-0.0 2035,electricity,R1,all-year.evening,-0.0 +2035,gas,R1,all-year.night,-0.0 +2035,gas,R1,all-year.morning,-0.0 +2035,gas,R1,all-year.afternoon,-0.0 +2035,gas,R1,all-year.early-peak,-0.0 +2035,gas,R1,all-year.late-peak,-0.0 +2035,gas,R1,all-year.evening,-0.0 2035,heat,R1,all-year.night,-0.0 2035,heat,R1,all-year.morning,-0.0 2035,heat,R1,all-year.afternoon,-0.0 2035,heat,R1,all-year.early-peak,-0.0 2035,heat,R1,all-year.late-peak,-0.0 2035,heat,R1,all-year.evening,-0.0 -2040,gas,R1,all-year.night,-0.0 -2040,gas,R1,all-year.morning,-0.0 -2040,gas,R1,all-year.afternoon,-0.0 -2040,gas,R1,all-year.early-peak,-0.0 -2040,gas,R1,all-year.late-peak,-0.0 -2040,gas,R1,all-year.evening,-0.0 2040,electricity,R1,all-year.night,-0.0 2040,electricity,R1,all-year.morning,-0.0 2040,electricity,R1,all-year.afternoon,-0.0 2040,electricity,R1,all-year.early-peak,-0.0 2040,electricity,R1,all-year.late-peak,-0.0 2040,electricity,R1,all-year.evening,-0.0 +2040,gas,R1,all-year.night,-0.0 +2040,gas,R1,all-year.morning,-0.0 +2040,gas,R1,all-year.afternoon,-0.0 +2040,gas,R1,all-year.early-peak,-0.0 +2040,gas,R1,all-year.late-peak,-0.0 +2040,gas,R1,all-year.evening,-0.0 2040,heat,R1,all-year.night,-0.0 2040,heat,R1,all-year.morning,-0.0 2040,heat,R1,all-year.afternoon,-0.0 2040,heat,R1,all-year.early-peak,-0.0 2040,heat,R1,all-year.late-peak,-0.0 2040,heat,R1,all-year.evening,-0.0 -2045,gas,R1,all-year.night,-0.0 -2045,gas,R1,all-year.morning,-0.0 -2045,gas,R1,all-year.afternoon,-0.0 -2045,gas,R1,all-year.early-peak,-0.0 -2045,gas,R1,all-year.late-peak,-0.0 -2045,gas,R1,all-year.evening,-0.0 2045,electricity,R1,all-year.night,-0.0 2045,electricity,R1,all-year.morning,-0.0 2045,electricity,R1,all-year.afternoon,-0.0 2045,electricity,R1,all-year.early-peak,-0.0 2045,electricity,R1,all-year.late-peak,-0.0 2045,electricity,R1,all-year.evening,-0.0 +2045,gas,R1,all-year.night,-0.0 +2045,gas,R1,all-year.morning,-0.0 +2045,gas,R1,all-year.afternoon,-0.0 +2045,gas,R1,all-year.early-peak,-0.0 +2045,gas,R1,all-year.late-peak,-0.0 +2045,gas,R1,all-year.evening,-0.0 2045,heat,R1,all-year.night,-0.0 2045,heat,R1,all-year.morning,-0.0 2045,heat,R1,all-year.afternoon,-0.0 diff --git a/tests/data/two_outputs/commodity_prices.csv b/tests/data/two_outputs/commodity_prices.csv index dd04d0b45..90b7e851e 100644 --- a/tests/data/two_outputs/commodity_prices.csv +++ b/tests/data/two_outputs/commodity_prices.csv @@ -31,22 +31,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASPRD,GBR,autumn.day,2.20452 2020,GASPRD,GBR,autumn.peak,2.20452 2020,GASPRD,GBR,autumn.evening,2.20452 -2020,BIOPRD,GBR,winter.night,3.5869398412698414 -2020,BIOPRD,GBR,winter.day,3.5869398412698414 -2020,BIOPRD,GBR,winter.peak,3.5869398412698414 -2020,BIOPRD,GBR,winter.evening,3.5869398412698414 -2020,BIOPRD,GBR,peak.night,3.5869398412698414 -2020,BIOPRD,GBR,peak.day,3.5869398412698414 -2020,BIOPRD,GBR,peak.peak,3.5869398412698414 -2020,BIOPRD,GBR,peak.evening,3.5869398412698414 -2020,BIOPRD,GBR,summer.night,0.25 -2020,BIOPRD,GBR,summer.day,0.25 -2020,BIOPRD,GBR,summer.peak,0.25 -2020,BIOPRD,GBR,summer.evening,0.25 -2020,BIOPRD,GBR,autumn.night,3.586939841269842 -2020,BIOPRD,GBR,autumn.day,3.586939841269842 -2020,BIOPRD,GBR,autumn.peak,3.586939841269842 -2020,BIOPRD,GBR,autumn.evening,3.586939841269842 2020,GASOLI,GBR,winter.night,10.570299353027398 2020,GASOLI,GBR,winter.day,10.570299353027398 2020,GASOLI,GBR,winter.peak,10.570299353027398 @@ -95,22 +79,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,GASNAT,GBR,autumn.day,2.9170059999999998 2020,GASNAT,GBR,autumn.peak,2.9170059999999998 2020,GASNAT,GBR,autumn.evening,2.9170059999999998 -2020,BIOPEL,GBR,winter.night,4.7221140833333335 -2020,BIOPEL,GBR,winter.day,4.7221140833333335 -2020,BIOPEL,GBR,winter.peak,4.7221140833333335 -2020,BIOPEL,GBR,winter.evening,4.7221140833333335 -2020,BIOPEL,GBR,peak.night,4.7221140833333335 -2020,BIOPEL,GBR,peak.day,4.7221140833333335 -2020,BIOPEL,GBR,peak.peak,4.7221140833333335 -2020,BIOPEL,GBR,peak.evening,4.7221140833333335 -2020,BIOPEL,GBR,summer.night,1.21832725 -2020,BIOPEL,GBR,summer.day,1.21832725 -2020,BIOPEL,GBR,summer.peak,1.21832725 -2020,BIOPEL,GBR,summer.evening,1.21832725 -2020,BIOPEL,GBR,autumn.night,4.7221140833333335 -2020,BIOPEL,GBR,autumn.day,4.7221140833333335 -2020,BIOPEL,GBR,autumn.peak,4.7221140833333335 -2020,BIOPEL,GBR,autumn.evening,4.7221140833333335 2020,ELCTRI,GBR,winter.night,7.993308999999999 2020,ELCTRI,GBR,winter.day,17.26223303030303 2020,ELCTRI,GBR,winter.peak,20.410312516918875 @@ -159,6 +127,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 +2020,BIOPRD,GBR,winter.night,3.5869398412698414 +2020,BIOPRD,GBR,winter.day,3.5869398412698414 +2020,BIOPRD,GBR,winter.peak,3.5869398412698414 +2020,BIOPRD,GBR,winter.evening,3.5869398412698414 +2020,BIOPRD,GBR,peak.night,3.5869398412698414 +2020,BIOPRD,GBR,peak.day,3.5869398412698414 +2020,BIOPRD,GBR,peak.peak,3.5869398412698414 +2020,BIOPRD,GBR,peak.evening,3.5869398412698414 +2020,BIOPRD,GBR,summer.night,0.25 +2020,BIOPRD,GBR,summer.day,0.25 +2020,BIOPRD,GBR,summer.peak,0.25 +2020,BIOPRD,GBR,summer.evening,0.25 +2020,BIOPRD,GBR,autumn.night,3.586939841269842 +2020,BIOPRD,GBR,autumn.day,3.586939841269842 +2020,BIOPRD,GBR,autumn.peak,3.586939841269842 +2020,BIOPRD,GBR,autumn.evening,3.586939841269842 +2020,BIOPEL,GBR,winter.night,4.7221140833333335 +2020,BIOPEL,GBR,winter.day,4.7221140833333335 +2020,BIOPEL,GBR,winter.peak,4.7221140833333335 +2020,BIOPEL,GBR,winter.evening,4.7221140833333335 +2020,BIOPEL,GBR,peak.night,4.7221140833333335 +2020,BIOPEL,GBR,peak.day,4.7221140833333335 +2020,BIOPEL,GBR,peak.peak,4.7221140833333335 +2020,BIOPEL,GBR,peak.evening,4.7221140833333335 +2020,BIOPEL,GBR,summer.night,1.21832725 +2020,BIOPEL,GBR,summer.day,1.21832725 +2020,BIOPEL,GBR,summer.peak,1.21832725 +2020,BIOPEL,GBR,summer.evening,1.21832725 +2020,BIOPEL,GBR,autumn.night,4.7221140833333335 +2020,BIOPEL,GBR,autumn.day,4.7221140833333335 +2020,BIOPEL,GBR,autumn.peak,4.7221140833333335 +2020,BIOPEL,GBR,autumn.evening,4.7221140833333335 2030,OILCRD,GBR,winter.night,3.072868 2030,OILCRD,GBR,winter.day,3.072868 2030,OILCRD,GBR,winter.peak,3.072868 @@ -191,22 +191,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASPRD,GBR,autumn.day,2.20452 2030,GASPRD,GBR,autumn.peak,2.20452 2030,GASPRD,GBR,autumn.evening,2.20452 -2030,BIOPRD,GBR,winter.night,4.249632460317461 -2030,BIOPRD,GBR,winter.day,4.249632460317461 -2030,BIOPRD,GBR,winter.peak,4.249632460317461 -2030,BIOPRD,GBR,winter.evening,4.249632460317461 -2030,BIOPRD,GBR,peak.night,1.822057119047619 -2030,BIOPRD,GBR,peak.day,1.822057119047619 -2030,BIOPRD,GBR,peak.peak,1.822057119047619 -2030,BIOPRD,GBR,peak.evening,1.822057119047619 -2030,BIOPRD,GBR,summer.night,0.25 -2030,BIOPRD,GBR,summer.day,0.25 -2030,BIOPRD,GBR,summer.peak,0.25 -2030,BIOPRD,GBR,summer.evening,0.25 -2030,BIOPRD,GBR,autumn.night,1.822057119047619 -2030,BIOPRD,GBR,autumn.day,1.822057119047619 -2030,BIOPRD,GBR,autumn.peak,1.822057119047619 -2030,BIOPRD,GBR,autumn.evening,1.822057119047619 2030,GASOLI,GBR,winter.night,5.585457080000001 2030,GASOLI,GBR,winter.day,5.585457080000001 2030,GASOLI,GBR,winter.peak,5.585457080000001 @@ -255,22 +239,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,autumn.day,2.9170059999999998 2030,GASNAT,GBR,autumn.peak,2.9170059999999998 2030,GASNAT,GBR,autumn.evening,2.9170059999999998 -2030,BIOPEL,GBR,winter.night,4.7221140833333335 -2030,BIOPEL,GBR,winter.day,4.7221140833333335 -2030,BIOPEL,GBR,winter.peak,4.7221140833333335 -2030,BIOPEL,GBR,winter.evening,4.7221140833333335 -2030,BIOPEL,GBR,peak.night,2.173159975 -2030,BIOPEL,GBR,peak.day,2.173159975 -2030,BIOPEL,GBR,peak.peak,2.173159975 -2030,BIOPEL,GBR,peak.evening,2.173159975 -2030,BIOPEL,GBR,summer.night,0.5225 -2030,BIOPEL,GBR,summer.day,0.5225 -2030,BIOPEL,GBR,summer.peak,0.5225 -2030,BIOPEL,GBR,summer.evening,0.5225 -2030,BIOPEL,GBR,autumn.night,2.173159975 -2030,BIOPEL,GBR,autumn.day,2.173159975 -2030,BIOPEL,GBR,autumn.peak,2.173159975 -2030,BIOPEL,GBR,autumn.evening,2.173159975 2030,ELCTRI,GBR,winter.night,7.993308999999999 2030,ELCTRI,GBR,winter.day,7.993308999999999 2030,ELCTRI,GBR,winter.peak,7.993308999999999 @@ -319,6 +287,38 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 +2030,BIOPRD,GBR,winter.night,4.249632460317461 +2030,BIOPRD,GBR,winter.day,4.249632460317461 +2030,BIOPRD,GBR,winter.peak,4.249632460317461 +2030,BIOPRD,GBR,winter.evening,4.249632460317461 +2030,BIOPRD,GBR,peak.night,1.822057119047619 +2030,BIOPRD,GBR,peak.day,1.822057119047619 +2030,BIOPRD,GBR,peak.peak,1.822057119047619 +2030,BIOPRD,GBR,peak.evening,1.822057119047619 +2030,BIOPRD,GBR,summer.night,0.25 +2030,BIOPRD,GBR,summer.day,0.25 +2030,BIOPRD,GBR,summer.peak,0.25 +2030,BIOPRD,GBR,summer.evening,0.25 +2030,BIOPRD,GBR,autumn.night,1.822057119047619 +2030,BIOPRD,GBR,autumn.day,1.822057119047619 +2030,BIOPRD,GBR,autumn.peak,1.822057119047619 +2030,BIOPRD,GBR,autumn.evening,1.822057119047619 +2030,BIOPEL,GBR,winter.night,4.7221140833333335 +2030,BIOPEL,GBR,winter.day,4.7221140833333335 +2030,BIOPEL,GBR,winter.peak,4.7221140833333335 +2030,BIOPEL,GBR,winter.evening,4.7221140833333335 +2030,BIOPEL,GBR,peak.night,2.173159975 +2030,BIOPEL,GBR,peak.day,2.173159975 +2030,BIOPEL,GBR,peak.peak,2.173159975 +2030,BIOPEL,GBR,peak.evening,2.173159975 +2030,BIOPEL,GBR,summer.night,0.5225 +2030,BIOPEL,GBR,summer.day,0.5225 +2030,BIOPEL,GBR,summer.peak,0.5225 +2030,BIOPEL,GBR,summer.evening,0.5225 +2030,BIOPEL,GBR,autumn.night,2.173159975 +2030,BIOPEL,GBR,autumn.day,2.173159975 +2030,BIOPEL,GBR,autumn.peak,2.173159975 +2030,BIOPEL,GBR,autumn.evening,2.173159975 2040,OILCRD,GBR,winter.night,3.072868 2040,OILCRD,GBR,winter.day,3.072868 2040,OILCRD,GBR,winter.peak,3.072868 @@ -351,22 +351,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,2.20452 2040,GASPRD,GBR,autumn.peak,2.20452 2040,GASPRD,GBR,autumn.evening,2.20452 -2040,BIOPRD,GBR,winter.night,0.25 -2040,BIOPRD,GBR,winter.day,0.25 -2040,BIOPRD,GBR,winter.peak,0.25 -2040,BIOPRD,GBR,winter.evening,0.25 -2040,BIOPRD,GBR,peak.night,0.25 -2040,BIOPRD,GBR,peak.day,0.25 -2040,BIOPRD,GBR,peak.peak,0.25 -2040,BIOPRD,GBR,peak.evening,0.25 -2040,BIOPRD,GBR,summer.night,0.25 -2040,BIOPRD,GBR,summer.day,0.25 -2040,BIOPRD,GBR,summer.peak,0.25 -2040,BIOPRD,GBR,summer.evening,0.25 -2040,BIOPRD,GBR,autumn.night,0.25 -2040,BIOPRD,GBR,autumn.day,0.25 -2040,BIOPRD,GBR,autumn.peak,0.25 -2040,BIOPRD,GBR,autumn.evening,0.25 2040,GASOLI,GBR,winter.night,5.585457080000001 2040,GASOLI,GBR,winter.day,5.585457080000001 2040,GASOLI,GBR,winter.peak,5.585457080000001 @@ -399,22 +383,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASNAT,GBR,autumn.day,2.9170059999999998 2040,GASNAT,GBR,autumn.peak,2.9170059999999998 2040,GASNAT,GBR,autumn.evening,2.9170059999999998 -2040,BIOPEL,GBR,winter.night,0.5225 -2040,BIOPEL,GBR,winter.day,0.5225 -2040,BIOPEL,GBR,winter.peak,0.5225 -2040,BIOPEL,GBR,winter.evening,0.5225 -2040,BIOPEL,GBR,peak.night,0.5225 -2040,BIOPEL,GBR,peak.day,0.5225 -2040,BIOPEL,GBR,peak.peak,0.5225 -2040,BIOPEL,GBR,peak.evening,0.5225 -2040,BIOPEL,GBR,summer.night,0.5225 -2040,BIOPEL,GBR,summer.day,0.5225 -2040,BIOPEL,GBR,summer.peak,0.5225 -2040,BIOPEL,GBR,summer.evening,0.5225 -2040,BIOPEL,GBR,autumn.night,0.5225 -2040,BIOPEL,GBR,autumn.day,0.5225 -2040,BIOPEL,GBR,autumn.peak,0.5225 -2040,BIOPEL,GBR,autumn.evening,0.5225 2040,ELCTRI,GBR,winter.night,7.993308999999999 2040,ELCTRI,GBR,winter.day,7.993308999999999 2040,ELCTRI,GBR,winter.peak,7.993308999999999 @@ -463,3 +431,35 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,RSHEAT,GBR,autumn.day,0.827 2040,RSHEAT,GBR,autumn.peak,0.827 2040,RSHEAT,GBR,autumn.evening,0.827 +2040,BIOPRD,GBR,winter.night,0.25 +2040,BIOPRD,GBR,winter.day,0.25 +2040,BIOPRD,GBR,winter.peak,0.25 +2040,BIOPRD,GBR,winter.evening,0.25 +2040,BIOPRD,GBR,peak.night,0.25 +2040,BIOPRD,GBR,peak.day,0.25 +2040,BIOPRD,GBR,peak.peak,0.25 +2040,BIOPRD,GBR,peak.evening,0.25 +2040,BIOPRD,GBR,summer.night,0.25 +2040,BIOPRD,GBR,summer.day,0.25 +2040,BIOPRD,GBR,summer.peak,0.25 +2040,BIOPRD,GBR,summer.evening,0.25 +2040,BIOPRD,GBR,autumn.night,0.25 +2040,BIOPRD,GBR,autumn.day,0.25 +2040,BIOPRD,GBR,autumn.peak,0.25 +2040,BIOPRD,GBR,autumn.evening,0.25 +2040,BIOPEL,GBR,winter.night,0.5225 +2040,BIOPEL,GBR,winter.day,0.5225 +2040,BIOPEL,GBR,winter.peak,0.5225 +2040,BIOPEL,GBR,winter.evening,0.5225 +2040,BIOPEL,GBR,peak.night,0.5225 +2040,BIOPEL,GBR,peak.day,0.5225 +2040,BIOPEL,GBR,peak.peak,0.5225 +2040,BIOPEL,GBR,peak.evening,0.5225 +2040,BIOPEL,GBR,summer.night,0.5225 +2040,BIOPEL,GBR,summer.day,0.5225 +2040,BIOPEL,GBR,summer.peak,0.5225 +2040,BIOPEL,GBR,summer.evening,0.5225 +2040,BIOPEL,GBR,autumn.night,0.5225 +2040,BIOPEL,GBR,autumn.day,0.5225 +2040,BIOPEL,GBR,autumn.peak,0.5225 +2040,BIOPEL,GBR,autumn.evening,0.5225 diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv index 03f82a03e..dc5aab4db 100644 --- a/tests/data/two_regions/commodity_prices.csv +++ b/tests/data/two_regions/commodity_prices.csv @@ -1,16 +1,4 @@ milestone_year,commodity_id,region_id,time_slice,price -2020,gas,R1,all-year.night,2.55 -2020,gas,R1,all-year.morning,2.55 -2020,gas,R1,all-year.afternoon,2.55 -2020,gas,R1,all-year.early-peak,2.55 -2020,gas,R1,all-year.late-peak,2.55 -2020,gas,R1,all-year.evening,2.55 -2020,gas,R2,all-year.night,2.55 -2020,gas,R2,all-year.morning,2.55 -2020,gas,R2,all-year.afternoon,2.55 -2020,gas,R2,all-year.early-peak,2.55 -2020,gas,R2,all-year.late-peak,2.55 -2020,gas,R2,all-year.evening,2.55 2020,electricity,R1,all-year.night,-0.0 2020,electricity,R1,all-year.morning,-0.0 2020,electricity,R1,all-year.afternoon,-0.0 @@ -23,6 +11,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,electricity,R2,all-year.early-peak,-0.0 2020,electricity,R2,all-year.late-peak,-0.0 2020,electricity,R2,all-year.evening,-0.0 +2020,gas,R1,all-year.night,2.55 +2020,gas,R1,all-year.morning,2.55 +2020,gas,R1,all-year.afternoon,2.55 +2020,gas,R1,all-year.early-peak,2.55 +2020,gas,R1,all-year.late-peak,2.55 +2020,gas,R1,all-year.evening,2.55 +2020,gas,R2,all-year.night,2.55 +2020,gas,R2,all-year.morning,2.55 +2020,gas,R2,all-year.afternoon,2.55 +2020,gas,R2,all-year.early-peak,2.55 +2020,gas,R2,all-year.late-peak,2.55 +2020,gas,R2,all-year.evening,2.55 2020,heat,R1,all-year.night,8.3380664049 2020,heat,R1,all-year.morning,8.3380664049 2020,heat,R1,all-year.afternoon,8.3380664049 @@ -35,18 +35,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,heat,R2,all-year.early-peak,2.9579999999999997 2020,heat,R2,all-year.late-peak,2.9579999999999997 2020,heat,R2,all-year.evening,2.9579999999999997 -2025,gas,R1,all-year.night,2.5500000000000007 -2025,gas,R1,all-year.morning,2.55 -2025,gas,R1,all-year.afternoon,2.55 -2025,gas,R1,all-year.early-peak,2.5500000000000007 -2025,gas,R1,all-year.late-peak,2.55 -2025,gas,R1,all-year.evening,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.55 -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,15.26529810765 2025,electricity,R1,all-year.morning,15.26529810765 2025,electricity,R1,all-year.afternoon,15.26529810765 @@ -59,6 +47,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2025,electricity,R2,all-year.early-peak,4.2585 2025,electricity,R2,all-year.late-peak,4.2585 2025,electricity,R2,all-year.evening,4.2585 +2025,gas,R1,all-year.night,2.5500000000000007 +2025,gas,R1,all-year.morning,2.55 +2025,gas,R1,all-year.afternoon,2.55 +2025,gas,R1,all-year.early-peak,2.5500000000000007 +2025,gas,R1,all-year.late-peak,2.55 +2025,gas,R1,all-year.evening,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.55 +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,heat,R1,all-year.night,6.10611924306 2025,heat,R1,all-year.morning,6.10611924306 2025,heat,R1,all-year.afternoon,6.10611924306 @@ -71,18 +71,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2025,heat,R2,all-year.early-peak,2.9579999999999997 2025,heat,R2,all-year.late-peak,2.9579999999999997 2025,heat,R2,all-year.evening,2.9579999999999997 -2030,gas,R1,all-year.night,-0.0 -2030,gas,R1,all-year.morning,-0.0 -2030,gas,R1,all-year.afternoon,-0.0 -2030,gas,R1,all-year.early-peak,-0.0 -2030,gas,R1,all-year.late-peak,-0.0 -2030,gas,R1,all-year.evening,-0.0 -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,-0.0 2030,electricity,R1,all-year.morning,-0.0 2030,electricity,R1,all-year.afternoon,-0.0 @@ -95,6 +83,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,electricity,R2,all-year.early-peak,4.2585 2030,electricity,R2,all-year.late-peak,4.2585 2030,electricity,R2,all-year.evening,4.2585 +2030,gas,R1,all-year.night,-0.0 +2030,gas,R1,all-year.morning,-0.0 +2030,gas,R1,all-year.afternoon,-0.0 +2030,gas,R1,all-year.early-peak,-0.0 +2030,gas,R1,all-year.late-peak,-0.0 +2030,gas,R1,all-year.evening,-0.0 +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,heat,R1,all-year.night,-0.0 2030,heat,R1,all-year.morning,-0.0 2030,heat,R1,all-year.afternoon,-0.0 @@ -107,18 +107,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,heat,R2,all-year.early-peak,2.9579999999999997 2030,heat,R2,all-year.late-peak,2.9579999999999997 2030,heat,R2,all-year.evening,2.9579999999999997 -2035,gas,R1,all-year.night,-0.0 -2035,gas,R1,all-year.morning,-0.0 -2035,gas,R1,all-year.afternoon,-0.0 -2035,gas,R1,all-year.early-peak,-0.0 -2035,gas,R1,all-year.late-peak,-0.0 -2035,gas,R1,all-year.evening,-0.0 -2035,gas,R2,all-year.night,2.55 -2035,gas,R2,all-year.morning,2.55 -2035,gas,R2,all-year.afternoon,2.55 -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,-0.0 2035,electricity,R1,all-year.morning,-0.0 2035,electricity,R1,all-year.afternoon,-0.0 @@ -131,6 +119,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2035,electricity,R2,all-year.early-peak,4.2585 2035,electricity,R2,all-year.late-peak,4.2585 2035,electricity,R2,all-year.evening,4.2585 +2035,gas,R1,all-year.night,-0.0 +2035,gas,R1,all-year.morning,-0.0 +2035,gas,R1,all-year.afternoon,-0.0 +2035,gas,R1,all-year.early-peak,-0.0 +2035,gas,R1,all-year.late-peak,-0.0 +2035,gas,R1,all-year.evening,-0.0 +2035,gas,R2,all-year.night,2.55 +2035,gas,R2,all-year.morning,2.55 +2035,gas,R2,all-year.afternoon,2.55 +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,heat,R1,all-year.night,-0.0 2035,heat,R1,all-year.morning,-0.0 2035,heat,R1,all-year.afternoon,-0.0 @@ -143,18 +143,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2035,heat,R2,all-year.early-peak,2.9579999999999997 2035,heat,R2,all-year.late-peak,2.9579999999999997 2035,heat,R2,all-year.evening,2.9579999999999997 -2040,gas,R1,all-year.night,-0.0 -2040,gas,R1,all-year.morning,-0.0 -2040,gas,R1,all-year.afternoon,-0.0 -2040,gas,R1,all-year.early-peak,-0.0 -2040,gas,R1,all-year.late-peak,-0.0 -2040,gas,R1,all-year.evening,-0.0 -2040,gas,R2,all-year.night,2.55 -2040,gas,R2,all-year.morning,2.55 -2040,gas,R2,all-year.afternoon,2.55 -2040,gas,R2,all-year.early-peak,2.55 -2040,gas,R2,all-year.late-peak,2.55 -2040,gas,R2,all-year.evening,2.55 2040,electricity,R1,all-year.night,-0.0 2040,electricity,R1,all-year.morning,-0.0 2040,electricity,R1,all-year.afternoon,-0.0 @@ -167,6 +155,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,electricity,R2,all-year.early-peak,4.2585 2040,electricity,R2,all-year.late-peak,4.2585 2040,electricity,R2,all-year.evening,4.2585 +2040,gas,R1,all-year.night,-0.0 +2040,gas,R1,all-year.morning,-0.0 +2040,gas,R1,all-year.afternoon,-0.0 +2040,gas,R1,all-year.early-peak,-0.0 +2040,gas,R1,all-year.late-peak,-0.0 +2040,gas,R1,all-year.evening,-0.0 +2040,gas,R2,all-year.night,2.55 +2040,gas,R2,all-year.morning,2.55 +2040,gas,R2,all-year.afternoon,2.55 +2040,gas,R2,all-year.early-peak,2.55 +2040,gas,R2,all-year.late-peak,2.55 +2040,gas,R2,all-year.evening,2.55 2040,heat,R1,all-year.night,-0.0 2040,heat,R1,all-year.morning,-0.0 2040,heat,R1,all-year.afternoon,-0.0 @@ -179,18 +179,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,heat,R2,all-year.early-peak,2.9579999999999997 2040,heat,R2,all-year.late-peak,2.9579999999999997 2040,heat,R2,all-year.evening,2.9579999999999997 -2045,gas,R1,all-year.night,-0.0 -2045,gas,R1,all-year.morning,-0.0 -2045,gas,R1,all-year.afternoon,-0.0 -2045,gas,R1,all-year.early-peak,-0.0 -2045,gas,R1,all-year.late-peak,-0.0 -2045,gas,R1,all-year.evening,-0.0 -2045,gas,R2,all-year.night,2.55 -2045,gas,R2,all-year.morning,2.55 -2045,gas,R2,all-year.afternoon,2.55 -2045,gas,R2,all-year.early-peak,2.55 -2045,gas,R2,all-year.late-peak,2.55 -2045,gas,R2,all-year.evening,2.55 2045,electricity,R1,all-year.night,-0.0 2045,electricity,R1,all-year.morning,-0.0 2045,electricity,R1,all-year.afternoon,-0.0 @@ -203,6 +191,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,electricity,R2,all-year.early-peak,4.2585 2045,electricity,R2,all-year.late-peak,4.2585 2045,electricity,R2,all-year.evening,4.2585 +2045,gas,R1,all-year.night,-0.0 +2045,gas,R1,all-year.morning,-0.0 +2045,gas,R1,all-year.afternoon,-0.0 +2045,gas,R1,all-year.early-peak,-0.0 +2045,gas,R1,all-year.late-peak,-0.0 +2045,gas,R1,all-year.evening,-0.0 +2045,gas,R2,all-year.night,2.55 +2045,gas,R2,all-year.morning,2.55 +2045,gas,R2,all-year.afternoon,2.55 +2045,gas,R2,all-year.early-peak,2.55 +2045,gas,R2,all-year.late-peak,2.55 +2045,gas,R2,all-year.evening,2.55 2045,heat,R1,all-year.night,-0.0 2045,heat,R1,all-year.morning,-0.0 2045,heat,R1,all-year.afternoon,-0.0 @@ -215,12 +215,6 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,heat,R2,all-year.early-peak,2.9579999999999997 2045,heat,R2,all-year.late-peak,2.9579999999999997 2045,heat,R2,all-year.evening,2.9579999999999997 -2050,gas,R2,all-year.night,2.55 -2050,gas,R2,all-year.morning,2.55 -2050,gas,R2,all-year.afternoon,2.55 -2050,gas,R2,all-year.early-peak,2.55 -2050,gas,R2,all-year.late-peak,2.55 -2050,gas,R2,all-year.evening,2.55 2050,electricity,R1,all-year.night,-0.0 2050,electricity,R1,all-year.morning,-0.0 2050,electricity,R1,all-year.afternoon,-0.0 From 7312d5fc67a9179b693fd8601a4eb36eb239b05c Mon Sep 17 00:00:00 2001 From: Aurash Karimi Date: Fri, 13 Mar 2026 17:09:50 +0000 Subject: [PATCH 14/14] Revert "test adding options to make highs more deterministic across oses" This reverts commit cdbe3c7597e677ce4e5d60a7aa2cbc8181e4f005. --- src/simulation/optimisation.rs | 12 +- tests/data/circularity/assets.csv | 4 +- tests/data/circularity/commodity_flows.csv | 310 ++--- tests/data/circularity/commodity_prices.csv | 16 +- tests/data/muse1_default/commodity_flows.csv | 292 ++-- tests/data/muse1_default/commodity_prices.csv | 4 +- tests/data/simple/debug_dispatch_assets.csv | 316 ++--- tests/data/simple/debug_solver.csv | 10 +- .../data/simple_divisible/commodity_flows.csv | 114 +- tests/data/simple_full/commodity_flows.csv | 68 +- tests/data/simple_full/commodity_prices.csv | 60 +- .../data/simple_marginal/commodity_flows.csv | 68 +- tests/data/simple_npv/assets.csv | 4 +- tests/data/simple_npv/commodity_flows.csv | 352 ++--- tests/data/two_outputs/commodity_flows.csv | 136 +- tests/data/two_regions/assets.csv | 9 +- tests/data/two_regions/commodity_flows.csv | 1174 ++++++++--------- tests/data/two_regions/commodity_prices.csv | 14 +- 18 files changed, 1473 insertions(+), 1490 deletions(-) diff --git a/src/simulation/optimisation.rs b/src/simulation/optimisation.rs index eb30778ec..c86638224 100644 --- a/src/simulation/optimisation.rs +++ b/src/simulation/optimisation.rs @@ -654,18 +654,8 @@ impl<'model, 'run> DispatchRun<'model, 'run> { self.year, ); - let mut model = problem.optimise(Sense::Minimise); - - model.set_option("random_seed", 42); - model.set_option("parallel", "off"); - model.set_option("simplex_max_concurrency", 1); - model.set_option("solver", "simplex"); - model.set_option("presolve", "on"); - model.set_option("mip_heuristic_run_rins", false); - model.set_option("mip_heuristic_run_rens", false); - // Solve model - let solution = solve_optimal(model)?; + let solution = solve_optimal(problem.optimise(Sense::Minimise))?; let solution = Solution { solution: solution.get_solution(), diff --git a/tests/data/circularity/assets.csv b/tests/data/circularity/assets.csv index 42848b611..c70589985 100644 --- a/tests/data/circularity/assets.csv +++ b/tests/data/circularity/assets.csv @@ -20,10 +20,10 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 18,H2YPRO,GBR,A0_ELC,,2030,,30.278400121113602 19,OILRF2,GBR,A0_REF,,2030,,756.7022737069626 20,BIOPLL,GBR,A0_BPL,,2030,,427.00608705177655 -21,BIOPRO,GBR,A0_BPD,,2030,,408.1748675995067 +21,BIOPRO,GBR,A0_BPD,,2030,,448.35639140436535 22,THYBCR,GBR,A0_TRA,,2040,,912.8939641298439 23,RBIOBL,GBR,A0_RES,,2040,,3655.8189696 24,GASCGT,GBR,A0_ELC,,2040,,0.8124316982834766 25,H2YPRO,GBR,A0_ELC,,2040,,19.235689279503628 26,BIOPLL,GBR,A0_BPL,,2040,,2167.9571005431867 -27,BIOPRO,GBR,A0_BPD,,2040,,2316.536479375206 +27,BIOPRO,GBR,A0_BPD,,2040,,2276.354955570347 diff --git a/tests/data/circularity/commodity_flows.csv b/tests/data/circularity/commodity_flows.csv index 3f23b8759..06c6aad44 100644 --- a/tests/data/circularity/commodity_flows.csv +++ b/tests/data/circularity/commodity_flows.csv @@ -319,10 +319,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2020,7,ELCTRI,peak.peak,0.0 2020,7,H2YPRD,peak.evening,0.0 2020,7,ELCTRI,peak.evening,-0.0 -2020,7,H2YPRD,summer.night,-0.0 -2020,7,ELCTRI,summer.night,0.0 -2020,7,H2YPRD,summer.day,0.0 -2020,7,ELCTRI,summer.day,-0.0 +2020,7,H2YPRD,summer.night,0.0 +2020,7,ELCTRI,summer.night,-0.0 +2020,7,H2YPRD,summer.day,-0.0 +2020,7,ELCTRI,summer.day,0.0 2020,7,H2YPRD,summer.peak,-0.0 2020,7,ELCTRI,summer.peak,0.0 2020,7,H2YPRD,summer.evening,-0.0 @@ -625,16 +625,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2020,14,RSHEAT,autumn.evening,11.435412867700338 2030,0,GASPRD,winter.night,0.0 2030,0,CO2EMT,winter.night,0.0 -2030,0,GASPRD,winter.day,294.923276683973 -2030,0,CO2EMT,winter.day,1507.9427136851539 +2030,0,GASPRD,winter.day,285.2964532338849 +2030,0,CO2EMT,winter.day,1458.7207653848536 2030,0,GASPRD,winter.peak,125.31875 2030,0,CO2EMT,winter.peak,640.75476875 2030,0,GASPRD,winter.evening,167.09166800339997 2030,0,CO2EMT,winter.evening,854.3396985013842 2030,0,GASPRD,peak.night,0.0 2030,0,CO2EMT,peak.night,0.0 -2030,0,GASPRD,peak.day,53.463034660662856 -2030,0,CO2EMT,peak.day,273.3564962199692 +2030,0,GASPRD,peak.day,49.319315001711914 +2030,0,CO2EMT,peak.day,252.16965760375302 2030,0,GASPRD,peak.peak,125.31875 2030,0,CO2EMT,peak.peak,640.75476875 2030,0,GASPRD,peak.evening,167.09166800339997 @@ -651,8 +651,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,117.79896805522893 -2030,0,CO2EMT,autumn.peak,602.3061236663856 +2030,0,GASPRD,autumn.peak,113.65524839627804 +2030,0,CO2EMT,autumn.peak,581.1192850501697 2030,0,GASPRD,autumn.evening,167.09166800339997 2030,0,CO2EMT,autumn.evening,854.3396985013842 2030,1,OILCRD,winter.night,0.0 @@ -706,9 +706,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,winter.night,-0.0 2030,2,GASNAT,winter.night,0.0 2030,2,CO2EMT,winter.night,0.0 -2030,2,GASPRD,winter.day,-315.9636229359989 -2030,2,GASNAT,winter.day,300.9177361295227 -2030,2,CO2EMT,winter.day,769.2961924151249 +2030,2,GASPRD,winter.day,-306.33679948591083 +2030,2,GASNAT,winter.day,291.7493328437246 +2030,2,CO2EMT,winter.day,745.857169414982 2030,2,GASPRD,winter.peak,-124.3475625 2030,2,GASNAT,winter.peak,118.42625 2030,2,CO2EMT,winter.peak,302.756708125 @@ -718,9 +718,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,peak.night,-0.0 2030,2,GASNAT,peak.night,0.0 2030,2,CO2EMT,peak.night,0.0 -2030,2,GASPRD,peak.day,-74.50338091268875 -2030,2,GASNAT,peak.day,70.95560086922738 -2030,2,CO2EMT,peak.day,181.39799362217983 +2030,2,GASPRD,peak.day,-70.35966125373784 +2030,2,GASNAT,peak.day,67.00920119403604 +2030,2,CO2EMT,peak.day,171.30902285255314 2030,2,GASPRD,peak.peak,-124.3475625 2030,2,GASNAT,peak.peak,118.42625 2030,2,CO2EMT,peak.peak,302.756708125 @@ -742,9 +742,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,autumn.night,-0.0 2030,2,GASNAT,autumn.night,0.0 2030,2,CO2EMT,autumn.night,0.0 -2030,2,GASPRD,autumn.day,-13.520564307254862 -2030,2,GASNAT,autumn.day,12.876727911671296 -2030,2,CO2EMT,autumn.day,32.91935490618767 +2030,2,GASPRD,autumn.day,-9.37684464830395 +2030,2,GASNAT,autumn.day,8.930328236479951 +2030,2,CO2EMT,autumn.day,22.830384136560998 2030,2,GASPRD,autumn.peak,-124.3475625 2030,2,GASNAT,autumn.peak,118.42625 2030,2,CO2EMT,autumn.peak,302.756708125 @@ -779,9 +779,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,winter.evening,-5.911778797294229 2030,6,ELCTRI,winter.evening,3.9411858648628195 2030,6,CO2EMT,winter.evening,302.2692499056539 -2030,6,GASNAT,peak.night,-10.34561285979423 -2030,6,ELCTRI,peak.night,6.89707523986282 -2030,6,CO2EMT,peak.night,528.9711855212789 +2030,6,GASNAT,peak.night,-0.0 +2030,6,ELCTRI,peak.night,0.0 +2030,6,CO2EMT,peak.night,0.0 2030,6,GASNAT,peak.day,-14.77944692229423 2030,6,ELCTRI,peak.day,9.85296461486282 2030,6,CO2EMT,peak.day,755.6731211369039 @@ -791,9 +791,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,peak.evening,-5.911778797294229 2030,6,ELCTRI,peak.evening,3.9411858648628195 2030,6,CO2EMT,peak.evening,302.2692499056539 -2030,6,GASNAT,summer.night,-4.808493968439487 -2030,6,ELCTRI,summer.night,3.205662645626325 -2030,6,CO2EMT,summer.night,245.85829660631097 +2030,6,GASNAT,summer.night,-0.0 +2030,6,ELCTRI,summer.night,0.0 +2030,6,CO2EMT,summer.night,0.0 2030,6,GASNAT,summer.day,-2.1020805394776474 2030,6,ELCTRI,summer.day,1.4013870263184316 2030,6,CO2EMT,summer.day,107.4793779834921 @@ -825,12 +825,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,ELCTRI,winter.evening,0.0 2030,7,H2YPRD,peak.night,-0.0 2030,7,ELCTRI,peak.night,0.0 -2030,7,H2YPRD,peak.day,0.0 -2030,7,ELCTRI,peak.day,-0.0 +2030,7,H2YPRD,peak.day,-0.0 +2030,7,ELCTRI,peak.day,0.0 2030,7,H2YPRD,peak.peak,-0.0 2030,7,ELCTRI,peak.peak,0.0 -2030,7,H2YPRD,peak.evening,-0.0 -2030,7,ELCTRI,peak.evening,0.0 +2030,7,H2YPRD,peak.evening,0.0 +2030,7,ELCTRI,peak.evening,-0.0 2030,7,H2YPRD,summer.night,-0.0 2030,7,ELCTRI,summer.night,0.0 2030,7,H2YPRD,summer.day,-0.0 @@ -879,9 +879,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,H2YPRD,autumn.peak,0.0 2030,8,ELCTRI,autumn.evening,-0.0 2030,8,H2YPRD,autumn.evening,0.0 -2030,13,GASNAT,winter.night,-23.17501873533602 -2030,13,RSHEAT,winter.night,20.15219020464002 -2030,13,CO2EMT,winter.night,1184.938707937731 +2030,13,GASNAT,winter.night,-14.006615449537906 +2030,13,RSHEAT,winter.night,12.179665608293831 +2030,13,CO2EMT,winter.night,716.1582479348732 2030,13,GASNAT,winter.day,-186.34120376960664 2030,13,RSHEAT,winter.day,162.03582936487535 2030,13,CO2EMT,winter.day,9527.625748739989 @@ -935,8 +935,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,14,RSHEAT,winter.peak,12.499375 2030,14,ELCTRI,winter.evening,-4.12689026226823 2030,14,RSHEAT,winter.evening,12.505728067479483 -2030,14,ELCTRI,peak.night,-9.62451879399781 -2030,14,RSHEAT,peak.night,29.16520846666003 +2030,14,ELCTRI,peak.night,-6.9935856772035665 +2030,14,RSHEAT,peak.night,21.192683870313836 2030,14,ELCTRI,peak.day,-10.26442369243675 2030,14,RSHEAT,peak.day,31.1043142195053 2030,14,ELCTRI,peak.peak,-2.945563825714082 @@ -951,8 +951,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,14,RSHEAT,summer.peak,0.0 2030,14,ELCTRI,summer.evening,-0.0 2030,14,RSHEAT,summer.evening,0.0 -2030,14,ELCTRI,autumn.night,-6.7041014229024105 -2030,14,RSHEAT,autumn.night,20.31545885728003 +2030,14,ELCTRI,autumn.night,-4.073168306108166 +2030,14,RSHEAT,autumn.night,12.342934260933838 2030,14,ELCTRI,autumn.day,-9.89481429602867 2030,14,RSHEAT,autumn.day,29.984285745541424 2030,14,ELCTRI,autumn.peak,-2.7167580064587074 @@ -1007,16 +1007,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,ELCTRI,autumn.evening,-27.671451920975297 2030,15,GASOLI,autumn.evening,-32.3875309924775 2030,15,TPASKM,autumn.evening,32.3875309924775 -2030,16,BIOPEL,winter.night,-21.568831140911975 -2030,16,RSHEAT,winter.night,17.97402595075998 +2030,16,BIOPEL,winter.night,-31.135860656527402 +2030,16,RSHEAT,winter.night,25.94655054710617 2030,16,BIOPEL,winter.day,-44.47980087689542 2030,16,RSHEAT,winter.day,37.066500730746185 2030,16,BIOPEL,winter.peak,-13.343940220368017 2030,16,RSHEAT,winter.peak,11.119950183640015 2030,16,BIOPEL,winter.evening,-17.791920436159383 2030,16,RSHEAT,winter.evening,14.826600363466154 -2030,16,BIOPEL,peak.night,-21.56883114091197 -2030,16,RSHEAT,peak.night,17.974025950759977 +2030,16,BIOPEL,peak.night,-31.135860656527402 +2030,16,RSHEAT,peak.night,25.94655054710617 2030,16,BIOPEL,peak.day,-44.47980087689542 2030,16,RSHEAT,peak.day,37.066500730746185 2030,16,BIOPEL,peak.peak,-13.343940220368017 @@ -1031,8 +1031,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,16,RSHEAT,summer.peak,3.2120121331800005 2030,16,BIOPEL,summer.evening,-2.869919866728 2030,16,RSHEAT,summer.evening,2.39159988894 -2030,16,BIOPEL,autumn.night,-21.56883114091197 -2030,16,RSHEAT,autumn.night,17.974025950759977 +2030,16,BIOPEL,autumn.night,-31.135860656527402 +2030,16,RSHEAT,autumn.night,25.94655054710617 2030,16,BIOPEL,autumn.day,-44.47980087689542 2030,16,RSHEAT,autumn.day,37.066500730746185 2030,16,BIOPEL,autumn.peak,-13.343940220368017 @@ -1051,9 +1051,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,17,GASNAT,winter.evening,-37.93123643781026 2030,17,ELCTRI,winter.evening,25.287490958540175 2030,17,CO2EMT,winter.evening,1939.4241190652385 -2030,17,GASNAT,peak.night,-7.07801296003685 -2030,17,ELCTRI,peak.night,4.7186753066912335 -2030,17,CO2EMT,peak.night,361.89880264668415 +2030,17,GASNAT,peak.night,-13.477226144639717 +2030,17,ELCTRI,peak.night,8.984817429759811 +2030,17,CO2EMT,peak.night,689.0905727754287 2030,17,GASNAT,peak.day,-94.82809063935083 2030,17,ELCTRI,peak.day,63.21872709290056 2030,17,CO2EMT,peak.day,4848.560274390008 @@ -1063,9 +1063,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,17,GASNAT,peak.evening,-37.93123643781026 2030,17,ELCTRI,peak.evening,25.287490958540175 2030,17,CO2EMT,peak.evening,1939.4241190652385 -2030,17,GASNAT,summer.night,-0.0 -2030,17,ELCTRI,summer.night,0.0 -2030,17,CO2EMT,summer.night,0.0 +2030,17,GASNAT,summer.night,-4.808493968439487 +2030,17,ELCTRI,summer.night,3.205662645626325 +2030,17,CO2EMT,summer.night,245.85829660631097 2030,17,GASNAT,summer.day,-94.82809063935083 2030,17,ELCTRI,summer.day,63.21872709290056 2030,17,CO2EMT,summer.day,4848.560274390008 @@ -1075,9 +1075,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,17,GASNAT,summer.evening,-34.011358793963126 2030,17,ELCTRI,summer.evening,22.674239195975417 2030,17,CO2EMT,summer.evening,1739.0007751353344 -2030,17,GASNAT,autumn.night,-12.51498634014025 -2030,17,ELCTRI,autumn.night,8.343324226760167 -2030,17,CO2EMT,autumn.night,639.891251571371 +2030,17,GASNAT,autumn.night,-8.568586664948883 +2030,17,ELCTRI,autumn.night,5.712391109965922 +2030,17,CO2EMT,autumn.night,438.11183617883637 2030,17,GASNAT,autumn.day,-94.82809063935083 2030,17,ELCTRI,autumn.day,63.21872709290056 2030,17,CO2EMT,autumn.day,4848.560274390008 @@ -1167,16 +1167,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,19,OILCRD,autumn.evening,-41.30333277026503 2030,19,GASOLI,autumn.evening,31.529261656690863 2030,19,CO2EMT,autumn.evening,693.6437564471989 -2030,20,BIOPRD,winter.night,-22.64727269795757 -2030,20,BIOPEL,winter.night,21.568831140911968 +2030,20,BIOPRD,winter.night,-32.69265368935377 +2030,20,BIOPEL,winter.night,31.135860656527395 2030,20,BIOPRD,winter.day,-46.7037909207402 2030,20,BIOPEL,winter.day,44.479800876895425 2030,20,BIOPRD,winter.peak,-14.011137231386419 2030,20,BIOPEL,winter.peak,13.343940220368017 2030,20,BIOPRD,winter.evening,-18.681516457967355 2030,20,BIOPEL,winter.evening,17.791920436159383 -2030,20,BIOPRD,peak.night,-22.647272697957572 -2030,20,BIOPEL,peak.night,21.56883114091197 +2030,20,BIOPRD,peak.night,-32.69265368935377 +2030,20,BIOPEL,peak.night,31.135860656527395 2030,20,BIOPRD,peak.day,-46.7037909207402 2030,20,BIOPEL,peak.day,44.479800876895425 2030,20,BIOPRD,peak.peak,-14.011137231386419 @@ -1191,36 +1191,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,20,BIOPEL,summer.peak,7.6626243860566206 2030,20,BIOPRD,summer.evening,-18.681516457967355 2030,20,BIOPEL,summer.evening,17.791920436159383 -2030,20,BIOPRD,autumn.night,-22.647272697957572 -2030,20,BIOPEL,autumn.night,21.56883114091197 +2030,20,BIOPRD,autumn.night,-32.69265368935377 +2030,20,BIOPEL,autumn.night,31.135860656527395 2030,20,BIOPRD,autumn.day,-46.7037909207402 2030,20,BIOPEL,autumn.day,44.479800876895425 2030,20,BIOPRD,autumn.peak,-14.011137231386419 2030,20,BIOPEL,autumn.peak,13.343940220368017 2030,20,BIOPRD,autumn.evening,-18.681516457967355 2030,20,BIOPEL,autumn.evening,17.791920436159383 -2030,21,BIOPRD,winter.night,29.76275089852232 -2030,21,BIOPRD,winter.day,42.5182155110069 -2030,21,BIOPRD,winter.peak,12.755464612484584 -2030,21,BIOPRD,winter.evening,17.007286286037733 -2030,21,BIOPRD,peak.night,29.76275089852232 -2030,21,BIOPRD,peak.day,42.5182155110069 -2030,21,BIOPRD,peak.peak,12.755464612484584 -2030,21,BIOPRD,peak.evening,17.007286286037733 +2030,21,BIOPRD,winter.night,32.692653689353776 +2030,21,BIOPRD,winter.day,46.70379092074019 +2030,21,BIOPRD,winter.peak,14.011137231386417 +2030,21,BIOPRD,winter.evening,18.68151645796735 +2030,21,BIOPRD,peak.night,32.692653689353776 +2030,21,BIOPRD,peak.day,46.70379092074019 +2030,21,BIOPRD,peak.peak,14.011137231386417 +2030,21,BIOPRD,peak.evening,18.68151645796735 2030,21,BIOPRD,summer.night,0.0 2030,21,BIOPRD,summer.day,0.0 -2030,21,BIOPRD,summer.peak,9.719985777289075 -2030,21,BIOPRD,summer.evening,17.007286286037733 -2030,21,BIOPRD,autumn.night,29.76275089852232 -2030,21,BIOPRD,autumn.day,42.5182155110069 -2030,21,BIOPRD,autumn.peak,12.755464612484584 -2030,21,BIOPRD,autumn.evening,17.007286286037733 +2030,21,BIOPRD,summer.peak,8.045755605359457 +2030,21,BIOPRD,summer.evening,18.68151645796735 +2030,21,BIOPRD,autumn.night,32.692653689353776 +2030,21,BIOPRD,autumn.day,46.70379092074019 +2030,21,BIOPRD,autumn.peak,14.011137231386417 +2030,21,BIOPRD,autumn.evening,18.68151645796735 2040,0,GASPRD,winter.night,0.0 2040,0,CO2EMT,winter.night,0.0 2040,0,GASPRD,winter.day,0.0 2040,0,CO2EMT,winter.day,0.0 -2040,0,GASPRD,winter.peak,12.071980068513597 -2040,0,CO2EMT,winter.peak,61.72403409031003 +2040,0,GASPRD,winter.peak,12.071980068513625 +2040,0,CO2EMT,winter.peak,61.72403409031017 2040,0,GASPRD,winter.evening,167.09166800339997 2040,0,CO2EMT,winter.evening,854.3396985013842 2040,0,GASPRD,peak.night,0.0 @@ -1301,9 +1301,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,2,GASPRD,winter.day,-0.0 2040,2,GASNAT,winter.day,0.0 2040,2,CO2EMT,winter.day,0.0 -2040,2,GASPRD,winter.peak,-35.41613882053961 -2040,2,GASNAT,winter.peak,33.72965601956153 -2040,2,CO2EMT,winter.peak,86.22986561400906 +2040,2,GASPRD,winter.peak,-35.416138820539636 +2040,2,GASNAT,winter.peak,33.72965601956156 +2040,2,CO2EMT,winter.peak,86.22986561400913 2040,2,GASPRD,winter.evening,-165.796751326374 2040,2,GASNAT,winter.evening,157.90166792987998 2040,2,CO2EMT,winter.evening,403.6756140627382 @@ -1359,9 +1359,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,5,ELCTRI,autumn.day,6.001752635595889 2040,5,ELCTRI,autumn.peak,1.5488393825638174 2040,5,ELCTRI,autumn.evening,1.9008483513729915 -2040,6,GASNAT,winter.night,-0.0 -2040,6,ELCTRI,winter.night,0.0 -2040,6,CO2EMT,winter.night,0.0 +2040,6,GASNAT,winter.night,-1.8778850857827112 +2040,6,ELCTRI,winter.night,1.2519233905218075 +2040,6,CO2EMT,winter.night,96.01626443607002 2040,6,GASNAT,winter.day,-14.77944692229423 2040,6,ELCTRI,winter.day,9.85296461486282 2040,6,CO2EMT,winter.day,755.6731211369039 @@ -1371,15 +1371,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,6,GASNAT,winter.evening,-5.911778797294229 2040,6,ELCTRI,winter.evening,3.9411858648628195 2040,6,CO2EMT,winter.evening,302.2692499056539 -2040,6,GASNAT,peak.night,-2.8828517310778556 -2040,6,ELCTRI,peak.night,1.9219011540519038 -2040,6,CO2EMT,peak.night,147.40020901001074 -2040,6,GASNAT,peak.day,-14.77944692229423 -2040,6,ELCTRI,peak.day,9.85296461486282 -2040,6,CO2EMT,peak.day,755.6731211369039 -2040,6,GASNAT,peak.peak,-4.4338340625 -2040,6,ELCTRI,peak.peak,2.955889375 -2040,6,CO2EMT,peak.peak,226.70193561562496 +2040,6,GASNAT,peak.night,-0.0 +2040,6,ELCTRI,peak.night,0.0 +2040,6,CO2EMT,peak.night,0.0 +2040,6,GASNAT,peak.day,-13.480443990108558 +2040,6,ELCTRI,peak.day,8.986962660072372 +2040,6,CO2EMT,peak.day,689.2551012142505 +2040,6,GASNAT,peak.peak,-4.244778058450182 +2040,6,ELCTRI,peak.peak,2.829852038966788 +2040,6,CO2EMT,peak.peak,217.03550212855777 2040,6,GASNAT,peak.evening,-5.911778797294229 2040,6,ELCTRI,peak.evening,3.9411858648628195 2040,6,CO2EMT,peak.evening,302.2692499056539 @@ -1474,21 +1474,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,17,GASNAT,winter.night,-0.0 2040,17,ELCTRI,winter.night,0.0 2040,17,CO2EMT,winter.night,0.0 -2040,17,GASNAT,winter.day,-94.82809063935083 -2040,17,ELCTRI,winter.day,63.21872709290056 -2040,17,CO2EMT,winter.day,4848.560274390008 +2040,17,GASNAT,winter.day,-92.47306085470227 +2040,17,ELCTRI,winter.day,61.64870723646818 +2040,17,CO2EMT,winter.day,4728.147601500927 2040,17,GASNAT,winter.peak,-28.44842710077028 2040,17,ELCTRI,winter.peak,18.965618067180188 2040,17,CO2EMT,winter.peak,1454.5680776623844 2040,17,GASNAT,winter.evening,-37.3799540536769 2040,17,ELCTRI,winter.evening,24.91996936911793 2040,17,CO2EMT,winter.evening,1911.2370507644994 -2040,17,GASNAT,peak.night,-0.0 -2040,17,ELCTRI,peak.night,0.0 -2040,17,CO2EMT,peak.night,0.0 -2040,17,GASNAT,peak.day,-93.52908770716516 -2040,17,ELCTRI,peak.day,62.35272513811011 -2040,17,CO2EMT,peak.day,4782.142254467354 +2040,17,GASNAT,peak.night,-5.6854872180621845 +2040,17,ELCTRI,peak.night,3.7903248120414563 +2040,17,CO2EMT,peak.night,290.69896145951947 +2040,17,GASNAT,peak.day,-94.82809063935083 +2040,17,ELCTRI,peak.day,63.21872709290056 +2040,17,CO2EMT,peak.day,4848.560274390008 2040,17,GASNAT,peak.peak,-28.44842710077028 2040,17,ELCTRI,peak.peak,18.965618067180188 2040,17,CO2EMT,peak.peak,1454.5680776623844 @@ -1510,9 +1510,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,17,GASNAT,autumn.night,-0.0 2040,17,ELCTRI,autumn.night,0.0 2040,17,CO2EMT,autumn.night,0.0 -2040,17,GASNAT,autumn.day,-94.08350180177729 -2040,17,ELCTRI,autumn.day,62.7223345345182 -2040,17,CO2EMT,autumn.day,4810.489447124873 +2040,17,GASNAT,autumn.day,-94.82809063935083 +2040,17,ELCTRI,autumn.day,63.21872709290056 +2040,17,CO2EMT,autumn.day,4848.560274390008 2040,17,GASNAT,autumn.peak,-28.44842710077028 2040,17,ELCTRI,autumn.peak,18.965618067180188 2040,17,CO2EMT,autumn.peak,1454.5680776623844 @@ -1607,34 +1607,34 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,20,BIOPEL,winter.peak,13.343940220368017 2040,20,BIOPRD,winter.evening,-18.681516457967355 2040,20,BIOPEL,winter.evening,17.791920436159383 -2040,20,BIOPRD,peak.night,-0.0 -2040,20,BIOPEL,peak.night,0.0 -2040,20,BIOPRD,peak.day,-0.0 -2040,20,BIOPEL,peak.day,0.0 -2040,20,BIOPRD,peak.peak,-0.0 -2040,20,BIOPEL,peak.peak,0.0 -2040,20,BIOPRD,peak.evening,-0.0 -2040,20,BIOPEL,peak.evening,0.0 +2040,20,BIOPRD,peak.night,-32.692653689353776 +2040,20,BIOPEL,peak.night,31.135860656527406 +2040,20,BIOPRD,peak.day,-46.7037909207402 +2040,20,BIOPEL,peak.day,44.479800876895425 +2040,20,BIOPRD,peak.peak,-14.011137231386419 +2040,20,BIOPEL,peak.peak,13.343940220368017 +2040,20,BIOPRD,peak.evening,-18.681516457967355 +2040,20,BIOPEL,peak.evening,17.791920436159383 2040,20,BIOPRD,summer.night,-0.0 2040,20,BIOPEL,summer.night,0.0 2040,20,BIOPRD,summer.day,-0.0 2040,20,BIOPEL,summer.day,0.0 -2040,20,BIOPRD,summer.peak,-10.647253791359448 -2040,20,BIOPEL,summer.peak,10.140241706056617 -2040,20,BIOPRD,summer.evening,-18.681516457967355 -2040,20,BIOPEL,summer.evening,17.791920436159383 -2040,20,BIOPRD,autumn.night,-0.0 -2040,20,BIOPEL,autumn.night,0.0 -2040,20,BIOPRD,autumn.day,-0.0 -2040,20,BIOPEL,autumn.day,0.0 -2040,20,BIOPRD,autumn.peak,-0.0 -2040,20,BIOPEL,autumn.peak,0.0 -2040,20,BIOPRD,autumn.evening,-0.0 -2040,20,BIOPEL,autumn.evening,0.0 -2040,21,BIOPRD,winter.night,29.76275089852203 -2040,21,BIOPRD,winter.day,42.5182155110069 -2040,21,BIOPRD,winter.peak,12.755464612484584 -2040,21,BIOPRD,winter.evening,17.007286286037733 +2040,20,BIOPRD,summer.peak,-0.0 +2040,20,BIOPEL,summer.peak,0.0 +2040,20,BIOPRD,summer.evening,-0.0 +2040,20,BIOPEL,summer.evening,0.0 +2040,20,BIOPRD,autumn.night,-32.692653689353776 +2040,20,BIOPEL,autumn.night,31.135860656527406 +2040,20,BIOPRD,autumn.day,-46.7037909207402 +2040,20,BIOPEL,autumn.day,44.479800876895425 +2040,20,BIOPRD,autumn.peak,-14.011137231386419 +2040,20,BIOPEL,autumn.peak,13.343940220368017 +2040,20,BIOPRD,autumn.evening,-18.681516457967355 +2040,20,BIOPEL,autumn.evening,17.791920436159383 +2040,21,BIOPRD,winter.night,32.692653689353605 +2040,21,BIOPRD,winter.day,46.70379092074019 +2040,21,BIOPRD,winter.peak,14.011137231386417 +2040,21,BIOPRD,winter.evening,18.68151645796735 2040,21,BIOPRD,peak.night,0.0 2040,21,BIOPRD,peak.day,0.0 2040,21,BIOPRD,peak.peak,0.0 @@ -1727,27 +1727,27 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,23,RSHEAT,autumn.peak,50.32290129557999 2040,23,BIOPEL,autumn.evening,-26.340322976368615 2040,23,RSHEAT,autumn.evening,21.950269146973845 -2040,24,GASNAT,winter.night,-1.8778850857827112 -2040,24,ELCTRI,winter.night,1.2519233905218075 -2040,24,CO2EMT,winter.night,96.01626443607002 -2040,24,GASNAT,winter.day,-1.6487351912667236 -2040,24,ELCTRI,winter.day,1.0991567941778158 -2040,24,CO2EMT,winter.day,84.29983032946757 +2040,24,GASNAT,winter.night,-0.0 +2040,24,ELCTRI,winter.night,0.0 +2040,24,CO2EMT,winter.night,0.0 +2040,24,GASNAT,winter.day,-4.003764975915306 +2040,24,ELCTRI,winter.day,2.669176650610204 +2040,24,CO2EMT,winter.day,204.71250321854959 2040,24,GASNAT,winter.peak,-1.2011294889309774 2040,24,ELCTRI,winter.peak,0.8007529926206516 2040,24,CO2EMT,winter.peak,61.41375076904087 2040,24,GASNAT,winter.evening,-1.6015059980533508 2040,24,ELCTRI,winter.evening,1.0676706653689005 2040,24,CO2EMT,winter.evening,81.88500168046782 -2040,24,GASNAT,peak.night,-2.8026354869843284 -2040,24,ELCTRI,peak.night,1.8684236579895523 -2040,24,CO2EMT,peak.night,143.2987524495087 +2040,24,GASNAT,peak.night,-0.0 +2040,24,ELCTRI,peak.night,0.0 +2040,24,CO2EMT,peak.night,0.0 2040,24,GASNAT,peak.day,-4.003764975915306 2040,24,ELCTRI,peak.day,2.669176650610204 2040,24,CO2EMT,peak.day,204.71250321854959 -2040,24,GASNAT,peak.peak,-1.0120734848811566 -2040,24,ELCTRI,peak.peak,0.6747156565874377 -2040,24,CO2EMT,peak.peak,51.74731728197353 +2040,24,GASNAT,peak.peak,-1.2011294889309774 +2040,24,ELCTRI,peak.peak,0.8007529926206516 +2040,24,CO2EMT,peak.peak,61.41375076904087 2040,24,GASNAT,peak.evening,-1.6015059980533508 2040,24,ELCTRI,peak.evening,1.0676706653689005 2040,24,CO2EMT,peak.evening,81.88500168046782 @@ -1766,9 +1766,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,24,GASNAT,autumn.night,-0.0 2040,24,ELCTRI,autumn.night,0.0 2040,24,CO2EMT,autumn.night,0.0 -2040,24,GASNAT,autumn.day,-4.003764975915306 -2040,24,ELCTRI,autumn.day,2.669176650610204 -2040,24,CO2EMT,autumn.day,204.71250321854959 +2040,24,GASNAT,autumn.day,-3.259176138341765 +2040,24,ELCTRI,autumn.day,2.172784092227843 +2040,24,CO2EMT,autumn.day,166.64167595341442 2040,24,GASNAT,autumn.peak,-1.2011294889309774 2040,24,ELCTRI,autumn.peak,0.8007529926206516 2040,24,CO2EMT,autumn.peak,61.41375076904087 @@ -1817,8 +1817,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,26,BIOPEL,winter.evening,90.33154657861847 2040,26,BIOPRD,peak.night,-0.0 2040,26,BIOPEL,peak.night,0.0 -2040,26,BIOPRD,peak.day,-227.9780274914425 -2040,26,BIOPEL,peak.day,217.12193094423094 +2040,26,BIOPRD,peak.day,-115.88892919199479 +2040,26,BIOPEL,peak.day,110.37040875428075 2040,26,BIOPRD,peak.peak,-71.13609236157332 2040,26,BIOPEL,peak.peak,67.74865939197458 2040,26,BIOPRD,peak.evening,-94.8481239075494 @@ -1829,29 +1829,29 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,26,BIOPEL,summer.day,0.0 2040,26,BIOPRD,summer.peak,-0.0 2040,26,BIOPEL,summer.peak,0.0 -2040,26,BIOPRD,summer.evening,-0.0 -2040,26,BIOPEL,summer.evening,0.0 +2040,26,BIOPRD,summer.evening,-29.3287702493268 +2040,26,BIOPEL,summer.evening,27.932162142216 2040,26,BIOPRD,autumn.night,-0.0 2040,26,BIOPEL,autumn.night,0.0 -2040,26,BIOPRD,autumn.day,-150.04572883209727 -2040,26,BIOPEL,autumn.day,142.90069412580692 +2040,26,BIOPRD,autumn.day,-37.95663053264955 +2040,26,BIOPEL,autumn.day,36.149171935856714 2040,26,BIOPRD,autumn.peak,-71.13609236157332 2040,26,BIOPEL,autumn.peak,67.74865939197458 2040,26,BIOPRD,autumn.evening,-94.8481239075494 2040,26,BIOPEL,autumn.evening,90.33154657861847 -2040,27,BIOPRD,winter.night,168.9141190599543 -2040,27,BIOPRD,winter.day,241.30588404042948 -2040,27,BIOPRD,winter.peak,72.39176498047519 -2040,27,BIOPRD,winter.evening,96.52235407947907 +2040,27,BIOPRD,winter.night,165.9842162691228 +2040,27,BIOPRD,winter.day,237.12030863069614 +2040,27,BIOPRD,winter.peak,71.13609236157335 +2040,27,BIOPRD,winter.evening,94.84812390754944 2040,27,BIOPRD,peak.night,0.0 -2040,27,BIOPRD,peak.day,225.04812470061094 -2040,27,BIOPRD,peak.peak,72.39176498047519 -2040,27,BIOPRD,peak.evening,96.52235407947907 +2040,27,BIOPRD,peak.day,227.97802749144245 +2040,27,BIOPRD,peak.peak,71.13609236157335 +2040,27,BIOPRD,peak.evening,94.84812390754944 2040,27,BIOPRD,summer.night,0.0 2040,27,BIOPRD,summer.day,0.0 2040,27,BIOPRD,summer.peak,0.0 2040,27,BIOPRD,summer.evening,29.3287702493268 2040,27,BIOPRD,autumn.night,0.0 -2040,27,BIOPRD,autumn.day,147.11582604126573 -2040,27,BIOPRD,autumn.peak,72.39176498047519 -2040,27,BIOPRD,autumn.evening,96.52235407947907 +2040,27,BIOPRD,autumn.day,150.0457288320972 +2040,27,BIOPRD,autumn.peak,71.13609236157335 +2040,27,BIOPRD,autumn.evening,94.84812390754944 diff --git a/tests/data/circularity/commodity_prices.csv b/tests/data/circularity/commodity_prices.csv index aad5936e7..763694956 100644 --- a/tests/data/circularity/commodity_prices.csv +++ b/tests/data/circularity/commodity_prices.csv @@ -227,18 +227,18 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,DIESEL,GBR,winter.day,6.373430018579993 2030,DIESEL,GBR,winter.peak,6.373430018579993 2030,DIESEL,GBR,winter.evening,6.373430018579993 -2030,DIESEL,GBR,peak.night,6.373430018579993 -2030,DIESEL,GBR,peak.day,6.373430018579993 -2030,DIESEL,GBR,peak.peak,6.373430018579993 -2030,DIESEL,GBR,peak.evening,6.373430018579993 +2030,DIESEL,GBR,peak.night,6.373430018579991 +2030,DIESEL,GBR,peak.day,6.373430018579991 +2030,DIESEL,GBR,peak.peak,6.373430018579991 +2030,DIESEL,GBR,peak.evening,6.373430018579991 2030,DIESEL,GBR,summer.night,2.8097726472596607 2030,DIESEL,GBR,summer.day,2.8097726472596607 2030,DIESEL,GBR,summer.peak,2.8097726472596607 2030,DIESEL,GBR,summer.evening,2.8097726472596607 -2030,DIESEL,GBR,autumn.night,6.373430018579991 -2030,DIESEL,GBR,autumn.day,6.373430018579991 -2030,DIESEL,GBR,autumn.peak,6.373430018579991 -2030,DIESEL,GBR,autumn.evening,6.373430018579991 +2030,DIESEL,GBR,autumn.night,6.373430018579993 +2030,DIESEL,GBR,autumn.day,6.373430018579993 +2030,DIESEL,GBR,autumn.peak,6.373430018579993 +2030,DIESEL,GBR,autumn.evening,6.373430018579993 2030,GASNAT,GBR,winter.night,2.9170059999999998 2030,GASNAT,GBR,winter.day,2.9170059999999998 2030,GASNAT,GBR,winter.peak,2.9170059999999998 diff --git a/tests/data/muse1_default/commodity_flows.csv b/tests/data/muse1_default/commodity_flows.csv index d4881fd45..81efff3a9 100644 --- a/tests/data/muse1_default/commodity_flows.csv +++ b/tests/data/muse1_default/commodity_flows.csv @@ -24,11 +24,11 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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.33266 +2025,0,gas,all-year.morning,0.0 2025,0,gas,all-year.afternoon,0.0 -2025,0,gas,all-year.early-peak,0.7818272000000002 -2025,0,gas,all-year.late-peak,1.3885199999999995 -2025,0,gas,all-year.evening,1.4925792000000002 +2025,0,gas,all-year.early-peak,1.33266 +2025,0,gas,all-year.late-peak,2.8810991999999995 +2025,0,gas,all-year.evening,0.7818272000000002 2025,1,gas,all-year.night,-0.0 2025,1,heat,all-year.night,0.0 2025,1,CO2f,all-year.night,0.0 @@ -61,34 +61,34 @@ milestone_year,asset_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.0 -2025,3,electricity,all-year.morning,0.0 +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.3298399999999999 -2025,3,electricity,all-year.early-peak,0.3298399999999999 -2025,3,wind,all-year.late-peak,-1.1172000000000002 -2025,3,electricity,all-year.late-peak,1.1172000000000002 -2025,3,wind,all-year.evening,-0.17023999999999995 -2025,3,electricity,all-year.evening,0.17023999999999995 +2025,3,wind,all-year.early-peak,-0.0 +2025,3,electricity,all-year.early-peak,0.0 +2025,3,wind,all-year.late-peak,-0.22344000000000008 +2025,3,electricity,all-year.late-peak,0.22344000000000008 +2025,3,wind,all-year.evening,-0.5958399999999999 +2025,3,electricity,all-year.evening,0.5958399999999999 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.33266 -2025,4,electricity,all-year.morning,0.798 -2025,4,CO2f,all-year.morning,73.15266000000001 +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.7818272000000002 -2025,4,electricity,all-year.early-peak,0.46816000000000013 -2025,4,CO2f,all-year.early-peak,42.916227200000016 -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,-1.4925792000000002 -2025,4,electricity,all-year.evening,0.8937600000000001 -2025,4,CO2f,all-year.evening,81.93097920000001 +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,-1.4925792000000002 +2025,4,electricity,all-year.late-peak,0.8937600000000001 +2025,4,CO2f,all-year.late-peak,81.93097920000001 +2025,4,gas,all-year.evening,-0.7818272000000002 +2025,4,electricity,all-year.evening,0.46816000000000013 +2025,4,CO2f,all-year.evening,42.916227200000016 2030,2,electricity,all-year.night,-0.0 2030,2,heat,all-year.night,0.0 2030,2,electricity,all-year.morning,-0.12120000000000015 @@ -101,18 +101,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,heat,all-year.late-peak,2.7930000000000006 2030,2,electricity,all-year.evening,-0.4532000000000002 2030,2,heat,all-year.evening,1.1330000000000005 -2030,3,wind,all-year.night,-0.0 -2030,3,electricity,all-year.night,0.0 +2030,3,wind,all-year.night,-0.6640000000000001 +2030,3,electricity,all-year.night,0.6640000000000001 2030,3,wind,all-year.morning,-0.9960000000000002 2030,3,electricity,all-year.morning,0.9960000000000002 -2030,3,wind,all-year.afternoon,-0.0 -2030,3,electricity,all-year.afternoon,0.0 +2030,3,wind,all-year.afternoon,-0.6640000000000001 +2030,3,electricity,all-year.afternoon,0.6640000000000001 2030,3,wind,all-year.early-peak,-0.0 2030,3,electricity,all-year.early-peak,0.0 2030,3,wind,all-year.late-peak,-0.0 2030,3,electricity,all-year.late-peak,0.0 -2030,3,wind,all-year.evening,-1.1172 -2030,3,electricity,all-year.evening,1.1172 +2030,3,wind,all-year.evening,-0.3572799999999996 +2030,3,electricity,all-year.evening,0.3572799999999996 2030,4,gas,all-year.night,-0.0 2030,4,electricity,all-year.night,0.0 2030,4,CO2f,all-year.night,0.0 @@ -143,18 +143,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,5,heat,all-year.late-peak,2.187 2030,5,electricity,all-year.evening,-0.8748 2030,5,heat,all-year.evening,2.187 -2030,6,wind,all-year.night,-0.6640000000000001 -2030,6,electricity,all-year.night,0.6640000000000001 +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.afternoon,-0.0 +2030,6,electricity,all-year.afternoon,0.0 2030,6,wind,all-year.early-peak,-0.9960000000000002 2030,6,electricity,all-year.early-peak,0.9960000000000002 2030,6,wind,all-year.late-peak,-1.9920000000000002 2030,6,electricity,all-year.late-peak,1.9920000000000002 -2030,6,wind,all-year.evening,-0.21080000000000026 -2030,6,electricity,all-year.evening,0.21080000000000026 +2030,6,wind,all-year.evening,-0.9707200000000007 +2030,6,electricity,all-year.evening,0.9707200000000007 2035,2,electricity,all-year.night,-0.0 2035,2,heat,all-year.night,0.0 2035,2,electricity,all-year.morning,-0.0 @@ -169,12 +169,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,2,heat,all-year.evening,0.7930000000000006 2035,3,wind,all-year.night,-0.0 2035,3,electricity,all-year.night,0.0 -2035,3,wind,all-year.morning,-0.0 -2035,3,electricity,all-year.morning,0.0 +2035,3,wind,all-year.morning,-1.1172 +2035,3,electricity,all-year.morning,1.1172 2035,3,wind,all-year.afternoon,-0.0 2035,3,electricity,all-year.afternoon,0.0 -2035,3,wind,all-year.early-peak,-0.0 -2035,3,electricity,all-year.early-peak,0.0 +2035,3,wind,all-year.early-peak,-1.1172 +2035,3,electricity,all-year.early-peak,1.1172 2035,3,wind,all-year.late-peak,-0.0 2035,3,electricity,all-year.late-peak,0.0 2035,3,wind,all-year.evening,-0.0 @@ -211,12 +211,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,5,heat,all-year.evening,2.187 2035,6,wind,all-year.night,-0.0 2035,6,electricity,all-year.night,0.0 -2035,6,wind,all-year.morning,-0.0 -2035,6,electricity,all-year.morning,0.0 -2035,6,wind,all-year.afternoon,-0.8 -2035,6,electricity,all-year.afternoon,0.8 -2035,6,wind,all-year.early-peak,-1.2000000000000002 -2035,6,electricity,all-year.early-peak,1.2000000000000002 +2035,6,wind,all-year.morning,-0.08280000000000015 +2035,6,electricity,all-year.morning,0.08280000000000015 +2035,6,wind,all-year.afternoon,-0.0 +2035,6,electricity,all-year.afternoon,0.0 +2035,6,wind,all-year.early-peak,-0.08280000000000015 +2035,6,electricity,all-year.early-peak,0.08280000000000015 2035,6,wind,all-year.late-peak,-1.9919999999999998 2035,6,electricity,all-year.late-peak,1.9919999999999998 2035,6,wind,all-year.evening,-0.0 @@ -235,10 +235,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,7,heat,all-year.evening,1.0199999999999996 2035,8,wind,all-year.night,-0.8 2035,8,electricity,all-year.night,0.8 -2035,8,wind,all-year.morning,-1.2000000000000002 -2035,8,electricity,all-year.morning,1.2000000000000002 -2035,8,wind,all-year.afternoon,-0.0 -2035,8,electricity,all-year.afternoon,0.0 +2035,8,wind,all-year.morning,-0.0 +2035,8,electricity,all-year.morning,0.0 +2035,8,wind,all-year.afternoon,-0.8 +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.4080000000000003 @@ -259,14 +259,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,2,heat,all-year.evening,0.4630000000000005 2040,3,wind,all-year.night,-0.0 2040,3,electricity,all-year.night,0.0 -2040,3,wind,all-year.morning,-1.1172 -2040,3,electricity,all-year.morning,1.1172 +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.11520000000000002 -2040,3,electricity,all-year.early-peak,0.11520000000000002 -2040,3,wind,all-year.late-peak,-1.1172 -2040,3,electricity,all-year.late-peak,1.1172 +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,-0.6360000000000001 +2040,3,electricity,all-year.late-peak,0.6360000000000001 2040,3,wind,all-year.evening,-0.0 2040,3,electricity,all-year.evening,0.0 2040,5,electricity,all-year.night,-0.1280000000000001 @@ -281,18 +281,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,5,heat,all-year.late-peak,2.187 2040,5,electricity,all-year.evening,-0.8748 2040,5,heat,all-year.evening,2.187 -2040,6,wind,all-year.night,-0.0 -2040,6,electricity,all-year.night,0.0 -2040,6,wind,all-year.morning,-0.2808000000000002 -2040,6,electricity,all-year.morning,0.2808000000000002 +2040,6,wind,all-year.night,-0.9320000000000002 +2040,6,electricity,all-year.night,0.9320000000000002 +2040,6,wind,all-year.morning,-1.3980000000000001 +2040,6,electricity,all-year.morning,1.3980000000000001 2040,6,wind,all-year.afternoon,-0.0 2040,6,electricity,all-year.afternoon,0.0 -2040,6,wind,all-year.early-peak,-0.0 -2040,6,electricity,all-year.early-peak,0.0 +2040,6,wind,all-year.early-peak,-0.11520000000000002 +2040,6,electricity,all-year.early-peak,0.11520000000000002 2040,6,wind,all-year.late-peak,-0.0 2040,6,electricity,all-year.late-peak,0.0 -2040,6,wind,all-year.evening,-0.0 -2040,6,electricity,all-year.evening,0.0 +2040,6,wind,all-year.evening,-1.8640000000000003 +2040,6,electricity,all-year.evening,1.8640000000000003 2040,7,electricity,all-year.night,-0.40799999999999986 2040,7,heat,all-year.night,1.0199999999999996 2040,7,electricity,all-year.morning,-0.40799999999999986 @@ -305,18 +305,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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.9320000000000002 -2040,8,electricity,all-year.night,0.9320000000000002 +2040,8,wind,all-year.night,-0.0 +2040,8,electricity,all-year.night,0.0 2040,8,wind,all-year.morning,-0.0 2040,8,electricity,all-year.morning,0.0 -2040,8,wind,all-year.afternoon,-0.0 -2040,8,electricity,all-year.afternoon,0.0 +2040,8,wind,all-year.afternoon,-0.9320000000000002 +2040,8,electricity,all-year.afternoon,0.9320000000000002 2040,8,wind,all-year.early-peak,-0.0 2040,8,electricity,all-year.early-peak,0.0 -2040,8,wind,all-year.late-peak,-0.8148799999999996 -2040,8,electricity,all-year.late-peak,0.8148799999999996 -2040,8,wind,all-year.evening,-1.8640000000000003 -2040,8,electricity,all-year.evening,1.8640000000000003 +2040,8,wind,all-year.late-peak,-2.16 +2040,8,electricity,all-year.late-peak,2.16 +2040,8,wind,all-year.evening,-0.0 +2040,8,electricity,all-year.evening,0.0 2040,9,electricity,all-year.night,-0.39600000000000013 2040,9,heat,all-year.night,0.9900000000000002 2040,9,electricity,all-year.morning,-0.39600000000000013 @@ -333,12 +333,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,10,electricity,all-year.night,0.0 2040,10,wind,all-year.morning,-0.0 2040,10,electricity,all-year.morning,0.0 -2040,10,wind,all-year.afternoon,-0.9320000000000002 -2040,10,electricity,all-year.afternoon,0.9320000000000002 +2040,10,wind,all-year.afternoon,-0.0 +2040,10,electricity,all-year.afternoon,0.0 2040,10,wind,all-year.early-peak,-1.2828000000000002 2040,10,electricity,all-year.early-peak,1.2828000000000002 -2040,10,wind,all-year.late-peak,-0.8639200000000007 -2040,10,electricity,all-year.late-peak,0.8639200000000007 +2040,10,wind,all-year.late-peak,-0.0 +2040,10,electricity,all-year.late-peak,0.0 2040,10,wind,all-year.evening,-0.0 2040,10,electricity,all-year.evening,0.0 2045,2,electricity,all-year.night,-0.0 @@ -355,16 +355,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,2,heat,all-year.evening,0.13300000000000045 2045,3,wind,all-year.night,-0.0 2045,3,electricity,all-year.night,0.0 -2045,3,wind,all-year.morning,-0.0 -2045,3,electricity,all-year.morning,0.0 +2045,3,wind,all-year.morning,-1.1172 +2045,3,electricity,all-year.morning,1.1172 2045,3,wind,all-year.afternoon,-0.0 2045,3,electricity,all-year.afternoon,0.0 -2045,3,wind,all-year.early-peak,-0.0 -2045,3,electricity,all-year.early-peak,0.0 +2045,3,wind,all-year.early-peak,-0.44688000000000017 +2045,3,electricity,all-year.early-peak,0.44688000000000017 2045,3,wind,all-year.late-peak,-0.0 2045,3,electricity,all-year.late-peak,0.0 -2045,3,wind,all-year.evening,-0.6807999999999994 -2045,3,electricity,all-year.evening,0.6807999999999994 +2045,3,wind,all-year.evening,-1.1172 +2045,3,electricity,all-year.evening,1.1172 2045,5,electricity,all-year.night,-0.0 2045,5,heat,all-year.night,0.0 2045,5,electricity,all-year.morning,-0.39600000000000013 @@ -377,16 +377,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,5,heat,all-year.late-peak,2.187 2045,5,electricity,all-year.evening,-0.8748 2045,5,heat,all-year.evening,2.187 -2045,6,wind,all-year.night,-0.0 -2045,6,electricity,all-year.night,0.0 -2045,6,wind,all-year.morning,-1.5960000000000003 -2045,6,electricity,all-year.morning,1.5960000000000003 +2045,6,wind,all-year.night,-0.6975199999999983 +2045,6,electricity,all-year.night,0.6975199999999983 +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.0 -2045,6,electricity,all-year.early-peak,0.0 -2045,6,wind,all-year.late-peak,-1.9919999999999998 -2045,6,electricity,all-year.late-peak,1.9919999999999998 +2045,6,wind,all-year.early-peak,-1.1491200000000001 +2045,6,electricity,all-year.early-peak,1.1491200000000001 +2045,6,wind,all-year.late-peak,-0.0 +2045,6,electricity,all-year.late-peak,0.0 2045,6,wind,all-year.evening,-0.0 2045,6,electricity,all-year.evening,0.0 2045,7,electricity,all-year.night,-0.2719999999999999 @@ -401,16 +401,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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,-1.064 -2045,8,electricity,all-year.night,1.064 -2045,8,wind,all-year.morning,-0.0 -2045,8,electricity,all-year.morning,0.0 +2045,8,wind,all-year.night,-0.0 +2045,8,electricity,all-year.night,0.0 +2045,8,wind,all-year.morning,-0.47880000000000034 +2045,8,electricity,all-year.morning,0.47880000000000034 2045,8,wind,all-year.afternoon,-0.0 2045,8,electricity,all-year.afternoon,0.0 -2045,8,wind,all-year.early-peak,-1.5960000000000003 -2045,8,electricity,all-year.early-peak,1.5960000000000003 -2045,8,wind,all-year.late-peak,-0.0 -2045,8,electricity,all-year.late-peak,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,-2.16 +2045,8,electricity,all-year.late-peak,2.16 2045,8,wind,all-year.evening,-0.0 2045,8,electricity,all-year.evening,0.0 2045,9,electricity,all-year.night,-0.39600000000000013 @@ -429,8 +429,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,10,electricity,all-year.night,0.0 2045,10,wind,all-year.morning,-0.0 2045,10,electricity,all-year.morning,0.0 -2045,10,wind,all-year.afternoon,-1.064 -2045,10,electricity,all-year.afternoon,1.064 +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.0 @@ -449,18 +449,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,11,heat,all-year.late-peak,0.9900000000000002 2045,11,electricity,all-year.evening,-0.39600000000000013 2045,11,heat,all-year.evening,0.9900000000000002 -2045,12,wind,all-year.night,-0.0 -2045,12,electricity,all-year.night,0.0 +2045,12,wind,all-year.night,-0.3664800000000019 +2045,12,electricity,all-year.night,0.3664800000000019 2045,12,wind,all-year.morning,-0.0 2045,12,electricity,all-year.morning,0.0 -2045,12,wind,all-year.afternoon,-0.0 -2045,12,electricity,all-year.afternoon,0.0 +2045,12,wind,all-year.afternoon,-1.064 +2045,12,electricity,all-year.afternoon,1.064 2045,12,wind,all-year.early-peak,-0.0 2045,12,electricity,all-year.early-peak,0.0 -2045,12,wind,all-year.late-peak,-1.2000000000000006 -2045,12,electricity,all-year.late-peak,1.2000000000000006 -2045,12,wind,all-year.evening,-1.447200000000001 -2045,12,electricity,all-year.evening,1.447200000000001 +2045,12,wind,all-year.late-peak,-1.032 +2045,12,electricity,all-year.late-peak,1.032 +2045,12,wind,all-year.evening,-1.0108000000000004 +2045,12,electricity,all-year.evening,1.0108000000000004 2050,2,electricity,all-year.night,-0.0 2050,2,heat,all-year.night,0.0 2050,2,electricity,all-year.morning,-0.0 @@ -497,16 +497,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,5,heat,all-year.late-peak,2.187 2050,5,electricity,all-year.evening,-0.7920000000000003 2050,5,heat,all-year.evening,1.9800000000000004 -2050,6,wind,all-year.night,-0.47400000000000364 -2050,6,electricity,all-year.night,0.47400000000000364 -2050,6,wind,all-year.morning,-1.8000000000000003 -2050,6,electricity,all-year.morning,1.8000000000000003 -2050,6,wind,all-year.afternoon,-0.7067999999999959 -2050,6,electricity,all-year.afternoon,0.7067999999999959 -2050,6,wind,all-year.early-peak,-1.8000000000000003 -2050,6,electricity,all-year.early-peak,1.8000000000000003 -2050,6,wind,all-year.late-peak,-0.0 -2050,6,electricity,all-year.late-peak,0.0 +2050,6,wind,all-year.night,-0.0 +2050,6,electricity,all-year.night,0.0 +2050,6,wind,all-year.morning,-0.0 +2050,6,electricity,all-year.morning,0.0 +2050,6,wind,all-year.afternoon,-0.0 +2050,6,electricity,all-year.afternoon,0.0 +2050,6,wind,all-year.early-peak,-0.0 +2050,6,electricity,all-year.early-peak,0.0 +2050,6,wind,all-year.late-peak,-0.6264000000000085 +2050,6,electricity,all-year.late-peak,0.6264000000000085 2050,6,wind,all-year.evening,-0.0 2050,6,electricity,all-year.evening,0.0 2050,7,electricity,all-year.night,-0.0 @@ -525,14 +525,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,8,electricity,all-year.night,0.0 2050,8,wind,all-year.morning,-0.0 2050,8,electricity,all-year.morning,0.0 -2050,8,wind,all-year.afternoon,-0.0 -2050,8,electricity,all-year.afternoon,0.0 -2050,8,wind,all-year.early-peak,-0.0 -2050,8,electricity,all-year.early-peak,0.0 -2050,8,wind,all-year.late-peak,-2.16 -2050,8,electricity,all-year.late-peak,2.16 -2050,8,wind,all-year.evening,-2.16 -2050,8,electricity,all-year.evening,2.16 +2050,8,wind,all-year.afternoon,-1.2000000000000002 +2050,8,electricity,all-year.afternoon,1.2000000000000002 +2050,8,wind,all-year.early-peak,-1.0740000000000038 +2050,8,electricity,all-year.early-peak,1.0740000000000038 +2050,8,wind,all-year.late-peak,-1.235999999999992 +2050,8,electricity,all-year.late-peak,1.235999999999992 +2050,8,wind,all-year.evening,-1.6740000000000037 +2050,8,electricity,all-year.evening,1.6740000000000037 2050,9,electricity,all-year.night,-0.39600000000000013 2050,9,heat,all-year.night,0.9900000000000002 2050,9,electricity,all-year.morning,-0.39600000000000013 @@ -547,14 +547,14 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,9,heat,all-year.evening,0.9900000000000002 2050,10,wind,all-year.night,-0.0 2050,10,electricity,all-year.night,0.0 -2050,10,wind,all-year.morning,-0.0 -2050,10,electricity,all-year.morning,0.0 +2050,10,wind,all-year.morning,-1.2828000000000002 +2050,10,electricity,all-year.morning,1.2828000000000002 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,-1.2828000000000002 -2050,10,electricity,all-year.late-peak,1.2828000000000002 +2050,10,wind,all-year.late-peak,-0.0 +2050,10,electricity,all-year.late-peak,0.0 2050,10,wind,all-year.evening,-0.0 2050,10,electricity,all-year.evening,0.0 2050,11,electricity,all-year.night,-0.39600000000000013 @@ -569,16 +569,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,11,heat,all-year.late-peak,0.9900000000000002 2050,11,electricity,all-year.evening,-0.39600000000000013 2050,11,heat,all-year.evening,0.9900000000000002 -2050,12,wind,all-year.night,-0.0 -2050,12,electricity,all-year.night,0.0 -2050,12,wind,all-year.morning,-0.0 -2050,12,electricity,all-year.morning,0.0 -2050,12,wind,all-year.afternoon,-0.49320000000000425 -2050,12,electricity,all-year.afternoon,0.49320000000000425 +2050,12,wind,all-year.night,-1.2000000000000002 +2050,12,electricity,all-year.night,1.2000000000000002 +2050,12,wind,all-year.morning,-0.5172000000000001 +2050,12,electricity,all-year.morning,0.5172000000000001 +2050,12,wind,all-year.afternoon,-0.0 +2050,12,electricity,all-year.afternoon,0.0 2050,12,wind,all-year.early-peak,-0.0 2050,12,electricity,all-year.early-peak,0.0 -2050,12,wind,all-year.late-peak,-0.0 -2050,12,electricity,all-year.late-peak,0.0 +2050,12,wind,all-year.late-peak,-1.447200000000001 +2050,12,electricity,all-year.late-peak,1.447200000000001 2050,12,wind,all-year.evening,-0.0 2050,12,electricity,all-year.evening,0.0 2050,13,electricity,all-year.night,-0.40799999999999986 @@ -593,15 +593,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,13,heat,all-year.late-peak,1.0199999999999996 2050,13,electricity,all-year.evening,-0.40799999999999986 2050,13,heat,all-year.evening,1.0199999999999996 -2050,14,wind,all-year.night,-0.7259999999999965 -2050,14,electricity,all-year.night,0.7259999999999965 +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.afternoon,-0.0 2050,14,electricity,all-year.afternoon,0.0 -2050,14,wind,all-year.early-peak,-0.0 -2050,14,electricity,all-year.early-peak,0.0 -2050,14,wind,all-year.late-peak,-0.15719999999999973 -2050,14,electricity,all-year.late-peak,0.15719999999999973 -2050,14,wind,all-year.evening,-0.2400000000000002 -2050,14,electricity,all-year.evening,0.2400000000000002 +2050,14,wind,all-year.early-peak,-0.7259999999999965 +2050,14,electricity,all-year.early-peak,0.7259999999999965 +2050,14,wind,all-year.late-peak,-0.290399999999999 +2050,14,electricity,all-year.late-peak,0.290399999999999 +2050,14,wind,all-year.evening,-0.7259999999999965 +2050,14,electricity,all-year.evening,0.7259999999999965 diff --git a/tests/data/muse1_default/commodity_prices.csv b/tests/data/muse1_default/commodity_prices.csv index 5a9fc6535..097e21a2d 100644 --- a/tests/data/muse1_default/commodity_prices.csv +++ b/tests/data/muse1_default/commodity_prices.csv @@ -25,8 +25,8 @@ milestone_year,commodity_id,region_id,time_slice,price 2025,electricity,R1,all-year.evening,15.26529810765 2025,gas,R1,all-year.night,2.55 2025,gas,R1,all-year.morning,2.55 -2025,gas,R1,all-year.afternoon,2.5500000000000007 -2025,gas,R1,all-year.early-peak,2.5500000000000007 +2025,gas,R1,all-year.afternoon,2.55 +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,heat,R1,all-year.night,6.10611924306 diff --git a/tests/data/simple/debug_dispatch_assets.csv b/tests/data/simple/debug_dispatch_assets.csv index b848fe274..762f6907f 100644 --- a/tests/data/simple/debug_dispatch_assets.csv +++ b/tests/data/simple/debug_dispatch_assets.csv @@ -96,7 +96,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final without candidates,5,RELCHP,GBR,autumn.peak,11.9512367653449,-0.0,0.0 2020,final without candidates,5,RELCHP,GBR,autumn.evening,15.437192051273913,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2020,final with candidates,0,GASDRV,GBR,winter.day,151.10292198068436,-0.0,0.0 +2020,final with candidates,0,GASDRV,GBR,winter.day,151.1029469806843,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 @@ -106,13 +106,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2020,final with candidates,0,GASDRV,GBR,summer.evening,0.168529625841434,-0.0,0.0 +2020,final with candidates,0,GASDRV,GBR,summer.evening,0.16855462584153408,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2020,final with candidates,0,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 -2020,final with candidates,0,GASDRV,GBR,autumn.evening,163.38648438726443,-0.0,0.0 +2020,final with candidates,0,GASDRV,GBR,autumn.evening,163.38648438726446,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,1,GASPRC,GBR,winter.day,146.06197828510372,-0.0,0.0 +2020,final with candidates,1,GASPRC,GBR,winter.day,146.06195328510356,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -122,11 +122,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,1,GASPRC,GBR,summer.evening,0.1605282150871752,-0.0,0.0 +2020,final with candidates,1,GASPRC,GBR,summer.evening,0.1605032150870753,-0.0,0.0 2020,final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,1,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,1,GASPRC,GBR,autumn.evening,155.6061756069185,-0.0,0.0 +2020,final with candidates,1,GASPRC,GBR,autumn.evening,155.60615060691842,-0.0,0.0 2020,final with candidates,2,WNDFRM,GBR,winter.night,4.435312795545212,-7.593308999999999,0.0 2020,final with candidates,2,WNDFRM,GBR,winter.day,7.075379933645912,-7.593308999999999,0.0 2020,final with candidates,2,WNDFRM,GBR,winter.peak,1.9712501261051125,-7.593308999999999,0.0 @@ -143,15 +143,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0 2020,final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0 2020,final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0 -2020,final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0 -2020,final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0 -2020,final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0 2020,final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,peak.peak,2.3471047442443087,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0 -2020,final with candidates,3,GASCGT,GBR,summer.night,0.10678883089039881,-0.0,0.0 +2020,final with candidates,3,GASCGT,GBR,summer.night,0.10701881005811686,-0.0,0.0 2020,final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2020,final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2020,final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -191,38 +191,38 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,5,RELCHP,GBR,autumn.day,41.664583466660005,-3.05874493,0.0 2020,final with candidates,5,RELCHP,GBR,autumn.peak,11.951650691317264,-0.0,0.0 2020,final with candidates,5,RELCHP,GBR,autumn.evening,15.437731397467225,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 -2020,final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 +2020,final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 2020,final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 -2020,final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 2020,final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2020,final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2020,final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 +2020,final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 +2020,final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2020,final with candidates,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593308999999999,0.0 2020,final with candidates,,WNDFRM,GBR,winter.day,0.00017845292106438267,-7.593308999999999,0.0 2020,final with candidates,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-7.593308999999999,0.0 @@ -239,15 +239,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2020,final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0 2020,final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0 2020,final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0 -2020,final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0 -2020,final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0 -2020,final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0 2020,final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0 -2020,final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0 +2020,final with candidates,,GASCGT,GBR,summer.night,0.0,-0.0,0.0 2020,final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2020,final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2020,final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -799,29 +799,29 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0 2030,ironing out iteration 0; final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.peak,2.347104744244309,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.day,7.3774647114145555,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.peak,2.3470061817443093,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.night,0.294834908890399,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.night,5.5884937755474,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.day,7.747411971657804,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.day,7.747083429990085,-0.0,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.peak,2.39506875,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,3,GASCGT,GBR,autumn.evening,3.1934250255473997,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,201.20839307010357,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,201.2083930701036,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,89.00555785782771,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.peak,89.00558285782782,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 @@ -829,36 +829,36 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,0.4425973320871755,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,23.60241159620854,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,23.602386596208433,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,209.00670875493438,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,209.00668375493427,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,92.1632161570447,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,92.1631911570446,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,0.4647021986914343,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,0.4647271986915343,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234447,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 @@ -867,18 +867,18 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.day,0.00017845292106438267,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-7.593308999999999,0.0 @@ -895,20 +895,20 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0 2030,ironing out iteration 0; final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.peak,0.0000985625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.night,0.00022997916771800003,-9.26892403030303,0.0 -2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.day,0.00032854166771800004,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.peak,0.0000985625,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,,GASCGT,GBR,autumn.evening,0.000131416667718,-9.26892403030303,0.0 2030,ironing out iteration 0; final with candidates,,RGASBR,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 @@ -1056,7 +1056,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final without candidates,6,RGASBR,GBR,autumn.peak,0.0,-0.0,0.0 2030,final without candidates,6,RGASBR,GBR,autumn.evening,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,final with candidates,0,GASDRV,GBR,winter.day,209.0066837549344,-0.0,0.0 +2030,final with candidates,0,GASDRV,GBR,winter.day,209.00670875493444,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 @@ -1066,13 +1066,13 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,final with candidates,0,GASDRV,GBR,summer.evening,0.4647021986914343,-0.0,0.0 +2030,final with candidates,0,GASDRV,GBR,summer.evening,0.46472719869153434,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 -2030,final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234444,-0.0,0.0 +2030,final with candidates,0,GASDRV,GBR,autumn.peak,23.48988633234447,-0.0,0.0 2030,final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,1,GASPRC,GBR,winter.day,201.20841807010382,-0.0,0.0 +2030,final with candidates,1,GASPRC,GBR,winter.day,201.20839307010365,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -1082,10 +1082,10 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,1,GASPRC,GBR,summer.evening,0.4425973320871755,-0.0,0.0 +2030,final with candidates,1,GASPRC,GBR,summer.evening,0.4425723320870756,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,1,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,1,GASPRC,GBR,autumn.peak,23.602411596208526,-0.0,0.0 +2030,final with candidates,1,GASPRC,GBR,autumn.peak,23.602386596208447,-0.0,0.0 2030,final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,2,WNDFRM,GBR,winter.night,4.435312795545212,-7.593308999999999,0.0 2030,final with candidates,2,WNDFRM,GBR,winter.day,7.075379933645912,-7.593308999999999,0.0 @@ -1103,15 +1103,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,2,WNDFRM,GBR,autumn.day,6.001752635595889,-7.593308999999999,0.0 2030,final with candidates,2,WNDFRM,GBR,autumn.peak,1.5488393825638174,-16.86223303030303,0.0 2030,final with candidates,2,WNDFRM,GBR,autumn.evening,1.9008483513729915,-16.86223303030303,0.0 -2030,final with candidates,3,GASCGT,GBR,winter.night,5.1890965386923495,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,winter.night,5.188866559524632,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,winter.day,6.67342905326312,-0.0,0.0 -2030,final with candidates,3,GASCGT,GBR,winter.peak,2.153396374418241,-0.0,0.0 -2030,final with candidates,3,GASCGT,GBR,winter.evening,2.9298648312293984,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,winter.peak,2.153494936918241,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,winter.evening,2.9299962478971167,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,peak.night,5.5884937755474,-9.26892403030303,0.0 2030,final with candidates,3,GASCGT,GBR,peak.day,7.377793253082274,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,peak.peak,2.3471047442443087,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,peak.evening,3.1934250255473997,-9.26892403030303,0.0 -2030,final with candidates,3,GASCGT,GBR,summer.night,0.294834908890399,-0.0,0.0 +2030,final with candidates,3,GASCGT,GBR,summer.night,0.29506488805811704,-0.0,0.0 2030,final with candidates,3,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,final with candidates,3,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,final with candidates,3,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -1167,38 +1167,38 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,6,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 2030,final with candidates,6,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 2030,final with candidates,6,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,GASDRV,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 +2030,final with candidates,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 2030,final with candidates,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 -2030,final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 2030,final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2030,final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2030,final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 +2030,final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 +2030,final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2030,final with candidates,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593308999999999,0.0 2030,final with candidates,,WNDFRM,GBR,winter.day,0.00017845292106438267,-7.593308999999999,0.0 2030,final with candidates,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-7.593308999999999,0.0 @@ -1215,15 +1215,15 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,final with candidates,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593308999999999,0.0 2030,final with candidates,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.86223303030303,0.0 2030,final with candidates,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.86223303030303,0.0 -2030,final with candidates,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,winter.day,0.00032854166771800004,-0.0,0.0 -2030,final with candidates,,GASCGT,GBR,winter.peak,0.0000985625,-0.0,0.0 -2030,final with candidates,,GASCGT,GBR,winter.evening,0.000131416667718,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,winter.peak,0.0,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,winter.evening,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.26892403030303,0.0 2030,final with candidates,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,peak.evening,0.000131416667718,-9.26892403030303,0.0 -2030,final with candidates,,GASCGT,GBR,summer.night,0.00022997916771800003,-0.0,0.0 +2030,final with candidates,,GASCGT,GBR,summer.night,0.0,-0.0,0.0 2030,final with candidates,,GASCGT,GBR,summer.day,0.0,-0.0,7.593309 2030,final with candidates,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,final with candidates,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 @@ -1504,7 +1504,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,,RGASBR,GBR,autumn.peak,50.32289817057999,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,RGASBR,GBR,autumn.evening,21.950264980307146,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,345.9295653374228,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.day,345.9295903374229,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -1514,17 +1514,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,26.76829330295688,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,summer.evening,26.76826830295678,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,12.659686748339873,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.day,12.659661748339765,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,360.9639396356195,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561946,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,85.71563541562148,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.day,85.71566041562158,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 @@ -1532,17 +1532,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,summer.evening,28.106682968104625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082272,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082215,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 @@ -1551,22 +1551,22 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.night,2.406250011e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.day,3.4375000110000007e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,WNDFRM,GBR,winter.peak,1.03125e-6,-0.0,0.0 @@ -1872,7 +1872,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,,RGASBR,GBR,autumn.peak,50.32289817057999,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,RGASBR,GBR,autumn.evening,21.950264980307146,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.day,345.9295653374228,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.day,345.9295903374229,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 @@ -1882,17 +1882,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.evening,26.76829330295688,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,summer.evening,26.76826830295678,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.day,12.659686748339873,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.day,12.659661748339765,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,1,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.day,360.9639396356195,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.day,360.96391463561946,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.day,85.71563541562148,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.day,85.71566041562158,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.night,0.0,-0.0,0.0 @@ -1900,17 +1900,17 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,summer.evening,28.106682968104625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082272,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.day,11.030515867082215,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.peak,125.070625,-0.0,0.0 2040,ironing out iteration 1; final with candidates,0,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,summer.peak,3.125e-6,-0.0,0.0 @@ -1919,22 +1919,22 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.night,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.day,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.peak,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,winter.evening,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.night,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.day,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.peak,0.0,-0.0,2.220446049250313e-16 2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,peak.evening,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.day,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.evening,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.night,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.day,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.peak,0.0,-0.0,2.220446049250313e-16 -2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.evening,0.0,-0.0,2.220446049250313e-16 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,summer.evening,4.1666667e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 1; final with candidates,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,WNDFRM,GBR,winter.night,2.406250011e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,WNDFRM,GBR,winter.day,3.4375000110000007e-6,-0.0,0.0 2040,ironing out iteration 1; final with candidates,,WNDFRM,GBR,winter.peak,1.03125e-6,-0.0,0.0 diff --git a/tests/data/simple/debug_solver.csv b/tests/data/simple/debug_solver.csv index 3363a448d..0eb50cc51 100644 --- a/tests/data/simple/debug_solver.csv +++ b/tests/data/simple/debug_solver.csv @@ -1,22 +1,22 @@ milestone_year,run_description,objective_value 2020,final without candidates,4132.120065800383 -2020,final with candidates,4132.101429603423 +2020,final with candidates,4132.101429603424 2030,ironing out iteration 0; post RSHEAT|GBR investment,5324.82265531636 2030,ironing out iteration 0; post ELCTRI|GBR investment,4708.71265302254 2030,ironing out iteration 0; post GASNAT|GBR investment,4708.712653022539 2030,ironing out iteration 0; post GASPRD|GBR investment,4708.712653022539 2030,ironing out iteration 0; final without candidates,4708.712653022539 -2030,ironing out iteration 0; final with candidates,4708.694016825578 +2030,ironing out iteration 0; final with candidates,4708.694016825579 2030,final without candidates,4708.712653022538 -2030,final with candidates,4708.694016825575 +2030,final with candidates,4708.694016825577 2040,ironing out iteration 0; post RSHEAT|GBR investment,6613.816363708183 2040,ironing out iteration 0; post GASNAT|GBR investment,6613.816363708183 2040,ironing out iteration 0; post GASPRD|GBR investment,6613.816363708185 2040,ironing out iteration 0; final without candidates,6613.816363708185 -2040,ironing out iteration 0; final with candidates,6613.815807254492 +2040,ironing out iteration 0; final with candidates,6613.815807254493 2040,ironing out iteration 1; post RSHEAT|GBR investment,6613.816363708183 2040,ironing out iteration 1; post GASNAT|GBR investment,6613.816363708183 2040,ironing out iteration 1; post GASPRD|GBR investment,6613.816363708185 2040,ironing out iteration 1; final without candidates,6613.816363708185 -2040,ironing out iteration 1; final with candidates,6613.815807254492 +2040,ironing out iteration 1; final with candidates,6613.815807254493 2040,final without candidates,6613.816363708183 diff --git a/tests/data/simple_divisible/commodity_flows.csv b/tests/data/simple_divisible/commodity_flows.csv index d2e7c42cd..03b9efc40 100644 --- a/tests/data/simple_divisible/commodity_flows.csv +++ b/tests/data/simple_divisible/commodity_flows.csv @@ -331,8 +331,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,peak.night,0.0 2030,0,GASPRD,peak.day,0.0 2030,0,CO2EMT,peak.day,0.0 -2030,0,GASPRD,peak.peak,44.96382923640522 -2030,0,CO2EMT,peak.peak,229.9000588857399 +2030,0,GASPRD,peak.peak,44.963829236405275 +2030,0,CO2EMT,peak.peak,229.90005888574018 2030,0,GASPRD,peak.evening,166.76083466742 2030,0,CO2EMT,peak.evening,852.6481476545185 2030,0,GASPRD,summer.night,0.0 @@ -349,8 +349,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.day,0.0 2030,0,GASPRD,autumn.peak,0.0 2030,0,CO2EMT,autumn.peak,0.0 -2030,0,GASPRD,autumn.evening,149.86150491920327 -2030,0,CO2EMT,autumn.evening,766.2418746518864 +2030,0,GASPRD,autumn.evening,149.8615049192033 +2030,0,CO2EMT,autumn.evening,766.2418746518865 2030,1,GASPRD,winter.night,-0.0 2030,1,GASNAT,winter.night,0.0 2030,1,CO2EMT,winter.night,0.0 @@ -369,9 +369,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,peak.day,-0.0 2030,1,GASNAT,peak.day,0.0 2030,1,CO2EMT,peak.day,0.0 -2030,1,GASPRD,peak.peak,-46.25647508007973 -2030,1,GASNAT,peak.peak,44.053785790552126 -2030,1,CO2EMT,peak.peak,112.62350337354653 +2030,1,GASPRD,peak.peak,-46.25647508007977 +2030,1,GASNAT,peak.peak,44.053785790552155 +2030,1,CO2EMT,peak.peak,112.6235033735466 2030,1,GASPRD,peak.evening,-165.4681888237455 2030,1,GASNAT,peak.evening,157.58875126070998 2030,1,CO2EMT,peak.evening,402.87564259800513 @@ -396,9 +396,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,autumn.peak,-0.0 2030,1,GASNAT,autumn.peak,0.0 2030,1,CO2EMT,autumn.peak,0.0 -2030,1,GASPRD,autumn.evening,-149.86150491920327 -2030,1,GASNAT,autumn.evening,142.72524278019358 -2030,1,CO2EMT,autumn.evening,364.87708316756493 +2030,1,GASPRD,autumn.evening,-149.8615049192033 +2030,1,GASNAT,autumn.evening,142.7252427801936 +2030,1,CO2EMT,autumn.evening,364.877083167565 2030,2,ELCTRI,winter.night,4.435312795545212 2030,2,ELCTRI,winter.day,7.075379933645912 2030,2,ELCTRI,winter.peak,1.9712501261051125 @@ -424,24 +424,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.peak,-3.592603125 2030,3,ELCTRI,winter.peak,2.39506875 2030,3,CO2EMT,winter.peak,183.68979778124998 -2030,3,GASNAT,winter.evening,-3.5229053092829044 -2030,3,ELCTRI,winter.evening,2.3486035395219362 -2030,3,CO2EMT,winter.evening,180.12614846363488 +2030,3,GASNAT,winter.evening,-4.790137538321099 +2030,3,ELCTRI,winter.evening,3.1934250255473997 +2030,3,CO2EMT,winter.evening,244.9197323343578 2030,3,GASNAT,peak.night,-8.382740663321101 2030,3,ELCTRI,peak.night,5.5884937755474 2030,3,CO2EMT,peak.night,428.6095301156078 -2030,3,GASNAT,peak.day,-8.886465236074454 -2030,3,ELCTRI,peak.day,5.924310157382969 -2030,3,CO2EMT,peak.day,454.3649675204868 -2030,3,GASNAT,peak.peak,-2.8665846647895705 -2030,3,ELCTRI,peak.peak,1.911056443193047 -2030,3,CO2EMT,peak.peak,146.56847391069073 +2030,3,GASNAT,peak.day,-11.975343788321101 +2030,3,ELCTRI,peak.day,7.9835625255474 +2030,3,CO2EMT,peak.day,612.2993278968578 +2030,3,GASNAT,peak.peak,-3.592603125 +2030,3,ELCTRI,peak.peak,2.39506875 +2030,3,CO2EMT,peak.peak,183.68979778124998 2030,3,GASNAT,peak.evening,-4.790137538321099 -2030,3,ELCTRI,peak.evening,3.1934250255473993 -2030,3,CO2EMT,peak.evening,244.91973233435778 -2030,3,GASNAT,summer.night,-0.0 -2030,3,ELCTRI,summer.night,0.0 -2030,3,CO2EMT,summer.night,0.0 +2030,3,ELCTRI,peak.evening,3.1934250255473997 +2030,3,CO2EMT,peak.evening,244.9197323343578 +2030,3,GASNAT,summer.night,-0.44265925791417715 +2030,3,ELCTRI,summer.night,0.29510617194278477 +2030,3,CO2EMT,summer.night,22.633167857151875 2030,3,GASNAT,summer.day,-0.0 2030,3,ELCTRI,summer.day,0.0 2030,3,CO2EMT,summer.day,0.0 @@ -451,15 +451,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-8.382740663321101 -2030,3,ELCTRI,autumn.night,5.5884937755474 -2030,3,CO2EMT,autumn.night,428.6095301156078 -2030,3,GASNAT,autumn.day,-9.44087933068659 -2030,3,ELCTRI,autumn.day,6.29391955379106 -2030,3,CO2EMT,autumn.day,482.7121601780053 -2030,3,GASNAT,autumn.peak,-3.592603125 -2030,3,ELCTRI,autumn.peak,2.39506875 -2030,3,CO2EMT,autumn.peak,183.68979778124998 +2030,3,GASNAT,autumn.night,-3.3878829022543346 +2030,3,ELCTRI,autumn.night,2.2585886015028898 +2030,3,CO2EMT,autumn.night,173.2224527922641 +2030,3,GASNAT,autumn.day,-11.975343788321101 +2030,3,ELCTRI,autumn.day,7.9835625255474 +2030,3,CO2EMT,autumn.day,612.2993278968578 +2030,3,GASNAT,autumn.peak,-3.2097933936726317 +2030,3,ELCTRI,autumn.peak,2.139862262448421 +2030,3,CO2EMT,autumn.peak,164.11673621848163 2030,3,GASNAT,autumn.evening,-4.790137538321099 2030,3,ELCTRI,autumn.evening,3.1934250255473997 2030,3,CO2EMT,autumn.evening,244.9197323343578 @@ -536,24 +536,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,9,GASNAT,winter.peak,-3.5952126517441387 2030,9,ELCTRI,winter.peak,2.3968084344960925 2030,9,CO2EMT,winter.peak,183.8232228836778 -2030,9,GASNAT,winter.evening,-6.148851380368743 -2030,9,ELCTRI,winter.evening,4.099234253579162 -2030,9,CO2EMT,winter.evening,314.3907710782538 +2030,9,GASNAT,winter.evening,-4.881619151330547 +2030,9,ELCTRI,winter.evening,3.2544127675536982 +2030,9,CO2EMT,winter.evening,249.59718720753085 2030,9,GASNAT,peak.night,-10.67427159737626 2030,9,ELCTRI,peak.night,7.116181064917506 2030,9,CO2EMT,peak.night,545.7755067738481 -2030,9,GASNAT,peak.day,-15.372128377135644 -2030,9,ELCTRI,peak.day,10.248085584757096 -2030,9,CO2EMT,peak.day,785.9769239229454 -2030,9,GASNAT,peak.peak,-4.611638498383449 -2030,9,ELCTRI,peak.peak,3.0744256655889663 -2030,9,CO2EMT,peak.peak,235.79307642234576 -2030,9,GASNAT,peak.evening,-6.148851380368743 -2030,9,ELCTRI,peak.evening,4.099234253579162 -2030,9,CO2EMT,peak.evening,314.3907710782538 -2030,9,GASNAT,summer.night,-0.44265925791417715 -2030,9,ELCTRI,summer.night,0.29510617194278477 -2030,9,CO2EMT,summer.night,22.633167857151875 +2030,9,GASNAT,peak.day,-12.283249824889 +2030,9,ELCTRI,peak.day,8.188833216592666 +2030,9,CO2EMT,peak.day,628.0425635465745 +2030,9,GASNAT,peak.peak,-3.8856200381730193 +2030,9,ELCTRI,peak.peak,2.590413358782013 +2030,9,CO2EMT,peak.peak,198.67175255178645 +2030,9,GASNAT,peak.evening,-6.1488513803687415 +2030,9,ELCTRI,peak.evening,4.099234253579161 +2030,9,CO2EMT,peak.evening,314.39077107825375 +2030,9,GASNAT,summer.night,-0.0 +2030,9,ELCTRI,summer.night,0.0 +2030,9,CO2EMT,summer.night,0.0 2030,9,GASNAT,summer.day,-0.0 2030,9,ELCTRI,summer.day,0.0 2030,9,CO2EMT,summer.day,0.0 @@ -563,15 +563,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,9,GASNAT,summer.evening,-0.0 2030,9,ELCTRI,summer.evening,0.0 2030,9,CO2EMT,summer.evening,0.0 -2030,9,GASNAT,autumn.night,-5.765632117685428 -2030,9,ELCTRI,autumn.night,3.8437547451236185 -2030,9,CO2EMT,autumn.night,294.7967701772559 -2030,9,GASNAT,autumn.day,-15.372128377135644 -2030,9,ELCTRI,autumn.day,10.248085584757096 -2030,9,CO2EMT,autumn.day,785.9769239229454 -2030,9,GASNAT,autumn.peak,-4.228828767056082 -2030,9,ELCTRI,autumn.peak,2.819219178037388 -2030,9,CO2EMT,autumn.peak,216.22001485957745 +2030,9,GASNAT,autumn.night,-10.760489878752193 +2030,9,ELCTRI,autumn.night,7.173659919168129 +2030,9,CO2EMT,autumn.night,550.1838475005997 +2030,9,GASNAT,autumn.day,-12.837663919501132 +2030,9,ELCTRI,autumn.day,8.558442613000755 +2030,9,CO2EMT,autumn.day,656.3897562040929 +2030,9,GASNAT,autumn.peak,-4.611638498383449 +2030,9,ELCTRI,autumn.peak,3.0744256655889663 +2030,9,CO2EMT,autumn.peak,235.79307642234576 2030,9,GASNAT,autumn.evening,-5.88484466403186 2030,9,ELCTRI,autumn.evening,3.9232297760212402 2030,9,CO2EMT,autumn.evening,300.892107671949 diff --git a/tests/data/simple_full/commodity_flows.csv b/tests/data/simple_full/commodity_flows.csv index 8777f8bfa..f7217b32f 100644 --- a/tests/data/simple_full/commodity_flows.csv +++ b/tests/data/simple_full/commodity_flows.csv @@ -251,8 +251,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,20.534211026060348 -2030,0,CO2EMT,autumn.peak,104.99142097624657 +2030,0,GASPRD,autumn.peak,20.534211026060376 +2030,0,CO2EMT,autumn.peak,104.99142097624672 2030,0,GASPRD,autumn.evening,166.76083466742 2030,0,CO2EMT,autumn.evening,852.6481476545185 2030,1,GASPRD,winter.night,-0.0 @@ -297,9 +297,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,autumn.day,-0.0 2030,1,GASNAT,autumn.day,0.0 2030,1,CO2EMT,autumn.day,0.0 -2030,1,GASPRD,autumn.peak,-21.826856869734865 -2030,1,GASNAT,autumn.peak,20.78748273308082 -2030,1,CO2EMT,autumn.peak,53.143199607121126 +2030,1,GASPRD,autumn.peak,-21.826856869734893 +2030,1,GASNAT,autumn.peak,20.78748273308085 +2030,1,CO2EMT,autumn.peak,53.1431996071212 2030,1,GASPRD,autumn.evening,-165.4681888237455 2030,1,GASNAT,autumn.evening,157.58875126070998 2030,1,CO2EMT,autumn.evening,402.87564259800513 @@ -328,15 +328,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.peak,-2.468688831431171 2030,3,ELCTRI,winter.peak,1.6457925542874472 2030,3,CO2EMT,winter.peak,126.22405995107574 -2030,3,GASNAT,winter.evening,-4.395089526235901 -2030,3,ELCTRI,winter.evening,2.9300596841572673 -2030,3,CO2EMT,winter.evening,224.7209274764416 +2030,3,GASNAT,winter.evening,-3.3795873788970026 +2030,3,ELCTRI,winter.evening,2.253058252598002 +2030,3,CO2EMT,winter.evening,172.79830268300373 2030,3,GASNAT,peak.night,-8.382740663321101 -2030,3,ELCTRI,peak.night,5.5884937755474 -2030,3,CO2EMT,peak.night,428.6095301156078 -2030,3,GASNAT,peak.day,-8.528170411829517 -2030,3,ELCTRI,peak.day,5.685446941219679 -2030,3,CO2EMT,peak.day,436.04535315684325 +2030,3,ELCTRI,peak.night,5.588493775547401 +2030,3,CO2EMT,peak.night,428.60953011560787 +2030,3,GASNAT,peak.day,-11.066925767990737 +2030,3,ELCTRI,peak.day,7.3779505119938245 +2030,3,CO2EMT,peak.day,565.8519145173664 2030,3,GASNAT,peak.peak,-3.520722822271213 2030,3,ELCTRI,peak.peak,2.3471485481808085 2030,3,CO2EMT,peak.peak,180.0145579027271 @@ -355,15 +355,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-8.382740663321101 -2030,3,ELCTRI,autumn.night,5.5884937755474 -2030,3,CO2EMT,autumn.night,428.6095301156078 +2030,3,GASNAT,autumn.night,-7.854727240273368 +2030,3,ELCTRI,autumn.night,5.236484826848912 +2030,3,CO2EMT,autumn.night,401.61220379517727 2030,3,GASNAT,autumn.day,-11.621339862602872 2030,3,ELCTRI,autumn.day,7.747559908401914 2030,3,CO2EMT,autumn.day,594.1991071748848 -2030,3,GASNAT,autumn.peak,-3.102304946743114 -2030,3,ELCTRI,autumn.peak,2.0682032978287426 -2030,3,CO2EMT,autumn.peak,158.6208519269754 +2030,3,GASNAT,autumn.peak,-3.592603125 +2030,3,ELCTRI,autumn.peak,2.39506875 +2030,3,CO2EMT,autumn.peak,183.68979778124998 2030,3,GASNAT,autumn.evening,-4.3828128915983156 2030,3,ELCTRI,autumn.evening,2.921875261065544 2030,3,CO2EMT,autumn.evening,224.09322314742187 @@ -504,15 +504,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,winter.peak,-0.7616266044111606 2030,7,ELCTRI,winter.peak,0.5077510696074404 2030,7,CO2EMT,winter.peak,38.94196828354264 -2030,7,GASNAT,winter.evening,-0.0 -2030,7,ELCTRI,winter.evening,0.0 -2030,7,CO2EMT,winter.evening,0.0 -2030,7,GASNAT,peak.night,-1.777128751750059 -2030,7,ELCTRI,peak.night,1.184752501166706 -2030,7,CO2EMT,peak.night,90.8645930769805 -2030,7,GASNAT,peak.day,-2.5387553561612193 -2030,7,ELCTRI,peak.day,1.6925035707741463 -2030,7,CO2EMT,peak.day,129.80656136052315 +2030,7,GASNAT,winter.evening,-1.0155021473388979 +2030,7,ELCTRI,winter.evening,0.6770014315592653 +2030,7,CO2EMT,winter.evening,51.92262479343785 +2030,7,GASNAT,peak.night,-1.7771287517500585 +2030,7,ELCTRI,peak.night,1.1847525011667057 +2030,7,CO2EMT,peak.night,90.86459307698048 +2030,7,GASNAT,peak.day,-0.0 +2030,7,ELCTRI,peak.day,0.0 +2030,7,CO2EMT,peak.day,0.0 2030,7,GASNAT,peak.peak,-0.0 2030,7,ELCTRI,peak.peak,0.0 2030,7,CO2EMT,peak.peak,0.0 @@ -531,15 +531,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,summer.evening,-0.0 2030,7,ELCTRI,summer.evening,0.0 2030,7,CO2EMT,summer.evening,0.0 -2030,7,GASNAT,autumn.night,-1.2491153287023264 -2030,7,ELCTRI,autumn.night,0.8327435524682176 -2030,7,CO2EMT,autumn.night,63.867266756549945 +2030,7,GASNAT,autumn.night,-1.7771287517500585 +2030,7,ELCTRI,autumn.night,1.1847525011667057 +2030,7,CO2EMT,autumn.night,90.86459307698048 2030,7,GASNAT,autumn.day,-0.0 2030,7,ELCTRI,autumn.day,0.0 2030,7,CO2EMT,autumn.day,0.0 -2030,7,GASNAT,autumn.peak,-0.7616266044111606 -2030,7,ELCTRI,autumn.peak,0.5077510696074404 -2030,7,CO2EMT,autumn.peak,38.94196828354264 +2030,7,GASNAT,autumn.peak,-0.27132842615427455 +2030,7,ELCTRI,autumn.peak,0.18088561743618303 +2030,7,CO2EMT,autumn.peak,13.873022429268056 2030,7,GASNAT,autumn.evening,-1.0155021473388979 2030,7,ELCTRI,autumn.evening,0.6770014315592653 2030,7,CO2EMT,autumn.evening,51.92262479343785 diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv index b85359426..9667a6a19 100644 --- a/tests/data/simple_full/commodity_prices.csv +++ b/tests/data/simple_full/commodity_prices.csv @@ -31,20 +31,20 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,5.8665369 2020,RSHEAT,GBR,autumn.peak,5.8665369 2020,RSHEAT,GBR,autumn.evening,5.8665369 -2020,GASPRD,GBR,winter.day,7.504535286481447 -2020,GASPRD,GBR,winter.peak,7.504535286481447 -2020,GASPRD,GBR,winter.evening,7.504535286481447 -2020,GASPRD,GBR,peak.peak,7.504535286481447 -2020,GASPRD,GBR,peak.evening,7.504535286481447 -2020,GASPRD,GBR,summer.evening,7.504535286481447 -2020,GASPRD,GBR,autumn.evening,7.504535286481447 -2020,GASNAT,GBR,winter.day,6.598258237765183 -2020,GASNAT,GBR,winter.peak,6.598258237765183 -2020,GASNAT,GBR,winter.evening,6.598258237765183 -2020,GASNAT,GBR,peak.peak,6.598258237765183 -2020,GASNAT,GBR,peak.evening,6.598258237765183 -2020,GASNAT,GBR,summer.evening,6.598258237765183 -2020,GASNAT,GBR,autumn.evening,6.598258237765183 +2020,GASPRD,GBR,winter.day,7.504534967942034 +2020,GASPRD,GBR,winter.peak,7.504534967942034 +2020,GASPRD,GBR,winter.evening,7.504534967942034 +2020,GASPRD,GBR,peak.peak,7.504534967942034 +2020,GASPRD,GBR,peak.evening,7.504534967942034 +2020,GASPRD,GBR,summer.evening,7.504534967942034 +2020,GASPRD,GBR,autumn.evening,7.504534967942034 +2020,GASNAT,GBR,winter.day,6.5982585862326335 +2020,GASNAT,GBR,winter.peak,6.5982585862326335 +2020,GASNAT,GBR,winter.evening,6.5982585862326335 +2020,GASNAT,GBR,peak.peak,6.5982585862326335 +2020,GASNAT,GBR,peak.evening,6.5982585862326335 +2020,GASNAT,GBR,summer.evening,6.5982585862326335 +2020,GASNAT,GBR,autumn.evening,6.5982585862326335 2020,GASPRD,GBR,winter.night,3.428609686103873 2020,GASPRD,GBR,peak.night,3.428609686103873 2020,GASPRD,GBR,peak.day,3.428609686103873 @@ -95,22 +95,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,5.8665369 2030,RSHEAT,GBR,autumn.peak,5.8665369 2030,RSHEAT,GBR,autumn.evening,5.8665369 -2030,GASPRD,GBR,winter.day,6.8760807959710935 -2030,GASPRD,GBR,winter.peak,6.8760807959710935 -2030,GASPRD,GBR,winter.evening,6.8760807959710935 -2030,GASPRD,GBR,peak.peak,6.8760807959710935 -2030,GASPRD,GBR,peak.evening,6.8760807959710935 -2030,GASPRD,GBR,summer.evening,6.8760807959710935 -2030,GASPRD,GBR,autumn.peak,6.8760807959710935 -2030,GASPRD,GBR,autumn.evening,6.8760807959710935 -2030,GASNAT,GBR,winter.day,6.161750372397898 -2030,GASNAT,GBR,winter.peak,6.161750372397898 -2030,GASNAT,GBR,winter.evening,6.161750372397898 -2030,GASNAT,GBR,peak.peak,6.161750372397898 -2030,GASNAT,GBR,peak.evening,6.161750372397898 -2030,GASNAT,GBR,summer.evening,6.161750372397898 -2030,GASNAT,GBR,autumn.peak,6.161750372397898 -2030,GASNAT,GBR,autumn.evening,6.161750372397898 +2030,GASPRD,GBR,winter.day,6.876080672233131 +2030,GASPRD,GBR,winter.peak,6.876080672233131 +2030,GASPRD,GBR,winter.evening,6.876080672233131 +2030,GASPRD,GBR,peak.peak,6.876080672233131 +2030,GASPRD,GBR,peak.evening,6.876080672233131 +2030,GASPRD,GBR,summer.evening,6.876080672233131 +2030,GASPRD,GBR,autumn.peak,6.876080672233131 +2030,GASPRD,GBR,autumn.evening,6.876080672233131 +2030,GASNAT,GBR,winter.day,6.161750462640322 +2030,GASNAT,GBR,winter.peak,6.161750462640322 +2030,GASNAT,GBR,winter.evening,6.161750462640322 +2030,GASNAT,GBR,peak.peak,6.161750462640322 +2030,GASNAT,GBR,peak.evening,6.161750462640322 +2030,GASNAT,GBR,summer.evening,6.161750462640322 +2030,GASNAT,GBR,autumn.peak,6.161750462640322 +2030,GASNAT,GBR,autumn.evening,6.161750462640322 2030,GASPRD,GBR,winter.night,3.428609686103873 2030,GASPRD,GBR,peak.night,3.428609686103873 2030,GASPRD,GBR,peak.day,3.428609686103873 diff --git a/tests/data/simple_marginal/commodity_flows.csv b/tests/data/simple_marginal/commodity_flows.csv index 8777f8bfa..f7217b32f 100644 --- a/tests/data/simple_marginal/commodity_flows.csv +++ b/tests/data/simple_marginal/commodity_flows.csv @@ -251,8 +251,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,0,CO2EMT,autumn.night,0.0 2030,0,GASPRD,autumn.day,0.0 2030,0,CO2EMT,autumn.day,0.0 -2030,0,GASPRD,autumn.peak,20.534211026060348 -2030,0,CO2EMT,autumn.peak,104.99142097624657 +2030,0,GASPRD,autumn.peak,20.534211026060376 +2030,0,CO2EMT,autumn.peak,104.99142097624672 2030,0,GASPRD,autumn.evening,166.76083466742 2030,0,CO2EMT,autumn.evening,852.6481476545185 2030,1,GASPRD,winter.night,-0.0 @@ -297,9 +297,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,1,GASPRD,autumn.day,-0.0 2030,1,GASNAT,autumn.day,0.0 2030,1,CO2EMT,autumn.day,0.0 -2030,1,GASPRD,autumn.peak,-21.826856869734865 -2030,1,GASNAT,autumn.peak,20.78748273308082 -2030,1,CO2EMT,autumn.peak,53.143199607121126 +2030,1,GASPRD,autumn.peak,-21.826856869734893 +2030,1,GASNAT,autumn.peak,20.78748273308085 +2030,1,CO2EMT,autumn.peak,53.1431996071212 2030,1,GASPRD,autumn.evening,-165.4681888237455 2030,1,GASNAT,autumn.evening,157.58875126070998 2030,1,CO2EMT,autumn.evening,402.87564259800513 @@ -328,15 +328,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.peak,-2.468688831431171 2030,3,ELCTRI,winter.peak,1.6457925542874472 2030,3,CO2EMT,winter.peak,126.22405995107574 -2030,3,GASNAT,winter.evening,-4.395089526235901 -2030,3,ELCTRI,winter.evening,2.9300596841572673 -2030,3,CO2EMT,winter.evening,224.7209274764416 +2030,3,GASNAT,winter.evening,-3.3795873788970026 +2030,3,ELCTRI,winter.evening,2.253058252598002 +2030,3,CO2EMT,winter.evening,172.79830268300373 2030,3,GASNAT,peak.night,-8.382740663321101 -2030,3,ELCTRI,peak.night,5.5884937755474 -2030,3,CO2EMT,peak.night,428.6095301156078 -2030,3,GASNAT,peak.day,-8.528170411829517 -2030,3,ELCTRI,peak.day,5.685446941219679 -2030,3,CO2EMT,peak.day,436.04535315684325 +2030,3,ELCTRI,peak.night,5.588493775547401 +2030,3,CO2EMT,peak.night,428.60953011560787 +2030,3,GASNAT,peak.day,-11.066925767990737 +2030,3,ELCTRI,peak.day,7.3779505119938245 +2030,3,CO2EMT,peak.day,565.8519145173664 2030,3,GASNAT,peak.peak,-3.520722822271213 2030,3,ELCTRI,peak.peak,2.3471485481808085 2030,3,CO2EMT,peak.peak,180.0145579027271 @@ -355,15 +355,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-8.382740663321101 -2030,3,ELCTRI,autumn.night,5.5884937755474 -2030,3,CO2EMT,autumn.night,428.6095301156078 +2030,3,GASNAT,autumn.night,-7.854727240273368 +2030,3,ELCTRI,autumn.night,5.236484826848912 +2030,3,CO2EMT,autumn.night,401.61220379517727 2030,3,GASNAT,autumn.day,-11.621339862602872 2030,3,ELCTRI,autumn.day,7.747559908401914 2030,3,CO2EMT,autumn.day,594.1991071748848 -2030,3,GASNAT,autumn.peak,-3.102304946743114 -2030,3,ELCTRI,autumn.peak,2.0682032978287426 -2030,3,CO2EMT,autumn.peak,158.6208519269754 +2030,3,GASNAT,autumn.peak,-3.592603125 +2030,3,ELCTRI,autumn.peak,2.39506875 +2030,3,CO2EMT,autumn.peak,183.68979778124998 2030,3,GASNAT,autumn.evening,-4.3828128915983156 2030,3,ELCTRI,autumn.evening,2.921875261065544 2030,3,CO2EMT,autumn.evening,224.09322314742187 @@ -504,15 +504,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,winter.peak,-0.7616266044111606 2030,7,ELCTRI,winter.peak,0.5077510696074404 2030,7,CO2EMT,winter.peak,38.94196828354264 -2030,7,GASNAT,winter.evening,-0.0 -2030,7,ELCTRI,winter.evening,0.0 -2030,7,CO2EMT,winter.evening,0.0 -2030,7,GASNAT,peak.night,-1.777128751750059 -2030,7,ELCTRI,peak.night,1.184752501166706 -2030,7,CO2EMT,peak.night,90.8645930769805 -2030,7,GASNAT,peak.day,-2.5387553561612193 -2030,7,ELCTRI,peak.day,1.6925035707741463 -2030,7,CO2EMT,peak.day,129.80656136052315 +2030,7,GASNAT,winter.evening,-1.0155021473388979 +2030,7,ELCTRI,winter.evening,0.6770014315592653 +2030,7,CO2EMT,winter.evening,51.92262479343785 +2030,7,GASNAT,peak.night,-1.7771287517500585 +2030,7,ELCTRI,peak.night,1.1847525011667057 +2030,7,CO2EMT,peak.night,90.86459307698048 +2030,7,GASNAT,peak.day,-0.0 +2030,7,ELCTRI,peak.day,0.0 +2030,7,CO2EMT,peak.day,0.0 2030,7,GASNAT,peak.peak,-0.0 2030,7,ELCTRI,peak.peak,0.0 2030,7,CO2EMT,peak.peak,0.0 @@ -531,15 +531,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,GASNAT,summer.evening,-0.0 2030,7,ELCTRI,summer.evening,0.0 2030,7,CO2EMT,summer.evening,0.0 -2030,7,GASNAT,autumn.night,-1.2491153287023264 -2030,7,ELCTRI,autumn.night,0.8327435524682176 -2030,7,CO2EMT,autumn.night,63.867266756549945 +2030,7,GASNAT,autumn.night,-1.7771287517500585 +2030,7,ELCTRI,autumn.night,1.1847525011667057 +2030,7,CO2EMT,autumn.night,90.86459307698048 2030,7,GASNAT,autumn.day,-0.0 2030,7,ELCTRI,autumn.day,0.0 2030,7,CO2EMT,autumn.day,0.0 -2030,7,GASNAT,autumn.peak,-0.7616266044111606 -2030,7,ELCTRI,autumn.peak,0.5077510696074404 -2030,7,CO2EMT,autumn.peak,38.94196828354264 +2030,7,GASNAT,autumn.peak,-0.27132842615427455 +2030,7,ELCTRI,autumn.peak,0.18088561743618303 +2030,7,CO2EMT,autumn.peak,13.873022429268056 2030,7,GASNAT,autumn.evening,-1.0155021473388979 2030,7,ELCTRI,autumn.evening,0.6770014315592653 2030,7,CO2EMT,autumn.evening,51.92262479343785 diff --git a/tests/data/simple_npv/assets.csv b/tests/data/simple_npv/assets.csv index 657a6bc3d..19ab193f0 100644 --- a/tests/data/simple_npv/assets.csv +++ b/tests/data/simple_npv/assets.csv @@ -9,9 +9,9 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 7,RGASBR,GBR,A0_RES,,2030,,3655.8184058764805 8,GASCGT,GBR,A0_ELC,,2030,,33.820477802912976 9,GASPRC,GBR,A0_GPR,,2030,,879.1648830751317 -10,GASDRV,GBR,A0_GEX,,2030,,923.1231272288883 +10,GASDRV,GBR,A0_GEX,,2030,,923.1231272288879 11,RGASBR,GBR,A0_RES,,2040,,4011.65737547648 12,RELCHP,GBR,A0_RES,,2040,,802.3314750952961 13,GASCGT,GBR,A0_ELC,,2040,,3.7231090668357614 14,GASPRC,GBR,A0_GPR,,2040,,94.9477829022087 -15,GASDRV,GBR,A0_GEX,,2040,,99.69517204731909 +15,GASDRV,GBR,A0_GEX,,2040,,99.6951720473196 diff --git a/tests/data/simple_npv/commodity_flows.csv b/tests/data/simple_npv/commodity_flows.csv index 599b09318..665767434 100644 --- a/tests/data/simple_npv/commodity_flows.csv +++ b/tests/data/simple_npv/commodity_flows.csv @@ -245,15 +245,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,winter.day,-11.975343788321101 2030,3,ELCTRI,winter.day,7.9835625255474 2030,3,CO2EMT,winter.day,612.2993278968578 -2030,3,GASNAT,winter.peak,-3.592603125 -2030,3,ELCTRI,winter.peak,2.39506875 -2030,3,CO2EMT,winter.peak,183.68979778124998 +2030,3,GASNAT,winter.peak,-3.592603124999987 +2030,3,ELCTRI,winter.peak,2.395068749999991 +2030,3,CO2EMT,winter.peak,183.6897977812493 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,-8.382740663321101 -2030,3,ELCTRI,peak.night,5.5884937755474 -2030,3,CO2EMT,peak.night,428.6095301156078 +2030,3,GASNAT,peak.night,-0.0 +2030,3,ELCTRI,peak.night,0.0 +2030,3,CO2EMT,peak.night,0.0 2030,3,GASNAT,peak.day,-11.975343788321101 2030,3,ELCTRI,peak.day,7.9835625255474 2030,3,CO2EMT,peak.day,612.2993278968578 @@ -263,9 +263,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,peak.evening,-0.0 2030,3,ELCTRI,peak.evening,0.0 2030,3,CO2EMT,peak.evening,0.0 -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.night,-0.44265925791417715 +2030,3,ELCTRI,summer.night,0.29510617194278477 +2030,3,CO2EMT,summer.night,22.633167857151875 2030,3,GASNAT,summer.day,-0.0 2030,3,ELCTRI,summer.day,0.0 2030,3,CO2EMT,summer.day,0.0 @@ -275,15 +275,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,3,GASNAT,summer.evening,-0.0 2030,3,ELCTRI,summer.evening,0.0 2030,3,CO2EMT,summer.evening,0.0 -2030,3,GASNAT,autumn.night,-0.0 -2030,3,ELCTRI,autumn.night,0.0 -2030,3,CO2EMT,autumn.night,0.0 +2030,3,GASNAT,autumn.night,-8.382740663321101 +2030,3,ELCTRI,autumn.night,5.5884937755474 +2030,3,CO2EMT,autumn.night,428.6095301156078 2030,3,GASNAT,autumn.day,-0.0 2030,3,ELCTRI,autumn.day,0.0 2030,3,CO2EMT,autumn.day,0.0 -2030,3,GASNAT,autumn.peak,-3.592603125 -2030,3,ELCTRI,autumn.peak,2.39506875 -2030,3,CO2EMT,autumn.peak,183.68979778124998 +2030,3,GASNAT,autumn.peak,-0.0 +2030,3,ELCTRI,autumn.peak,0.0 +2030,3,CO2EMT,autumn.peak,0.0 2030,3,GASNAT,autumn.evening,-4.790137538321099 2030,3,ELCTRI,autumn.evening,3.1934250255473997 2030,3,CO2EMT,autumn.evening,244.9197323343578 @@ -453,15 +453,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,GASNAT,winter.day,-92.41990209966076 2030,8,ELCTRI,winter.day,61.613268066440504 2030,8,CO2EMT,winter.day,4725.429594355654 -2030,8,GASNAT,winter.peak,-50.00146265174414 -2030,8,ELCTRI,winter.peak,33.334308434496094 -2030,8,CO2EMT,winter.peak,2556.574785383678 +2030,8,GASNAT,winter.peak,-50.00146265174415 +2030,8,ELCTRI,winter.peak,33.3343084344961 +2030,8,CO2EMT,winter.peak,2556.5747853836783 2030,8,GASNAT,winter.evening,-35.1456239886199 2030,8,ELCTRI,winter.evening,23.43041599241327 2030,8,CO2EMT,winter.evening,1796.9957545381355 -2030,8,GASNAT,peak.night,-10.674271597376258 -2030,8,ELCTRI,peak.night,7.116181064917505 -2030,8,CO2EMT,peak.night,545.7755067738481 +2030,8,GASNAT,peak.night,-19.05701226069736 +2030,8,ELCTRI,peak.night,12.704674840464905 +2030,8,CO2EMT,peak.night,974.3850368894558 2030,8,GASNAT,peak.day,-40.504913969167234 2030,8,ELCTRI,peak.day,27.003275979444822 2030,8,CO2EMT,peak.day,2071.0162512435204 @@ -471,9 +471,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,GASNAT,peak.evening,-18.4335370492673 2030,8,ELCTRI,peak.evening,12.289024699511533 2030,8,CO2EMT,peak.evening,942.5067493290369 -2030,8,GASNAT,summer.night,-0.44265925791417715 -2030,8,ELCTRI,summer.night,0.29510617194278477 -2030,8,CO2EMT,summer.night,22.633167857151875 +2030,8,GASNAT,summer.night,-0.0 +2030,8,ELCTRI,summer.night,0.0 +2030,8,CO2EMT,summer.night,0.0 2030,8,GASNAT,summer.day,-0.0 2030,8,ELCTRI,summer.day,0.0 2030,8,CO2EMT,summer.day,0.0 @@ -483,21 +483,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,8,GASNAT,summer.evening,-0.0 2030,8,ELCTRI,summer.evening,0.0 2030,8,CO2EMT,summer.evening,0.0 -2030,8,GASNAT,autumn.night,-14.148372781006529 -2030,8,ELCTRI,autumn.night,9.432248520671019 -2030,8,CO2EMT,autumn.night,723.4063002928638 +2030,8,GASNAT,autumn.night,-5.765632117685428 +2030,8,ELCTRI,autumn.night,3.8437547451236185 +2030,8,CO2EMT,autumn.night,294.7967701772559 2030,8,GASNAT,autumn.day,-40.87981133800968 2030,8,ELCTRI,autumn.day,27.25320755867312 2030,8,CO2EMT,autumn.day,2090.184753712435 -2030,8,GASNAT,autumn.peak,-21.80057111786818 -2030,8,ELCTRI,autumn.peak,14.533714078578786 -2030,8,CO2EMT,autumn.peak,1114.6632012566 +2030,8,GASNAT,autumn.peak,-25.393174242868177 +2030,8,ELCTRI,autumn.peak,16.928782828578786 +2030,8,CO2EMT,autumn.peak,1298.35299903785 2030,8,GASNAT,autumn.evening,-8.948374211287213 2030,8,ELCTRI,autumn.evening,5.965582807524809 2030,8,CO2EMT,autumn.evening,457.5303734231152 -2030,9,GASPRD,winter.night,-67.31106166814746 -2030,9,GASNAT,winter.night,64.1057730172833 -2030,9,CO2EMT,winter.night,163.88640871868478 +2030,9,GASPRD,winter.night,-67.31106166814747 +2030,9,GASNAT,winter.night,64.10577301728331 +2030,9,CO2EMT,winter.night,163.8864087186848 2030,9,GASPRD,winter.day,-96.15865939405025 2030,9,GASNAT,winter.day,91.57967561338118 2030,9,CO2EMT,winter.day,234.12344070560903 @@ -534,31 +534,31 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,9,GASPRD,autumn.night,-0.0 2030,9,GASNAT,autumn.night,0.0 2030,9,CO2EMT,autumn.night,0.0 -2030,9,GASPRD,autumn.day,-31.556801948919876 -2030,9,GASNAT,autumn.day,30.054097094209403 -2030,9,CO2EMT,autumn.day,76.83329922134635 +2030,9,GASPRD,autumn.day,-31.556801948919844 +2030,9,GASNAT,autumn.day,30.054097094209375 +2030,9,CO2EMT,autumn.day,76.83329922134628 2030,9,GASPRD,autumn.peak,-28.84759772590276 2030,9,GASNAT,autumn.peak,27.473902596097865 2030,9,CO2EMT,autumn.peak,70.2370319869242 2030,9,GASPRD,autumn.evening,-38.46346394224472 2030,9,GASNAT,autumn.evening,36.63187042118545 2030,9,CO2EMT,autumn.evening,93.6493767317606 -2030,10,GASPRD,winter.night,67.31106166814747 -2030,10,CO2EMT,winter.night,344.16145830923807 -2030,10,GASPRD,winter.day,96.15865939405025 -2030,10,CO2EMT,winter.day,491.65922548177895 -2030,10,GASPRD,winter.peak,28.84759772590276 -2030,10,CO2EMT,winter.peak,147.49776717254082 -2030,10,GASPRD,winter.evening,38.463463942244715 -2030,10,CO2EMT,winter.evening,196.66369113669725 +2030,10,GASPRD,winter.night,67.31106166814757 +2030,10,CO2EMT,winter.night,344.1614583092386 +2030,10,GASPRD,winter.day,96.1586593940502 +2030,10,CO2EMT,winter.day,491.6592254817787 +2030,10,GASPRD,winter.peak,28.847597725902748 +2030,10,CO2EMT,winter.peak,147.49776717254076 +2030,10,GASPRD,winter.evening,38.4634639422447 +2030,10,CO2EMT,winter.evening,196.66369113669717 2030,10,GASPRD,peak.night,0.0 2030,10,CO2EMT,peak.night,0.0 -2030,10,GASPRD,peak.day,60.74150718530866 -2030,10,CO2EMT,peak.day,310.5713262384832 -2030,10,GASPRD,peak.peak,28.84759772590276 -2030,10,CO2EMT,peak.peak,147.49776717254082 -2030,10,GASPRD,peak.evening,38.463463942244715 -2030,10,CO2EMT,peak.evening,196.66369113669725 +2030,10,GASPRD,peak.day,60.74150718530869 +2030,10,CO2EMT,peak.day,310.5713262384834 +2030,10,GASPRD,peak.peak,28.847597725902748 +2030,10,CO2EMT,peak.peak,147.49776717254076 +2030,10,GASPRD,peak.evening,38.4634639422447 +2030,10,CO2EMT,peak.evening,196.66369113669717 2030,10,GASPRD,summer.night,0.0 2030,10,CO2EMT,summer.night,0.0 2030,10,GASPRD,summer.day,0.0 @@ -569,12 +569,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,10,CO2EMT,summer.evening,2.3764826250009476 2030,10,GASPRD,autumn.night,0.0 2030,10,CO2EMT,autumn.night,0.0 -2030,10,GASPRD,autumn.day,31.556801948919897 -2030,10,CO2EMT,autumn.day,161.34992836482746 -2030,10,GASPRD,autumn.peak,28.84759772590276 -2030,10,CO2EMT,autumn.peak,147.49776717254082 -2030,10,GASPRD,autumn.evening,38.463463942244715 -2030,10,CO2EMT,autumn.evening,196.66369113669725 +2030,10,GASPRD,autumn.day,31.55680194891988 +2030,10,CO2EMT,autumn.day,161.34992836482735 +2030,10,GASPRD,autumn.peak,28.847597725902748 +2030,10,CO2EMT,autumn.peak,147.49776717254076 +2030,10,GASPRD,autumn.evening,38.4634639422447 +2030,10,CO2EMT,autumn.evening,196.66369113669717 2040,2,ELCTRI,winter.night,4.435312795545212 2040,2,ELCTRI,winter.day,7.075379933645912 2040,2,ELCTRI,winter.peak,1.9712501261051125 @@ -594,30 +594,30 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,3,GASNAT,winter.night,-8.382740663321101 2040,3,ELCTRI,winter.night,5.5884937755474 2040,3,CO2EMT,winter.night,428.6095301156078 -2040,3,GASNAT,winter.day,-0.0 -2040,3,ELCTRI,winter.day,0.0 -2040,3,CO2EMT,winter.day,0.0 +2040,3,GASNAT,winter.day,-11.975343788321101 +2040,3,ELCTRI,winter.day,7.9835625255474 +2040,3,CO2EMT,winter.day,612.2993278968578 2040,3,GASNAT,winter.peak,-3.592603125 2040,3,ELCTRI,winter.peak,2.39506875 2040,3,CO2EMT,winter.peak,183.68979778124998 -2040,3,GASNAT,winter.evening,-4.790137538321099 -2040,3,ELCTRI,winter.evening,3.1934250255473997 -2040,3,CO2EMT,winter.evening,244.9197323343578 +2040,3,GASNAT,winter.evening,-0.0 +2040,3,ELCTRI,winter.evening,0.0 +2040,3,CO2EMT,winter.evening,0.0 2040,3,GASNAT,peak.night,-8.382740663321101 2040,3,ELCTRI,peak.night,5.5884937755474 2040,3,CO2EMT,peak.night,428.6095301156078 2040,3,GASNAT,peak.day,-11.975343788321101 2040,3,ELCTRI,peak.day,7.9835625255474 2040,3,CO2EMT,peak.day,612.2993278968578 -2040,3,GASNAT,peak.peak,-3.592603125 -2040,3,ELCTRI,peak.peak,2.39506875 -2040,3,CO2EMT,peak.peak,183.68979778124998 +2040,3,GASNAT,peak.peak,-0.0 +2040,3,ELCTRI,peak.peak,0.0 +2040,3,CO2EMT,peak.peak,0.0 2040,3,GASNAT,peak.evening,-0.0 2040,3,ELCTRI,peak.evening,0.0 2040,3,CO2EMT,peak.evening,0.0 -2040,3,GASNAT,summer.night,-0.0 -2040,3,ELCTRI,summer.night,0.0 -2040,3,CO2EMT,summer.night,0.0 +2040,3,GASNAT,summer.night,-0.7247283749141771 +2040,3,ELCTRI,summer.night,0.4831522499427847 +2040,3,CO2EMT,summer.night,37.05536180936187 2040,3,GASNAT,summer.day,-0.0 2040,3,ELCTRI,summer.day,0.0 2040,3,CO2EMT,summer.day,0.0 @@ -630,12 +630,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,3,GASNAT,autumn.night,-0.0 2040,3,ELCTRI,autumn.night,0.0 2040,3,CO2EMT,autumn.night,0.0 -2040,3,GASNAT,autumn.day,-0.0 -2040,3,ELCTRI,autumn.day,0.0 -2040,3,CO2EMT,autumn.day,0.0 -2040,3,GASNAT,autumn.peak,-3.592603125 -2040,3,ELCTRI,autumn.peak,2.39506875 -2040,3,CO2EMT,autumn.peak,183.68979778124998 +2040,3,GASNAT,autumn.day,-11.975343788321101 +2040,3,ELCTRI,autumn.day,7.9835625255474 +2040,3,CO2EMT,autumn.day,612.2993278968578 +2040,3,GASNAT,autumn.peak,-0.0 +2040,3,ELCTRI,autumn.peak,0.0 +2040,3,CO2EMT,autumn.peak,0.0 2040,3,GASNAT,autumn.evening,-4.790137538321099 2040,3,ELCTRI,autumn.evening,3.1934250255473997 2040,3,CO2EMT,autumn.evening,244.9197323343578 @@ -722,24 +722,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,8,GASNAT,winter.night,-8.672137770067362 2040,8,ELCTRI,winter.night,5.781425180044908 2040,8,CO2EMT,winter.night,443.4064041835442 -2040,8,GASNAT,winter.day,-115.58957668948185 -2040,8,ELCTRI,winter.day,77.0597177929879 -2040,8,CO2EMT,winter.day,5910.0950561332065 +2040,8,GASNAT,winter.day,-85.26628597244733 +2040,8,ELCTRI,winter.day,56.84419064829822 +2040,8,CO2EMT,winter.day,4359.665201771232 2040,8,GASNAT,winter.peak,-50.00146265174415 2040,8,ELCTRI,winter.peak,33.3343084344961 2040,8,CO2EMT,winter.peak,2556.5747853836783 -2040,8,GASNAT,winter.evening,-26.81238329508539 -2040,8,ELCTRI,winter.evening,17.874922196723592 -2040,8,CO2EMT,winter.evening,1370.9171578777157 +2040,8,GASNAT,winter.evening,-38.94169964011991 +2040,8,ELCTRI,winter.evening,25.961133093413274 +2040,8,CO2EMT,winter.evening,1991.0891025993308 2040,8,GASNAT,peak.night,-12.945478067876259 2040,8,ELCTRI,peak.night,8.630318711917505 2040,8,CO2EMT,peak.night,661.902293610513 2040,8,GASNAT,peak.day,-28.195365763953824 2040,8,ELCTRI,peak.day,18.79691050930255 2040,8,CO2EMT,peak.day,1441.6290515109588 -2040,8,GASNAT,peak.peak,-26.25973740702902 -2040,8,ELCTRI,peak.peak,17.506491604686016 -2040,8,CO2EMT,peak.peak,1342.6603736213938 +2040,8,GASNAT,peak.peak,-29.852340532029025 +2040,8,ELCTRI,peak.peak,19.901560354686016 +2040,8,CO2EMT,peak.peak,1526.3501714026438 2040,8,GASNAT,peak.evening,-20.4795962347673 2040,8,ELCTRI,peak.evening,13.653064156511533 2040,8,CO2EMT,peak.evening,1047.121755483652 @@ -758,15 +758,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,8,GASNAT,autumn.night,-15.993191152006526 2040,8,ELCTRI,autumn.night,10.662127434671017 2040,8,CO2EMT,autumn.night,817.7318636020937 -2040,8,GASNAT,autumn.day,-45.73511709550968 -2040,8,ELCTRI,autumn.day,30.490078063673117 -2040,8,CO2EMT,autumn.day,2338.4365370934097 -2040,8,GASNAT,autumn.peak,-18.993965222368182 -2040,8,ELCTRI,autumn.peak,12.662643481578787 -2040,8,CO2EMT,autumn.peak,971.1614418196849 -2040,8,GASNAT,autumn.evening,-3.2239615355737916 -2040,8,ELCTRI,autumn.evening,2.149307690382528 -2040,8,CO2EMT,autumn.evening,164.84115331388796 +2040,8,GASNAT,autumn.day,-33.759773307188574 +2040,8,ELCTRI,autumn.day,22.506515538125715 +2040,8,CO2EMT,autumn.day,1726.1372091965516 +2040,8,GASNAT,autumn.peak,-28.090952408368175 +2040,8,ELCTRI,autumn.peak,18.727301605578784 +2040,8,CO2EMT,autumn.peak,1436.2903966398646 +2040,8,GASNAT,autumn.evening,-10.563140342287216 +2040,8,ELCTRI,autumn.evening,7.04209356152481 +2040,8,CO2EMT,autumn.evening,540.0933657011452 2040,9,GASPRD,winter.night,-67.31106166814747 2040,9,GASNAT,winter.night,64.10577301728331 2040,9,CO2EMT,winter.night,163.8864087186848 @@ -782,9 +782,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,9,GASPRD,peak.night,-0.0 2040,9,GASNAT,peak.night,0.0 2040,9,CO2EMT,peak.night,0.0 -2040,9,GASPRD,peak.day,-50.232501062308685 -2040,9,GASNAT,peak.day,47.84047720219875 -2040,9,CO2EMT,peak.day,122.3041799674211 +2040,9,GASPRD,peak.day,-75.15629417383364 +2040,9,GASNAT,peak.day,71.57742302269871 +2040,9,CO2EMT,peak.day,182.98768195752928 2040,9,GASPRD,peak.peak,-28.84759772590276 2040,9,GASNAT,peak.peak,27.473902596097865 2040,9,CO2EMT,peak.peak,70.2370319869242 @@ -806,47 +806,47 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,9,GASPRD,autumn.night,-0.0 2040,9,GASNAT,autumn.night,0.0 2040,9,CO2EMT,autumn.night,0.0 -2040,9,GASPRD,autumn.day,-18.1963106836449 -2040,9,GASNAT,autumn.day,17.32981969870943 -2040,9,CO2EMT,autumn.day,44.30368405975066 +2040,9,GASPRD,autumn.day,-18.196310683644896 +2040,9,GASNAT,autumn.day,17.329819698709425 +2040,9,CO2EMT,autumn.day,44.30368405975065 2040,9,GASPRD,autumn.peak,-28.84759772590276 2040,9,GASNAT,autumn.peak,27.473902596097865 2040,9,CO2EMT,autumn.peak,70.2370319869242 2040,9,GASPRD,autumn.evening,-38.46346394224472 2040,9,GASNAT,autumn.evening,36.63187042118545 2040,9,CO2EMT,autumn.evening,93.6493767317606 -2040,10,GASPRD,winter.night,67.31106166814749 -2040,10,CO2EMT,winter.night,344.1614583092381 -2040,10,GASPRD,winter.day,96.15865939405025 -2040,10,CO2EMT,winter.day,491.65922548177895 -2040,10,GASPRD,winter.peak,28.84759772590276 -2040,10,CO2EMT,winter.peak,147.49776717254082 -2040,10,GASPRD,winter.evening,38.463463942244715 -2040,10,CO2EMT,winter.evening,196.66369113669725 +2040,10,GASPRD,winter.night,67.31106166814746 +2040,10,CO2EMT,winter.night,344.161458309238 +2040,10,GASPRD,winter.day,96.1586593940502 +2040,10,CO2EMT,winter.day,491.6592254817787 +2040,10,GASPRD,winter.peak,28.847597725902748 +2040,10,CO2EMT,winter.peak,147.49776717254076 +2040,10,GASPRD,winter.evening,38.4634639422447 +2040,10,CO2EMT,winter.evening,196.66369113669717 2040,10,GASPRD,peak.night,0.0 2040,10,CO2EMT,peak.night,0.0 -2040,10,GASPRD,peak.day,50.232501062308714 -2040,10,CO2EMT,peak.day,256.8387779315845 -2040,10,GASPRD,peak.peak,28.84759772590276 -2040,10,CO2EMT,peak.peak,147.49776717254082 -2040,10,GASPRD,peak.evening,38.463463942244715 -2040,10,CO2EMT,peak.evening,196.66369113669725 +2040,10,GASPRD,peak.day,75.1562941738337 +2040,10,CO2EMT,peak.day,384.27413211081176 +2040,10,GASPRD,peak.peak,28.847597725902748 +2040,10,CO2EMT,peak.peak,147.49776717254076 +2040,10,GASPRD,peak.evening,38.4634639422447 +2040,10,CO2EMT,peak.evening,196.66369113669717 2040,10,GASPRD,summer.night,0.0 2040,10,CO2EMT,summer.night,0.0 2040,10,GASPRD,summer.day,0.0 2040,10,CO2EMT,summer.day,0.0 2040,10,GASPRD,summer.peak,0.0 2040,10,CO2EMT,summer.peak,0.0 -2040,10,GASPRD,summer.evening,0.0 -2040,10,CO2EMT,summer.evening,0.0 +2040,10,GASPRD,summer.evening,0.760964793659886 +2040,10,CO2EMT,summer.evening,3.8908129899829973 2040,10,GASPRD,autumn.night,0.0 2040,10,CO2EMT,autumn.night,0.0 -2040,10,GASPRD,autumn.day,18.19631068364491 -2040,10,CO2EMT,autumn.day,93.03773652547643 -2040,10,GASPRD,autumn.peak,28.84759772590276 -2040,10,CO2EMT,autumn.peak,147.49776717254082 -2040,10,GASPRD,autumn.evening,38.463463942244715 -2040,10,CO2EMT,autumn.evening,196.66369113669725 +2040,10,GASPRD,autumn.day,43.120103795169896 +2040,10,CO2EMT,autumn.day,220.4730907047037 +2040,10,GASPRD,autumn.peak,28.847597725902748 +2040,10,CO2EMT,autumn.peak,147.49776717254076 +2040,10,GASPRD,autumn.evening,38.4634639422447 +2040,10,CO2EMT,autumn.evening,196.66369113669717 2040,11,GASNAT,winter.night,-0.0 2040,11,RSHEAT,winter.night,0.0 2040,11,CO2EMT,winter.night,0.0 @@ -930,15 +930,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,13,GASNAT,winter.night,-12.843562867713421 2040,13,ELCTRI,winter.night,8.562375245142281 2040,13,CO2EMT,winter.night,656.6913694261872 -2040,13,GASNAT,winter.day,-0.0 -2040,13,ELCTRI,winter.day,0.0 -2040,13,CO2EMT,winter.day,0.0 +2040,13,GASNAT,winter.day,-18.34794692871342 +2040,13,ELCTRI,winter.day,12.231964619142278 +2040,13,CO2EMT,winter.day,938.130526465117 2040,13,GASNAT,winter.peak,-5.504384060999996 2040,13,ELCTRI,winter.peak,3.6695893739999974 2040,13,CO2EMT,winter.peak,281.43915703892975 -2040,13,GASNAT,winter.evening,-7.339178806713424 -2040,13,ELCTRI,winter.evening,4.892785871142283 -2040,13,CO2EMT,winter.evening,375.2522123872573 +2040,13,GASNAT,winter.evening,-0.0 +2040,13,ELCTRI,winter.evening,0.0 +2040,13,CO2EMT,winter.evening,0.0 2040,13,GASNAT,peak.night,-0.0 2040,13,ELCTRI,peak.night,0.0 2040,13,CO2EMT,peak.night,0.0 @@ -951,9 +951,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,13,GASNAT,peak.evening,-0.0 2040,13,ELCTRI,peak.evening,0.0 2040,13,CO2EMT,peak.evening,0.0 -2040,13,GASNAT,summer.night,-0.7247283749141771 -2040,13,ELCTRI,summer.night,0.4831522499427847 -2040,13,CO2EMT,summer.night,37.05536180936187 +2040,13,GASNAT,summer.night,-0.0 +2040,13,ELCTRI,summer.night,0.0 +2040,13,CO2EMT,summer.night,0.0 2040,13,GASNAT,summer.day,-0.0 2040,13,ELCTRI,summer.day,0.0 2040,13,CO2EMT,summer.day,0.0 @@ -969,15 +969,15 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,13,GASNAT,autumn.day,-0.0 2040,13,ELCTRI,autumn.day,0.0 2040,13,CO2EMT,autumn.day,0.0 -2040,13,GASNAT,autumn.peak,-5.504384060999996 -2040,13,ELCTRI,autumn.peak,3.6695893739999974 -2040,13,CO2EMT,autumn.peak,281.43915703892975 -2040,13,GASNAT,autumn.evening,-7.339178806713424 -2040,13,ELCTRI,autumn.evening,4.892785871142283 -2040,13,CO2EMT,autumn.evening,375.2522123872573 -2040,14,GASPRD,winter.night,-7.269439661682072 -2040,14,GASNAT,winter.night,6.9232758682686395 -2040,14,CO2EMT,winter.night,17.69935475722878 +2040,13,GASNAT,autumn.peak,-0.0 +2040,13,ELCTRI,autumn.peak,0.0 +2040,13,CO2EMT,autumn.peak,0.0 +2040,13,GASNAT,autumn.evening,-0.0 +2040,13,ELCTRI,autumn.evening,0.0 +2040,13,CO2EMT,autumn.evening,0.0 +2040,14,GASPRD,winter.night,-7.2694396616820685 +2040,14,GASNAT,winter.night,6.923275868268636 +2040,14,CO2EMT,winter.night,17.699354757228768 2040,14,GASPRD,winter.day,-10.384913788160802 2040,14,GASNAT,winter.day,9.890394083962669 2040,14,CO2EMT,winter.day,25.284792475650566 @@ -987,18 +987,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,14,GASPRD,winter.evening,-4.153965535203355 2040,14,GASNAT,winter.evening,3.9561576525746234 2040,14,CO2EMT,winter.evening,10.113917038807026 -2040,14,GASPRD,peak.night,-7.269439661682078 -2040,14,GASNAT,peak.night,6.923275868268646 -2040,14,CO2EMT,peak.night,17.699354757228793 -2040,14,GASPRD,peak.day,-10.384913788160802 -2040,14,GASNAT,peak.day,9.890394083962669 -2040,14,CO2EMT,peak.day,25.284792475650566 -2040,14,GASPRD,peak.peak,-3.115474126478723 -2040,14,GASNAT,peak.peak,2.967118215694022 -2040,14,CO2EMT,peak.peak,7.585437718421768 -2040,14,GASPRD,peak.evening,-4.153965535203355 -2040,14,GASNAT,peak.evening,3.9561576525746234 -2040,14,CO2EMT,peak.evening,10.113917038807026 +2040,14,GASPRD,peak.night,-0.0 +2040,14,GASNAT,peak.night,0.0 +2040,14,CO2EMT,peak.night,0.0 +2040,14,GASPRD,peak.day,-0.0 +2040,14,GASNAT,peak.day,0.0 +2040,14,CO2EMT,peak.day,0.0 +2040,14,GASPRD,peak.peak,-0.0 +2040,14,GASNAT,peak.peak,0.0 +2040,14,CO2EMT,peak.peak,0.0 +2040,14,GASPRD,peak.evening,-0.0 +2040,14,GASNAT,peak.evening,0.0 +2040,14,CO2EMT,peak.evening,0.0 2040,14,GASPRD,summer.night,-0.0 2040,14,GASNAT,summer.night,0.0 2040,14,CO2EMT,summer.night,0.0 @@ -1023,35 +1023,35 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,14,GASPRD,autumn.evening,-4.153965535203355 2040,14,GASNAT,autumn.evening,3.9561576525746234 2040,14,CO2EMT,autumn.evening,10.113917038807026 -2040,15,GASPRD,winter.night,7.269439661682055 -2040,15,CO2EMT,winter.night,37.168644990180354 -2040,15,GASPRD,winter.day,10.384913788160796 -2040,15,CO2EMT,winter.day,53.098064198866155 -2040,15,GASPRD,winter.peak,3.1154741264787216 -2040,15,CO2EMT,winter.peak,15.929419208685704 -2040,15,GASPRD,winter.evening,4.153965535203352 -2040,15,CO2EMT,winter.evening,21.239225781494742 -2040,15,GASPRD,peak.night,7.269439661682075 -2040,15,CO2EMT,peak.night,37.168644990180454 -2040,15,GASPRD,peak.day,10.384913788160796 -2040,15,CO2EMT,peak.day,53.098064198866155 -2040,15,GASPRD,peak.peak,3.1154741264787216 -2040,15,CO2EMT,peak.peak,15.929419208685704 -2040,15,GASPRD,peak.evening,4.153965535203352 -2040,15,CO2EMT,peak.evening,21.239225781494742 +2040,15,GASPRD,winter.night,7.269439661682059 +2040,15,CO2EMT,winter.night,37.16864499018037 +2040,15,GASPRD,winter.day,10.38491378816085 +2040,15,CO2EMT,winter.day,53.09806419886643 +2040,15,GASPRD,winter.peak,3.1154741264787376 +2040,15,CO2EMT,winter.peak,15.929419208685786 +2040,15,GASPRD,winter.evening,4.1539655352033735 +2040,15,CO2EMT,winter.evening,21.239225781494852 +2040,15,GASPRD,peak.night,0.0 +2040,15,CO2EMT,peak.night,0.0 +2040,15,GASPRD,peak.day,0.0 +2040,15,CO2EMT,peak.day,0.0 +2040,15,GASPRD,peak.peak,0.0 +2040,15,CO2EMT,peak.peak,0.0 +2040,15,GASPRD,peak.evening,0.0 +2040,15,CO2EMT,peak.evening,0.0 2040,15,GASPRD,summer.night,0.0 2040,15,CO2EMT,summer.night,0.0 2040,15,GASPRD,summer.day,0.0 2040,15,CO2EMT,summer.day,0.0 2040,15,GASPRD,summer.peak,0.0 2040,15,CO2EMT,summer.peak,0.0 -2040,15,GASPRD,summer.evening,0.760964793659886 -2040,15,CO2EMT,summer.evening,3.8908129899829973 -2040,15,GASPRD,autumn.night,7.269439661682075 -2040,15,CO2EMT,autumn.night,37.168644990180454 -2040,15,GASPRD,autumn.day,10.384913788160796 -2040,15,CO2EMT,autumn.day,53.098064198866155 -2040,15,GASPRD,autumn.peak,3.1154741264787216 -2040,15,CO2EMT,autumn.peak,15.929419208685704 -2040,15,GASPRD,autumn.evening,4.153965535203352 -2040,15,CO2EMT,autumn.evening,21.239225781494742 +2040,15,GASPRD,summer.evening,0.0 +2040,15,CO2EMT,summer.evening,0.0 +2040,15,GASPRD,autumn.night,0.0 +2040,15,CO2EMT,autumn.night,0.0 +2040,15,GASPRD,autumn.day,0.0 +2040,15,CO2EMT,autumn.day,0.0 +2040,15,GASPRD,autumn.peak,0.0 +2040,15,CO2EMT,autumn.peak,0.0 +2040,15,GASPRD,autumn.evening,0.0 +2040,15,CO2EMT,autumn.evening,0.0 diff --git a/tests/data/two_outputs/commodity_flows.csv b/tests/data/two_outputs/commodity_flows.csv index b35d424bc..d2043ae06 100644 --- a/tests/data/two_outputs/commodity_flows.csv +++ b/tests/data/two_outputs/commodity_flows.csv @@ -654,9 +654,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,2,GASPRD,peak.night,-0.0 2030,2,GASNAT,peak.night,0.0 2030,2,CO2EMT,peak.night,0.0 -2030,2,GASPRD,peak.day,-56.01741644695815 -2030,2,GASNAT,peak.day,53.349920425674426 -2030,2,CO2EMT,peak.day,136.3890715682367 +2030,2,GASPRD,peak.day,-56.01741644695821 +2030,2,GASNAT,peak.day,53.34992042567448 +2030,2,CO2EMT,peak.day,136.38907156823683 2030,2,GASPRD,peak.peak,-124.3475625 2030,2,GASNAT,peak.peak,118.42625 2030,2,CO2EMT,peak.peak,302.756708125 @@ -706,12 +706,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,winter.night,-0.0 2030,6,ELCTRI,winter.night,0.0 2030,6,CO2EMT,winter.night,0.0 -2030,6,GASNAT,winter.day,-14.77944692229423 -2030,6,ELCTRI,winter.day,9.85296461486282 -2030,6,CO2EMT,winter.day,755.6731211369039 -2030,6,GASNAT,winter.peak,-3.4174082812344855 -2030,6,ELCTRI,winter.peak,2.278272187489657 -2030,6,CO2EMT,winter.peak,174.73208541951922 +2030,6,GASNAT,winter.day,-10.634542383009325 +2030,6,ELCTRI,winter.day,7.089694922006217 +2030,6,CO2EMT,winter.day,543.7441520432668 +2030,6,GASNAT,winter.peak,-4.4338340625 +2030,6,ELCTRI,winter.peak,2.955889375 +2030,6,CO2EMT,winter.peak,226.70193561562496 2030,6,GASNAT,winter.evening,-4.644546568256023 2030,6,ELCTRI,winter.evening,3.0963643788373485 2030,6,CO2EMT,winter.evening,237.4756660349304 @@ -721,12 +721,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,peak.day,-14.77944692229423 2030,6,ELCTRI,peak.day,9.85296461486282 2030,6,CO2EMT,peak.day,755.6731211369039 -2030,6,GASNAT,peak.peak,-3.7078156676633673 -2030,6,ELCTRI,peak.peak,2.4718771117755782 -2030,6,CO2EMT,peak.peak,189.58061508762796 -2030,6,GASNAT,peak.evening,-5.911778797294229 -2030,6,ELCTRI,peak.evening,3.9411858648628195 -2030,6,CO2EMT,peak.evening,302.2692499056539 +2030,6,GASNAT,peak.peak,-4.4338340625 +2030,6,ELCTRI,peak.peak,2.955889375 +2030,6,CO2EMT,peak.peak,226.70193561562496 +2030,6,GASNAT,peak.evening,-5.911778797294223 +2030,6,ELCTRI,peak.evening,3.941185864862815 +2030,6,CO2EMT,peak.evening,302.26924990565357 2030,6,GASNAT,summer.night,-4.808493968439487 2030,6,ELCTRI,summer.night,3.205662645626325 2030,6,CO2EMT,summer.night,245.85829660631097 @@ -745,9 +745,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,6,GASNAT,autumn.day,-14.77944692229423 2030,6,ELCTRI,autumn.day,9.85296461486282 2030,6,CO2EMT,autumn.day,755.6731211369039 -2030,6,GASNAT,autumn.peak,-4.0510243965464285 -2030,6,ELCTRI,autumn.peak,2.7006829310309524 -2030,6,CO2EMT,autumn.peak,207.12887739541887 +2030,6,GASNAT,autumn.peak,-4.4338340625 +2030,6,ELCTRI,autumn.peak,2.955889375 +2030,6,CO2EMT,autumn.peak,226.70193561562496 2030,6,GASNAT,autumn.evening,-5.647772080957336 2030,6,ELCTRI,autumn.evening,3.7651813873048905 2030,6,CO2EMT,autumn.evening,288.77058649934855 @@ -914,12 +914,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,GASNAT,winter.night,-15.047565402438797 2030,15,ELCTRI,winter.night,10.031710268292532 2030,15,CO2EMT,winter.night,769.3820190266956 -2030,15,GASNAT,winter.day,-98.9993970642295 -2030,15,ELCTRI,winter.day,65.99959804281967 -2030,15,CO2EMT,winter.day,5061.839171894054 -2030,15,GASNAT,winter.peak,-30.943290382035794 -2030,15,ELCTRI,winter.peak,20.62886025469053 -2030,15,CO2EMT,winter.peak,1582.13043723349 +2030,15,GASNAT,winter.day,-103.14430160351442 +2030,15,ELCTRI,winter.day,68.76286773567628 +2030,15,CO2EMT,winter.day,5273.768140987692 +2030,15,GASNAT,winter.peak,-29.92686460077028 +2030,15,ELCTRI,winter.peak,19.951243067180187 +2030,15,CO2EMT,winter.peak,1530.1605870373842 2030,15,GASNAT,winter.evening,-41.257720839442825 2030,15,ELCTRI,winter.evening,27.505147226295215 2030,15,CO2EMT,winter.evening,2109.5072665207113 @@ -929,12 +929,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,GASNAT,peak.day,-100.0554239166924 2030,15,ELCTRI,peak.day,66.7036159444616 2030,15,CO2EMT,peak.day,5115.833824860482 -2030,15,GASNAT,peak.peak,-30.943290382035794 -2030,15,ELCTRI,peak.peak,20.62886025469053 -2030,15,CO2EMT,peak.peak,1582.13043723349 -2030,15,GASNAT,peak.evening,-41.25772083944281 -2030,15,ELCTRI,peak.evening,27.505147226295207 -2030,15,CO2EMT,peak.evening,2109.507266520711 +2030,15,GASNAT,peak.peak,-30.21727198719916 +2030,15,ELCTRI,peak.peak,20.144847991466108 +2030,15,CO2EMT,peak.peak,1545.009116705493 +2030,15,GASNAT,peak.evening,-41.257720839442825 +2030,15,ELCTRI,peak.evening,27.505147226295215 +2030,15,CO2EMT,peak.evening,2109.5072665207113 2030,15,GASNAT,summer.night,-0.0 2030,15,ELCTRI,summer.night,0.0 2030,15,CO2EMT,summer.night,0.0 @@ -953,9 +953,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,15,GASNAT,autumn.day,-100.60983801130455 2030,15,ELCTRI,autumn.day,67.0732253408697 2030,15,CO2EMT,autumn.day,5144.181017518001 -2030,15,GASNAT,autumn.peak,-30.943290382035794 -2030,15,ELCTRI,autumn.peak,20.62886025469053 -2030,15,CO2EMT,autumn.peak,1582.13043723349 +2030,15,GASNAT,autumn.peak,-30.560480716082225 +2030,15,ELCTRI,autumn.peak,20.373653810721482 +2030,15,CO2EMT,autumn.peak,1562.557379013284 2030,15,GASNAT,autumn.evening,-41.257720839442825 2030,15,ELCTRI,autumn.evening,27.505147226295215 2030,15,CO2EMT,autumn.evening,2109.5072665207113 @@ -1083,8 +1083,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,0,CO2EMT,autumn.night,0.0 2040,0,GASPRD,autumn.day,0.0 2040,0,CO2EMT,autumn.day,0.0 -2040,0,GASPRD,autumn.peak,17.42207611641811 -2040,0,CO2EMT,autumn.peak,89.0790751832458 +2040,0,GASPRD,autumn.peak,17.42207611641814 +2040,0,CO2EMT,autumn.peak,89.07907518324596 2040,0,GASPRD,autumn.evening,167.09166800339997 2040,0,CO2EMT,autumn.evening,854.3396985013842 2040,1,OILCRD,winter.night,0.0 @@ -1177,9 +1177,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,2,GASPRD,autumn.day,-0.0 2040,2,GASNAT,autumn.day,0.0 2040,2,CO2EMT,autumn.day,0.0 -2040,2,GASPRD,autumn.peak,-40.766234868444116 -2040,2,GASNAT,autumn.peak,38.824985588994394 -2040,2,CO2EMT,autumn.peak,99.25607565826418 +2040,2,GASPRD,autumn.peak,-40.766234868444144 +2040,2,GASNAT,autumn.peak,38.82498558899442 +2040,2,CO2EMT,autumn.peak,99.25607565826425 2040,2,GASPRD,autumn.evening,-165.796751326374 2040,2,GASNAT,autumn.evening,157.90166792987998 2040,2,CO2EMT,autumn.evening,403.6756140627382 @@ -1211,42 +1211,42 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,6,GASNAT,winter.evening,-5.911778797294229 2040,6,ELCTRI,winter.evening,3.9411858648628195 2040,6,CO2EMT,winter.evening,302.2692499056539 -2040,6,GASNAT,peak.night,-4.253945503174984 -2040,6,ELCTRI,peak.night,2.835963668783323 -2040,6,CO2EMT,peak.night,217.50423357733695 +2040,6,GASNAT,peak.night,-0.0 +2040,6,ELCTRI,peak.night,0.0 +2040,6,CO2EMT,peak.night,0.0 2040,6,GASNAT,peak.day,-9.16799800186029 2040,6,ELCTRI,peak.day,6.11199866790686 2040,6,CO2EMT,peak.day,468.7597378351166 2040,6,GASNAT,peak.peak,-2.9510442661156464 2040,6,ELCTRI,peak.peak,1.9673628440770976 2040,6,CO2EMT,peak.peak,150.88689332649298 -2040,6,GASNAT,peak.evening,-5.911778797294229 -2040,6,ELCTRI,peak.evening,3.9411858648628195 -2040,6,CO2EMT,peak.evening,302.2692499056539 +2040,6,GASNAT,peak.evening,-4.9027502386198485 +2040,6,ELCTRI,peak.evening,3.268500159079899 +2040,6,CO2EMT,peak.evening,250.67761970063282 2040,6,GASNAT,summer.night,-0.0 2040,6,ELCTRI,summer.night,0.0 2040,6,CO2EMT,summer.night,0.0 -2040,6,GASNAT,summer.day,-11.887267157698844 -2040,6,ELCTRI,summer.day,7.924844771799229 -2040,6,CO2EMT,summer.day,607.7959697731418 +2040,6,GASNAT,summer.day,-14.77944692229423 +2040,6,ELCTRI,summer.day,9.85296461486282 +2040,6,CO2EMT,summer.day,755.6731211369039 2040,6,GASNAT,summer.peak,-3.611061049723789 2040,6,ELCTRI,summer.peak,2.4073740331491926 2040,6,CO2EMT,summer.peak,184.63355147237732 2040,6,GASNAT,summer.evening,-5.911778797294229 2040,6,ELCTRI,summer.evening,3.9411858648628195 2040,6,CO2EMT,summer.evening,302.2692499056539 -2040,6,GASNAT,autumn.night,-0.0 -2040,6,ELCTRI,autumn.night,0.0 -2040,6,CO2EMT,autumn.night,0.0 +2040,6,GASNAT,autumn.night,-3.7259320801272513 +2040,6,ELCTRI,autumn.night,2.483954720084834 +2040,6,CO2EMT,autumn.night,190.50690725690635 2040,6,GASNAT,autumn.day,-14.77944692229423 2040,6,ELCTRI,autumn.day,9.85296461486282 2040,6,CO2EMT,autumn.day,755.6731211369039 2040,6,GASNAT,autumn.peak,-4.4338340625 2040,6,ELCTRI,autumn.peak,2.955889375 2040,6,CO2EMT,autumn.peak,226.70193561562496 -2040,6,GASNAT,autumn.evening,-4.638743522282962 -2040,6,ELCTRI,autumn.evening,3.0924956815219744 -2040,6,CO2EMT,autumn.evening,237.1789562943278 +2040,6,GASNAT,autumn.evening,-5.911778797294229 +2040,6,ELCTRI,autumn.evening,3.9411858648628195 +2040,6,CO2EMT,autumn.evening,302.2692499056539 2040,14,BIOPEL,winter.night,-31.135860656527402 2040,14,RSHEAT,winter.night,25.94655054710617 2040,14,BIOPEL,winter.day,-44.47980087689542 @@ -1291,42 +1291,42 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,15,GASNAT,winter.evening,-38.981460051730245 2040,15,ELCTRI,winter.evening,25.98764003448683 2040,15,CO2EMT,winter.evening,1993.1220524449673 -2040,15,GASNAT,peak.night,-0.0 -2040,15,ELCTRI,peak.night,0.0 -2040,15,CO2EMT,peak.night,0.0 +2040,15,GASNAT,peak.night,-4.253945503174984 +2040,15,ELCTRI,peak.night,2.835963668783323 +2040,15,CO2EMT,peak.night,217.50423357733695 2040,15,GASNAT,peak.day,-103.14430160351442 2040,15,ELCTRI,peak.day,68.76286773567628 2040,15,CO2EMT,peak.day,5273.768140987692 2040,15,GASNAT,peak.peak,-30.943290382035794 2040,15,ELCTRI,peak.peak,20.62886025469053 2040,15,CO2EMT,peak.peak,1582.13043723349 -2040,15,GASNAT,peak.evening,-40.24869228076844 -2040,15,ELCTRI,peak.evening,26.832461520512293 -2040,15,CO2EMT,peak.evening,2057.9156363156903 +2040,15,GASNAT,peak.evening,-41.257720839442825 +2040,15,ELCTRI,peak.evening,27.505147226295215 +2040,15,CO2EMT,peak.evening,2109.5072665207113 2040,15,GASNAT,summer.night,-6.0755918427801054 2040,15,ELCTRI,summer.night,4.050394561853404 2040,15,CO2EMT,summer.night,310.64501092134674 -2040,15,GASNAT,summer.day,-103.14430160351442 -2040,15,ELCTRI,summer.day,68.76286773567628 -2040,15,CO2EMT,summer.day,5273.768140987692 +2040,15,GASNAT,summer.day,-100.25212183891902 +2040,15,ELCTRI,summer.day,66.83474789261268 +2040,15,CO2EMT,summer.day,5125.890989623929 2040,15,GASNAT,summer.peak,-30.943290382035794 2040,15,ELCTRI,summer.peak,20.62886025469053 2040,15,CO2EMT,summer.peak,1582.13043723349 2040,15,GASNAT,summer.evening,-41.251917801285444 2040,15,ELCTRI,summer.evening,27.5012785341903 2040,15,CO2EMT,summer.evening,2109.2105571797247 -2040,15,GASNAT,autumn.night,-3.7259320801272513 -2040,15,ELCTRI,autumn.night,2.483954720084834 -2040,15,CO2EMT,autumn.night,190.50690725690635 +2040,15,GASNAT,autumn.night,-0.0 +2040,15,ELCTRI,autumn.night,0.0 +2040,15,CO2EMT,autumn.night,0.0 2040,15,GASNAT,autumn.day,-98.0872667776926 2040,15,ELCTRI,autumn.day,65.39151118512841 2040,15,CO2EMT,autumn.day,5015.201950343423 2040,15,GASNAT,autumn.peak,-29.8037093145345 2040,15,ELCTRI,autumn.peak,19.869139543023 2040,15,CO2EMT,autumn.peak,1523.8636572521489 -2040,15,GASNAT,autumn.evening,-41.257720839442825 -2040,15,ELCTRI,autumn.evening,27.505147226295215 -2040,15,CO2EMT,autumn.evening,2109.5072665207113 +2040,15,GASNAT,autumn.evening,-39.98468556443156 +2040,15,ELCTRI,autumn.evening,26.656457042954372 +2040,15,CO2EMT,autumn.evening,2044.4169729093853 2040,16,OILCRD,winter.night,-44.9532572198336 2040,16,GASOLI,winter.night,34.315463526590534 2040,16,CO2EMT,winter.night,754.9401975849918 diff --git a/tests/data/two_regions/assets.csv b/tests/data/two_regions/assets.csv index 53877674a..bbf314e6e 100644 --- a/tests/data/two_regions/assets.csv +++ b/tests/data/two_regions/assets.csv @@ -14,30 +14,29 @@ asset_id,process_id,region_id,agent_id,group_id,commission_year,decommission_yea 12,windturbine,R1,A1_PWR,,2030,,11.951976096047806 13,gasCCGT,R2,A1_PWR,,2030,,0.5025589948820103 14,windturbine,R2,A1_PWR,,2030,,0.6926386147227713 -15,gassupply1,R2,A1_GAS,,2030,,5.464509710980579 +15,gassupply1,R2,A1_GAS,,2030,,2.425210605578789 16,heatpump,R1,A1_RES,,2035,,6.119987760024477 17,gasboiler,R2,A1_RES,,2035,,4.4359531280937405 18,windturbine,R1,A1_PWR,,2035,,12.95997408005184 19,windturbine,R2,A1_PWR,,2035,,0.5025589948820103 20,gasCCGT,R2,A1_PWR,,2035,,0.532030935938128 -21,gassupply1,R2,A1_GAS,,2035,,3.0512018335963322 +21,gassupply1,R2,A1_GAS,,2035,,10.365247128705743 22,heatpump,R1,A1_RES,,2040,,5.939988120023761 23,heatpump,R2,A1_RES,,2040,,4.193991612016776 24,gasboiler,R2,A1_RES,,2040,,1.7459965080069861 25,windturbine,R1,A1_PWR,,2040,,7.696784606430788 26,gasCCGT,R2,A1_PWR,,2040,,1.167885664228672 27,windturbine,R2,A1_PWR,,2040,,0.6703186593626813 -28,gassupply1,R2,A1_GAS,,2040,,7.857190205619588 +28,gassupply1,R2,A1_GAS,,2040,,3.839745936508127 29,heatpump,R1,A1_RES,,2045,,5.939988120023761 30,gasboiler,R2,A1_RES,,2045,,5.939988120023761 31,windturbine,R1,A1_PWR,,2045,,8.683182633634738 32,windturbine,R2,A1_PWR,,2045,,0.6703186593626813 33,gasCCGT,R2,A1_PWR,,2045,,1.0852778294443406 -34,gassupply1,R2,A1_GAS,,2045,,4.110991474017053 +34,gassupply1,R2,A1_GAS,,2045,,9.207676432647135 35,heatpump,R1,A1_RES,,2050,,6.119987760024477 36,heatpump,R2,A1_RES,,2050,,5.3999892000216 37,gasboiler,R2,A1_RES,,2050,,0.7199985600028752 38,windturbine,R1,A1_PWR,,2050,,4.355991288017403 39,windturbine,R2,A1_PWR,,2050,,1.772636454727091 40,gasCCGT,R2,A1_PWR,,2050,,0.2818554362891272 -41,gassupply1,R2,A1_GAS,,2050,,4.793545788908421 diff --git a/tests/data/two_regions/commodity_flows.csv b/tests/data/two_regions/commodity_flows.csv index 25c7eaf21..c32aee2a4 100644 --- a/tests/data/two_regions/commodity_flows.csv +++ b/tests/data/two_regions/commodity_flows.csv @@ -51,8 +51,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,0,gas,all-year.morning,0.0 2025,0,gas,all-year.afternoon,0.7818272000000002 2025,0,gas,all-year.early-peak,1.33266 -2025,0,gas,all-year.late-peak,2.8810991999999995 -2025,0,gas,all-year.evening,0.0 +2025,0,gas,all-year.late-peak,1.3885199999999995 +2025,0,gas,all-year.evening,1.4925792000000002 2025,1,gas,all-year.night,-0.0 2025,1,heat,all-year.night,0.0 2025,1,CO2f,all-year.night,0.0 @@ -71,12 +71,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,1,gas,all-year.evening,-0.0 2025,1,heat,all-year.evening,0.0 2025,1,CO2f,all-year.evening,0.0 -2025,2,gas,all-year.night,0.37669856000000024 -2025,2,gas,all-year.morning,1.5289679999999999 -2025,2,gas,all-year.afternoon,0.37669856000000024 +2025,2,gas,all-year.night,0.88844 +2025,2,gas,all-year.morning,1.0172265600000003 +2025,2,gas,all-year.afternoon,0.88844 2025,2,gas,all-year.early-peak,1.528968 -2025,2,gas,all-year.late-peak,3.8431680000000004 -2025,2,gas,all-year.evening,2.095671424 +2025,2,gas,all-year.late-peak,3.638471424 +2025,2,gas,all-year.evening,1.7886265600000004 2025,3,gas,all-year.night,-0.0 2025,3,heat,all-year.night,0.0 2025,3,CO2f,all-year.night,0.0 @@ -127,10 +127,10 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,6,electricity,all-year.afternoon,0.0638399999999999 2025,6,wind,all-year.early-peak,-0.0 2025,6,electricity,all-year.early-peak,0.0 -2025,6,wind,all-year.late-peak,-0.22344000000000008 -2025,6,electricity,all-year.late-peak,0.22344000000000008 -2025,6,wind,all-year.evening,-1.064 -2025,6,electricity,all-year.evening,1.064 +2025,6,wind,all-year.late-peak,-1.1172000000000002 +2025,6,electricity,all-year.late-peak,1.1172000000000002 +2025,6,wind,all-year.evening,-0.17023999999999995 +2025,6,electricity,all-year.evening,0.17023999999999995 2025,7,gas,all-year.night,0.0 2025,7,electricity,all-year.night,-0.0 2025,7,CO2f,all-year.night,-0.0 @@ -143,48 +143,48 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2025,7,gas,all-year.early-peak,-1.33266 2025,7,electricity,all-year.early-peak,0.798 2025,7,CO2f,all-year.early-peak,73.15266000000001 -2025,7,gas,all-year.late-peak,-1.4925792000000002 -2025,7,electricity,all-year.late-peak,0.8937600000000001 -2025,7,CO2f,all-year.late-peak,81.93097920000001 -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.37669856000000024 -2025,8,electricity,all-year.night,0.22556800000000016 -2025,8,CO2f,all-year.night,20.677818560000016 -2025,8,gas,all-year.morning,-1.066128 -2025,8,electricity,all-year.morning,0.6384 -2025,8,CO2f,all-year.morning,58.522127999999995 -2025,8,gas,all-year.afternoon,-0.37669856000000024 -2025,8,electricity,all-year.afternoon,0.22556800000000016 -2025,8,CO2f,all-year.afternoon,20.677818560000016 +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.4925792000000002 +2025,7,electricity,all-year.evening,0.8937600000000001 +2025,7,CO2f,all-year.evening,81.93097920000001 +2025,8,gas,all-year.night,-0.88844 +2025,8,electricity,all-year.night,0.532 +2025,8,CO2f,all-year.night,48.768440000000005 +2025,8,gas,all-year.morning,-0.5543865600000003 +2025,8,electricity,all-year.morning,0.3319680000000002 +2025,8,CO2f,all-year.morning,30.43150656000002 +2025,8,gas,all-year.afternoon,-0.88844 +2025,8,electricity,all-year.afternoon,0.532 +2025,8,CO2f,all-year.afternoon,48.768440000000005 2025,8,gas,all-year.early-peak,-1.0661280000000002 2025,8,electricity,all-year.early-peak,0.6384000000000001 2025,8,CO2f,all-year.early-peak,58.52212800000001 -2025,8,gas,all-year.late-peak,-1.0661280000000002 -2025,8,electricity,all-year.late-peak,0.6384000000000001 -2025,8,CO2f,all-year.late-peak,58.52212800000001 -2025,8,gas,all-year.evening,-0.8614314240000001 -2025,8,electricity,all-year.evening,0.5158272 -2025,8,CO2f,all-year.evening,47.28587942400001 -2025,9,wind,all-year.night,-0.30643199999999987 -2025,9,electricity,all-year.night,0.30643199999999987 -2025,9,wind,all-year.morning,0.0 -2025,9,electricity,all-year.morning,-0.0 -2025,9,wind,all-year.afternoon,-0.30643199999999987 -2025,9,electricity,all-year.afternoon,0.30643199999999987 +2025,8,gas,all-year.late-peak,-0.8614314240000001 +2025,8,electricity,all-year.late-peak,0.5158272 +2025,8,CO2f,all-year.late-peak,47.28587942400001 +2025,8,gas,all-year.evening,-0.5543865600000003 +2025,8,electricity,all-year.evening,0.3319680000000002 +2025,8,CO2f,all-year.evening,30.43150656000002 +2025,9,wind,all-year.night,-0.0 +2025,9,electricity,all-year.night,0.0 +2025,9,wind,all-year.morning,-0.30643199999999987 +2025,9,electricity,all-year.morning,0.30643199999999987 +2025,9,wind,all-year.afternoon,-0.0 +2025,9,electricity,all-year.afternoon,0.0 2025,9,wind,all-year.early-peak,-0.0 2025,9,electricity,all-year.early-peak,0.0 -2025,9,wind,all-year.late-peak,-0.0 -2025,9,electricity,all-year.late-peak,0.0 -2025,9,wind,all-year.evening,-0.12257280000000004 -2025,9,electricity,all-year.evening,0.12257280000000004 -2030,2,gas,all-year.night,0.0 -2030,2,gas,all-year.morning,0.24287232000000014 -2030,2,gas,all-year.afternoon,1.1088800000000003 -2030,2,gas,all-year.early-peak,1.6653672 -2030,2,gas,all-year.late-peak,3.433157984 -2030,2,gas,all-year.evening,1.7174137599999995 +2025,9,wind,all-year.late-peak,-0.12257280000000004 +2025,9,electricity,all-year.late-peak,0.12257280000000004 +2025,9,wind,all-year.evening,-0.30643199999999987 +2025,9,electricity,all-year.evening,0.30643199999999987 +2030,2,gas,all-year.night,0.8700850495999999 +2030,2,gas,all-year.morning,0.9422079840000003 +2030,2,gas,all-year.afternoon,0.7046774240000002 +2030,2,gas,all-year.early-peak,1.261164624 +2030,2,gas,all-year.late-peak,4.000008 +2030,2,gas,all-year.evening,1.8498680319999998 2030,3,gas,all-year.night,-0.0 2030,3,heat,all-year.night,0.0 2030,3,CO2f,all-year.night,0.0 @@ -227,16 +227,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,5,heat,all-year.late-peak,1.596 2030,5,electricity,all-year.evening,-0.6384000000000001 2030,5,heat,all-year.evening,1.596 -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.0 -2030,6,electricity,all-year.afternoon,0.0 -2030,6,wind,all-year.early-peak,-0.9960000000000002 -2030,6,electricity,all-year.early-peak,0.9960000000000002 -2030,6,wind,all-year.late-peak,-0.8632000000000011 -2030,6,electricity,all-year.late-peak,0.8632000000000011 +2030,6,wind,all-year.night,-0.6640000000000001 +2030,6,electricity,all-year.night,0.6640000000000001 +2030,6,wind,all-year.morning,-0.5312000000000008 +2030,6,electricity,all-year.morning,0.5312000000000008 +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.0 +2030,6,electricity,all-year.late-peak,0.0 2030,6,wind,all-year.evening,-0.0 2030,6,electricity,all-year.evening,0.0 2030,7,gas,all-year.night,-0.0 @@ -257,36 +257,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,7,gas,all-year.evening,-0.0 2030,7,electricity,all-year.evening,0.0 2030,7,CO2f,all-year.evening,0.0 -2030,8,gas,all-year.night,-0.9107534400000002 -2030,8,electricity,all-year.night,0.5453613413173655 -2030,8,CO2f,all-year.night,49.99327415856289 -2030,8,gas,all-year.morning,-0.5543865600000003 -2030,8,electricity,all-year.morning,0.3319680000000002 -2030,8,CO2f,all-year.morning,30.43150656000002 +2030,8,gas,all-year.night,-1.0317660800000001 +2030,8,electricity,all-year.night,0.6178240000000002 +2030,8,CO2f,all-year.night,56.63592608000001 +2030,8,gas,all-year.morning,-0.7471713600000003 +2030,8,electricity,all-year.morning,0.4474080000000002 +2030,8,CO2f,all-year.morning,41.01389136000002 2030,8,gas,all-year.afternoon,-1.066128 2030,8,electricity,all-year.afternoon,0.6384 2030,8,CO2f,all-year.afternoon,58.522127999999995 2030,8,gas,all-year.early-peak,-1.066128 2030,8,electricity,all-year.early-peak,0.6384 2030,8,CO2f,all-year.early-peak,58.522127999999995 -2030,8,gas,all-year.late-peak,-0.9961514240000001 -2030,8,electricity,all-year.late-peak,0.5964978586826348 -2030,8,CO2f,all-year.late-peak,54.680958705437135 -2030,8,gas,all-year.evening,-1.066128 -2030,8,electricity,all-year.evening,0.6384 -2030,8,CO2f,all-year.evening,58.522127999999995 -2030,9,wind,all-year.night,-0.07246265868263461 -2030,9,electricity,all-year.night,0.07246265868263461 +2030,8,gas,all-year.late-peak,-0.9165713760000004 +2030,8,electricity,all-year.late-peak,0.5488451353293415 +2030,8,CO2f,all-year.late-peak,50.31263355564074 +2030,8,gas,all-year.evening,-0.8319106079999999 +2030,8,electricity,all-year.evening,0.4981500646706587 +2030,8,CO2f,all-year.evening,45.665416428359286 +2030,9,wind,all-year.night,-0.0 +2030,9,electricity,all-year.night,0.0 2030,9,wind,all-year.morning,-0.30643199999999987 2030,9,electricity,all-year.morning,0.30643199999999987 2030,9,wind,all-year.afternoon,-0.0 2030,9,electricity,all-year.afternoon,0.0 -2030,9,wind,all-year.early-peak,-0.0 -2030,9,electricity,all-year.early-peak,0.0 -2030,9,wind,all-year.late-peak,-0.24110214131736524 -2030,9,electricity,all-year.late-peak,0.24110214131736524 -2030,9,wind,all-year.evening,-0.11544000000000003 -2030,9,electricity,all-year.evening,0.11544000000000003 +2030,9,wind,all-year.early-peak,-0.11544000000000014 +2030,9,electricity,all-year.early-peak,0.11544000000000014 +2030,9,wind,all-year.late-peak,-0.08955486467065843 +2030,9,electricity,all-year.late-peak,0.08955486467065843 +2030,9,wind,all-year.evening,-0.22400993532934133 +2030,9,electricity,all-year.evening,0.22400993532934133 2030,10,electricity,all-year.night,-0.6640000000000001 2030,10,heat,all-year.night,1.6600000000000001 2030,10,electricity,all-year.morning,-0.8748 @@ -311,16 +311,16 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,11,heat,all-year.late-peak,0.49800000000000005 2030,11,electricity,all-year.evening,-0.19920000000000004 2030,11,heat,all-year.evening,0.49800000000000005 -2030,12,wind,all-year.night,-0.6640000000000001 -2030,12,electricity,all-year.night,0.6640000000000001 -2030,12,wind,all-year.morning,-0.9960000000000002 -2030,12,electricity,all-year.morning,0.9960000000000002 -2030,12,wind,all-year.afternoon,-0.6640000000000001 -2030,12,electricity,all-year.afternoon,0.6640000000000001 -2030,12,wind,all-year.early-peak,-0.0 -2030,12,electricity,all-year.early-peak,0.0 -2030,12,wind,all-year.late-peak,-1.1287999999999991 -2030,12,electricity,all-year.late-peak,1.1287999999999991 +2030,12,wind,all-year.night,-0.0 +2030,12,electricity,all-year.night,0.0 +2030,12,wind,all-year.morning,-0.46479999999999944 +2030,12,electricity,all-year.morning,0.46479999999999944 +2030,12,wind,all-year.afternoon,-0.0 +2030,12,electricity,all-year.afternoon,0.0 +2030,12,wind,all-year.early-peak,-0.9960000000000002 +2030,12,electricity,all-year.early-peak,0.9960000000000002 +2030,12,wind,all-year.late-peak,-1.9920000000000002 +2030,12,electricity,all-year.late-peak,1.9920000000000002 2030,12,wind,all-year.evening,-1.3280000000000003 2030,12,electricity,all-year.evening,1.3280000000000003 2030,13,gas,all-year.night,-0.0 @@ -335,36 +335,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2030,13,gas,all-year.early-peak,-0.1398792 2030,13,electricity,all-year.early-peak,0.08376000000000001 2030,13,CO2f,all-year.early-peak,7.678279200000001 -2030,13,gas,all-year.late-peak,-0.0 -2030,13,electricity,all-year.late-peak,0.0 -2030,13,CO2f,all-year.late-peak,0.0 -2030,13,gas,all-year.evening,-0.1398792 -2030,13,electricity,all-year.evening,0.08376000000000001 -2030,13,CO2f,all-year.evening,7.678279200000001 +2030,13,gas,all-year.late-peak,-0.1398792 +2030,13,electricity,all-year.late-peak,0.08376000000000001 +2030,13,CO2f,all-year.late-peak,7.678279200000001 +2030,13,gas,all-year.evening,-0.0 +2030,13,electricity,all-year.evening,0.0 +2030,13,CO2f,all-year.evening,0.0 2030,14,wind,all-year.night,-0.046176000000000064 2030,14,electricity,all-year.night,0.046176000000000064 -2030,14,wind,all-year.morning,-0.11544000000000014 -2030,14,electricity,all-year.morning,0.11544000000000014 +2030,14,wind,all-year.morning,-0.0 +2030,14,electricity,all-year.morning,0.0 2030,14,wind,all-year.afternoon,-0.0 2030,14,electricity,all-year.afternoon,0.0 -2030,14,wind,all-year.early-peak,-0.11544000000000014 -2030,14,electricity,all-year.early-peak,0.11544000000000014 -2030,14,wind,all-year.late-peak,-0.0 -2030,14,electricity,all-year.late-peak,0.0 -2030,14,wind,all-year.evening,-0.0 -2030,14,electricity,all-year.evening,0.0 -2030,15,gas,all-year.night,0.9107534400000002 -2030,15,gas,all-year.morning,0.9107534400000002 -2030,15,gas,all-year.afternoon,0.0 -2030,15,gas,all-year.early-peak,0.0 -2030,15,gas,all-year.late-peak,0.9107534400000002 -2030,15,gas,all-year.evening,0.9107534400000002 -2035,2,gas,all-year.night,0.0 -2035,2,gas,all-year.morning,0.7374042880000004 -2035,2,gas,all-year.afternoon,0.42524655999999994 -2035,2,gas,all-year.early-peak,0.18605846400000003 -2035,2,gas,all-year.late-peak,3.666058463999999 -2035,2,gas,all-year.evening,3.56504944 +2030,14,wind,all-year.early-peak,-0.0 +2030,14,electricity,all-year.early-peak,0.0 +2030,14,wind,all-year.late-peak,-0.11544000000000014 +2030,14,electricity,all-year.late-peak,0.11544000000000014 +2030,14,wind,all-year.evening,-0.11544000000000014 +2030,14,electricity,all-year.evening,0.11544000000000014 +2030,15,gas,all-year.night,0.16168103040000026 +2030,15,gas,all-year.morning,0.4042025760000001 +2030,15,gas,all-year.afternoon,0.4042025760000001 +2030,15,gas,all-year.early-peak,0.4042025760000001 +2030,15,gas,all-year.late-peak,0.4042025760000001 +2030,15,gas,all-year.evening,0.4042025760000001 +2035,2,gas,all-year.night,0.6834403680000004 +2035,2,gas,all-year.morning,2.40504944 +2035,2,gas,all-year.afternoon,1.336 +2035,2,gas,all-year.early-peak,2.40504944 +2035,2,gas,all-year.late-peak,4.000008 +2035,2,gas,all-year.evening,1.0378019167999997 2035,3,gas,all-year.night,-0.0 2035,3,heat,all-year.night,0.0 2035,3,CO2f,all-year.night,0.0 @@ -409,12 +409,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,5,heat,all-year.evening,1.596 2035,6,wind,all-year.night,-0.0 2035,6,electricity,all-year.night,0.0 -2035,6,wind,all-year.morning,-0.0 -2035,6,electricity,all-year.morning,0.0 -2035,6,wind,all-year.afternoon,-0.0 -2035,6,electricity,all-year.afternoon,0.0 -2035,6,wind,all-year.early-peak,-1.1172 -2035,6,electricity,all-year.early-peak,1.1172 +2035,6,wind,all-year.morning,-1.1172 +2035,6,electricity,all-year.morning,1.1172 +2035,6,wind,all-year.afternoon,-0.8 +2035,6,electricity,all-year.afternoon,0.8 +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.40800000000000036 2035,6,electricity,all-year.late-peak,0.40800000000000036 2035,6,wind,all-year.evening,-0.0 @@ -440,33 +440,33 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,8,gas,all-year.night,-1.066128 2035,8,electricity,all-year.night,0.6384 2035,8,CO2f,all-year.night,58.522127999999995 -2035,8,gas,all-year.morning,-0.8177709440000005 -2035,8,electricity,all-year.morning,0.4896832000000003 -2035,8,CO2f,all-year.morning,44.88925894400003 +2035,8,gas,all-year.morning,-1.066128 +2035,8,electricity,all-year.morning,0.6384 +2035,8,CO2f,all-year.morning,58.522127999999995 2035,8,gas,all-year.afternoon,-1.066128 2035,8,electricity,all-year.afternoon,0.6384 2035,8,CO2f,all-year.afternoon,58.522127999999995 -2035,8,gas,all-year.early-peak,-0.2664251200000002 -2035,8,electricity,all-year.early-peak,0.15953600000000012 -2035,8,CO2f,all-year.early-peak,14.624665120000012 -2035,8,gas,all-year.late-peak,-0.55438656 -2035,8,electricity,all-year.late-peak,0.331968 -2035,8,CO2f,all-year.late-peak,30.43150656 -2035,8,gas,all-year.evening,-1.066128 -2035,8,electricity,all-year.evening,0.6384 -2035,8,CO2f,all-year.evening,58.522127999999995 -2035,9,wind,all-year.night,-0.0 -2035,9,electricity,all-year.night,0.0 -2035,9,wind,all-year.morning,-0.12257280000000004 -2035,9,electricity,all-year.morning,0.12257280000000004 +2035,8,gas,all-year.early-peak,-1.066128 +2035,8,electricity,all-year.early-peak,0.6384 +2035,8,CO2f,all-year.early-peak,58.522127999999995 +2035,8,gas,all-year.late-peak,-0.2664251200000003 +2035,8,electricity,all-year.late-peak,0.15953600000000018 +2035,8,CO2f,all-year.late-peak,14.624665120000017 +2035,8,gas,all-year.evening,-0.40630432000000016 +2035,8,electricity,all-year.evening,0.24329600000000012 +2035,8,CO2f,all-year.evening,22.302944320000012 +2035,9,wind,all-year.night,-0.12257280000000004 +2035,9,electricity,all-year.night,0.12257280000000004 +2035,9,wind,all-year.morning,-0.0 +2035,9,electricity,all-year.morning,0.0 2035,9,wind,all-year.afternoon,-0.0 2035,9,electricity,all-year.afternoon,0.0 -2035,9,wind,all-year.early-peak,-0.30643199999999987 -2035,9,electricity,all-year.early-peak,0.30643199999999987 +2035,9,wind,all-year.early-peak,-0.0 +2035,9,electricity,all-year.early-peak,0.0 2035,9,wind,all-year.late-peak,-0.30643199999999987 2035,9,electricity,all-year.late-peak,0.30643199999999987 -2035,9,wind,all-year.evening,-0.0 -2035,9,electricity,all-year.evening,0.0 +2035,9,wind,all-year.evening,-0.30643199999999987 +2035,9,electricity,all-year.evening,0.30643199999999987 2035,10,electricity,all-year.night,-0.3920000000000002 2035,10,heat,all-year.night,0.9800000000000004 2035,10,electricity,all-year.morning,-0.7920000000000003 @@ -491,8 +491,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,11,heat,all-year.late-peak,0.49800000000000005 2035,11,electricity,all-year.evening,-0.19920000000000004 2035,11,heat,all-year.evening,0.49800000000000005 -2035,12,wind,all-year.night,-0.8 -2035,12,electricity,all-year.night,0.8 +2035,12,wind,all-year.night,-0.0 +2035,12,electricity,all-year.night,0.0 2035,12,wind,all-year.morning,-0.0 2035,12,electricity,all-year.morning,0.0 2035,12,wind,all-year.afternoon,-0.0 @@ -501,11 +501,11 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,12,electricity,all-year.early-peak,0.0 2035,12,wind,all-year.late-peak,-1.9919999999999998 2035,12,electricity,all-year.late-peak,1.9919999999999998 -2035,12,wind,all-year.evening,-1.6 -2035,12,electricity,all-year.evening,1.6 -2035,13,gas,all-year.night,-0.1398792 -2035,13,electricity,all-year.night,0.08376000000000001 -2035,13,CO2f,all-year.night,7.678279200000001 +2035,12,wind,all-year.evening,-0.0 +2035,12,electricity,all-year.evening,0.0 +2035,13,gas,all-year.night,-0.0 +2035,13,electricity,all-year.night,0.0 +2035,13,CO2f,all-year.night,0.0 2035,13,gas,all-year.morning,-0.1398792 2035,13,electricity,all-year.morning,0.08376000000000001 2035,13,CO2f,all-year.morning,7.678279200000001 @@ -515,29 +515,29 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,13,gas,all-year.early-peak,-0.1398792 2035,13,electricity,all-year.early-peak,0.08376000000000001 2035,13,CO2f,all-year.early-peak,7.678279200000001 -2035,13,gas,all-year.late-peak,-0.0 -2035,13,electricity,all-year.late-peak,0.0 -2035,13,CO2f,all-year.late-peak,0.0 -2035,13,gas,all-year.evening,-0.1398792 -2035,13,electricity,all-year.evening,0.08376000000000001 -2035,13,CO2f,all-year.evening,7.678279200000001 -2035,14,wind,all-year.night,-0.0 -2035,14,electricity,all-year.night,0.0 -2035,14,wind,all-year.morning,-0.019407999999999884 -2035,14,electricity,all-year.morning,0.019407999999999884 +2035,13,gas,all-year.late-peak,-0.1398792 +2035,13,electricity,all-year.late-peak,0.08376000000000001 +2035,13,CO2f,all-year.late-peak,7.678279200000001 +2035,13,gas,all-year.evening,-0.0 +2035,13,electricity,all-year.evening,0.0 +2035,13,CO2f,all-year.evening,0.0 +2035,14,wind,all-year.night,-0.01940799999999991 +2035,14,electricity,all-year.night,0.01940799999999991 +2035,14,wind,all-year.morning,-0.0 +2035,14,electricity,all-year.morning,0.0 2035,14,wind,all-year.afternoon,-0.0 2035,14,electricity,all-year.afternoon,0.0 -2035,14,wind,all-year.early-peak,-0.11544000000000014 -2035,14,electricity,all-year.early-peak,0.11544000000000014 +2035,14,wind,all-year.early-peak,-0.026768000000000153 +2035,14,electricity,all-year.early-peak,0.026768000000000153 2035,14,wind,all-year.late-peak,-0.11544000000000014 2035,14,electricity,all-year.late-peak,0.11544000000000014 -2035,14,wind,all-year.evening,-0.026768000000000153 -2035,14,electricity,all-year.evening,0.026768000000000153 -2035,15,gas,all-year.night,0.827465344 -2035,15,gas,all-year.morning,0.9107534400000002 -2035,15,gas,all-year.afternoon,0.9107534400000002 -2035,15,gas,all-year.early-peak,0.9107534400000002 -2035,15,gas,all-year.late-peak,0.9107534400000002 +2035,14,wind,all-year.evening,-0.11544000000000014 +2035,14,electricity,all-year.evening,0.11544000000000014 +2035,15,gas,all-year.night,0.4042025760000001 +2035,15,gas,all-year.morning,0.0 +2035,15,gas,all-year.afternoon,0.0 +2035,15,gas,all-year.early-peak,0.0 +2035,15,gas,all-year.late-peak,0.4042025760000001 2035,15,gas,all-year.evening,0.0 2035,16,electricity,all-year.night,-0.40799999999999986 2035,16,heat,all-year.night,1.0199999999999996 @@ -569,33 +569,33 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,17,gas,all-year.evening,-0.8576193199999994 2035,17,heat,all-year.evening,0.7393269999999995 2035,17,CO2f,all-year.evening,47.841850169999965 -2035,18,wind,all-year.night,-0.0 -2035,18,electricity,all-year.night,0.0 -2035,18,wind,all-year.morning,-1.2000000000000002 -2035,18,electricity,all-year.morning,1.2000000000000002 -2035,18,wind,all-year.afternoon,-0.8 -2035,18,electricity,all-year.afternoon,0.8 -2035,18,wind,all-year.early-peak,-0.0828000000000002 -2035,18,electricity,all-year.early-peak,0.0828000000000002 +2035,18,wind,all-year.night,-0.8 +2035,18,electricity,all-year.night,0.8 +2035,18,wind,all-year.morning,-0.0828000000000002 +2035,18,electricity,all-year.morning,0.0828000000000002 +2035,18,wind,all-year.afternoon,-0.0 +2035,18,electricity,all-year.afternoon,0.0 +2035,18,wind,all-year.early-peak,-1.2000000000000002 +2035,18,electricity,all-year.early-peak,1.2000000000000002 2035,18,wind,all-year.late-peak,-0.0 2035,18,electricity,all-year.late-peak,0.0 -2035,18,wind,all-year.evening,-0.0 -2035,18,electricity,all-year.evening,0.0 -2035,19,wind,all-year.night,-0.0 -2035,19,electricity,all-year.night,0.0 -2035,19,wind,all-year.morning,-0.033504000000000006 -2035,19,electricity,all-year.morning,0.033504000000000006 +2035,18,wind,all-year.evening,-1.6 +2035,18,electricity,all-year.evening,1.6 +2035,19,wind,all-year.night,-0.006735999999999853 +2035,19,electricity,all-year.night,0.006735999999999853 +2035,19,wind,all-year.morning,-0.026768000000000153 +2035,19,electricity,all-year.morning,0.026768000000000153 2035,19,wind,all-year.afternoon,-0.0 2035,19,electricity,all-year.afternoon,0.0 -2035,19,wind,all-year.early-peak,-0.08376000000000001 -2035,19,electricity,all-year.early-peak,0.08376000000000001 +2035,19,wind,all-year.early-peak,-0.0 +2035,19,electricity,all-year.early-peak,0.0 2035,19,wind,all-year.late-peak,-0.08376000000000001 2035,19,electricity,all-year.late-peak,0.08376000000000001 -2035,19,wind,all-year.evening,-0.0 -2035,19,electricity,all-year.evening,0.0 -2035,20,gas,all-year.night,-0.12999280000000002 -2035,20,electricity,all-year.night,0.07784000000000002 -2035,20,CO2f,all-year.night,7.135592800000002 +2035,19,wind,all-year.evening,-0.08376000000000001 +2035,19,electricity,all-year.evening,0.08376000000000001 +2035,20,gas,all-year.night,-0.02151494400000053 +2035,20,electricity,all-year.night,0.012883200000000317 +2035,20,CO2f,all-year.night,1.1810029440000291 2035,20,gas,all-year.morning,-0.14808223999999998 2035,20,electricity,all-year.morning,0.08867199999999999 2035,20,CO2f,all-year.morning,8.128562239999999 @@ -605,24 +605,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2035,20,gas,all-year.early-peak,-0.14808223999999998 2035,20,electricity,all-year.early-peak,0.08867199999999999 2035,20,CO2f,all-year.early-peak,8.128562239999999 -2035,20,gas,all-year.late-peak,-0.0 -2035,20,electricity,all-year.late-peak,0.0 -2035,20,CO2f,all-year.late-peak,0.0 +2035,20,gas,all-year.late-peak,-0.14808223999999998 +2035,20,electricity,all-year.late-peak,0.08867199999999999 +2035,20,CO2f,all-year.late-peak,8.128562239999999 2035,20,gas,all-year.evening,-0.14808223999999998 2035,20,electricity,all-year.evening,0.08867199999999999 2035,20,CO2f,all-year.evening,8.128562239999999 -2035,21,gas,all-year.night,0.5085346559999999 -2035,21,gas,all-year.morning,0.5085346559999999 +2035,21,gas,all-year.night,0.0 +2035,21,gas,all-year.morning,0.0 2035,21,gas,all-year.afternoon,0.0 -2035,21,gas,all-year.early-peak,0.5085346559999999 -2035,21,gas,all-year.late-peak,0.5085346559999999 -2035,21,gas,all-year.evening,0.0 -2040,2,gas,all-year.night,0.09790556800000028 -2040,2,gas,all-year.morning,1.1839372799999999 -2040,2,gas,all-year.afternoon,1.5564400000000003 -2040,2,gas,all-year.early-peak,0.22977806399999956 -2040,2,gas,all-year.late-peak,2.9744437439999993 -2040,2,gas,all-year.evening,3.8448716000000003 +2035,21,gas,all-year.early-peak,0.0 +2035,21,gas,all-year.late-peak,0.6811359839999991 +2035,21,gas,all-year.evening,1.7275446432000001 +2040,2,gas,all-year.night,0.0 +2040,2,gas,all-year.morning,0.6183879567999997 +2040,2,gas,all-year.afternoon,0.0 +2040,2,gas,all-year.early-peak,0.1259680207999998 +2040,2,gas,all-year.late-peak,4.000008 +2040,2,gas,all-year.evening,3.6401750240000004 2040,3,gas,all-year.night,-0.0 2040,3,heat,all-year.night,0.0 2040,3,CO2f,all-year.night,0.0 @@ -665,48 +665,48 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,5,heat,all-year.late-peak,1.596 2040,5,electricity,all-year.evening,-0.6384000000000001 2040,5,heat,all-year.evening,1.596 -2040,6,wind,all-year.night,-0.9320000000000002 -2040,6,electricity,all-year.night,0.9320000000000002 +2040,6,wind,all-year.night,-0.0 +2040,6,electricity,all-year.night,0.0 2040,6,wind,all-year.morning,-0.0 2040,6,electricity,all-year.morning,0.0 2040,6,wind,all-year.afternoon,-0.0 2040,6,electricity,all-year.afternoon,0.0 2040,6,wind,all-year.early-peak,-0.0 2040,6,electricity,all-year.early-peak,0.0 -2040,6,wind,all-year.late-peak,-1.1172 -2040,6,electricity,all-year.late-peak,1.1172 -2040,6,wind,all-year.evening,-0.63208 -2040,6,electricity,all-year.evening,0.63208 -2040,8,gas,all-year.night,-0.9041700640000003 -2040,8,electricity,all-year.night,0.5414192000000002 -2040,8,CO2f,all-year.night,49.63189806400002 -2040,8,gas,all-year.morning,-1.066128 -2040,8,electricity,all-year.morning,0.6384 -2040,8,CO2f,all-year.morning,58.522127999999995 +2040,6,wind,all-year.late-peak,-0.0 +2040,6,electricity,all-year.late-peak,0.0 +2040,6,wind,all-year.evening,-1.1172 +2040,6,electricity,all-year.evening,1.1172 +2040,8,gas,all-year.night,-0.43113791199999996 +2040,8,electricity,all-year.night,0.2581664143712575 +2040,8,CO2f,all-year.night,23.666115205413174 +2040,8,gas,all-year.morning,-0.28527113279999966 +2040,8,electricity,all-year.morning,0.17082103760479023 +2040,8,CO2f,all-year.morning,15.65916451723112 2040,8,gas,all-year.afternoon,-1.066128 2040,8,electricity,all-year.afternoon,0.6384 2040,8,CO2f,all-year.afternoon,58.522127999999995 -2040,8,gas,all-year.early-peak,-0.5227767999999998 -2040,8,electricity,all-year.early-peak,0.31303999999999993 -2040,8,CO2f,all-year.early-peak,28.696376799999992 -2040,8,gas,all-year.late-peak,-0.22172255999999999 -2040,8,electricity,all-year.late-peak,0.132768 -2040,8,CO2f,all-year.late-peak,12.17084256 +2040,8,gas,all-year.early-peak,-1.066128 +2040,8,electricity,all-year.early-peak,0.6384 +2040,8,CO2f,all-year.early-peak,58.522127999999995 +2040,8,gas,all-year.late-peak,-0.8859679792000001 +2040,8,electricity,all-year.late-peak,0.5305197480239522 +2040,8,CO2f,all-year.late-peak,48.6327453013557 2040,8,gas,all-year.evening,-1.066128 2040,8,electricity,all-year.evening,0.6384 2040,8,CO2f,all-year.evening,58.522127999999995 -2040,9,wind,all-year.night,-0.0 -2040,9,electricity,all-year.night,0.0 -2040,9,wind,all-year.morning,-0.010852799999999913 -2040,9,electricity,all-year.morning,0.010852799999999913 +2040,9,wind,all-year.night,-0.30643199999999987 +2040,9,electricity,all-year.night,0.30643199999999987 +2040,9,wind,all-year.morning,-0.30643199999999987 +2040,9,electricity,all-year.morning,0.30643199999999987 2040,9,wind,all-year.afternoon,-0.0 2040,9,electricity,all-year.afternoon,0.0 -2040,9,wind,all-year.early-peak,-0.30643199999999987 -2040,9,electricity,all-year.early-peak,0.30643199999999987 -2040,9,wind,all-year.late-peak,-0.30643199999999987 -2040,9,electricity,all-year.late-peak,0.30643199999999987 -2040,9,wind,all-year.evening,-0.11172000000000012 -2040,9,electricity,all-year.evening,0.11172000000000012 +2040,9,wind,all-year.early-peak,-0.0 +2040,9,electricity,all-year.early-peak,0.0 +2040,9,wind,all-year.late-peak,-0.0 +2040,9,electricity,all-year.late-peak,0.0 +2040,9,wind,all-year.evening,-0.12257280000000004 +2040,9,electricity,all-year.evening,0.12257280000000004 2040,10,electricity,all-year.night,-0.1280000000000001 2040,10,heat,all-year.night,0.3200000000000003 2040,10,electricity,all-year.morning,-0.5940000000000002 @@ -731,53 +731,53 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,11,heat,all-year.late-peak,0.49800000000000005 2040,11,electricity,all-year.evening,-0.19920000000000004 2040,11,heat,all-year.evening,0.49800000000000005 -2040,12,wind,all-year.night,-0.0 -2040,12,electricity,all-year.night,0.0 -2040,12,wind,all-year.morning,-0.9380799999999991 -2040,12,electricity,all-year.morning,0.9380799999999991 -2040,12,wind,all-year.afternoon,-0.9320000000000002 -2040,12,electricity,all-year.afternoon,0.9320000000000002 +2040,12,wind,all-year.night,-0.9320000000000002 +2040,12,electricity,all-year.night,0.9320000000000002 +2040,12,wind,all-year.morning,-0.0 +2040,12,electricity,all-year.morning,0.0 +2040,12,wind,all-year.afternoon,-0.0 +2040,12,electricity,all-year.afternoon,0.0 2040,12,wind,all-year.early-peak,-0.0 2040,12,electricity,all-year.early-peak,0.0 -2040,12,wind,all-year.late-peak,-1.6788000000000003 -2040,12,electricity,all-year.late-peak,1.6788000000000003 -2040,12,wind,all-year.evening,-1.2319200000000003 -2040,12,electricity,all-year.evening,1.2319200000000003 +2040,12,wind,all-year.late-peak,-1.5132 +2040,12,electricity,all-year.late-peak,1.5132 +2040,12,wind,all-year.evening,-0.0 +2040,12,electricity,all-year.evening,0.0 2040,13,gas,all-year.night,-0.1398792 2040,13,electricity,all-year.night,0.08376000000000001 2040,13,CO2f,all-year.night,7.678279200000001 2040,13,gas,all-year.morning,-0.1398792 2040,13,electricity,all-year.morning,0.08376000000000001 2040,13,CO2f,all-year.morning,7.678279200000001 -2040,13,gas,all-year.afternoon,-0.1398792 -2040,13,electricity,all-year.afternoon,0.08376000000000001 -2040,13,CO2f,all-year.afternoon,7.678279200000001 -2040,13,gas,all-year.early-peak,-0.0 -2040,13,electricity,all-year.early-peak,0.0 -2040,13,CO2f,all-year.early-peak,0.0 +2040,13,gas,all-year.afternoon,-0.0559516800000001 +2040,13,electricity,all-year.afternoon,0.03350400000000006 +2040,13,CO2f,all-year.afternoon,3.0713116800000058 +2040,13,gas,all-year.early-peak,-0.1398792 +2040,13,electricity,all-year.early-peak,0.08376000000000001 +2040,13,CO2f,all-year.early-peak,7.678279200000001 2040,13,gas,all-year.late-peak,-0.1398792 2040,13,electricity,all-year.late-peak,0.08376000000000001 2040,13,CO2f,all-year.late-peak,7.678279200000001 2040,13,gas,all-year.evening,-0.1398792 2040,13,electricity,all-year.evening,0.08376000000000001 2040,13,CO2f,all-year.evening,7.678279200000001 -2040,14,wind,all-year.night,-0.0 -2040,14,electricity,all-year.night,0.0 -2040,14,wind,all-year.morning,-0.046176000000000064 -2040,14,electricity,all-year.morning,0.046176000000000064 +2040,14,wind,all-year.night,-0.00032158562874262664 +2040,14,electricity,all-year.night,0.00032158562874262664 +2040,14,wind,all-year.morning,-0.11544000000000014 +2040,14,electricity,all-year.morning,0.11544000000000014 2040,14,wind,all-year.afternoon,-0.0 2040,14,electricity,all-year.afternoon,0.0 -2040,14,wind,all-year.early-peak,-0.11544000000000014 -2040,14,electricity,all-year.early-peak,0.11544000000000014 +2040,14,wind,all-year.early-peak,-0.04585441437125744 +2040,14,electricity,all-year.early-peak,0.04585441437125744 2040,14,wind,all-year.late-peak,-0.11544000000000014 2040,14,electricity,all-year.late-peak,0.11544000000000014 2040,14,wind,all-year.evening,-0.0 2040,14,electricity,all-year.evening,0.0 -2040,15,gas,all-year.night,0.9107534400000002 -2040,15,gas,all-year.morning,0.0 +2040,15,gas,all-year.night,0.4042025760000001 +2040,15,gas,all-year.morning,0.4042025760000001 2040,15,gas,all-year.afternoon,0.0 -2040,15,gas,all-year.early-peak,0.9107534400000002 -2040,15,gas,all-year.late-peak,0.9107534400000002 +2040,15,gas,all-year.early-peak,0.0 +2040,15,gas,all-year.late-peak,0.0 2040,15,gas,all-year.evening,0.0 2040,16,electricity,all-year.night,-0.40799999999999986 2040,16,heat,all-year.night,1.0199999999999996 @@ -811,51 +811,51 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,17,CO2f,all-year.evening,47.841850169999965 2040,18,wind,all-year.night,-0.0 2040,18,electricity,all-year.night,0.0 -2040,18,wind,all-year.morning,-0.4599200000000011 -2040,18,electricity,all-year.morning,0.4599200000000011 +2040,18,wind,all-year.morning,-1.3980000000000001 +2040,18,electricity,all-year.morning,1.3980000000000001 2040,18,wind,all-year.afternoon,-0.0 2040,18,electricity,all-year.afternoon,0.0 -2040,18,wind,all-year.early-peak,-0.11519999999999997 -2040,18,electricity,all-year.early-peak,0.11519999999999997 +2040,18,wind,all-year.early-peak,-1.2808799999999996 +2040,18,electricity,all-year.early-peak,1.2808799999999996 2040,18,wind,all-year.late-peak,-0.0 2040,18,electricity,all-year.late-peak,0.0 2040,18,wind,all-year.evening,-0.0 2040,18,electricity,all-year.evening,0.0 2040,19,wind,all-year.night,-0.0 2040,19,electricity,all-year.night,0.0 -2040,19,wind,all-year.morning,-0.033504000000000006 -2040,19,electricity,all-year.morning,0.033504000000000006 +2040,19,wind,all-year.morning,-0.07568616239520966 +2040,19,electricity,all-year.morning,0.07568616239520966 2040,19,wind,all-year.afternoon,-0.0 2040,19,electricity,all-year.afternoon,0.0 -2040,19,wind,all-year.early-peak,-0.08376000000000001 -2040,19,electricity,all-year.early-peak,0.08376000000000001 -2040,19,wind,all-year.late-peak,-0.08376000000000001 -2040,19,electricity,all-year.late-peak,0.08376000000000001 +2040,19,wind,all-year.early-peak,-0.06586558562874266 +2040,19,electricity,all-year.early-peak,0.06586558562874266 +2040,19,wind,all-year.late-peak,-0.05947225197604773 +2040,19,electricity,all-year.late-peak,0.05947225197604773 2040,19,wind,all-year.evening,-0.0 2040,19,electricity,all-year.evening,0.0 2040,20,gas,all-year.night,-0.14808223999999998 2040,20,electricity,all-year.night,0.08867199999999999 2040,20,CO2f,all-year.night,8.128562239999999 -2040,20,gas,all-year.morning,-0.14808223999999998 -2040,20,electricity,all-year.morning,0.08867199999999999 -2040,20,CO2f,all-year.morning,8.128562239999999 -2040,20,gas,all-year.afternoon,-0.14808223999999998 -2040,20,electricity,all-year.afternoon,0.08867199999999999 -2040,20,CO2f,all-year.afternoon,8.128562239999999 -2040,20,gas,all-year.early-peak,-0.05923289600000008 -2040,20,electricity,all-year.early-peak,0.03546880000000005 -2040,20,CO2f,all-year.early-peak,3.2514248960000045 +2040,20,gas,all-year.morning,-0.09801697600000014 +2040,20,electricity,all-year.morning,0.05869280000000009 +2040,20,CO2f,all-year.morning,5.380368976000008 +2040,20,gas,all-year.afternoon,-0.10929815999999996 +2040,20,electricity,all-year.afternoon,0.06544799999999998 +2040,20,CO2f,all-year.afternoon,5.999618159999998 +2040,20,gas,all-year.early-peak,-0.14808223999999998 +2040,20,electricity,all-year.early-peak,0.08867199999999999 +2040,20,CO2f,all-year.early-peak,8.128562239999999 2040,20,gas,all-year.late-peak,-0.14808223999999998 2040,20,electricity,all-year.late-peak,0.08867199999999999 2040,20,CO2f,all-year.late-peak,8.128562239999999 2040,20,gas,all-year.evening,-0.14808223999999998 2040,20,electricity,all-year.evening,0.08867199999999999 2040,20,CO2f,all-year.evening,8.128562239999999 -2040,21,gas,all-year.night,0.5085346559999999 +2040,21,gas,all-year.night,0.0 2040,21,gas,all-year.morning,0.0 -2040,21,gas,all-year.afternoon,0.0 -2040,21,gas,all-year.early-peak,0.5085346559999999 -2040,21,gas,all-year.late-peak,0.5085346559999999 +2040,21,gas,all-year.afternoon,1.5564400000000003 +2040,21,gas,all-year.early-peak,1.7275446432000001 +2040,21,gas,all-year.late-peak,1.7275446432000001 2040,21,gas,all-year.evening,0.0 2040,22,electricity,all-year.night,-0.39600000000000013 2040,22,heat,all-year.night,0.9900000000000002 @@ -903,56 +903,56 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2040,25,electricity,all-year.night,0.0 2040,25,wind,all-year.morning,-0.0 2040,25,electricity,all-year.morning,0.0 -2040,25,wind,all-year.afternoon,-0.0 -2040,25,electricity,all-year.afternoon,0.0 -2040,25,wind,all-year.early-peak,-1.2828000000000002 -2040,25,electricity,all-year.early-peak,1.2828000000000002 -2040,25,wind,all-year.late-peak,-0.0 -2040,25,electricity,all-year.late-peak,0.0 -2040,25,wind,all-year.evening,-0.0 -2040,25,electricity,all-year.evening,0.0 +2040,25,wind,all-year.afternoon,-0.9320000000000002 +2040,25,electricity,all-year.afternoon,0.9320000000000002 +2040,25,wind,all-year.early-peak,-0.11712000000000056 +2040,25,electricity,all-year.early-peak,0.11712000000000056 +2040,25,wind,all-year.late-peak,-1.2828000000000002 +2040,25,electricity,all-year.late-peak,1.2828000000000002 +2040,25,wind,all-year.evening,-0.7468000000000004 +2040,25,electricity,all-year.evening,0.7468000000000004 2040,26,gas,all-year.night,-0.3250621600000001 2040,26,electricity,all-year.night,0.19464800000000007 2040,26,CO2f,all-year.night,17.843382160000008 2040,26,gas,all-year.morning,-0.3250621600000001 2040,26,electricity,all-year.morning,0.19464800000000007 2040,26,CO2f,all-year.morning,17.843382160000008 -2040,26,gas,all-year.afternoon,-0.20235056000000018 -2040,26,electricity,all-year.afternoon,0.12116800000000011 -2040,26,CO2f,all-year.afternoon,11.10747056000001 -2040,26,gas,all-year.early-peak,-0.25273646399999994 -2040,26,electricity,all-year.early-peak,0.15133919999999998 -2040,26,CO2f,all-year.early-peak,13.873264463999998 +2040,26,gas,all-year.afternoon,-0.3250621600000001 +2040,26,electricity,all-year.afternoon,0.19464800000000007 +2040,26,CO2f,all-year.afternoon,17.843382160000008 +2040,26,gas,all-year.early-peak,-0.3250621600000001 +2040,26,electricity,all-year.early-peak,0.19464800000000007 +2040,26,CO2f,all-year.early-peak,17.843382160000008 2040,26,gas,all-year.late-peak,-0.3250621600000001 2040,26,electricity,all-year.late-peak,0.19464800000000007 2040,26,CO2f,all-year.late-peak,17.843382160000008 -2040,26,gas,all-year.evening,-0.3250621600000001 -2040,26,electricity,all-year.evening,0.19464800000000007 -2040,26,CO2f,all-year.evening,17.843382160000008 -2040,27,wind,all-year.night,-0.023500799999999863 -2040,27,electricity,all-year.night,0.023500799999999863 -2040,27,wind,all-year.morning,-0.021187200000000142 -2040,27,electricity,all-year.morning,0.021187200000000142 +2040,26,gas,all-year.evening,-0.12036558400000019 +2040,26,electricity,all-year.evening,0.07207520000000012 +2040,26,CO2f,all-year.evening,6.607133584000011 +2040,27,wind,all-year.night,-0.0 +2040,27,electricity,all-year.night,0.0 +2040,27,wind,all-year.morning,-0.11172000000000001 +2040,27,electricity,all-year.morning,0.11172000000000001 2040,27,wind,all-year.afternoon,-0.0 2040,27,electricity,all-year.afternoon,0.0 -2040,27,wind,all-year.early-peak,-0.11172000000000001 -2040,27,electricity,all-year.early-peak,0.11172000000000001 -2040,27,wind,all-year.late-peak,-0.11172000000000001 -2040,27,electricity,all-year.late-peak,0.11172000000000001 -2040,27,wind,all-year.evening,-0.0 -2040,27,electricity,all-year.evening,0.0 -2040,28,gas,all-year.night,0.0 -2040,28,gas,all-year.morning,1.30953432 +2040,27,wind,all-year.early-peak,-0.0 +2040,27,electricity,all-year.early-peak,0.0 +2040,27,wind,all-year.late-peak,-0.044688000000000005 +2040,27,electricity,all-year.late-peak,0.044688000000000005 +2040,27,wind,all-year.evening,-0.11172000000000001 +2040,27,electricity,all-year.evening,0.11172000000000001 +2040,28,gas,all-year.night,0.639958936 +2040,28,gas,all-year.morning,0.639958936 2040,28,gas,all-year.afternoon,0.0 -2040,28,gas,all-year.early-peak,0.0 -2040,28,gas,all-year.late-peak,1.30953432 +2040,28,gas,all-year.early-peak,0.639958936 +2040,28,gas,all-year.late-peak,0.639958936 2040,28,gas,all-year.evening,0.0 2045,2,gas,all-year.night,0.0 -2045,2,gas,all-year.morning,1.3513149279999992 -2045,2,gas,all-year.afternoon,0.4673456799999999 -2045,2,gas,all-year.early-peak,0.0 -2045,2,gas,all-year.late-peak,4.000008 -2045,2,gas,all-year.evening,0.6740393839999997 +2045,2,gas,all-year.morning,0.0 +2045,2,gas,all-year.afternoon,0.0 +2045,2,gas,all-year.early-peak,3.2542440000000004 +2045,2,gas,all-year.late-peak,2.3587717967999993 +2045,2,gas,all-year.evening,0.0 2045,3,gas,all-year.night,-0.0 2045,3,heat,all-year.night,0.0 2045,3,CO2f,all-year.night,0.0 @@ -968,9 +968,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,3,gas,all-year.late-peak,-3.67334068 2045,3,heat,all-year.late-peak,3.1666730000000003 2045,3,CO2f,all-year.late-peak,204.91540983 -2045,3,gas,all-year.evening,-0.5877406800000001 -2045,3,heat,all-year.evening,0.5066730000000002 -2045,3,CO2f,all-year.evening,32.78680983000001 +2045,3,gas,all-year.evening,-0.5877406799999999 +2045,3,heat,all-year.evening,0.5066729999999999 +2045,3,CO2f,all-year.evening,32.786809829999996 2045,4,electricity,all-year.night,-0.0 2045,4,heat,all-year.night,0.0 2045,4,electricity,all-year.morning,-0.0 @@ -1001,40 +1001,40 @@ milestone_year,asset_id,commodity_id,time_slice,flow 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,-1.1172 -2045,6,electricity,all-year.early-peak,1.1172 +2045,6,wind,all-year.early-peak,-0.0 +2045,6,electricity,all-year.early-peak,0.0 2045,6,wind,all-year.late-peak,-0.0 2045,6,electricity,all-year.late-peak,0.0 2045,6,wind,all-year.evening,-0.0 2045,6,electricity,all-year.evening,0.0 -2045,8,gas,all-year.night,-0.9756900479999987 -2045,8,electricity,all-year.night,0.5842455377245501 -2045,8,CO2f,all-year.night,53.55778844320951 -2045,8,gas,all-year.morning,-0.9506308000000003 -2045,8,electricity,all-year.morning,0.5692400000000002 -2045,8,CO2f,all-year.morning,52.18223080000002 -2045,8,gas,all-year.afternoon,-0.8617868000000001 -2045,8,electricity,all-year.afternoon,0.51604 -2045,8,CO2f,all-year.afternoon,47.30538680000001 -2045,8,gas,all-year.early-peak,-1.066128 -2045,8,electricity,all-year.early-peak,0.6384 -2045,8,CO2f,all-year.early-peak,58.522127999999995 -2045,8,gas,all-year.late-peak,-0.0 -2045,8,electricity,all-year.late-peak,0.0 -2045,8,CO2f,all-year.late-peak,0.0 -2045,8,gas,all-year.evening,-0.021042000000000092 -2045,8,electricity,all-year.evening,0.012600000000000056 -2045,8,CO2f,all-year.evening,1.155042000000005 -2045,9,wind,all-year.night,-0.16073846227544974 -2045,9,electricity,all-year.night,0.16073846227544974 -2045,9,wind,all-year.morning,-0.0 -2045,9,electricity,all-year.morning,0.0 -2045,9,wind,all-year.afternoon,-0.0 -2045,9,electricity,all-year.afternoon,0.0 +2045,8,gas,all-year.night,-1.066128 +2045,8,electricity,all-year.night,0.6384 +2045,8,CO2f,all-year.night,58.522127999999995 +2045,8,gas,all-year.morning,-0.9100417552000004 +2045,8,electricity,all-year.morning,0.5449351827544913 +2045,8,CO2f,all-year.morning,49.954208203104216 +2045,8,gas,all-year.afternoon,-1.066128 +2045,8,electricity,all-year.afternoon,0.6384 +2045,8,CO2f,all-year.afternoon,58.522127999999995 +2045,8,gas,all-year.early-peak,-0.9506308000000003 +2045,8,electricity,all-year.early-peak,0.5692400000000002 +2045,8,CO2f,all-year.early-peak,52.18223080000002 +2045,8,gas,all-year.late-peak,-0.2448634447999993 +2045,8,electricity,all-year.late-peak,0.14662481724550858 +2045,8,CO2f,all-year.late-peak,13.441096996895771 +2045,8,gas,all-year.evening,-0.0 +2045,8,electricity,all-year.evening,0.0 +2045,8,CO2f,all-year.evening,0.0 +2045,9,wind,all-year.night,-0.0 +2045,9,electricity,all-year.night,0.0 +2045,9,wind,all-year.morning,-0.1198888172455086 +2045,9,electricity,all-year.morning,0.1198888172455086 +2045,9,wind,all-year.afternoon,-0.002683982754491443 +2045,9,electricity,all-year.afternoon,0.002683982754491443 2045,9,wind,all-year.early-peak,-0.0 2045,9,electricity,all-year.early-peak,0.0 -2045,9,wind,all-year.late-peak,-0.26826633772455016 -2045,9,electricity,all-year.late-peak,0.26826633772455016 +2045,9,wind,all-year.late-peak,-0.30643199999999987 +2045,9,electricity,all-year.late-peak,0.30643199999999987 2045,9,wind,all-year.evening,-0.30643199999999987 2045,9,electricity,all-year.evening,0.30643199999999987 2045,10,electricity,all-year.night,-0.0 @@ -1067,34 +1067,34 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,12,electricity,all-year.morning,0.0 2045,12,wind,all-year.afternoon,-0.0 2045,12,electricity,all-year.afternoon,0.0 -2045,12,wind,all-year.early-peak,-0.3015199999999984 -2045,12,electricity,all-year.early-peak,0.3015199999999984 -2045,12,wind,all-year.late-peak,-0.0 -2045,12,electricity,all-year.late-peak,0.0 -2045,12,wind,all-year.evening,-1.9919999999999998 -2045,12,electricity,all-year.evening,1.9919999999999998 +2045,12,wind,all-year.early-peak,-1.5960000000000003 +2045,12,electricity,all-year.early-peak,1.5960000000000003 +2045,12,wind,all-year.late-peak,-1.9919999999999998 +2045,12,electricity,all-year.late-peak,1.9919999999999998 +2045,12,wind,all-year.evening,-0.0 +2045,12,electricity,all-year.evening,0.0 2045,13,gas,all-year.night,-0.0 2045,13,electricity,all-year.night,0.0 2045,13,CO2f,all-year.night,0.0 -2045,13,gas,all-year.morning,-0.1398792 -2045,13,electricity,all-year.morning,0.08376000000000001 -2045,13,CO2f,all-year.morning,7.678279200000001 -2045,13,gas,all-year.afternoon,-0.1398792 -2045,13,electricity,all-year.afternoon,0.08376000000000001 -2045,13,CO2f,all-year.afternoon,7.678279200000001 +2045,13,gas,all-year.morning,-0.0 +2045,13,electricity,all-year.morning,0.0 +2045,13,CO2f,all-year.morning,0.0 +2045,13,gas,all-year.afternoon,-0.0 +2045,13,electricity,all-year.afternoon,0.0 +2045,13,CO2f,all-year.afternoon,0.0 2045,13,gas,all-year.early-peak,-0.1398792 2045,13,electricity,all-year.early-peak,0.08376000000000001 2045,13,CO2f,all-year.early-peak,7.678279200000001 2045,13,gas,all-year.late-peak,-0.1398792 2045,13,electricity,all-year.late-peak,0.08376000000000001 2045,13,CO2f,all-year.late-peak,7.678279200000001 -2045,13,gas,all-year.evening,-0.0 -2045,13,electricity,all-year.evening,0.0 -2045,13,CO2f,all-year.evening,0.0 -2045,14,wind,all-year.night,-0.046176000000000064 -2045,14,electricity,all-year.night,0.046176000000000064 -2045,14,wind,all-year.morning,-0.0 -2045,14,electricity,all-year.morning,0.0 +2045,13,gas,all-year.evening,-0.1398792 +2045,13,electricity,all-year.evening,0.08376000000000001 +2045,13,CO2f,all-year.evening,7.678279200000001 +2045,14,wind,all-year.night,-0.0 +2045,14,electricity,all-year.night,0.0 +2045,14,wind,all-year.morning,-0.046176000000000064 +2045,14,electricity,all-year.morning,0.046176000000000064 2045,14,wind,all-year.afternoon,-0.0 2045,14,electricity,all-year.afternoon,0.0 2045,14,wind,all-year.early-peak,-0.0 @@ -1103,12 +1103,12 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,14,electricity,all-year.late-peak,0.11544000000000014 2045,14,wind,all-year.evening,-0.11544000000000014 2045,14,electricity,all-year.evening,0.11544000000000014 -2045,15,gas,all-year.night,0.0 -2045,15,gas,all-year.morning,0.0 +2045,15,gas,all-year.night,0.24226419199999982 +2045,15,gas,all-year.morning,0.4042025760000001 2045,15,gas,all-year.afternoon,0.0 -2045,15,gas,all-year.early-peak,0.9107534400000002 -2045,15,gas,all-year.late-peak,0.9107534400000002 -2045,15,gas,all-year.evening,0.9107534400000002 +2045,15,gas,all-year.early-peak,0.0 +2045,15,gas,all-year.late-peak,0.4042025760000001 +2045,15,gas,all-year.evening,0.0 2045,16,electricity,all-year.night,-0.2719999999999999 2045,16,heat,all-year.night,0.6799999999999997 2045,16,electricity,all-year.morning,-0.40799999999999986 @@ -1141,20 +1141,20 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,17,CO2f,all-year.evening,47.841850169999965 2045,18,wind,all-year.night,-0.0 2045,18,electricity,all-year.night,0.0 -2045,18,wind,all-year.morning,-1.5960000000000003 -2045,18,electricity,all-year.morning,1.5960000000000003 +2045,18,wind,all-year.morning,-0.14879999999999938 +2045,18,electricity,all-year.morning,0.14879999999999938 2045,18,wind,all-year.afternoon,-0.0 2045,18,electricity,all-year.afternoon,0.0 2045,18,wind,all-year.early-peak,-0.0 2045,18,electricity,all-year.early-peak,0.0 -2045,18,wind,all-year.late-peak,-2.16 -2045,18,electricity,all-year.late-peak,2.16 +2045,18,wind,all-year.late-peak,-1.2000000000000006 +2045,18,electricity,all-year.late-peak,1.2000000000000006 2045,18,wind,all-year.evening,-0.0 2045,18,electricity,all-year.evening,0.0 -2045,19,wind,all-year.night,-0.033504000000000006 -2045,19,electricity,all-year.night,0.033504000000000006 -2045,19,wind,all-year.morning,-0.0 -2045,19,electricity,all-year.morning,0.0 +2045,19,wind,all-year.night,-0.0 +2045,19,electricity,all-year.night,0.0 +2045,19,wind,all-year.morning,-0.033504000000000006 +2045,19,electricity,all-year.morning,0.033504000000000006 2045,19,wind,all-year.afternoon,-0.0 2045,19,electricity,all-year.afternoon,0.0 2045,19,wind,all-year.early-peak,-0.0 @@ -1163,9 +1163,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,19,electricity,all-year.late-peak,0.08376000000000001 2045,19,wind,all-year.evening,-0.08376000000000001 2045,19,electricity,all-year.evening,0.08376000000000001 -2045,20,gas,all-year.night,-0.0 -2045,20,electricity,all-year.night,0.0 -2045,20,CO2f,all-year.night,0.0 +2045,20,gas,all-year.night,-0.14808223999999998 +2045,20,electricity,all-year.night,0.08867199999999999 +2045,20,CO2f,all-year.night,8.128562239999999 2045,20,gas,all-year.morning,-0.14808223999999998 2045,20,electricity,all-year.morning,0.08867199999999999 2045,20,CO2f,all-year.morning,8.128562239999999 @@ -1175,18 +1175,18 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,20,gas,all-year.early-peak,-0.14808223999999998 2045,20,electricity,all-year.early-peak,0.08867199999999999 2045,20,CO2f,all-year.early-peak,8.128562239999999 -2045,20,gas,all-year.late-peak,-0.14808223999999998 -2045,20,electricity,all-year.late-peak,0.08867199999999999 -2045,20,CO2f,all-year.late-peak,8.128562239999999 -2045,20,gas,all-year.evening,-0.0 -2045,20,electricity,all-year.evening,0.0 -2045,20,CO2f,all-year.evening,0.0 +2045,20,gas,all-year.late-peak,-0.0 +2045,20,electricity,all-year.late-peak,0.0 +2045,20,CO2f,all-year.late-peak,0.0 +2045,20,gas,all-year.evening,-0.14808223999999998 +2045,20,electricity,all-year.evening,0.08867199999999999 +2045,20,CO2f,all-year.evening,8.128562239999999 2045,21,gas,all-year.night,0.0 -2045,21,gas,all-year.morning,0.0 -2045,21,gas,all-year.afternoon,0.0 -2045,21,gas,all-year.early-peak,0.5085346559999999 -2045,21,gas,all-year.late-peak,0.5085346559999999 -2045,21,gas,all-year.evening,0.0 +2045,21,gas,all-year.morning,1.7275446432000001 +2045,21,gas,all-year.afternoon,1.7275446432000001 +2045,21,gas,all-year.early-peak,0.0 +2045,21,gas,all-year.late-peak,1.7275446432000001 +2045,21,gas,all-year.evening,1.7275446432000001 2045,22,electricity,all-year.night,-0.39600000000000013 2045,22,heat,all-year.night,0.9900000000000002 2045,22,electricity,all-year.morning,-0.39600000000000013 @@ -1229,54 +1229,54 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,24,gas,all-year.evening,-0.3375600000000004 2045,24,heat,all-year.evening,0.29100000000000037 2045,24,CO2f,all-year.evening,18.83061000000002 -2045,25,wind,all-year.night,-0.0 -2045,25,electricity,all-year.night,0.0 +2045,25,wind,all-year.night,-1.064 +2045,25,electricity,all-year.night,1.064 2045,25,wind,all-year.morning,-0.0 2045,25,electricity,all-year.morning,0.0 -2045,25,wind,all-year.afternoon,-0.0 -2045,25,electricity,all-year.afternoon,0.0 +2045,25,wind,all-year.afternoon,-1.064 +2045,25,electricity,all-year.afternoon,1.064 2045,25,wind,all-year.early-peak,-0.0 2045,25,electricity,all-year.early-peak,0.0 2045,25,wind,all-year.late-peak,-0.0 2045,25,electricity,all-year.late-peak,0.0 -2045,25,wind,all-year.evening,-0.0 -2045,25,electricity,all-year.evening,0.0 -2045,26,gas,all-year.night,-0.3250621600000001 -2045,26,electricity,all-year.night,0.19464800000000007 -2045,26,CO2f,all-year.night,17.843382160000008 +2045,25,wind,all-year.evening,-0.6807999999999994 +2045,25,electricity,all-year.evening,0.6807999999999994 +2045,26,gas,all-year.night,-0.2606001600000002 +2045,26,electricity,all-year.night,0.15604800000000013 +2045,26,CO2f,all-year.night,14.304920160000012 2045,26,gas,all-year.morning,-0.3250621600000001 2045,26,electricity,all-year.morning,0.19464800000000007 2045,26,CO2f,all-year.morning,17.843382160000008 -2045,26,gas,all-year.afternoon,-0.3250621600000001 -2045,26,electricity,all-year.afternoon,0.19464800000000007 -2045,26,CO2f,all-year.afternoon,17.843382160000008 -2045,26,gas,all-year.early-peak,-0.13493600000000042 -2045,26,electricity,all-year.early-peak,0.08080000000000026 -2045,26,CO2f,all-year.early-peak,7.406936000000024 -2045,26,gas,all-year.late-peak,-0.12187937600000122 -2045,26,electricity,all-year.late-peak,0.07298166227544983 -2045,26,CO2f,all-year.late-peak,6.6902289807904864 +2045,26,gas,all-year.afternoon,-0.2561179087999995 +2045,26,electricity,all-year.afternoon,0.1533640172455087 +2045,26,CO2f,all-year.afternoon,14.058879460895781 +2045,26,gas,all-year.early-peak,-0.3250621600000001 +2045,26,electricity,all-year.early-peak,0.19464800000000007 +2045,26,CO2f,all-year.early-peak,17.843382160000008 +2045,26,gas,all-year.late-peak,-0.2634311152000007 +2045,26,electricity,all-year.late-peak,0.15774318275449142 +2045,26,CO2f,all-year.late-peak,14.46031756310423 2045,26,gas,all-year.evening,-0.3250621600000001 2045,26,electricity,all-year.evening,0.19464800000000007 2045,26,CO2f,all-year.evening,17.843382160000008 2045,27,wind,all-year.night,-0.0 2045,27,electricity,all-year.night,0.0 -2045,27,wind,all-year.morning,-0.0 -2045,27,electricity,all-year.morning,0.0 +2045,27,wind,all-year.morning,-0.044688000000000005 +2045,27,electricity,all-year.morning,0.044688000000000005 2045,27,wind,all-year.afternoon,-0.0 2045,27,electricity,all-year.afternoon,0.0 -2045,27,wind,all-year.early-peak,-0.044688000000000005 -2045,27,electricity,all-year.early-peak,0.044688000000000005 +2045,27,wind,all-year.early-peak,-0.0 +2045,27,electricity,all-year.early-peak,0.0 2045,27,wind,all-year.late-peak,-0.11172000000000001 2045,27,electricity,all-year.late-peak,0.11172000000000001 2045,27,wind,all-year.evening,-0.11172000000000001 2045,27,electricity,all-year.evening,0.11172000000000001 -2045,28,gas,all-year.night,0.6155855919999986 -2045,28,gas,all-year.morning,1.2177624560000009 -2045,28,gas,all-year.afternoon,1.30953432 -2045,28,gas,all-year.early-peak,1.30953432 -2045,28,gas,all-year.late-peak,1.30953432 -2045,28,gas,all-year.evening,1.30953432 +2045,28,gas,all-year.night,0.0 +2045,28,gas,all-year.morning,0.639958936 +2045,28,gas,all-year.afternoon,0.0 +2045,28,gas,all-year.early-peak,0.0 +2045,28,gas,all-year.late-peak,0.639958936 +2045,28,gas,all-year.evening,0.639958936 2045,29,electricity,all-year.night,-0.39600000000000013 2045,29,heat,all-year.night,0.9900000000000002 2045,29,electricity,all-year.morning,-0.39600000000000013 @@ -1307,22 +1307,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,30,gas,all-year.evening,-1.1484 2045,30,heat,all-year.evening,0.9900000000000002 2045,30,CO2f,all-year.evening,64.06290000000001 -2045,31,wind,all-year.night,-1.064 -2045,31,electricity,all-year.night,1.064 -2045,31,wind,all-year.morning,-0.0 -2045,31,electricity,all-year.morning,0.0 -2045,31,wind,all-year.afternoon,-1.064 -2045,31,electricity,all-year.afternoon,1.064 -2045,31,wind,all-year.early-peak,-0.17728000000000188 -2045,31,electricity,all-year.early-peak,0.17728000000000188 -2045,31,wind,all-year.late-peak,-1.032 -2045,31,electricity,all-year.late-peak,1.032 -2045,31,wind,all-year.evening,-0.13600000000000062 -2045,31,electricity,all-year.evening,0.13600000000000062 -2045,32,wind,all-year.night,-0.044688000000000005 -2045,32,electricity,all-year.night,0.044688000000000005 -2045,32,wind,all-year.morning,-0.0 -2045,32,electricity,all-year.morning,0.0 +2045,31,wind,all-year.night,-0.0 +2045,31,electricity,all-year.night,0.0 +2045,31,wind,all-year.morning,-1.447200000000001 +2045,31,electricity,all-year.morning,1.447200000000001 +2045,31,wind,all-year.afternoon,-0.0 +2045,31,electricity,all-year.afternoon,0.0 +2045,31,wind,all-year.early-peak,-0.0 +2045,31,electricity,all-year.early-peak,0.0 +2045,31,wind,all-year.late-peak,-0.0 +2045,31,electricity,all-year.late-peak,0.0 +2045,31,wind,all-year.evening,-1.447200000000001 +2045,31,electricity,all-year.evening,1.447200000000001 +2045,32,wind,all-year.night,-0.0 +2045,32,electricity,all-year.night,0.0 +2045,32,wind,all-year.morning,-0.044688000000000005 +2045,32,electricity,all-year.morning,0.044688000000000005 2045,32,wind,all-year.afternoon,-0.0 2045,32,electricity,all-year.afternoon,0.0 2045,32,wind,all-year.early-peak,-0.0 @@ -1331,36 +1331,36 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2045,32,electricity,all-year.late-peak,0.11172000000000001 2045,32,wind,all-year.evening,-0.11172000000000001 2045,32,electricity,all-year.evening,0.11172000000000001 -2045,33,gas,all-year.night,-0.0 -2045,33,electricity,all-year.night,0.0 -2045,33,CO2f,all-year.night,0.0 -2045,33,gas,all-year.morning,-0.3020695999999999 -2045,33,electricity,all-year.morning,0.18087999999999993 -2045,33,CO2f,all-year.morning,16.581269599999995 +2045,33,gas,all-year.night,-0.3020695999999999 +2045,33,electricity,all-year.night,0.18087999999999993 +2045,33,CO2f,all-year.night,16.581269599999995 +2045,33,gas,all-year.morning,-0.0 +2045,33,electricity,all-year.morning,0.0 +2045,33,CO2f,all-year.morning,0.0 2045,33,gas,all-year.afternoon,-0.3020695999999999 2045,33,electricity,all-year.afternoon,0.18087999999999993 2045,33,CO2f,all-year.afternoon,16.581269599999995 2045,33,gas,all-year.early-peak,-0.3020695999999999 2045,33,electricity,all-year.early-peak,0.18087999999999993 2045,33,CO2f,all-year.early-peak,16.581269599999995 -2045,33,gas,all-year.late-peak,-0.3020695999999999 -2045,33,electricity,all-year.late-peak,0.18087999999999993 -2045,33,CO2f,all-year.late-peak,16.581269599999995 -2045,33,gas,all-year.evening,-0.3020695999999999 -2045,33,electricity,all-year.evening,0.18087999999999993 -2045,33,CO2f,all-year.evening,16.581269599999995 -2045,34,gas,all-year.night,0.6851666160000002 -2045,34,gas,all-year.morning,0.6851666160000002 -2045,34,gas,all-year.afternoon,0.0 -2045,34,gas,all-year.early-peak,0.450792624 -2045,34,gas,all-year.late-peak,0.0 -2045,34,gas,all-year.evening,0.6851666160000002 +2045,33,gas,all-year.late-peak,-0.0 +2045,33,electricity,all-year.late-peak,0.0 +2045,33,CO2f,all-year.late-peak,0.0 +2045,33,gas,all-year.evening,-0.03515016000000016 +2045,33,electricity,all-year.evening,0.021048000000000094 +2045,33,CO2f,all-year.evening,1.9294701600000086 +2045,34,gas,all-year.night,1.534615808 +2045,34,gas,all-year.morning,0.0 +2045,34,gas,all-year.afternoon,0.044853105599999166 +2045,34,gas,all-year.early-peak,0.0 +2045,34,gas,all-year.late-peak,1.534615808 +2045,34,gas,all-year.evening,1.2119901808 2050,2,gas,all-year.night,0.0 -2050,2,gas,all-year.morning,2.9957911199999994 -2050,2,gas,all-year.afternoon,0.18593102399999983 -2050,2,gas,all-year.early-peak,2.4872564639999997 -2050,2,gas,all-year.late-peak,3.4981199279999986 -2050,2,gas,all-year.evening,1.5299577360000003 +2050,2,gas,all-year.morning,1.2682464767999992 +2050,2,gas,all-year.afternoon,2.004 +2050,2,gas,all-year.early-peak,0.6282875407999993 +2050,2,gas,all-year.late-peak,4.000008 +2050,2,gas,all-year.evening,1.4736306687999994 2050,3,gas,all-year.night,-0.0 2050,3,heat,all-year.night,0.0 2050,3,CO2f,all-year.night,0.0 @@ -1373,9 +1373,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,3,gas,all-year.early-peak,-0.0 2050,3,heat,all-year.early-peak,0.0 2050,3,CO2f,all-year.early-peak,0.0 -2050,3,gas,all-year.late-peak,-3.67334068 -2050,3,heat,all-year.late-peak,3.1666730000000003 -2050,3,CO2f,all-year.late-peak,204.91540983 +2050,3,gas,all-year.late-peak,-3.673340680000001 +2050,3,heat,all-year.late-peak,3.1666730000000007 +2050,3,CO2f,all-year.late-peak,204.91540983000002 2050,3,gas,all-year.evening,-0.1933406800000006 2050,3,heat,all-year.evening,0.16667300000000052 2050,3,CO2f,all-year.evening,10.785409830000033 @@ -1405,19 +1405,19 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,5,heat,all-year.evening,1.596 2050,6,wind,all-year.night,-1.1172 2050,6,electricity,all-year.night,1.1172 -2050,6,wind,all-year.morning,-0.0 -2050,6,electricity,all-year.morning,0.0 +2050,6,wind,all-year.morning,-0.3527999999999993 +2050,6,electricity,all-year.morning,0.3527999999999993 2050,6,wind,all-year.afternoon,-0.0 2050,6,electricity,all-year.afternoon,0.0 2050,6,wind,all-year.early-peak,-0.0 2050,6,electricity,all-year.early-peak,0.0 2050,6,wind,all-year.late-peak,-0.0 2050,6,electricity,all-year.late-peak,0.0 -2050,6,wind,all-year.evening,-0.4080000000000006 -2050,6,electricity,all-year.evening,0.4080000000000006 -2050,8,gas,all-year.night,-1.066128 -2050,8,electricity,all-year.night,0.6384 -2050,8,CO2f,all-year.night,58.522127999999995 +2050,6,wind,all-year.evening,-0.2112000000000005 +2050,6,electricity,all-year.evening,0.2112000000000005 +2050,8,gas,all-year.night,-0.612120464000001 +2050,8,electricity,all-year.night,0.3665392000000006 +2050,8,CO2f,all-year.night,33.60064846400006 2050,8,gas,all-year.morning,-1.066128 2050,8,electricity,all-year.morning,0.6384 2050,8,CO2f,all-year.morning,58.522127999999995 @@ -1427,24 +1427,24 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,8,gas,all-year.early-peak,-1.066128 2050,8,electricity,all-year.early-peak,0.6384 2050,8,CO2f,all-year.early-peak,58.522127999999995 -2050,8,gas,all-year.late-peak,-0.2910475999999998 -2050,8,electricity,all-year.late-peak,0.17427999999999988 -2050,8,CO2f,all-year.late-peak,15.97624759999999 -2050,8,gas,all-year.evening,-0.21838780800000093 -2050,8,electricity,all-year.evening,0.13077114251497063 -2050,8,CO2f,all-year.evening,11.987790634347357 -2050,9,wind,all-year.night,-0.0 -2050,9,electricity,all-year.night,0.0 +2050,8,gas,all-year.late-peak,-0.0 +2050,8,electricity,all-year.late-peak,0.0 +2050,8,CO2f,all-year.late-peak,0.0 +2050,8,gas,all-year.evening,-1.066128 +2050,8,electricity,all-year.evening,0.6384 +2050,8,CO2f,all-year.evening,58.522127999999995 +2050,9,wind,all-year.night,-0.30058079999999976 +2050,9,electricity,all-year.night,0.30058079999999976 2050,9,wind,all-year.morning,-0.0 2050,9,electricity,all-year.morning,0.0 2050,9,wind,all-year.afternoon,-0.0 2050,9,electricity,all-year.afternoon,0.0 -2050,9,wind,all-year.early-peak,-0.12257280000000004 -2050,9,electricity,all-year.early-peak,0.12257280000000004 +2050,9,wind,all-year.early-peak,-0.0 +2050,9,electricity,all-year.early-peak,0.0 2050,9,wind,all-year.late-peak,-0.30643199999999987 2050,9,electricity,all-year.late-peak,0.30643199999999987 -2050,9,wind,all-year.evening,-0.30643199999999987 -2050,9,electricity,all-year.evening,0.30643199999999987 +2050,9,wind,all-year.evening,-0.12842400000000012 +2050,9,electricity,all-year.evening,0.12842400000000012 2050,10,electricity,all-year.night,-0.0 2050,10,heat,all-year.night,0.0 2050,10,electricity,all-year.morning,-0.19200000000000017 @@ -1469,54 +1469,54 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,11,heat,all-year.late-peak,0.49800000000000005 2050,11,electricity,all-year.evening,-0.19920000000000004 2050,11,heat,all-year.evening,0.49800000000000005 -2050,12,wind,all-year.night,-0.0 -2050,12,electricity,all-year.night,0.0 -2050,12,wind,all-year.morning,-0.5172000000000001 -2050,12,electricity,all-year.morning,0.5172000000000001 +2050,12,wind,all-year.night,-0.08280000000000015 +2050,12,electricity,all-year.night,0.08280000000000015 +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.0 -2050,12,electricity,all-year.early-peak,0.0 +2050,12,wind,all-year.early-peak,-1.8000000000000003 +2050,12,electricity,all-year.early-peak,1.8000000000000003 2050,12,wind,all-year.late-peak,-1.9919999999999998 2050,12,electricity,all-year.late-peak,1.9919999999999998 -2050,12,wind,all-year.evening,-1.9919999999999998 -2050,12,electricity,all-year.evening,1.9919999999999998 +2050,12,wind,all-year.evening,-0.9059999999999997 +2050,12,electricity,all-year.evening,0.9059999999999997 2050,13,gas,all-year.night,-0.1398792 2050,13,electricity,all-year.night,0.08376000000000001 2050,13,CO2f,all-year.night,7.678279200000001 2050,13,gas,all-year.morning,-0.1398792 2050,13,electricity,all-year.morning,0.08376000000000001 2050,13,CO2f,all-year.morning,7.678279200000001 -2050,13,gas,all-year.afternoon,-0.1398792 -2050,13,electricity,all-year.afternoon,0.08376000000000001 -2050,13,CO2f,all-year.afternoon,7.678279200000001 +2050,13,gas,all-year.afternoon,-0.08420808000000013 +2050,13,electricity,all-year.afternoon,0.05042400000000008 +2050,13,CO2f,all-year.afternoon,4.622368080000007 2050,13,gas,all-year.early-peak,-0.1398792 2050,13,electricity,all-year.early-peak,0.08376000000000001 2050,13,CO2f,all-year.early-peak,7.678279200000001 -2050,13,gas,all-year.late-peak,-0.1398792 -2050,13,electricity,all-year.late-peak,0.08376000000000001 -2050,13,CO2f,all-year.late-peak,7.678279200000001 -2050,13,gas,all-year.evening,-0.0 -2050,13,electricity,all-year.evening,0.0 -2050,13,CO2f,all-year.evening,0.0 +2050,13,gas,all-year.late-peak,-0.1116228 +2050,13,electricity,all-year.late-peak,0.06684 +2050,13,CO2f,all-year.late-peak,6.1272228 +2050,13,gas,all-year.evening,-0.1398792 +2050,13,electricity,all-year.evening,0.08376000000000001 +2050,13,CO2f,all-year.evening,7.678279200000001 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.046176000000000064 +2050,14,electricity,all-year.morning,0.046176000000000064 2050,14,wind,all-year.afternoon,-0.0 2050,14,electricity,all-year.afternoon,0.0 -2050,14,wind,all-year.early-peak,-0.06976314251497022 -2050,14,electricity,all-year.early-peak,0.06976314251497022 +2050,14,wind,all-year.early-peak,-0.0 +2050,14,electricity,all-year.early-peak,0.0 2050,14,wind,all-year.late-peak,-0.11544000000000014 2050,14,electricity,all-year.late-peak,0.11544000000000014 -2050,14,wind,all-year.evening,-0.09185285748502998 -2050,14,electricity,all-year.evening,0.09185285748502998 +2050,14,wind,all-year.evening,-0.11544000000000014 +2050,14,electricity,all-year.evening,0.11544000000000014 2050,15,gas,all-year.night,0.0 2050,15,gas,all-year.morning,0.0 2050,15,gas,all-year.afternoon,0.0 2050,15,gas,all-year.early-peak,0.0 -2050,15,gas,all-year.late-peak,0.9107534400000002 -2050,15,gas,all-year.evening,0.9107534400000002 +2050,15,gas,all-year.late-peak,0.0 +2050,15,gas,all-year.evening,0.0 2050,16,electricity,all-year.night,-0.0 2050,16,heat,all-year.night,0.0 2050,16,electricity,all-year.morning,-0.40799999999999986 @@ -1559,8 +1559,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,18,electricity,all-year.late-peak,0.0 2050,18,wind,all-year.evening,-0.0 2050,18,electricity,all-year.evening,0.0 -2050,19,wind,all-year.night,-0.0 -2050,19,electricity,all-year.night,0.0 +2050,19,wind,all-year.night,-0.08376000000000001 +2050,19,electricity,all-year.night,0.08376000000000001 2050,19,wind,all-year.morning,-0.033504000000000006 2050,19,electricity,all-year.morning,0.033504000000000006 2050,19,wind,all-year.afternoon,-0.0 @@ -1569,32 +1569,32 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,19,electricity,all-year.early-peak,0.0 2050,19,wind,all-year.late-peak,-0.08376000000000001 2050,19,electricity,all-year.late-peak,0.08376000000000001 -2050,19,wind,all-year.evening,-0.08376000000000001 -2050,19,electricity,all-year.evening,0.08376000000000001 -2050,20,gas,all-year.night,-0.14808223999999998 -2050,20,electricity,all-year.night,0.08867199999999999 -2050,20,CO2f,all-year.night,8.128562239999999 +2050,19,wind,all-year.evening,-0.0 +2050,19,electricity,all-year.evening,0.0 +2050,20,gas,all-year.night,-0.0 +2050,20,electricity,all-year.night,0.0 +2050,20,CO2f,all-year.night,0.0 2050,20,gas,all-year.morning,-0.14808223999999998 2050,20,electricity,all-year.morning,0.08867199999999999 2050,20,CO2f,all-year.morning,8.128562239999999 -2050,20,gas,all-year.afternoon,-0.09241112000000004 -2050,20,electricity,all-year.afternoon,0.055336000000000024 -2050,20,CO2f,all-year.afternoon,5.072651120000002 +2050,20,gas,all-year.afternoon,-0.14808223999999998 +2050,20,electricity,all-year.afternoon,0.08867199999999999 +2050,20,CO2f,all-year.afternoon,8.128562239999999 2050,20,gas,all-year.early-peak,-0.14808223999999998 2050,20,electricity,all-year.early-peak,0.08867199999999999 2050,20,CO2f,all-year.early-peak,8.128562239999999 -2050,20,gas,all-year.late-peak,-0.0 -2050,20,electricity,all-year.late-peak,0.0 -2050,20,CO2f,all-year.late-peak,0.0 +2050,20,gas,all-year.late-peak,-0.14808223999999998 +2050,20,electricity,all-year.late-peak,0.08867199999999999 +2050,20,CO2f,all-year.late-peak,8.128562239999999 2050,20,gas,all-year.evening,-0.14808223999999998 2050,20,electricity,all-year.evening,0.08867199999999999 2050,20,CO2f,all-year.evening,8.128562239999999 -2050,21,gas,all-year.night,0.5085346559999999 -2050,21,gas,all-year.morning,0.0 -2050,21,gas,all-year.afternoon,0.5085346559999999 -2050,21,gas,all-year.early-peak,0.5085346559999999 -2050,21,gas,all-year.late-peak,0.5085346559999999 -2050,21,gas,all-year.evening,0.5085346559999999 +2050,21,gas,all-year.night,0.8304495840000009 +2050,21,gas,all-year.morning,1.7275446432000001 +2050,21,gas,all-year.afternoon,0.0 +2050,21,gas,all-year.early-peak,1.7275446432000001 +2050,21,gas,all-year.late-peak,1.7275446432000001 +2050,21,gas,all-year.evening,1.7275446432000001 2050,22,electricity,all-year.night,-0.39600000000000013 2050,22,heat,all-year.night,0.9900000000000002 2050,22,electricity,all-year.morning,-0.39600000000000013 @@ -1637,21 +1637,21 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,24,gas,all-year.evening,-0.3375600000000004 2050,24,heat,all-year.evening,0.29100000000000037 2050,24,CO2f,all-year.evening,18.83061000000002 -2050,25,wind,all-year.night,-0.08280000000000015 -2050,25,electricity,all-year.night,0.08280000000000015 -2050,25,wind,all-year.morning,-1.2828000000000002 -2050,25,electricity,all-year.morning,1.2828000000000002 -2050,25,wind,all-year.afternoon,-1.2000000000000002 -2050,25,electricity,all-year.afternoon,1.2000000000000002 -2050,25,wind,all-year.early-peak,-0.35279999999999934 -2050,25,electricity,all-year.early-peak,0.35279999999999934 -2050,25,wind,all-year.late-peak,-0.0 -2050,25,electricity,all-year.late-peak,0.0 -2050,25,wind,all-year.evening,-0.0 -2050,25,electricity,all-year.evening,0.0 -2050,26,gas,all-year.night,-0.08346001600000026 -2050,26,electricity,all-year.night,0.0499760574850301 -2050,26,CO2f,all-year.night,4.581305189652709 +2050,25,wind,all-year.night,-0.0 +2050,25,electricity,all-year.night,0.0 +2050,25,wind,all-year.morning,-0.0 +2050,25,electricity,all-year.morning,0.0 +2050,25,wind,all-year.afternoon,-0.0 +2050,25,electricity,all-year.afternoon,0.0 +2050,25,wind,all-year.early-peak,-0.0 +2050,25,electricity,all-year.early-peak,0.0 +2050,25,wind,all-year.late-peak,-1.2828000000000002 +2050,25,electricity,all-year.late-peak,1.2828000000000002 +2050,25,wind,all-year.evening,-1.2828000000000002 +2050,25,electricity,all-year.evening,1.2828000000000002 +2050,26,gas,all-year.night,-0.0 +2050,26,electricity,all-year.night,0.0 +2050,26,CO2f,all-year.night,0.0 2050,26,gas,all-year.morning,-0.3250621600000001 2050,26,electricity,all-year.morning,0.19464800000000007 2050,26,CO2f,all-year.morning,17.843382160000008 @@ -1667,23 +1667,23 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,26,gas,all-year.evening,-0.3250621600000001 2050,26,electricity,all-year.evening,0.19464800000000007 2050,26,CO2f,all-year.evening,17.843382160000008 -2050,27,wind,all-year.night,-0.0 -2050,27,electricity,all-year.night,0.0 +2050,27,wind,all-year.night,-0.044688000000000005 +2050,27,electricity,all-year.night,0.044688000000000005 2050,27,wind,all-year.morning,-0.11172000000000001 2050,27,electricity,all-year.morning,0.11172000000000001 2050,27,wind,all-year.afternoon,-0.0 2050,27,electricity,all-year.afternoon,0.0 -2050,27,wind,all-year.early-peak,-0.044688000000000005 -2050,27,electricity,all-year.early-peak,0.044688000000000005 +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.11172000000000001 2050,27,electricity,all-year.late-peak,0.11172000000000001 2050,27,wind,all-year.evening,-0.0 2050,27,electricity,all-year.evening,0.0 -2050,28,gas,all-year.night,1.30953432 +2050,28,gas,all-year.night,0.0 2050,28,gas,all-year.morning,0.0 -2050,28,gas,all-year.afternoon,1.30953432 -2050,28,gas,all-year.early-peak,0.0 -2050,28,gas,all-year.late-peak,1.30953432 +2050,28,gas,all-year.afternoon,0.0 +2050,28,gas,all-year.early-peak,0.639958936 +2050,28,gas,all-year.late-peak,0.639958936 2050,28,gas,all-year.evening,0.0 2050,29,electricity,all-year.night,-0.39600000000000013 2050,29,heat,all-year.night,0.9900000000000002 @@ -1717,31 +1717,31 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,30,CO2f,all-year.evening,64.06290000000001 2050,31,wind,all-year.night,-0.0 2050,31,electricity,all-year.night,0.0 -2050,31,wind,all-year.morning,-0.0 -2050,31,electricity,all-year.morning,0.0 -2050,31,wind,all-year.afternoon,-0.0 -2050,31,electricity,all-year.afternoon,0.0 -2050,31,wind,all-year.early-peak,-1.447200000000001 -2050,31,electricity,all-year.early-peak,1.447200000000001 -2050,31,wind,all-year.late-peak,-1.447200000000001 -2050,31,electricity,all-year.late-peak,1.447200000000001 +2050,31,wind,all-year.morning,-1.447200000000001 +2050,31,electricity,all-year.morning,1.447200000000001 +2050,31,wind,all-year.afternoon,-1.2000000000000002 +2050,31,electricity,all-year.afternoon,1.2000000000000002 +2050,31,wind,all-year.early-peak,-0.0 +2050,31,electricity,all-year.early-peak,0.0 +2050,31,wind,all-year.late-peak,-0.3252000000000003 +2050,31,electricity,all-year.late-peak,0.3252000000000003 2050,31,wind,all-year.evening,-0.0 2050,31,electricity,all-year.evening,0.0 -2050,32,wind,all-year.night,-0.0 -2050,32,electricity,all-year.night,0.0 -2050,32,wind,all-year.morning,-0.09864000000000026 -2050,32,electricity,all-year.morning,0.09864000000000026 +2050,32,wind,all-year.night,-0.044688000000000005 +2050,32,electricity,all-year.night,0.044688000000000005 +2050,32,wind,all-year.morning,-0.0 +2050,32,electricity,all-year.morning,0.0 2050,32,wind,all-year.afternoon,-0.0 2050,32,electricity,all-year.afternoon,0.0 -2050,32,wind,all-year.early-peak,-0.0 -2050,32,electricity,all-year.early-peak,0.0 +2050,32,wind,all-year.early-peak,-0.11172000000000001 +2050,32,electricity,all-year.early-peak,0.11172000000000001 2050,32,wind,all-year.late-peak,-0.11172000000000001 2050,32,electricity,all-year.late-peak,0.11172000000000001 -2050,32,wind,all-year.evening,-0.057767999999999764 -2050,32,electricity,all-year.evening,0.057767999999999764 -2050,33,gas,all-year.night,-0.3020695999999999 -2050,33,electricity,all-year.night,0.18087999999999993 -2050,33,CO2f,all-year.night,16.581269599999995 +2050,32,wind,all-year.evening,-0.0 +2050,32,electricity,all-year.evening,0.0 +2050,33,gas,all-year.night,-0.0 +2050,33,electricity,all-year.night,0.0 +2050,33,CO2f,all-year.night,0.0 2050,33,gas,all-year.morning,-0.3020695999999999 2050,33,electricity,all-year.morning,0.18087999999999993 2050,33,CO2f,all-year.morning,16.581269599999995 @@ -1751,9 +1751,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,33,gas,all-year.early-peak,-0.3020695999999999 2050,33,electricity,all-year.early-peak,0.18087999999999993 2050,33,CO2f,all-year.early-peak,16.581269599999995 -2050,33,gas,all-year.late-peak,-0.0 -2050,33,electricity,all-year.late-peak,0.0 -2050,33,CO2f,all-year.late-peak,0.0 +2050,33,gas,all-year.late-peak,-0.13984179200000024 +2050,33,electricity,all-year.late-peak,0.08373760000000015 +2050,33,CO2f,all-year.late-peak,7.676225792000014 2050,33,gas,all-year.evening,-0.3020695999999999 2050,33,electricity,all-year.evening,0.18087999999999993 2050,33,CO2f,all-year.evening,16.581269599999995 @@ -1761,8 +1761,8 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,34,gas,all-year.morning,0.0 2050,34,gas,all-year.afternoon,0.0 2050,34,gas,all-year.early-peak,0.0 -2050,34,gas,all-year.late-peak,0.6851666160000002 -2050,34,gas,all-year.evening,0.0 +2050,34,gas,all-year.late-peak,0.5445973808000002 +2050,34,gas,all-year.evening,1.534615808 2050,35,electricity,all-year.night,-0.40799999999999986 2050,35,heat,all-year.night,1.0199999999999996 2050,35,electricity,all-year.morning,-0.40799999999999986 @@ -1813,22 +1813,22 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,38,electricity,all-year.afternoon,0.0 2050,38,wind,all-year.early-peak,-0.0 2050,38,electricity,all-year.early-peak,0.0 -2050,38,wind,all-year.late-peak,-0.16079999999999955 -2050,38,electricity,all-year.late-peak,0.16079999999999955 +2050,38,wind,all-year.late-peak,-0.0 +2050,38,electricity,all-year.late-peak,0.0 2050,38,wind,all-year.evening,-0.0 2050,38,electricity,all-year.evening,0.0 -2050,39,wind,all-year.night,-0.11133594251497007 -2050,39,electricity,all-year.night,0.11133594251497007 -2050,39,wind,all-year.morning,-0.0 -2050,39,electricity,all-year.morning,0.0 +2050,39,wind,all-year.night,-0.2290079999999997 +2050,39,electricity,all-year.night,0.2290079999999997 +2050,39,wind,all-year.morning,-0.05246400000000019 +2050,39,electricity,all-year.morning,0.05246400000000019 2050,39,wind,all-year.afternoon,-0.0 2050,39,electricity,all-year.afternoon,0.0 -2050,39,wind,all-year.early-peak,-0.006840057485029985 -2050,39,electricity,all-year.early-peak,0.006840057485029985 +2050,39,wind,all-year.early-peak,-0.13214400000000026 +2050,39,electricity,all-year.early-peak,0.13214400000000026 2050,39,wind,all-year.late-peak,-0.2954400000000001 2050,39,electricity,all-year.late-peak,0.2954400000000001 -2050,39,wind,all-year.evening,-0.2954400000000001 -2050,39,electricity,all-year.evening,0.2954400000000001 +2050,39,wind,all-year.evening,-0.0 +2050,39,electricity,all-year.evening,0.0 2050,40,gas,all-year.night,-0.07844991999999994 2050,40,electricity,all-year.night,0.04697599999999996 2050,40,CO2f,all-year.night,4.306289919999997 @@ -1841,15 +1841,9 @@ milestone_year,asset_id,commodity_id,time_slice,flow 2050,40,gas,all-year.early-peak,-0.07844991999999994 2050,40,electricity,all-year.early-peak,0.04697599999999996 2050,40,CO2f,all-year.early-peak,4.306289919999997 -2050,40,gas,all-year.late-peak,-0.0 -2050,40,electricity,all-year.late-peak,0.0 -2050,40,CO2f,all-year.late-peak,0.0 +2050,40,gas,all-year.late-peak,-0.03137996799999997 +2050,40,electricity,all-year.late-peak,0.018790399999999985 +2050,40,CO2f,all-year.late-peak,1.7225159679999986 2050,40,gas,all-year.evening,-0.07844991999999994 2050,40,electricity,all-year.evening,0.04697599999999996 2050,40,CO2f,all-year.evening,4.306289919999997 -2050,41,gas,all-year.night,0.0 -2050,41,gas,all-year.morning,0.0 -2050,41,gas,all-year.afternoon,0.0 -2050,41,gas,all-year.early-peak,0.0 -2050,41,gas,all-year.late-peak,0.0 -2050,41,gas,all-year.evening,0.7989258959999999 diff --git a/tests/data/two_regions/commodity_prices.csv b/tests/data/two_regions/commodity_prices.csv index dc5aab4db..11a49d2bf 100644 --- a/tests/data/two_regions/commodity_prices.csv +++ b/tests/data/two_regions/commodity_prices.csv @@ -52,7 +52,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2025,gas,R1,all-year.afternoon,2.55 2025,gas,R1,all-year.early-peak,2.5500000000000007 2025,gas,R1,all-year.late-peak,2.55 -2025,gas,R1,all-year.evening,2.55 +2025,gas,R1,all-year.evening,2.5500000000000007 2025,gas,R2,all-year.night,2.55 2025,gas,R2,all-year.morning,2.55 2025,gas,R2,all-year.afternoon,2.55 @@ -93,7 +93,7 @@ milestone_year,commodity_id,region_id,time_slice,price 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.late-peak,2.5500000000000003 2030,gas,R2,all-year.evening,2.55 2030,heat,R1,all-year.night,-0.0 2030,heat,R1,all-year.morning,-0.0 @@ -105,7 +105,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,heat,R2,all-year.morning,2.9579999999999997 2030,heat,R2,all-year.afternoon,1.7034 2030,heat,R2,all-year.early-peak,2.9579999999999997 -2030,heat,R2,all-year.late-peak,2.9579999999999997 +2030,heat,R2,all-year.late-peak,2.958 2030,heat,R2,all-year.evening,2.9579999999999997 2035,electricity,R1,all-year.night,-0.0 2035,electricity,R1,all-year.morning,-0.0 @@ -197,10 +197,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,gas,R1,all-year.early-peak,-0.0 2045,gas,R1,all-year.late-peak,-0.0 2045,gas,R1,all-year.evening,-0.0 -2045,gas,R2,all-year.night,2.55 +2045,gas,R2,all-year.night,2.5500000000000003 2045,gas,R2,all-year.morning,2.55 2045,gas,R2,all-year.afternoon,2.55 -2045,gas,R2,all-year.early-peak,2.55 +2045,gas,R2,all-year.early-peak,2.5500000000000003 2045,gas,R2,all-year.late-peak,2.55 2045,gas,R2,all-year.evening,2.55 2045,heat,R1,all-year.night,-0.0 @@ -212,7 +212,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2045,heat,R2,all-year.night,1.7034 2045,heat,R2,all-year.morning,2.9579999999999997 2045,heat,R2,all-year.afternoon,1.7034 -2045,heat,R2,all-year.early-peak,2.9579999999999997 +2045,heat,R2,all-year.early-peak,2.958 2045,heat,R2,all-year.late-peak,2.9579999999999997 2045,heat,R2,all-year.evening,2.9579999999999997 2050,electricity,R1,all-year.night,-0.0 @@ -227,7 +227,7 @@ milestone_year,commodity_id,region_id,time_slice,price 2050,electricity,R2,all-year.early-peak,4.2585 2050,electricity,R2,all-year.late-peak,4.2585 2050,electricity,R2,all-year.evening,4.2585 -2050,gas,R2,all-year.night,2.5500000000000003 +2050,gas,R2,all-year.night,2.55 2050,gas,R2,all-year.morning,2.55 2050,gas,R2,all-year.afternoon,2.55 2050,gas,R2,all-year.early-peak,2.55