openstudio-common-measures 0.9.0 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (241) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test_with_openstudio.yml +2 -2
  3. data/CHANGELOG.md +17 -0
  4. data/Gemfile +10 -5
  5. data/Jenkinsfile +1 -1
  6. data/LICENSE.md +1 -1
  7. data/README.md +2 -0
  8. data/doc_templates/LICENSE.md +1 -1
  9. data/lib/measures/.rubocop.yml +6 -0
  10. data/lib/measures/AddCostPerAreaToConstruction/LICENSE.md +1 -1
  11. data/lib/measures/AddCostPerAreaToConstruction/measure.xml +21 -21
  12. data/lib/measures/AddCostPerFloorAreaToBuilding/LICENSE.md +1 -1
  13. data/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml +25 -25
  14. data/lib/measures/AddCostPerFloorAreaToElectricEquipment/LICENSE.md +1 -1
  15. data/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml +21 -21
  16. data/lib/measures/AddCostPerFloorAreaToLights/LICENSE.md +1 -1
  17. data/lib/measures/AddCostPerFloorAreaToLights/measure.xml +21 -21
  18. data/lib/measures/AddCostPerFloorAreaUnusedToLights/LICENSE.md +1 -1
  19. data/lib/measures/AddCostPerFloorAreaUnusedToLights/measure.xml +21 -21
  20. data/lib/measures/AddCostToSupplySideHVACComponentByAirLoop/LICENSE.md +1 -1
  21. data/lib/measures/AddCostToSupplySideHVACComponentByAirLoop/measure.xml +24 -24
  22. data/lib/measures/AddCostperAreatoUnusedConstruction/LICENSE.md +1 -1
  23. data/lib/measures/AddCostperAreatoUnusedConstruction/measure.xml +21 -21
  24. data/lib/measures/AddExteriorLights/LICENSE.md +1 -1
  25. data/lib/measures/AddExteriorLights/measure.xml +19 -19
  26. data/lib/measures/AddMeter/LICENSE.md +1 -1
  27. data/lib/measures/AddMeter/measure.xml +15 -15
  28. data/lib/measures/AddOutputDiagnostics/LICENSE.md +1 -1
  29. data/lib/measures/AddOutputDiagnostics/measure.rb +1 -1
  30. data/lib/measures/AddOutputDiagnostics/measure.xml +18 -18
  31. data/lib/measures/AddOutputVariable/LICENSE.md +1 -1
  32. data/lib/measures/AddOutputVariable/measure.xml +15 -15
  33. data/lib/measures/AddSimplePvToShadingSurfacesByType/LICENSE.md +1 -1
  34. data/lib/measures/AddSimplePvToShadingSurfacesByType/measure.xml +24 -24
  35. data/lib/measures/AddThermalComfortModelTypes/LICENSE.md +1 -1
  36. data/lib/measures/AddThermalComfortModelTypes/measure.xml +21 -21
  37. data/lib/measures/AdjustSystemEfficiencies/LICENSE.md +1 -1
  38. data/lib/measures/AdjustSystemEfficiencies/measure.xml +12 -12
  39. data/lib/measures/AdjustThermostatSetpointsByDegrees/LICENSE.md +1 -1
  40. data/lib/measures/AdjustThermostatSetpointsByDegrees/measure.xml +23 -23
  41. data/lib/measures/ChangeBuildingLocation/LICENSE.md +1 -1
  42. data/lib/measures/ChangeBuildingLocation/README.md +1 -1
  43. data/lib/measures/ChangeBuildingLocation/measure.rb +8 -13
  44. data/lib/measures/ChangeBuildingLocation/measure.xml +104 -86
  45. data/lib/measures/ChangeBuildingLocation/resources/epw.rb +7 -2
  46. data/lib/measures/EnableIdealAirLoadsForAllZones/LICENSE.md +1 -1
  47. data/lib/measures/EnableIdealAirLoadsForAllZones/measure.xml +22 -22
  48. data/lib/measures/ExportScheduleCSV/LICENSE.md +1 -1
  49. data/lib/measures/ExportScheduleCSV/measure.xml +29 -29
  50. data/lib/measures/ImportEnvelopeAndInternalLoadsFromIdf/LICENSE.md +1 -1
  51. data/lib/measures/ImportEnvelopeAndInternalLoadsFromIdf/measure.xml +29 -29
  52. data/lib/measures/MeterFlodPlot/LICENSE.md +1 -1
  53. data/lib/measures/MeterFlodPlot/measure.xml +35 -35
  54. data/lib/measures/ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects/LICENSE.md +1 -1
  55. data/lib/measures/ModifyEnergyPlusCoilCoolingDXSingleSpeedObjects/measure.xml +24 -24
  56. data/lib/measures/ModifyEnergyPlusFanVariableVolumeObjects/LICENSE.md +1 -1
  57. data/lib/measures/ModifyEnergyPlusFanVariableVolumeObjects/measure.xml +24 -24
  58. data/lib/measures/PredictedMeanVote/LICENSE.md +1 -1
  59. data/lib/measures/PredictedMeanVote/measure.xml +23 -23
  60. data/lib/measures/RemoveInternalLoadsDirectlyAssignedToSpaces/LICENSE.md +1 -1
  61. data/lib/measures/RemoveInternalLoadsDirectlyAssignedToSpaces/measure.xml +21 -21
  62. data/lib/measures/RemoveUnusedDefaultProfiles/LICENSE.md +1 -1
  63. data/lib/measures/RemoveUnusedDefaultProfiles/measure.xml +19 -19
  64. data/lib/measures/ReplaceExteriorWindowConstruction/LICENSE.md +1 -1
  65. data/lib/measures/ReplaceExteriorWindowConstruction/measure.xml +29 -29
  66. data/lib/measures/ReplaceModel/LICENSE.md +1 -1
  67. data/lib/measures/ReplaceModel/README.md +1 -3
  68. data/lib/measures/ReplaceModel/measure.xml +32 -14
  69. data/lib/measures/ReplaceThermostatSchedules/LICENSE.md +1 -1
  70. data/lib/measures/ReplaceThermostatSchedules/measure.xml +17 -17
  71. data/lib/measures/ReportModelChanges/LICENSE.md +1 -1
  72. data/lib/measures/ReportModelChanges/measure.xml +23 -23
  73. data/lib/measures/RunPeriod/LICENSE.md +1 -1
  74. data/lib/measures/RunPeriod/measure.xml +14 -14
  75. data/lib/measures/RunPeriodMultiple/LICENSE.md +1 -1
  76. data/lib/measures/RunPeriodMultiple/measure.xml +12 -12
  77. data/lib/measures/ServerDirectoryCleanup/LICENSE.md +1 -1
  78. data/lib/measures/ServerDirectoryCleanup/README.md +14 -14
  79. data/lib/measures/ServerDirectoryCleanup/measure.rb +22 -18
  80. data/lib/measures/ServerDirectoryCleanup/measure.xml +44 -44
  81. data/lib/measures/SetCOPforSingleSpeedDXCoolingUnits/LICENSE.md +1 -1
  82. data/lib/measures/SetCOPforSingleSpeedDXCoolingUnits/measure.xml +23 -23
  83. data/lib/measures/SetCOPforTwoSpeedDXCoolingUnits/LICENSE.md +1 -1
  84. data/lib/measures/SetCOPforTwoSpeedDXCoolingUnits/measure.xml +23 -23
  85. data/lib/measures/SetEnergyPlusInfiltrationFlowRatePerFloorArea/LICENSE.md +1 -1
  86. data/lib/measures/SetEnergyPlusInfiltrationFlowRatePerFloorArea/measure.xml +24 -24
  87. data/lib/measures/SetEnergyPlusLightObjectsLPD/LICENSE.md +1 -1
  88. data/lib/measures/SetEnergyPlusLightObjectsLPD/measure.xml +24 -24
  89. data/lib/measures/SetEnergyPlusMinimumOutdoorAirFlowRate/LICENSE.md +1 -1
  90. data/lib/measures/SetEnergyPlusMinimumOutdoorAirFlowRate/measure.xml +24 -24
  91. data/lib/measures/SetGasBurnerEfficiency/LICENSE.md +1 -1
  92. data/lib/measures/SetGasBurnerEfficiency/measure.xml +23 -23
  93. data/lib/measures/SetLifecycleCostParameters/LICENSE.md +1 -1
  94. data/lib/measures/SetLifecycleCostParameters/measure.xml +15 -15
  95. data/lib/measures/SetLightingLoadsByLPD/LICENSE.md +1 -1
  96. data/lib/measures/SetLightingLoadsByLPD/measure.xml +35 -35
  97. data/lib/measures/SetSpaceInfiltrationByExteriorSurfaceArea/LICENSE.md +1 -1
  98. data/lib/measures/SetSpaceInfiltrationByExteriorSurfaceArea/measure.xml +25 -25
  99. data/lib/measures/SetThermostatSchedules/LICENSE.md +1 -1
  100. data/lib/measures/SetThermostatSchedules/measure.xml +17 -17
  101. data/lib/measures/ShiftScheduleProfileTime/LICENSE.md +1 -1
  102. data/lib/measures/ShiftScheduleProfileTime/measure.xml +23 -23
  103. data/lib/measures/SwapLightsDefinition/LICENSE.md +1 -1
  104. data/lib/measures/SwapLightsDefinition/measure.xml +25 -25
  105. data/lib/measures/UnmetLoadHoursTroubleshooting/LICENSE.md +1 -1
  106. data/lib/measures/UnmetLoadHoursTroubleshooting/measure.xml +43 -43
  107. data/lib/measures/VentilationQAQC/LICENSE.md +1 -1
  108. data/lib/measures/VentilationQAQC/measure.xml +31 -31
  109. data/lib/measures/XcelEDAReportingandQAQC/LICENSE.md +1 -1
  110. data/lib/measures/XcelEDAReportingandQAQC/measure.xml +4 -4
  111. data/lib/measures/XcelEDATariffSelectionandModelSetup/LICENSE.md +1 -1
  112. data/lib/measures/XcelEDATariffSelectionandModelSetup/measure.xml +73 -73
  113. data/lib/measures/ZoneReport/LICENSE.md +1 -1
  114. data/lib/measures/ZoneReport/measure.xml +35 -35
  115. data/lib/measures/add_ems_emissions_reporting/LICENSE.md +1 -1
  116. data/lib/measures/add_ems_emissions_reporting/measure.rb +0 -2
  117. data/lib/measures/add_ems_emissions_reporting/measure.xml +23 -23
  118. data/lib/measures/add_ems_to_control_ev_charging/LICENSE.md +1 -1
  119. data/lib/measures/add_ems_to_control_ev_charging/measure.rb +0 -2
  120. data/lib/measures/add_ems_to_control_ev_charging/measure.xml +21 -21
  121. data/lib/measures/add_ev_load/LICENSE.md +1 -1
  122. data/lib/measures/add_ev_load/measure.xml +35 -35
  123. data/lib/measures/add_rooftop_pv/LICENSE.md +1 -1
  124. data/lib/measures/add_rooftop_pv/measure.rb +5 -7
  125. data/lib/measures/add_rooftop_pv/measure.xml +25 -25
  126. data/lib/measures/add_zone_mixing_object/LICENSE.md +1 -1
  127. data/lib/measures/add_zone_mixing_object/measure.xml +19 -19
  128. data/lib/measures/add_zone_ventilation_design_flow_rate_object/LICENSE.md +1 -1
  129. data/lib/measures/add_zone_ventilation_design_flow_rate_object/measure.xml +21 -21
  130. data/lib/measures/air_wall_zone_mixing/LICENSE.md +1 -1
  131. data/lib/measures/air_wall_zone_mixing/measure.rb +4 -6
  132. data/lib/measures/air_wall_zone_mixing/measure.xml +27 -27
  133. data/lib/measures/create_csv_output/LICENSE.md +1 -1
  134. data/lib/measures/create_csv_output/measure.xml +28 -28
  135. data/lib/measures/envelope_and_internal_load_breakdown/LICENSE.md +1 -1
  136. data/lib/measures/envelope_and_internal_load_breakdown/measure.rb +0 -4
  137. data/lib/measures/envelope_and_internal_load_breakdown/measure.xml +52 -52
  138. data/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb +1 -0
  139. data/lib/measures/example_report/LICENSE.md +1 -1
  140. data/lib/measures/example_report/measure.rb +2 -5
  141. data/lib/measures/example_report/measure.xml +41 -41
  142. data/lib/measures/example_report/resources/report.html.erb +1 -0
  143. data/lib/measures/gem_env_report/LICENSE.md +1 -1
  144. data/lib/measures/gem_env_report/measure.xml +32 -32
  145. data/lib/measures/generic_qaqc/LICENSE.md +1 -1
  146. data/lib/measures/generic_qaqc/README.md +0 -32
  147. data/lib/measures/generic_qaqc/measure.rb +13 -17
  148. data/lib/measures/generic_qaqc/measure.xml +15 -71
  149. data/lib/measures/generic_qaqc/resources/check_air_sys_temps.rb +2 -2
  150. data/lib/measures/generic_qaqc/resources/check_domestic_hot_water.rb +4 -4
  151. data/lib/measures/generic_qaqc/resources/check_envelope_conductance.rb +7 -5
  152. data/lib/measures/generic_qaqc/resources/check_internal_loads.rb +2 -2
  153. data/lib/measures/generic_qaqc/resources/check_mech_sys_type.rb +1 -1
  154. data/lib/measures/generic_qaqc/resources/check_plant_temps.rb +6 -6
  155. data/lib/measures/generic_qaqc/resources/check_schedules.rb +7 -7
  156. data/lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb +5 -2
  157. data/lib/measures/generic_qaqc/resources/report.html.erb +1 -0
  158. data/lib/measures/get_site_from_building_component_library/LICENSE.md +1 -1
  159. data/lib/measures/get_site_from_building_component_library/measure.rb +4 -8
  160. data/lib/measures/get_site_from_building_component_library/measure.xml +28 -28
  161. data/lib/measures/hvac_psychrometric_chart/LICENSE.md +1 -1
  162. data/lib/measures/hvac_psychrometric_chart/measure.xml +29 -29
  163. data/lib/measures/hvac_psychrometric_chart/resources/report.html.erb +1 -0
  164. data/lib/measures/inject_idf_objects/LICENSE.md +1 -1
  165. data/lib/measures/inject_idf_objects/measure.xml +31 -31
  166. data/lib/measures/openstudio_results/LICENSE.md +1 -1
  167. data/lib/measures/openstudio_results/README.md +10 -2
  168. data/lib/measures/openstudio_results/measure.rb +21 -13
  169. data/lib/measures/openstudio_results/measure.xml +404 -357
  170. data/lib/measures/openstudio_results/resources/Siz.AirConditionerVariableRefrigerantFlow.rb +1 -1
  171. data/lib/measures/openstudio_results/resources/Siz.CoilCoolingDXMultiSpeed.rb +10 -0
  172. data/lib/measures/openstudio_results/resources/Siz.CoilCoolingDXMultiSpeedStageData.rb +3 -1
  173. data/lib/measures/openstudio_results/resources/Siz.CoilCoolingDXSingleSpeed.rb +2 -2
  174. data/lib/measures/openstudio_results/resources/Siz.CoilCoolingDXTwoSpeed.rb +4 -3
  175. data/lib/measures/openstudio_results/resources/Siz.CoilCoolingWaterToAirHeatPumpEquationFit.rb +6 -0
  176. data/lib/measures/openstudio_results/resources/Siz.CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit.rb +10 -0
  177. data/lib/measures/openstudio_results/resources/Siz.CoilHeatingDXMultiSpeed.rb +10 -0
  178. data/lib/measures/openstudio_results/resources/Siz.CoilHeatingDXSingleSpeed.rb +1 -1
  179. data/lib/measures/openstudio_results/resources/Siz.CoilHeatingWaterToAirHeatPumpEquationFit.rb +6 -0
  180. data/lib/measures/openstudio_results/resources/Siz.CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit.rb +10 -0
  181. data/lib/measures/openstudio_results/resources/Siz.CoilPerformanceDXCooling.rb +1 -1
  182. data/lib/measures/openstudio_results/resources/Siz.FanSystemModel.rb +31 -0
  183. data/lib/measures/openstudio_results/resources/Siz.Model.rb +1 -0
  184. data/lib/measures/openstudio_results/resources/bootstrap.min.css +5 -0
  185. data/lib/measures/openstudio_results/resources/bootstrap.min.js +6 -0
  186. data/lib/measures/openstudio_results/resources/d3.min.js +5 -0
  187. data/lib/measures/openstudio_results/resources/dimple.v2.1.2.min.js +3 -0
  188. data/lib/measures/openstudio_results/resources/jquery.min.js +6 -0
  189. data/lib/measures/openstudio_results/resources/os_lib_reporting.rb +20 -8
  190. data/lib/measures/openstudio_results/resources/report.html.erb +6 -5
  191. data/lib/measures/remove_orphan_objects_and_unused_resources/LICENSE.md +1 -1
  192. data/lib/measures/remove_orphan_objects_and_unused_resources/measure.xml +24 -24
  193. data/lib/measures/set_electric_equipment_loads_by_epd/LICENSE.md +1 -1
  194. data/lib/measures/set_electric_equipment_loads_by_epd/measure.xml +33 -33
  195. data/lib/measures/set_exterior_walls_and_floors_to_adiabatic/LICENSE.md +1 -1
  196. data/lib/measures/set_exterior_walls_and_floors_to_adiabatic/measure.xml +19 -19
  197. data/lib/measures/set_run_period/LICENSE.md +1 -1
  198. data/lib/measures/set_run_period/measure.xml +19 -19
  199. data/lib/measures/set_space_infiltration_per_exterior_area/LICENSE.md +1 -1
  200. data/lib/measures/set_space_infiltration_per_exterior_area/README.md +11 -0
  201. data/lib/measures/set_space_infiltration_per_exterior_area/measure.rb +13 -0
  202. data/lib/measures/set_space_infiltration_per_exterior_area/measure.xml +42 -23
  203. data/lib/measures/shadow_calculation/LICENSE.md +1 -1
  204. data/lib/measures/shadow_calculation/measure.xml +18 -18
  205. data/lib/measures/simulation_control/README.md +120 -0
  206. data/lib/measures/simulation_control/README.md.erb +42 -0
  207. data/lib/measures/simulation_control/measure.rb +169 -0
  208. data/lib/measures/simulation_control/measure.xml +246 -0
  209. data/lib/measures/tariff_selection_block/LICENSE.md +1 -1
  210. data/lib/measures/tariff_selection_block/measure.rb +2 -5
  211. data/lib/measures/tariff_selection_block/measure.xml +25 -25
  212. data/lib/measures/tariff_selection_flat/LICENSE.md +1 -1
  213. data/lib/measures/tariff_selection_flat/measure.rb +3 -5
  214. data/lib/measures/tariff_selection_flat/measure.xml +25 -25
  215. data/lib/measures/tariff_selection_generic/LICENSE.md +1 -1
  216. data/lib/measures/tariff_selection_generic/measure.rb +2 -5
  217. data/lib/measures/tariff_selection_generic/measure.xml +39 -39
  218. data/lib/measures/tariff_selection_time_and_date_dependant/LICENSE.md +1 -1
  219. data/lib/measures/tariff_selection_time_and_date_dependant/measure.rb +19 -15
  220. data/lib/measures/tariff_selection_time_and_date_dependant/measure.xml +37 -25
  221. data/lib/measures/view_data/LICENSE.md +1 -1
  222. data/lib/measures/view_data/README.md +8 -0
  223. data/lib/measures/view_data/measure.rb +32 -7
  224. data/lib/measures/view_data/measure.xml +83 -40
  225. data/lib/measures/view_data/resources/js/TweenLite.2.1.3.min.js +12 -0
  226. data/lib/measures/view_data/resources/js/dat.gui.0.7.9.min.js +13 -0
  227. data/lib/measures/view_data/resources/js/three.orbitcontrols.js +706 -0
  228. data/lib/measures/view_data/resources/js/three.r98.min.js +964 -0
  229. data/lib/measures/view_data/resources/report.html.in +170 -1837
  230. data/lib/measures/view_model/LICENSE.md +1 -1
  231. data/lib/measures/view_model/README.md +7 -1
  232. data/lib/measures/view_model/measure.rb +28 -2
  233. data/lib/measures/view_model/measure.xml +80 -36
  234. data/lib/measures/view_model/resources/js/TweenLite.2.1.3.min.js +12 -0
  235. data/lib/measures/view_model/resources/js/dat.gui.0.7.9.min.js +13 -0
  236. data/lib/measures/view_model/resources/js/three.orbitcontrols.js +706 -0
  237. data/lib/measures/view_model/resources/js/three.r98.min.js +964 -0
  238. data/lib/measures/view_model/resources/report.html.in +168 -1835
  239. data/lib/openstudio/common_measures/version.rb +1 -1
  240. data/openstudio-common-measures.gemspec +10 -4
  241. metadata +76 -15
