Skip to content

Commit be2a242

Browse files
committed
Allow zero demand for year
1 parent b64fbb6 commit be2a242

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

src/input/commodity/demand.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ where
135135
);
136136

137137
ensure!(
138-
demand.demand.is_normal() && demand.demand > Flow(0.0),
139-
"Demand must be a valid number greater than zero"
138+
demand.demand.is_finite() && demand.demand >= Flow(0.0),
139+
"Demand must be a valid number greater than or equal to zero"
140140
);
141141

142142
ensure!(
@@ -270,6 +270,12 @@ mod tests {
270270
commodity_id: "commodity1".to_string(),
271271
demand: Flow(11.0),
272272
},
273+
Demand {
274+
year: 2020,
275+
region_id: "Spain".to_string(),
276+
commodity_id: "commodity3".to_string(),
277+
demand: Flow(0.0),
278+
},
273279
];
274280
assert_error!(
275281
read_demand_from_iter(demand.into_iter(), &svd_commodities, &region_ids, &[2020]),
@@ -334,7 +340,6 @@ mod tests {
334340

335341
#[rstest]
336342
#[case(-1.0)]
337-
#[case(0.0)]
338343
#[case(f64::NAN)]
339344
#[case(f64::NEG_INFINITY)]
340345
#[case(f64::INFINITY)]
@@ -353,7 +358,7 @@ mod tests {
353358
}];
354359
assert_error!(
355360
read_demand_from_iter(demand.into_iter(), &svd_commodities, &region_ids, &[2020],),
356-
"Demand must be a valid number greater than zero"
361+
"Demand must be a valid number greater than or equal to zero"
357362
);
358363
}
359364

0 commit comments

Comments
 (0)