honeybee-radiance-postprocess 0.4.498__py2.py3-none-any.whl → 0.4.500__py2.py3-none-any.whl

honeybee_radiance_postprocess/breeam/breeam.py

@@ -360,7 +360,7 @@ def breeam_daylight_assessment_4b(
         if program_type is None:
             continue
         if program_type not in type_summary:
-            type_summary[program_type] = {}
+            type_summary[program_type] = {}  # add dict for program type
         type_summary[program_type][grid_info['full_id']] = []
 
         array = results._array_from_states(grid_info, zero_array=True)
@@ -374,33 +374,36 @@ def breeam_daylight_assessment_4b(
             metrics_summary['area'] = grid_areas[grid_info['full_id']]
             # calculate number of hours where avg. illuminance > target illuminance
             target_ill = metrics['average_daylight_illuminance']['illuminance']
-            hrs_abv = (avg_ill >= target_ill).sum()
+            hrs_abv_avg = (avg_ill >= target_ill).sum()
             # check if value is >= target hours
             target_hrs = metrics['average_daylight_illuminance']['hours']
-            avg_comply = hrs_abv >= target_hrs
+            avg_comply = hrs_abv_avg >= target_hrs
 
             # calculate number of hours where illuminance > target illuminance
             if program_type == 'BREEAM::Prison_buildings::Cells_and_custody_cells':
-                minimum_comply = True
+                min_comply = True  # no minimum daylight illuminance for this space
             else:
                 target_ill = metrics['minimum_daylight_illuminance']['illuminance']
                 hrs_abv_target = (array >= target_ill).sum(axis=1)
                 # get the minimum, i.e., worst lit point
-                worst_lit_point = np.min(hrs_abv_target)
+                hrs_abv_min = np.min(hrs_abv_target)
                 # check if values is >= target hours
                 target_hrs = metrics['minimum_daylight_illuminance']['hours']
-                minimum_comply = worst_lit_point >= target_hrs
+                min_comply = hrs_abv_min >= target_hrs
 
             metrics_summary['credits'] = metrics['credits']
-            if avg_comply and minimum_comply:
+            if avg_comply and min_comply:
                 metrics_summary['comply'] = True
             else:
                 metrics_summary['comply'] = False
             metrics_summary['average-comply'] = True if avg_comply else False
-            metrics_summary['minimum-comply'] = True if minimum_comply else False
-            
+            metrics_summary['minimum-comply'] = True if min_comply else False
+
             metrics_summary['count'] = grid_info['count']
 
+            metrics_summary['average-illuminance-hours'] = hrs_abv_avg
+            metrics_summary['minimum-illuminance-hours'] = hrs_abv_min
+
             type_summary[program_type][grid_info['full_id']].append(metrics_summary)
 
     program_summary = []
@@ -448,6 +451,24 @@ def breeam_daylight_assessment_4b(
                 program_type_summary['area_comply_%'] = metric_summary['area_comply_%']
                 program_type_summary['type'] = metric_summary['type']
 
+        avg_hrs, min_hrs, areas = [], [], []
+        for grid_id, metrics_list in grid_summary.items():
+            for metric in metrics_list:
+                areas.append(metric['area'])
+                avg_hrs.append(metric['average-illuminance-hours'])
+                min_hrs.append(metric['minimum-illuminance-hours'])
+                break  # only need to get the first one
+
+        area_proportions = np.array(areas) / program_type_summary['total_area']
+
+        weighted_hours_avg = area_proportions * np.array(avg_hrs)
+        total_weighted_hours_avg = np.sum(weighted_hours_avg)
+        program_type_summary['average-illuminance-hours'] = total_weighted_hours_avg
+
+        weighted_hours_min = area_proportions * np.array(min_hrs)
+        total_weighted_hours_min = np.sum(weighted_hours_min)
+        program_type_summary['minimum-illuminance-hours'] = total_weighted_hours_min
+
         program_summary.append(program_type_summary)
 
     building_type_summary = {}

{honeybee_radiance_postprocess-0.4.498.dist-info → honeybee_radiance_postprocess-0.4.500.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.498
+Version: 0.4.500
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools
@@ -13,7 +13,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-radiance==1.66.146
+Requires-Dist: honeybee-radiance==1.66.147
 Requires-Dist: numpy<2.0.0
 
 [![Build Status](https://github.com/ladybug-tools/honeybee-radiance-postprocess/actions/workflows/ci.yaml/badge.svg)](https://github.com/ladybug-tools/honeybee-radiance-postprocess/actions)

{honeybee_radiance_postprocess-0.4.498.dist-info → honeybee_radiance_postprocess-0.4.500.dist-info}/RECORD

@@ -14,7 +14,7 @@ honeybee_radiance_postprocess/type_hints.py,sha256=4R0kZgacQrqzoh8Tq7f8MVzUDzynV
 honeybee_radiance_postprocess/util.py,sha256=uxqop4TsUMp8l8iLQf784NJINprHCgj00GZHvTth1C0,5603
 honeybee_radiance_postprocess/vis_metadata.py,sha256=7ywIgdiuNKcctxifhpy7-Q2oaSX2ngQBeA0Kh7q1Gg0,1780
 honeybee_radiance_postprocess/breeam/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
-honeybee_radiance_postprocess/breeam/breeam.py,sha256=0krsh8gIRpTTSi86GnAIpCIYkvWy0bi6WwJjz-co53o,18279
+honeybee_radiance_postprocess/breeam/breeam.py,sha256=Na0zthVdka2j5_NiIdl0aqlB4866sOgoePWIhKCdm5s,19364
 honeybee_radiance_postprocess/cli/__init__.py,sha256=_mYHnIOpH0qJ4QK56SB3qUT2Duuts2GR2U_0t_uE-2s,958
 honeybee_radiance_postprocess/cli/abnt.py,sha256=RmEjhxdEK6Uks3S10rQs6n8cup9qv036qRwh_wj1taA,15705
 honeybee_radiance_postprocess/cli/breeam.py,sha256=-mkQDUgFksfPiZwMgbp4i-qh2PYzl-hGc7LFmsVpS90,3144
@@ -42,9 +42,9 @@ honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=5zwrr4MNeHUebb
 honeybee_radiance_postprocess/results/results.py,sha256=8wpxu6HBnrJXRoTkI7ucNuzhVmNKw1Z2zPP6wzk7ULQ,55236
 honeybee_radiance_postprocess/well/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
 honeybee_radiance_postprocess/well/well.py,sha256=Fs81hs5e2UaVo2hlbHiRsxiSQHfSMvCt6ZT1a4psF9E,22350
-honeybee_radiance_postprocess-0.4.498.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.498.dist-info/METADATA,sha256=Q_ZOGRSPF9lW9nW6RDHk9HyFY5WKvHQ06c-oqRh3doM,2238
-honeybee_radiance_postprocess-0.4.498.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_radiance_postprocess-0.4.498.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.498.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.498.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.500.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.500.dist-info/METADATA,sha256=9KloLOMRRbb5KOLp-1xpFHdsj0J7QHfRV_k9_xhdnqs,2238
+honeybee_radiance_postprocess-0.4.500.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_radiance_postprocess-0.4.500.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.500.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.500.dist-info/RECORD,,