From c13d98e6bcc846cf723c02541830210e2f495562 Mon Sep 17 00:00:00 2001 From: Douglas Greenshields Date: Fri, 14 Jul 2023 21:26:50 +0100 Subject: [PATCH] correct tests --- .../space_heat_demand/ventilation_element.rs | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/core/space_heat_demand/ventilation_element.rs b/src/core/space_heat_demand/ventilation_element.rs index 4b70a84..8c4feda 100644 --- a/src/core/space_heat_demand/ventilation_element.rs +++ b/src/core/space_heat_demand/ventilation_element.rs @@ -637,7 +637,11 @@ mod test { // external_conditions.next(); assert_eq!( round_by_precision( - infiltration_element.h_ve_heat_transfer_coefficient(75.0, simtime_step.index), + infiltration_element.h_ve_heat_transfer_coefficient( + 75.0, + None, + Some(simtime_step.index) + ), 1e6 ), round_by_precision(EXPECTED_HEAT_TRANSFER_COEFFICIENTS[simtime_step.index], 1e6), @@ -691,11 +695,14 @@ mod test { pub fn should_have_correct_h_ve_for_mechanical(mvhr: MechanicalVentilationHeatRecovery) { // for (i, _) in simulation_time_iterator.enumerate() { assert_eq!( - round_by_precision(mvhr.h_ve_heat_transfer_coefficient(75.0, None), 1e6), + round_by_precision(mvhr.h_ve_heat_transfer_coefficient(75.0, None, None), 1e6), round_by_precision(4.28975166666666, 1e6), ); assert_eq!( - round_by_precision(mvhr.h_ve_heat_transfer_coefficient(75.0, Some(1.2)), 1e6), + round_by_precision( + mvhr.h_ve_heat_transfer_coefficient(75.0, Some(1.2), None), + 1e6 + ), round_by_precision(5.147701999999999, 1e6), ); // } @@ -777,7 +784,11 @@ mod test { for (i, _) in simulation_time_iterator.enumerate() { assert_eq!( round_by_precision( - whole_house_extract_ventilation.h_ve_heat_transfer_coefficient(75.0, None, i), + whole_house_extract_ventilation.h_ve_heat_transfer_coefficient( + 75.0, + None, + Some(i) + ), 1e6 ), round_by_precision(WHOLE_HOUSE_H_VE_RESULTS[i], 1e6), @@ -789,7 +800,7 @@ mod test { whole_house_extract_ventilation.h_ve_heat_transfer_coefficient( 75.0, Some(1.2), - i + Some(i) ), 1e6 ),