data/lib/measures/XcelEDATariffSelectionandModelSetup/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>xcel_eda_tariff_selectionand_model_setup</name>
5
5
  <uid>c5ab60e9-b8e5-4653-a502-5ed030f1335d</uid>
6
- <version_id>aee4a050-8cce-4e9a-8f6c-9ad93af850ba</version_id>
7
- <version_modified>20230607T052233Z</version_modified>
6
+ <version_id>f7e70c8e-6b11-4436-b518-5ac929c7c79e</version_id>
7
+ <version_modified>2024-11-16T23:54:19Z</version_modified>
8
8
  <xml_checksum>4FA703D1</xml_checksum>
9
9
  <class_name>XcelEDATariffSelectionandModelSetup</class_name>
10
10
  <display_name>XcelEDATariffSelectionandModelSetup</display_name>
@@ -133,10 +133,39 @@
133
133
  </attributes>
134
134
  <files>
135
135
  <file>
136
- <filename>EnvelopeAndLoadTestModel_01.osm</filename>
137
- <filetype>osm</filetype>
138
- <usage_type>test</usage_type>
139
- <checksum>E11F67BD</checksum>
136
+ <filename>LICENSE.md</filename>
137
+ <filetype>md</filetype>
138
+ <usage_type>license</usage_type>
139
+ <checksum>8696A072</checksum>
140
+ </file>
141
+ <file>
142
+ <filename>README.md</filename>
143
+ <filetype>md</filetype>
144
+ <usage_type>readme</usage_type>
145
+ <checksum>D8E0C68E</checksum>
146
+ </file>
147
+ <file>
148
+ <filename>README.md.erb</filename>
149
+ <filetype>erb</filetype>
150
+ <usage_type>readmeerb</usage_type>
151
+ <checksum>703C9964</checksum>
152
+ </file>
153
+ <file>
154
+ <version>
155
+ <software_program>OpenStudio</software_program>
156
+ <identifier>2.0.0</identifier>
157
+ <min_compatible>2.0.0</min_compatible>
158
+ </version>
159
+ <filename>measure.rb</filename>
160
+ <filetype>rb</filetype>
161
+ <usage_type>script</usage_type>
162
+ <checksum>808C0D31</checksum>
163
+ </file>
164
+ <file>
165
+ <filename>Commercial.idf</filename>
166
+ <filetype>idf</filetype>
167
+ <usage_type>resource</usage_type>
168
+ <checksum>3F35D94A</checksum>
140
169
  </file>
