Skip to content

Commit 4562348

Browse files
committed
Remove >0 limitation in graph and demand slices
1 parent be2a242 commit 4562348

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/graph.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::commodity::{CommodityID, CommodityMap, CommodityType};
33
use crate::process::{ProcessID, ProcessMap};
44
use crate::region::RegionID;
55
use crate::time_slice::{TimeSliceInfo, TimeSliceLevel, TimeSliceSelection};
6-
use crate::units::{Dimensionless, Flow};
6+
use crate::units::Dimensionless;
77
use anyhow::{Context, Result, anyhow, ensure};
88
use indexmap::IndexSet;
99
use itertools::{Itertools, iproduct};
@@ -202,7 +202,7 @@ fn prepare_commodities_graph_for_validation(
202202
&& commodity
203203
.demand
204204
.get(&(region_id.clone(), year, time_slice_selection.clone()))
205-
.is_some_and(|&v| v > Flow(0.0))
205+
.is_some()
206206
{
207207
let commodity_node = GraphNode::Commodity(commodity_id.clone());
208208
let commodity_node_index = filtered_graph

src/input/commodity/demand_slicing.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//! Demand slicing determines how annual demand is distributed across the year.
2-
use super::super::{
3-
check_values_sum_to_one_approx, deserialise_proportion_nonzero, input_err_msg, read_csv,
4-
};
2+
use super::super::{check_values_sum_to_one_approx, input_err_msg, read_csv};
53
use crate::commodity::CommodityID;
64
use crate::id::IDCollection;
75
use crate::input::commodity::demand::BorrowedCommodityMap;
@@ -22,7 +20,6 @@ struct DemandSlice {
2220
commodity_id: String,
2321
region_id: String,
2422
time_slice: String,
25-
#[serde(deserialize_with = "deserialise_proportion_nonzero")]
2623
fraction: Dimensionless,
2724
}
2825

0 commit comments

Comments
 (0)