remove is_tolerance_fail when comparing two user input values

pnnl · Feb 9, 2024 · 88299e8 · 88299e8
1 parent ad9d588
commit 88299e8
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 135 deletions.
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule13.py b/rct229/rulesets/ashrae9012019/section5/section5rule13.py
@@ -173,30 +173,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                     )
                 else:
                     return False
-
-            def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                baseline_surface_type = calc_vals["baseline_surface_type"]
-                proposed_surface_type = calc_vals["proposed_surface_type"]
-                if (
-                    proposed_surface_type is None
-                    or baseline_surface_type != proposed_surface_type
-                ):
-                    return False
-
-                if baseline_surface_type in [OST.ABOVE_GRADE_WALL, OST.FLOOR, OST.ROOF]:
-                    return std_equal(
-                        calc_vals["baseline_surface_u_factor"],
-                        calc_vals["proposed_surface_u_factor"],
-                    )
-                elif baseline_surface_type in [OST.UNHEATED_SOG, OST.HEATED_SOG]:
-                    return std_equal(
-                        calc_vals["baseline_surface_f_factor"],
-                        calc_vals["proposed_surface_f_factor"],
-                    )
-                elif baseline_surface_type == OST.BELOW_GRADE_WALL:
-                    return std_equal(
-                        calc_vals["baseline_surface_c_factor"],
-                        calc_vals["proposed_surface_c_factor"],
-                    )
-                else:
-                    return False
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule16.py b/rct229/rulesets/ashrae9012019/section5/section5rule16.py
@@ -174,21 +174,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                 ) == (
                     total_fenestration_area_surface_p / total_fenestration_area_p
                 )
-
-            def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                total_fenestration_area_surface_b = calc_vals[
-                    "total_fenestration_area_surface_b"
-                ]
-                total_fenestration_area_surface_p = calc_vals[
-                    "total_fenestration_area_surface_p"
-                ]
-                total_fenestration_area_b = calc_vals["total_fenestration_area_b"]
-                total_fenestration_area_p = calc_vals["total_fenestration_area_p"]
-
-                return (
-                    total_fenestration_area_b == ZERO.AREA
-                    and total_fenestration_area_p == ZERO.AREA
-                ) or std_equal(
-                    (total_fenestration_area_surface_b / total_fenestration_area_b),
-                    (total_fenestration_area_surface_p / total_fenestration_area_p),
-                )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule20.py b/rct229/rulesets/ashrae9012019/section5/section5rule20.py
@@ -287,4 +287,6 @@ def rule_check(self, context, calc_vals=None, data=None):
                 def is_tolerance_fail(self, context, calc_vals=None, data=None):
                     target_shgc = calc_vals["target_shgc"]
                     subsurface_shgc = calc_vals["subsurface_shgc"]
-                    return target_shgc is not None and std_equal(target_shgc, subsurface_shgc)
+                    return target_shgc is not None and std_equal(
+                        target_shgc, subsurface_shgc
+                    )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule21.py b/rct229/rulesets/ashrae9012019/section5/section5rule21.py
@@ -128,23 +128,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                         and calc_vals["subsurface_opaque_area_b"]
                         == calc_vals["subsurface_opaque_area_p"],
                     )
-
-                def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                    return (
-                        std_equal(
-                            calc_vals["subsurface_u_factor_b"],
-                            calc_vals["subsurface_u_factor_p"],
-                        )
-                        and std_equal(
-                            calc_vals["subsurface_shgc_b"],
-                            calc_vals["subsurface_shgc_p"],
-                        )
-                        and std_equal(
-                            calc_vals["subsurface_glazed_area_b"],
-                            calc_vals["subsurface_glazed_area_p"],
-                        )
-                        and std_equal(
-                            calc_vals["subsurface_opaque_area_b"],
-                            calc_vals["subsurface_opaque_area_p"],
-                        )
-                    )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule24.py b/rct229/rulesets/ashrae9012019/section5/section5rule24.py
@@ -115,8 +115,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                 skylight_roof_ratio_b = calc_vals["skylight_roof_ratio_b"]
                 skylight_roof_ratio_p = calc_vals["skylight_total_roof_ratio_p"]
                 return skylight_roof_ratio_b == skylight_roof_ratio_p
-
-            def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                skylight_roof_ratio_b = calc_vals["skylight_roof_ratio_b"]
-                skylight_roof_ratio_p = calc_vals["skylight_total_roof_ratio_p"]
-                return std_equal(skylight_roof_ratio_b, skylight_roof_ratio_p)
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule25.py b/rct229/rulesets/ashrae9012019/section5/section5rule25.py
@@ -115,4 +115,4 @@ def rule_check(self, context, calc_vals=None, data=None):
 
             def is_tolerance_fail(self, context, calc_vals=None, data=None):
                 skylight_roof_ratio_b = calc_vals["skylight_roof_ratio_b"]
-                return std_equal(skylight_roof_ratio_b, SKYLIGHT_THRESHOLD )
+                return std_equal(skylight_roof_ratio_b, SKYLIGHT_THRESHOLD)
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule26.py b/rct229/rulesets/ashrae9012019/section5/section5rule26.py
@@ -191,29 +191,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                         and total_skylight_area_surface_b / total_skylight_area_b
                         == total_skylight_area_surface_p / total_skylight_area_p,
                     )