141
170
  <file>
142
171
  <filename>Interruptible Industrial G.idf</filename>
@@ -145,10 +174,10 @@
145
174
  <checksum>B643926B</checksum>
146
175
  </file>
147
176
  <file>
148
- <filename>Commercial.idf</filename>
177
+ <filename>Large CG.idf</filename>
149
178
  <filetype>idf</filetype>
150
179
  <usage_type>resource</usage_type>
151
- <checksum>3F35D94A</checksum>
180
+ <checksum>A27CAF65</checksum>
152
181
  </file>
153
182
  <file>
154
183
  <filename>Non-Xcel Commercial.idf</filename>
@@ -156,6 +185,18 @@
156
185
  <usage_type>resource</usage_type>
157
186
  <checksum>63C4C653</checksum>
158
187
  </file>
188
+ <file>
189
+ <filename>Non-Xcel Gas Firm.idf</filename>
190
+ <filetype>idf</filetype>
191
+ <usage_type>resource</usage_type>
192
+ <checksum>245CE0CB</checksum>
193
+ </file>
194
+ <file>
195
+ <filename>Non-Xcel Gas Interruptible.idf</filename>
196
+ <filetype>idf</filetype>
197
+ <usage_type>resource</usage_type>
198
+ <checksum>8A690662</checksum>
199
+ </file>
159
200
  <file>
