Merge branch 'RT/JG/undetermined_text' into RT/JG/19_19_fix

pnnl · Dec 11, 2024 · f79e683 · f79e683
2 parents 21752cd + 23487ee
commit f79e683
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 31 deletions.
diff --git a/rct229/rulesets/ashrae9012019/section1/section1rule6.py b/rct229/rulesets/ashrae9012019/section1/section1rule6.py
@@ -47,4 +47,4 @@ def rule_check(self, context, calc_vals=None, data=None):
         return result
 
     def get_fail_msg(self, context, calc_vals=None, data=None):
-        return calc_vals["error_msg_list"]
+        return "; ".join(calc_vals["error_msg_list"])
diff --git a/rct229/rulesets/ashrae9012019/section1/section1rule7.py b/rct229/rulesets/ashrae9012019/section1/section1rule7.py
@@ -46,4 +46,4 @@ def rule_check(self, context, calc_vals=None, data=None):
         return result
 
     def get_fail_msg(self, context, calc_vals=None, data=None):
-        return calc_vals["error_msg_list"]
+        return "; ".join(calc_vals["error_msg_list"])
diff --git a/rct229/rulesets/ashrae9012019/section21/section21rule1.py b/rct229/rulesets/ashrae9012019/section21/section21rule1.py
@@ -27,8 +27,7 @@ def __init__(self):
             standard_section="Section G3.1.1.3 Baseline HVAC System Requirements for Systems Utilizing Purchased "
             "Chilled Water and/or Purchased Heat",
             is_primary_rule=False,
-            list_path="ruleset_model_descriptions[0]"
-
+            list_path="ruleset_model_descriptions[0]",
         )
 
     class RulesetModelInstanceRule(PartialRuleDefinition):
@@ -38,9 +37,9 @@ def __init__(self):
                     USER=False, BASELINE_0=False, PROPOSED=True
                 ),
                 manual_check_required_msg="Manual Check Required - Proposed is modeled with purchased hot water or steam.  "
-                                          "Make sure the heating source in the baseline building is also purchased hot water or steam.",
+                "Make sure the heating source in the baseline building is also purchased hot water or steam.",
                 not_applicable_msg="Rule 21-1 Not Applicable - the proposed is not modeled with Purchased Hot Water or "
-                                   "Steam",
+                "Steam",
             )
 
         def applicability_check(self, context, calc_vals, data):

diff --git a/rct229/rulesets/ashrae9012019/section21/section21rule2.py b/rct229/rulesets/ashrae9012019/section21/section21rule2.py
@@ -24,8 +24,7 @@ def __init__(self):
             standard_section="Section G3.1.1.3 Baseline HVAC System Requirements for Systems Utilizing Purchased "
             "Chilled Water and/or Purchased Heat",
             is_primary_rule=False,
-            list_path="ruleset_model_descriptions[0]"
-
+            list_path="ruleset_model_descriptions[0]",
         )
 
     class RulesetModelInstanceRule(PartialRuleDefinition):
@@ -35,9 +34,9 @@ def __init__(self):
                     USER=False, BASELINE_0=False, PROPOSED=True
                 ),
                 manual_check_required_msg="Manual Check Required - Proposed is modeled with purchased hot water or steam.  "
-                                          "Make sure the baseline model uses the same number of pumps for the heating loop.",
+                "Make sure the baseline model uses the same number of pumps for the heating loop.",
                 not_applicable_msg="Rule 21-2 Not Applicable - the proposed is not modeled with Purchased Hot Water or "
-                                   "Steam"
+                "Steam",
             )
 
         def applicability_check(self, context, calc_vals, data):

diff --git a/rct229/rulesets/ashrae9012019/section22/section22rule35.py b/rct229/rulesets/ashrae9012019/section22/section22rule35.py
@@ -23,7 +23,8 @@ def __init__(self):
             ruleset_section_title="HVAC - Chiller",
             standard_section="Section G3.1.3.10 Chilled-Water Pumps (Systems 7, 8, 11, 12, and 13)",
             is_primary_rule=False,
-            list_path="ruleset_model_descriptions[0]")
+            list_path="ruleset_model_descriptions[0]",
+        )
 
     class RulesetModelInstanceRule(PartialRuleDefinition):
         def __init__(self):
@@ -34,7 +35,6 @@ def __init__(self):
                 manual_check_required_msg="Manual Check Required - Baseline is modeled with purchased chilled water. Make "
                 "sure baseline systems served by purchased chilled water are not modeled with chilled water reset.",
                 not_applicable_msg="Rule 22-35 Not Applicable - the baseline is not modeled with Purchased Chilled Water",
-
             )
 
         def applicability_check(self, context, calc_vals, data):

diff --git a/rct229/rulesets/ashrae9012019/section22/section22rule37.py b/rct229/rulesets/ashrae9012019/section22/section22rule37.py
@@ -23,7 +23,8 @@ def __init__(self):
             ruleset_section_title="HVAC - Chiller",
             standard_section="Section G3.1.3.10 Chilled-Water Pumps (Systems 7, 8, 11, 12, and 13)",
             is_primary_rule=False,
-            list_path="ruleset_model_descriptions[0]")
+            list_path="ruleset_model_descriptions[0]",
+        )
 
     class RulesetModelInstanceRule(PartialRuleDefinition):
         def __init__(self):
@@ -34,7 +35,6 @@ def __init__(self):
                 manual_check_required_msg="Manual Check Required - Baseline is modeled with purchased chilled water. Make "
                 "sure baseline systems served by purchased chilled water are modeled with a variable speed drive pump.",
                 not_applicable_msg="Rule 22-37 Not Applicable - the baseline is not modeled with Purchased Chilled Water",