-
-                def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                    total_skylight_area_b = calc_vals["total_skylight_area_b"]
-                    total_skylight_area_p = calc_vals["total_skylight_area_p"]
-                    total_skylight_area_surface_b = calc_vals[
-                        "total_skylight_area_surface_b"
-                    ]
-                    total_skylight_area_surface_p = calc_vals[
-                        "total_skylight_area_surface_p"
-                    ]
-
-                    return (
-                        # both segments have no skylight area
-                        total_skylight_area_b == 0
-                        and total_skylight_area_p == 0
-                        and total_skylight_area_surface_b == 0
-                        and total_skylight_area_surface_p == 0
-                    ) or (
-                        # product to ensure neither is 0 & short-circuit logic if either of them is 0.
-                        total_skylight_area_b * total_skylight_area_p > 0
-                        # both segments' skylight area ratios are the same
-                        and std_equal(
-                            total_skylight_area_surface_b / total_skylight_area_b,
-                            total_skylight_area_surface_p / total_skylight_area_p,
-                        )
-                    )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule30.py b/rct229/rulesets/ashrae9012019/section5/section5rule30.py
@@ -143,8 +143,9 @@ def get_pass_msg(self, context, calc_vals=None, data=None):
                 )
 
                 return pass_msg
+
             def is_tolerance_fail(self, context, calc_vals=None, data=None):
                 return std_equal(
                     calc_vals["absorptance_thermal_exterior_p"],
                     ABSORPTION_THERMAL_EXTERIOR,
-                )
+                )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule36.py b/rct229/rulesets/ashrae9012019/section5/section5rule36.py
@@ -95,9 +95,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                     calc_vals["baseline_infiltration"]
                     == calc_vals["proposed_infiltration"]
                 )
-
-            def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                return std_equal(
-                    calc_vals["baseline_infiltration"],
-                    calc_vals["proposed_infiltration"],
-                )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule37.py b/rct229/rulesets/ashrae9012019/section5/section5rule37.py
@@ -178,10 +178,11 @@ def is_tolerance_fail(self, context, calc_vals=None, data=None):
                 building_total_air_leakage_rate,
                 TOTAL_AIR_LEAKAGE_COEFF * target_air_leakage_rate_75pa_p,
             ) or (
-                not std_equal(building_total_air_leakage_rate, TOTAL_AIR_LEAKAGE_COEFF * target_air_leakage_rate_75pa_p)
-                and empty_measured_air_leakage_rate_flow_flag == False
-                and std_equal(
+                not std_equal(
                     building_total_air_leakage_rate,
-                    TOTAL_AIR_LEAKAGE_COEFF * building_total_measured_air_leakage_rate,
+                    TOTAL_AIR_LEAKAGE_COEFF * target_air_leakage_rate_75pa_p,
                 )
+                and empty_measured_air_leakage_rate_flow_flag == False
+                and building_total_air_leakage_rate
+                == TOTAL_AIR_LEAKAGE_COEFF * building_total_measured_air_leakage_rate
             )
diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule40.py b/rct229/rulesets/ashrae9012019/section5/section5rule40.py
@@ -124,18 +124,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                     absorptance_solar_exterior_b == absorptance_solar_exterior_p
                     and absorptance_thermal_exterior_b == absorptance_thermal_exterior_p
                 )
-
-            def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                absorptance_solar_exterior_b = calc_vals["absorptance_solar_exterior_b"]
-                absorptance_solar_exterior_p = calc_vals["absorptance_solar_exterior_p"]
-                absorptance_thermal_exterior_b = calc_vals[
-                    "absorptance_thermal_exterior_b"
-                ]
-                absorptance_thermal_exterior_p = calc_vals[
-                    "absorptance_thermal_exterior_p"
-                ]
-                return std_equal(
-                    absorptance_solar_exterior_b, absorptance_solar_exterior_p
-                ) and std_equal(
-                    absorptance_thermal_exterior_b, absorptance_thermal_exterior_p
-                )
diff --git a/rct229/rulesets/ashrae9012019/section6/section6rule3.py b/rct229/rulesets/ashrae9012019/section6/section6rule3.py
@@ -99,8 +99,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                 total_space_lpd_u = calc_vals["total_space_lpd_u"]
                 total_space_lpd_p = calc_vals["total_space_lpd_p"]
                 return total_space_lpd_u == total_space_lpd_p
-
-            def is_tolerance_fail(self, context, calc_vals=None, data=None):
-                total_space_lpd_u = calc_vals["total_space_lpd_u"]
-                total_space_lpd_p = calc_vals["total_space_lpd_p"]
-                return std_equal(total_space_lpd_u, total_space_lpd_p)
diff --git a/rct229/rulesets/ashrae9012019/section6/section6rule5.py b/rct229/rulesets/ashrae9012019/section6/section6rule5.py
@@ -189,4 +189,3 @@ def rule_check(self, context, calc_vals=None, data=None):
                             schedule_comparison_result["total_hours_compared"]
                             == schedule_comparison_result["total_hours_matched"]
                         )
-
diff --git a/rct229/rulesets/ashrae9012019/section6/section6rule9.py b/rct229/rulesets/ashrae9012019/section6/section6rule9.py
@@ -187,11 +187,6 @@ def rule_check(self, context, calc_vals=None, data=None):
                         total_hours_matched = calc_vals["total_hours_matched"]
                         return total_hours_matched == total_hours_compared
 
-                    def rule_check(self, context, calc_vals=None, data=None):
-                        total_hours_compared = calc_vals["total_hours_compared"]
-                        total_hours_matched = calc_vals["total_hours_matched"]
-                        return total_hours_matched == total_hours_compared
-
                     def get_fail_msg(self, context, calc_vals=None, data=None):
                         eflh_difference = calc_vals["eflh_difference"]
                         return f"Space lighting schedule EFLH in P-RMD is {eflh_difference} of that in B-RMD."
Original file line number	Diff line number	Diff line change
Expand Up		@@ -189,4 +189,3 @@ def rule_check(self, context, calc_vals=None, data=None):
		schedule_comparison_result["total_hours_compared"]
		== schedule_comparison_result["total_hours_matched"]
		)