160
201
  <filename>Non-Xcel Primary General.idf</filename>
161
202
  <filetype>idf</filetype>
@@ -186,6 +227,12 @@
186
227
  <usage_type>resource</usage_type>
187
228
  <checksum>85ABC54E</checksum>
188
229
  </file>
230
+ <file>
231
+ <filename>Residential Gas.idf</filename>
232
+ <filetype>idf</filetype>
233
+ <usage_type>resource</usage_type>
234
+ <checksum>5816D7C1</checksum>
235
+ </file>
189
236
  <file>
190
237
  <filename>Residential General.idf</filename>
191
238
  <filetype>idf</filetype>
@@ -204,30 +251,6 @@
204
251
  <usage_type>resource</usage_type>
205
252
  <checksum>0735795F</checksum>
206
253
  </file>
207
- <file>
208
- <filename>Transmission General.idf</filename>
209
- <filetype>idf</filetype>
210
- <usage_type>resource</usage_type>
211
- <checksum>CD615EA6</checksum>
212
- </file>
213
- <file>
214
- <filename>Large CG.idf</filename>
215
- <filetype>idf</filetype>
216
- <usage_type>resource</usage_type>
217
- <checksum>A27CAF65</checksum>
218
- </file>
219
- <file>
220
- <filename>Residential Gas.idf</filename>
221
- <filetype>idf</filetype>
222
- <usage_type>resource</usage_type>
223
- <checksum>5816D7C1</checksum>
224
- </file>
225
- <file>
226
- <filename>Small CG.idf</filename>
227
- <filetype>idf</filetype>
228
- <usage_type>resource</usage_type>
229
- <checksum>B1DA33A6</checksum>
230
- </file>
231
254
  <file>