-
             )
 
         def applicability_check(self, context, calc_vals, data):

diff --git a/rct229/rulesets/ashrae9012019/section22/section22rule38.py b/rct229/rulesets/ashrae9012019/section22/section22rule38.py
@@ -23,8 +23,8 @@ def __init__(self):
             ruleset_section_title="HVAC - Chiller",
             standard_section="Section G3.1.3.10 Chilled-Water Pumps (Systems 7, 8, 11, 12, and 13)",
             is_primary_rule=False,
-            list_path="ruleset_model_descriptions[0]"
-            )
+            list_path="ruleset_model_descriptions[0]",
+        )
 
     class RulesetModelInstanceRule(PartialRuleDefinition):
         def __init__(self):
@@ -33,10 +33,9 @@ def __init__(self):
                     USER=False, BASELINE_0=True, PROPOSED=False
                 ),
                 manual_check_required_msg="Manual Check Required - Baseline is modeled with purchased chilled water. Make sure "
-                                          "baseline systems served by purchased chilled water are modeled with the purchased chilled water loop having "
-                                          "a minimum flow setpoint of 25%.",
+                "baseline systems served by purchased chilled water are modeled with the purchased chilled water loop having "
+                "a minimum flow setpoint of 25%.",
                 not_applicable_msg="Rule 22-38 Not Applicable - the baseline is not modeled with Purchased Chilled Water",
-
             )
 
         def applicability_check(self, context, calc_vals, data):

diff --git a/rct229/rulesets/ashrae9012019/section22/section22rule39.py b/rct229/rulesets/ashrae9012019/section22/section22rule39.py
@@ -23,7 +23,7 @@ def __init__(self):
             ruleset_section_title="HVAC - Chiller",
             standard_section="Section G3.1.3.10 Chilled-Water Pumps (Systems 7, 8, 11, 12, and 13)",
             is_primary_rule=False,
-            list_path="ruleset_model_descriptions[0]"
+            list_path="ruleset_model_descriptions[0]",
         )
 
     class RulesetModelInstanceRule(PartialRuleDefinition):
@@ -32,10 +32,9 @@ def __init__(self):
                 rmds_used=produce_ruleset_model_description(
                     USER=False, BASELINE_0=True, PROPOSED=False
                 ),
-            manual_check_required_msg="Manual Check Required - Baseline is modeled with purchased chilled water. Make sure "
-            "baseline systems served by purchased chilled water are modeled with a distribution pump whose pump power is 16 W/gpm.",
-            not_applicable_msg="Rule 22-39 Not Applicable - the baseline is not modeled with Purchased Chilled Water",
-
+                manual_check_required_msg="Manual Check Required - Baseline is modeled with purchased chilled water. Make sure "
+                "baseline systems served by purchased chilled water are modeled with a distribution pump whose pump power is 16 W/gpm.",
+                not_applicable_msg="Rule 22-39 Not Applicable - the baseline is not modeled with Purchased Chilled Water",
             )
 
         def applicability_check(self, context, calc_vals, data):

diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule37.py b/rct229/rulesets/ashrae9012019/section5/section5rule37.py
@@ -46,7 +46,7 @@ def __init__(self):
             standard_section="Section G3.1-5(b) Building Envelope Modeling Requirements for the Proposed design",
             is_primary_rule=True,
             list_path="ruleset_model_descriptions[0].buildings[*]",
-            data_items={"climate_zone": (PROPOSED, "weather/climate_zone")}
+            data_items={"climate_zone": (PROPOSED, "weather/climate_zone")},
         )
 
     class BuildingRule(RuleDefinitionBase):

diff --git a/rct229/ruletest_engine/ruletest_engine.py b/rct229/ruletest_engine/ruletest_engine.py
@@ -702,7 +702,8 @@ def evaluate_outcome_object(outcome_dict, test_result_dict, test_dict, test_id):
             )
 
             test_result_dict["log"].append(
-                f"{outcome_result_context}: Calculated values - {outcome_calc_vals_string}"
+                # Append calculations but cap length of string to avoid printing long arrays
+                f"{outcome_result_context}: Calculated values - {outcome_calc_vals_string[:300]}"
             )
 
         test_result_dict[f"{test_id}"].append(received_expected_outcome)

diff --git a/rct229/ruletest_engine/ruletest_jsons/ashrae9012019/section1/rule_1_4.json b/rct229/ruletest_engine/ruletest_jsons/ashrae9012019/section1/rule_1_4.json
@@ -511,8 +511,8 @@
                         ],
                         "output": {
                             "id": "Output 1",
-                            "performance_cost_index": 0.5,
-                            "performance_cost_index_target": 0.65
+                            "performance_cost_index": 0.57,
+                            "performance_cost_index_target": 0.7
                         },
                         "type": "USER"
                     }
@@ -555,8 +555,8 @@
                         ],
                         "output": {
                             "id": "Output 1",
-                            "performance_cost_index": 0.5,
-                            "performance_cost_index_target": 0.75
+                            "performance_cost_index": 0.55,
+                            "performance_cost_index_target": 0.7
                         },
                         "type": "PROPOSED"
                     }
@@ -600,7 +600,7 @@
                         "output": {
                             "id": "Output 1",
                             "performance_cost_index": 0.5,
-                            "performance_cost_index_target": 0.6
+                            "performance_cost_index_target": 0.7
                         },
                         "type": "BASELINE_0"
                     }