made changes to be able to work with dev_settings along with idf_ou…

…tput_variables

demo/brick_demo/brick_dataset/data_file.csv

@@ -1,4 +1,4 @@
-Date/Time,CORE_ZN:Zone Thermostat Heating Setpoint Temperature,CORE_ZN:Zone Thermostat Cooling Setpoint Temperature,zone_2:Zone Thermostat Heating Setpoint Temperature,zone_2:Zone Thermostat Cooling Setpoint Temperature
+Date/Time,CORE_ZN:CORE_ZN_heating_temperature_setpoint,CORE_ZN:CORE_ZN_cooling_temperature_setpoint,zone_2:zone_2_heating_temperature_setpoint,zone_2:zone_2_cooling_temperature_setpoint
  01/01  01:00:00,15.56,29.44,15.56,29.44
  01/01  02:00:00,15.56,29.44,15.56,29.44
  01/01  03:00:00,15.56,29.44,15.56,29.44

demo/brick_demo/brick_workflow.json

@@ -24,8 +24,8 @@
             "MethodCall": "Payloads['BrickCompliance_obj'].query_verification_case_datapoints",
             "Parameters": {
                 "verification_item_lib_name": "ZoneTempControl",
-                "energyplus_naming_assembly": true,
-						    "default_verification_case_values": "{'run_simulation': False, 'simulation_IO': {'idf': './demo/brick_demo/brick_dataset/ASHRAE901_OfficeSmall_STD2019_Atlanta.idf', 'idd': './resources/Energy+V9_0_1.idd', 'weather': './weather/USA_GA_Atlanta-Hartsfield.Jackson.Intl.AP.722190_TMY3.epw', 'output': './demo/brick_demo/brick_dataset/data_file.csv', 'ep_path': 'C:\\\\\\\\EnergyPlusV9-0-1\\\\\\\\energyplus.exe'}, 'expected_result': 'pass', 'parameters': {}}"},
+                "energyplus_naming_assembly": false,
+						    "default_verification_case_values": "{'run_simulation': False, 'simulation_IO': {'idf': 'EnergyPlus_data', 'idd': './resources/Energy+V9_0_1.idd', 'weather': './weather/USA_GA_Atlanta-Hartsfield.Jackson.Intl.AP.722190_TMY3.epw', 'output': './demo/brick_demo/brick_dataset/data_file.csv', 'ep_path': 'C:\\\\\\\\EnergyPlusV9-0-1\\\\\\\\energyplus.exe'}, 'expected_result': 'pass', 'parameters': {}}"},
             "Payloads": {"query_result": "$"},
             "Next": "instantiate verification case"
 			  },

src/api/brick_compliance.py

@@ -105,9 +105,7 @@ def __init__(
                 "ep_path": "",
             },
             "expected_result": "",
-            "datapoints_source": {
-                "idf_output_variables": {},
-            },
+            "datapoints_source": {},
             "parameters": {},
             "verification_class": "",
         }
@@ -208,9 +206,14 @@ def get_applicable_verification_lib_items(
             for query_result in self.query_verification_case_datapoints(
                 verification_lib_item
             ):
-                queried_datapoints = set(
-                    query_result["datapoints_source"]["idf_output_variables"]
-                )
+                try:
+                    queried_datapoints = set(
+                        query_result["datapoints_source"]["idf_output_variables"]
+                    )
+                except KeyError:
+                    queried_datapoints = set(
+                        query_result["datapoints_source"]["dev_settings"]
+                    )
                 lib_datapoints = set(
                     self.library_json[verification_lib_item]["description_datapoints"]
                 )
@@ -423,6 +426,13 @@ def _convert_to_verification_case_format_helper(
         energyplus_naming_assembly: str,
         default_verification_case_values: dict = None,
     ) -> list:
+
+        if energyplus_naming_assembly:
+            self.verification_case_dict["datapoints_source"]["idf_output_variables"] = {}
+        else:
+            self.verification_case_dict["datapoints_source"]["dev_settings"] = {}
+
+
         verification_case_saving_list = []
         for idx, query_dict in enumerate(
             self.queried_datapoint_all_dict[verification_case_name]
@@ -442,9 +452,14 @@ def _convert_to_verification_case_format_helper(
             for key, value in query_dict.items():
                 if key not in ("hvac_zone"):
                     point_nonmen = datapoint_info[key]["point"]
-                    verification_case_dict_copy["datapoints_source"][
-                        "idf_output_variables"
-                    ][point_nonmen] = {}
+                    if energyplus_naming_assembly:
+                        verification_case_dict_copy["datapoints_source"][
+                            "idf_output_variables"
+                        ][point_nonmen] = {}
+                    else:
+                        verification_case_dict_copy["datapoints_source"][
+                            "dev_settings"
+                        ][point_nonmen] = {}
 
                     datapoint_ver_case_idx = self.queried_datapoint_all_dict[
                         verification_case_name
@@ -467,7 +482,7 @@ def _convert_to_verification_case_format_helper(
                         )
                     else:
                         verification_case_dict_copy["datapoints_source"][
-                            "idf_output_variables"
+                            "dev_settings"
                         ][point_nonmen].update(
                             {
                                 "subject": "" if subject is None else subject,

tests/api/test_brick_compliance.py

@@ -245,7 +245,7 @@ def test_query_verification_case_datapoints(self):
         )
 
         # check zone 1's datapoint names
-        zone1_info = query_result[0]["datapoints_source"]["idf_output_variables"]
+        zone1_info = query_result[0]["datapoints_source"]["dev_settings"]
         self.assertEqual(
             zone1_info["T_set_cool"]["subject"],
             "zone_1",
@@ -265,7 +265,7 @@ def test_query_verification_case_datapoints(self):
         )
 
         # check zone 2's datapoint names
-        zone2_info = query_result[1]["datapoints_source"]["idf_output_variables"]
+        zone2_info = query_result[1]["datapoints_source"]["dev_settings"]
         self.assertEqual(
             zone2_info["T_set_cool"]["subject"],
             "zone_2",