232
255
  <filename>Secondary Photovoltaic Time-of-Use.idf</filename>
233
256
  <filetype>idf</filetype>
@@ -235,51 +258,28 @@
235
258
  <checksum>D5155043</checksum>
236
259
  </file>
237
260
  <file>
238
- <filename>Non-Xcel Gas Firm.idf</filename>
261
+ <filename>Small CG.idf</filename>
239
262
  <filetype>idf</filetype>
240
263
  <usage_type>resource</usage_type>
241
- <checksum>245CE0CB</checksum>
264
+ <checksum>B1DA33A6</checksum>
242
265
  </file>
243
266
  <file>
244
- <filename>Non-Xcel Gas Interruptible.idf</filename>
267
+ <filename>Transmission General.idf</filename>
245
268
  <filetype>idf</filetype>
246
269
  <usage_type>resource</usage_type>
247
- <checksum>8A690662</checksum>
248
- </file>
249
- <file>
250
- <filename>LICENSE.md</filename>
251
- <filetype>md</filetype>
252
- <usage_type>license</usage_type>
253
- <checksum>9640B6CB</checksum>
254
- </file>
255
- <file>
256
- <filename>README.md.erb</filename>
257
- <filetype>erb</filetype>
258
- <usage_type>readmeerb</usage_type>
259
- <checksum>703C9964</checksum>
260
- </file>
261
- <file>
262
- <filename>README.md</filename>
263
- <filetype>md</filetype>
264
- <usage_type>readme</usage_type>
265
- <checksum>D8E0C68E</checksum>
270
+ <checksum>CD615EA6</checksum>
266
271
  </file>
267
272
  <file>
268
- <filename>XcelEDATariffSelectionandModelSetup_Test.rb</filename>
269
- <filetype>rb</filetype>
273
+ <filename>EnvelopeAndLoadTestModel_01/files/USA_CO_Golden-NREL.724666_TMY3.epw</filename>
274
+ <filetype>epw</filetype>
270
275
  <usage_type>test</usage_type>
271
- <checksum>1486C77E</checksum>
276
+ <checksum>BDF687C1</checksum>
272
277
  </file>
273
278
  <file>
