address comments about occupant type dataset

building_energy_standards_data/database_files/support_occupant_energy_behavior.json

@@ -6,7 +6,7 @@
         "heating_setpoint": 24.9,
         "heating_setpoint_units": "Celsius",
         "minimum_dimming_level": 0,
-        "annotation": "Based on previous works of literature"
+        "annotation": "Based on previous literature, see the reference table in Occupant Types Dataset section in Structure.md"
     },
     {
         "energy_behavior_name": "office_normal",
@@ -15,7 +15,7 @@
         "heating_setpoint": 22.7,
         "heating_setpoint_units": "Celsius",
         "minimum_dimming_level": 0.2,
-        "annotation": "Based on previous works of literature"
+        "annotation": "Based on previous literature, see the reference table in Occupant Types Dataset section in Structure.md"
     },
     {
         "energy_behavior_name": "office_austerity",
@@ -24,6 +24,6 @@
         "heating_setpoint": 20.5,
         "heating_setpoint_units": "Celsius",
         "minimum_dimming_level": 0.5,
-        "annotation": "Based on previous works of literature"
+        "annotation": "Based on previous literature, see the reference table in Occupant Types Dataset section in Structure.md"
     }
 ]

building_energy_standards_data/database_tables/__init__.py

@@ -88,8 +88,8 @@
     "exterior_lighting_90_1_prm",
     "exterior_lighting_IECC",
     "support_occupant_energy_behavior",
-    # tables with foreign keys
     "support_occupant_physical_characteristics",
+    # tables with foreign keys
     "level_2_lighting_space_types",
     "level_2_ventilation_space_types",
     "level_1_space_types",

building_energy_standards_data/database_tables/support_occupant_energy_behavior.py

@@ -10,9 +10,9 @@
 Must provide a dict that contains the following key-value pairs:
 energy_behavior_name TEXT NOT NULL UNIQUE ,
 cooling_setpoint NUMERIC,
-cooling_setpoint_units TEXT,
+cooling_setpoint_units TEXT NOT NULL,
 heating_setpoint NUMERIC,
-heating_setpoint_units TEXT,
+heating_setpoint_units TEXT NOT NULL,
 minimum_dimming_level NUMERIC,
 annotation TEXT
 """
@@ -21,9 +21,9 @@
 CREATE TABLE IF NOT EXISTS support_occupant_energy_behavior (
     energy_behavior_name TEXT UNIQUE NOT NULL PRIMARY KEY,
     cooling_setpoint NUMERIC,
-    cooling_setpoint_units TEXT,
+    cooling_setpoint_units TEXT NOT NULL,
     heating_setpoint NUMERIC,
-    heating_setpoint_units TEXT,
+    heating_setpoint_units TEXT NOT NULL,
     minimum_dimming_level NUMERIC,
     annotation TEXT
 );

docs/Structure.md

@@ -29,10 +29,10 @@ The equipment assumptions are based on a plug-load values derived from a project
 The schedules used in the database were determined based on the PNNL led *Development of Building-Space-Specific Loads for Performance Rating Methods* project. The schedules were derived from the [SBEM-NCN database](https://www.ncm-pcdb.org.uk/sap/page.jsp?id=7), modifications were applied to make them perceived as more realistic such as reducing the occupancy fraction during the day (as space is very rarely fully occupied), or leave a very small fraction of the lights on at night. 
 
 ### Occupant Types Dataset
-Different groups of occupants may exhibit varying behaviors influenced by factors such as the type of space, cultural background, and social context. The occupant types database is designed to caputure diverse behavioral patterns and create a representative dataset that enables users to improve the building energy modeling and advance research on dynamic occupant behavior using OpenStudio. 
+Different groups of occupants may exhibit varying behaviors influenced by factors such as the type of space, cultural background, and social context. The occupant types database is designed to caputure diverse behavioral patterns and create a representative dataset that enables users to improve the building energy modeling and advance research on dynamic occupant behavior. 
 
 #### Occupant Types Data Structure
-This database is insipried by a previous work Lawrence Berkeley National Laboratory (LBNL) led [(Sun and Hong 2017)](https://www.sciencedirect.com/science/article/abs/pii/S0378778817302013), which established a framework categorizing occupant types into three primary categories: 
+This database is insipried by a previous work led by Lawrence Berkeley National Laboratory (LBNL) [(Sun and Hong 2017)](https://www.sciencedirect.com/science/article/abs/pii/S0378778817302013), which established a framework categorizing occupant types into three primary categories: 
 - energy behavior (including actions related to thermostat and lighting),
 - physical characteristics of occupants (including clothing insulation, work efficiency, CO2 generation, and air velocity),
 - 24-hour occupant schedule. 
@@ -67,4 +67,4 @@ The specific details of each subcategory of design occupant types are summarized
 <tr><td>CO<sub>2</sub> generation rate</td><td><a href="https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards">ANSI/ASHRAE Standard 62.1-2017 </td><td>A default metabolic rate of 1 met is assumed.</td><td></tr>
 </table>
 
-**Notice**: This initial design of the occupant types database focuses specifically on office space types and has not yet been integrated into OpenStudio-Standards yet. 
+**Notice**: This initial design of the occupant types database focuses specifically on office space types and has not yet been integrated into simulation software.