From a61da3e0e7eb7b6ad750151887e081042a6c24d4 Mon Sep 17 00:00:00 2001 From: yunjoonjung Date: Thu, 1 Aug 2024 10:31:42 -0700 Subject: [PATCH] Made MONTH_FRACTIONS and DAYS_IN_MONTH global vars --- rct229/rulesets/ashrae9012019/__init__.py | 1 + .../ashrae9012019/section12/section12rule4.py | 60 ++++++++++--------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/rct229/rulesets/ashrae9012019/__init__.py b/rct229/rulesets/ashrae9012019/__init__.py index bcd75ae3d8..9cd0ff1f56 100644 --- a/rct229/rulesets/ashrae9012019/__init__.py +++ b/rct229/rulesets/ashrae9012019/__init__.py @@ -11,6 +11,7 @@ "section5", "section6", "section10", + "section12", "section16", "section18", "section19", diff --git a/rct229/rulesets/ashrae9012019/section12/section12rule4.py b/rct229/rulesets/ashrae9012019/section12/section12rule4.py index 969f928f3d..de581e3dbc 100644 --- a/rct229/rulesets/ashrae9012019/section12/section12rule4.py +++ b/rct229/rulesets/ashrae9012019/section12/section12rule4.py @@ -11,6 +11,35 @@ MISCELLANEOUS_EQUIPMENT = SchemaEnums.schema_enums["MiscellaneousEquipmentOptions"] +MONTH_FRACTIONS = { + 1: 0.25, + 2: 0.5, + 3: 0.75, + 4: 1, + 5: 0.25, + 6: 0.5, + 7: 0.75, + 8: 1, + 9: 0.25, + 10: 0.5, + 11: 0.75, + 12: 1, +} +DAYS_IN_MONTH = { + 1: 31, + 2: 28, # If leap year, this will be replaced with 29 + 3: 31, + 4: 30, + 5: 31, + 6: 30, + 7: 31, + 8: 31, + 9: 30, + 10: 31, + 11: 30, + 12: 31, +} + class Section12Rule4(RuleDefinitionListIndexedBase): """Rule 4 of ASHRAE 90.1-2019 Appendix G Section 12 (Receptacle)""" @@ -77,34 +106,9 @@ def get_calc_vals(self, context, data=None): misc_equip_b = context.BASELINE_0 is_leap_year = data["is_leap_year"] - MONTH_FRACTIONS = { - 1: 0.25, - 2: 0.5, - 3: 0.75, - 4: 1, - 5: 0.25, - 6: 0.5, - 7: 0.75, - 8: 1, - 9: 0.25, - 10: 0.5, - 11: 0.75, - 12: 1, - } - DAYS_IN_MONTH = { - 1: 31, - 2: 29 if is_leap_year else 28, - 3: 31, - 4: 30, - 5: 31, - 6: 30, - 7: 31, - 8: 31, - 9: 30, - 10: 31, - 11: 30, - 12: 31, - } + + if is_leap_year: + DAYS_IN_MONTH[2] = 29 multiplier_schedule_b = getattr_( misc_equip_b, "misc_equip", "multiplier_schedule", "hourly_values"