274
- <version>
275
- <software_program>OpenStudio</software_program>
276
- <identifier>2.0.0</identifier>
277
- <min_compatible>2.0.0</min_compatible>
278
- </version>
279
- <filename>measure.rb</filename>
280
- <filetype>rb</filetype>
281
- <usage_type>script</usage_type>
282
- <checksum>B040D95B</checksum>
279
+ <filename>EnvelopeAndLoadTestModel_01/project.osp</filename>
280
+ <filetype>osp</filetype>
281
+ <usage_type>test</usage_type>
282
+ <checksum>2F951741</checksum>
283
283
  </file>
284
284
  <file>
285
285
  <filename>EnvelopeAndLoadTestModel_01/project.osp-journal</filename>
@@ -294,16 +294,16 @@
294
294
  <checksum>7042FFF4</checksum>
295
295
  </file>
296
296
  <file>
297
- <filename>EnvelopeAndLoadTestModel_01/files/USA_CO_Golden-NREL.724666_TMY3.epw</filename>
298
- <filetype>epw</filetype>
297
+ <filename>EnvelopeAndLoadTestModel_01.osm</filename>
298
+ <filetype>osm</filetype>
299
299
  <usage_type>test</usage_type>
300
- <checksum>BDF687C1</checksum>
300
+ <checksum>E11F67BD</checksum>
301
301
  </file>
302
302
  <file>
303
- <filename>EnvelopeAndLoadTestModel_01/project.osp</filename>
304
- <filetype>osp</filetype>
303
+ <filename>XcelEDATariffSelectionandModelSetup_Test.rb</filename>
304
+ <filetype>rb</filetype>
305
305
  <usage_type>test</usage_type>
306
- <checksum>2F951741</checksum>
306
+ <checksum>8CFDBBFF</checksum>
307
307
  </file>
308
308
  </files>
309
309
  </measure>
data/lib/measures/ZoneReport/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/ZoneReport/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>zone_report</name>
5
5
  <uid>81ac119f-4841-434c-9e11-824310fe1cb7</uid>
6
- <version_id>54e4658d-21fa-46d2-9724-cf5791d19079</version_id>
7
- <version_modified>20221115T223557Z</version_modified>
6
+ <version_id>783f69cf-8d41-4389-b98b-d3f9b73f8891</version_id>
7
+ <version_modified>2024-11-16T23:54:13Z</version_modified>
8
8
  <xml_checksum>2C8A3EEF</xml_checksum>
9
9
  <class_name>ZoneReport</class_name>
10
10
  <display_name>Zone Report</display_name>
@@ -30,22 +30,16 @@
30
30
  </attributes>
31
31
  <files>
32
32
  <file>
33
- <filename>report.html.in</filename>
34
- <filetype>in</filetype>
35
- <usage_type>resource</usage_type>
36
- <checksum>9863EEC5</checksum>
37
- </file>
38
- <file>
39
- <filename>gas_electric_mark_load.osm</filename>
40
- <filetype>osm</filetype>
41
- <usage_type>test</usage_type>
42
- <checksum>1F5C6B63</checksum>
33
+ <filename>LICENSE.md</filename>
34
+ <filetype>md</filetype>
35
+ <usage_type>license</usage_type>
36
+ <checksum>8696A072</checksum>
43
37
  </file>
44
38
  <file>
45
- <filename>USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
46
- <filetype>epw</filetype>
47
- <usage_type>test</usage_type>
48
- <checksum>C254B53F</checksum>
39
+ <filename>README.md</filename>
40
+ <filetype>md</filetype>
41
+ <usage_type>readme</usage_type>
42
+ <checksum>C013AECE</checksum>
49
43
  </file>
50
44
  <file>
51
45
  <filename>README.md.erb</filename>
@@ -54,33 +48,39 @@
54
48
  <checksum>703C9964</checksum>
55
49
  </file>
56
50
  <file>
57
- <filename>README.md</filename>
58
- <filetype>md</filetype>
59
- <usage_type>readme</usage_type>
60
- <checksum>C013AECE</checksum>
51
+ <version>
52
+ <software_program>OpenStudio</software_program>
53
+ <identifier>2.0.0</identifier>
54
+ <min_compatible>2.0.0</min_compatible>
55
+ </version>
56
+ <filename>measure.rb</filename>
57
+ <filetype>rb</filetype>
58
+ <usage_type>script</usage_type>
59
+ <checksum>C6695B06</checksum>
61
60
  </file>
62
61
  <file>
63
- <filename>LICENSE.md</filename>
64
- <filetype>md</filetype>
65
- <usage_type>license</usage_type>
66
- <checksum>64FFEBDE</checksum>
62
+ <filename>report.html.in</filename>
63
+ <filetype>in</filetype>
64
+ <usage_type>resource</usage_type>
65
+ <checksum>9863EEC5</checksum>
66
+ </file>
67
+ <file>
68
+ <filename>USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
69
+ <filetype>epw</filetype>
70
+ <usage_type>test</usage_type>
71
+ <checksum>C254B53F</checksum>
67
72
  </file>
68
73
  <file>
69
74
  <filename>ZoneReport_Test.rb</filename>
70
75
  <filetype>rb</filetype>
71
76
  <usage_type>test</usage_type>
72
- <checksum>DD50BE40</checksum>
77
+ <checksum>5CDE28AB</checksum>
73
78
  </file>
74
79
  <file>
75
- <version>
76
- <software_program>OpenStudio</software_program>
77
- <identifier>2.0.0</identifier>
78
- <min_compatible>2.0.0</min_compatible>
79
- </version>
80
- <filename>measure.rb</filename>
81
- <filetype>rb</filetype>
82
- <usage_type>script</usage_type>
83
- <checksum>02F159D1</checksum>
80
+ <filename>gas_electric_mark_load.osm</filename>
81
+ <filetype>osm</filetype>
82
+ <usage_type>test</usage_type>
83
+ <checksum>1F5C6B63</checksum>
84
84
  </file>
85
85
  </files>
86
86
  </measure>
data/lib/measures/add_ems_emissions_reporting/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/add_ems_emissions_reporting/measure.rb CHANGED
@@ -4,8 +4,6 @@
4
4
  # *******************************************************************************
5
5
 
6
6
  require 'csv'
7
- require 'openstudio-extension'
8
- require 'openstudio/extension/core/os_lib_helper_methods'
9
7
 
10
8
  # start the measure
11
9
  class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
data/lib/measures/add_ems_emissions_reporting/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>add_ems_emissions_reporting</name>
5
5
  <uid>e8fe9153-5e70-4769-afa0-6da0045aa529</uid>
6
- <version_id>5503bbcc-4de8-4493-8ed7-e7129da38e82</version_id>
7
- <version_modified>20221115T223601Z</version_modified>
6
+ <version_id>5d43cac2-efd0-4a24-92af-afdbcca53db7</version_id>
7
+ <version_modified>2024-11-16T23:54:14Z</version_modified>
8
8
  <xml_checksum>976EB6EB</xml_checksum>
9
9
  <class_name>AddEMSEmissionsReporting</class_name>
10
10
  <display_name>Add EMS to Report Emissions</display_name>
@@ -447,10 +447,10 @@
447
447
  </attributes>
448
448
  <files>
449
449
  <file>
450
- <filename>example_model.osm</filename>
451
- <filetype>osm</filetype>
452
- <usage_type>test</usage_type>
453
- <checksum>8EA06A27</checksum>
450
+ <filename>LICENSE.md</filename>
451
+ <filetype>md</filetype>
452
+ <usage_type>license</usage_type>
453
+ <checksum>8696A072</checksum>
454
454
  </file>
455
455
  <file>
456
456
  <filename>README.md</filename>
@@ -458,6 +458,17 @@
458
458
  <usage_type>readme</usage_type>
459
459
  <checksum>D90928F0</checksum>
460
460
  </file>
461
+ <file>
462
+ <version>
463
+ <software_program>OpenStudio</software_program>
464
+ <identifier>2.5.1</identifier>
465
+ <min_compatible>3.8.0</min_compatible>
466
+ </version>
467
+ <filename>measure.rb</filename>
468
+ <filetype>rb</filetype>
469
+ <usage_type>script</usage_type>
470
+ <checksum>88A306FD</checksum>
471
+ </file>
461
472
  <file>
462
473
  <filename>future_annual_co2e.csv</filename>
463
474
  <filetype>csv</filetype>
@@ -572,28 +583,17 @@
572
583
  <usage_type>resource</usage_type>
573
584
  <checksum>6C952ECC</checksum>
574
585
  </file>
575
- <file>
576
- <filename>LICENSE.md</filename>
577
- <filetype>md</filetype>
578
- <usage_type>license</usage_type>
579
- <checksum>64FFEBDE</checksum>
580
- </file>
581
586
  <file>
582
587
  <filename>add_ems_emissions_reporting_test.rb</filename>
583
588
  <filetype>rb</filetype>
584
589
  <usage_type>test</usage_type>
585
- <checksum>17B2F148</checksum>
590
+ <checksum>8A2D4011</checksum>
586
591
  </file>
587
592
  <file>
588
- <version>
589
- <software_program>OpenStudio</software_program>
590
- <identifier>2.5.1</identifier>
591
- <min_compatible>2.5.1</min_compatible>
592
- </version>
593
- <filename>measure.rb</filename>
594
- <filetype>rb</filetype>
595
- <usage_type>script</usage_type>
596
- <checksum>471C0F9A</checksum>
593
+ <filename>example_model.osm</filename>
594
+ <filetype>osm</filetype>
595
+ <usage_type>test</usage_type>
596
+ <checksum>8EA06A27</checksum>
597
597
  </file>
598
598
  </files>
599
599
  </measure>
data/lib/measures/add_ems_to_control_ev_charging/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/add_ems_to_control_ev_charging/measure.rb CHANGED
@@ -4,8 +4,6 @@
4
4
  # *******************************************************************************
5
5
 
6
6
  # start the measure
7
- require 'openstudio-extension'
8
- require 'openstudio/extension/core/os_lib_helper_methods'
9
7
  class AddEMSToControlEVCharging < OpenStudio::Measure::ModelMeasure
10
8
  # human readable name
11
9
  def name
data/lib/measures/add_ems_to_control_ev_charging/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>add_ems_to_control_ev_charging</name>
5
5
  <uid>df97997f-d02a-4e35-af7a-5aed16cb5772</uid>
6
- <version_id>5a5c367a-fcf8-4162-ba42-59edc0c46a4a</version_id>
7
- <version_modified>20221115T223602Z</version_modified>
6
+ <version_id>a6a93a92-7693-4cf3-81a1-59a618e75322</version_id>
7
+ <version_modified>2024-11-16T23:54:15Z</version_modified>
8
8
  <xml_checksum>976EB6EB</xml_checksum>
9
9
  <class_name>AddEMSToControlEVCharging</class_name>
10
10
  <display_name>Add EMS to Control EV Charging</display_name>
@@ -50,10 +50,10 @@
50
50
  </attributes>
51
51
  <files>
52
52
  <file>
53
- <filename>example_model.osm</filename>
54
- <filetype>osm</filetype>
55
- <usage_type>test</usage_type>
56
- <checksum>E925F127</checksum>
53
+ <filename>LICENSE.md</filename>
54
+ <filetype>md</filetype>
55
+ <usage_type>license</usage_type>
56
+ <checksum>8696A072</checksum>
57
57
  </file>
58
58
  <file>
59
59
  <filename>README.md</filename>
@@ -61,28 +61,28 @@
61
61
  <usage_type>readme</usage_type>
62
62
  <checksum>70CA2C6E</checksum>
63
63
  </file>
64
- <file>
65
- <filename>LICENSE.md</filename>
66
- <filetype>md</filetype>
67
- <usage_type>license</usage_type>
68
- <checksum>64FFEBDE</checksum>
69
- </file>
70
- <file>
71
- <filename>add_ems_to_control_ev_charging_test.rb</filename>
72
- <filetype>rb</filetype>
73
- <usage_type>test</usage_type>
74
- <checksum>0BFC4A8F</checksum>
75
- </file>
76
64
  <file>
77
65
  <version>
78
66
  <software_program>OpenStudio</software_program>
79
67
  <identifier>2.5.1</identifier>
80
- <min_compatible>2.5.1</min_compatible>
68
+ <min_compatible>3.8.0</min_compatible>
81
69
  </version>
82
70
  <filename>measure.rb</filename>
83
71
  <filetype>rb</filetype>
84
72
  <usage_type>script</usage_type>
85
- <checksum>7EC3E27C</checksum>
73
+ <checksum>D2FD7CFE</checksum>
74
+ </file>
75
+ <file>
76
+ <filename>add_ems_to_control_ev_charging_test.rb</filename>
77
+ <filetype>rb</filetype>
78
+ <usage_type>test</usage_type>
79
+ <checksum>D10942F4</checksum>
80
+ </file>
81
+ <file>
82
+ <filename>example_model.osm</filename>
83
+ <filetype>osm</filetype>
84
+ <usage_type>test</usage_type>
85
+ <checksum>E925F127</checksum>
86
86
  </file>
87
87
  </files>
88
88
  </measure>
data/lib/measures/add_ev_load/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/add_ev_load/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>add_ev_load</name>
5
5
  <uid>a23e0493-7357-48ca-b089-4d902efd6b50</uid>
6
- <version_id>1a1691ef-23a0-4d6e-b061-f2b3407950a3</version_id>
7
- <version_modified>20221115T223600Z</version_modified>
6
+ <version_id>12fb9a15-3439-41f4-981b-832f5c219cd0</version_id>
7
+ <version_modified>2024-11-16T23:54:14Z</version_modified>
8
8
  <xml_checksum>9A202986</xml_checksum>
9
9
  <class_name>AddEVLoad</class_name>
10
10
  <display_name>Add_EV_Load</display_name>
@@ -136,10 +136,10 @@
136
136
  </attributes>
137
137
  <files>
138
138
  <file>
139
- <filename>example_model.osm</filename>
140
- <filetype>osm</filetype>
141
- <usage_type>test</usage_type>
142
- <checksum>E925F127</checksum>
139
+ <filename>LICENSE.md</filename>
140
+ <filetype>md</filetype>
141
+ <usage_type>license</usage_type>
142
+ <checksum>8696A072</checksum>
143
143
  </file>
144
144
  <file>
145
145
  <filename>README.md</filename>
@@ -147,6 +147,29 @@
147
147
  <usage_type>readme</usage_type>
148
148
  <checksum>2293F4B3</checksum>
149
149
  </file>
150
+ <file>
151
+ <version>
152
+ <software_program>OpenStudio</software_program>
153
+ <identifier>2.5.1</identifier>
154
+ <min_compatible>2.5.1</min_compatible>
155
+ </version>
156
+ <filename>measure.rb</filename>
157
+ <filetype>rb</filetype>
158
+ <usage_type>script</usage_type>
159
+ <checksum>D3110BC3</checksum>
160
+ </file>
161
+ <file>
162
+ <filename>PSN_BuildingKey.csv</filename>
163
+ <filetype>csv</filetype>
164
+ <usage_type>resource</usage_type>
165
+ <checksum>153D4BBA</checksum>
166
+ </file>
167
+ <file>
168
+ <filename>PSN_BuildingKey_v2.csv</filename>
169
+ <filetype>csv</filetype>
170
+ <usage_type>resource</usage_type>
171
+ <checksum>1000C8E8</checksum>
172
+ </file>
150
173
  <file>
151
174
  <filename>chg1_dow1_flex1.csv</filename>
152
175
  <filetype>csv</filetype>
@@ -327,40 +350,17 @@
327
350
  <usage_type>resource</usage_type>
328
351
  <checksum>114F9EA1</checksum>
329
352
  </file>
330
- <file>
331
- <filename>PSN_BuildingKey.csv</filename>
332
- <filetype>csv</filetype>
333
- <usage_type>resource</usage_type>
334
- <checksum>153D4BBA</checksum>
335
- </file>
336
- <file>
337
- <filename>PSN_BuildingKey_v2.csv</filename>
338
- <filetype>csv</filetype>
339
- <usage_type>resource</usage_type>
340
- <checksum>1000C8E8</checksum>
341
- </file>
342
- <file>
343
- <filename>LICENSE.md</filename>
344
- <filetype>md</filetype>
345
- <usage_type>license</usage_type>
346
- <checksum>64FFEBDE</checksum>
347
- </file>
348
353
  <file>
349
354
  <filename>add_ev_load_test.rb</filename>
350
355
  <filetype>rb</filetype>
351
356
  <usage_type>test</usage_type>
352
- <checksum>8D60903A</checksum>
357
+ <checksum>5381CBDE</checksum>
353
358
  </file>
354
359
  <file>
355
- <version>
356
- <software_program>OpenStudio</software_program>
357
- <identifier>2.5.1</identifier>
358
- <min_compatible>2.5.1</min_compatible>
359
- </version>
360
- <filename>measure.rb</filename>
361
- <filetype>rb</filetype>
362
- <usage_type>script</usage_type>
363
- <checksum>488C2195</checksum>
360
+ <filename>example_model.osm</filename>
361
+ <filetype>osm</filetype>
362
+ <usage_type>test</usage_type>
363
+ <checksum>E925F127</checksum>
364
364
  </file>
365
365
  </files>
366
366
  </measure>
data/lib/measures/add_rooftop_pv/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4