honeybee-radiance-postprocess 0.4.497__py2.py3-none-any.whl → 0.4.499__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/cli/breeam.py

@@ -61,7 +61,7 @@ def breeam_4b(
 )
 def breeam_4b_vis(output_folder):
     """Write visualization metadata files for BREEAM 4b."""
-    colors = [Color(220, 0, 0), Color(240, 170, 130), Color(250, 200, 170), Color(0, 220, 0)]
+    colors = [Color(220, 0, 0), Color(220, 110, 25), Color(255, 190, 0), Color(0, 220, 0)]
     pass_fail_lpar = \
         LegendParameters(min=0, max=3, colors=colors, segment_count=4, title='Pass/Fail')
     pass_fail_lpar.ordinal_dictionary = {

honeybee_radiance_postprocess/cli/leed.py

@@ -5,6 +5,10 @@ import logging
 import os
 import click
 
+from ladybug.color import Color
+from ladybug.datatype.generic import GenericType
+from ladybug.legend import LegendParameters
+
 from ..leed.leed import leed_option_one
 from ..results.annual_daylight import AnnualDaylight
 
@@ -94,3 +98,46 @@ def daylight_option_one(
         sys.exit(1)
     else:
         sys.exit(0)
+
+
+@leed.command('leed-daylight-option-one-vis-metadata')
+@click.option(
+    '--output-folder', '-o', help='Output folder for vis metadata files.',
+    type=click.Path(exists=False, file_okay=False, dir_okay=True, resolve_path=True),
+    default='visualization', show_default=True
+)
+def leed_daylight_optione_one_vis(output_folder):
+    """Write visualization metadata files for LEED Daylight Option I."""
+    colors = [Color(220, 0, 0), Color(0, 220, 0)]
+    pass_fail_lpar = \
+        LegendParameters(min=0, max=1, colors=colors, segment_count=2, title='Pass/Fail')
+    pass_fail_lpar.ordinal_dictionary = {0: "Fail", 1: "Pass"}
+
+    metric_info_dict = {
+        'DA': {
+            'type': 'VisualizationMetaData',
+            'data_type': GenericType('DA300,50%', '').to_dict(),
+            'unit': '',
+            'legend_parameters': pass_fail_lpar.to_dict()
+        },
+        'ASE': {
+            'type': 'VisualizationMetaData',
+            'data_type': GenericType('ASE1000,250hrs', '').to_dict(),
+            'unit': '',
+            'legend_parameters': pass_fail_lpar.to_dict()
+        }
+    }
+    try:
+        if not os.path.exists(output_folder):
+            os.mkdir(output_folder)
+        for metric, data in metric_info_dict.items():
+            if not os.path.exists(os.path.join(output_folder, metric)):
+                os.mkdir(os.path.join(output_folder, metric))
+            file_path = os.path.join(output_folder, metric, 'vis_metadata.json')
+            with open(file_path, 'w') as fp:
+                json.dump(data, fp, indent=4)
+    except Exception:
+        _logger.exception('Failed to write the visualization metadata files.')
+        sys.exit(1)
+    else:
+        sys.exit(0)

honeybee_radiance_postprocess/leed/leed.py

@@ -740,6 +740,27 @@ def leed_option_one(
             folder.joinpath('states_schedule_err.json')
         states_schedule_err_file.write_text(json.dumps(fail_to_comply))
 
+        pf_folder = folder.joinpath('pass_fail')
+        pf_folder.mkdir(parents=True, exist_ok=True)
+        for pass_sda_grid, pass_ase_grid, grid_info in zip(
+                pass_sda_grids, pass_ase_grids, grids_info):
+            grid_id = grid_info['full_id']
+            da_pf_folder = pf_folder.joinpath('DA')
+            da_pf_folder.mkdir(parents=True, exist_ok=True)
+            da_pf_file = da_pf_folder.joinpath(f'{grid_id}.pf')
+            pass_sda_grid = pass_sda_grid.astype(int)
+            np.savetxt(da_pf_file, pass_sda_grid, fmt='%d')
+            grids_info_file = da_pf_folder.joinpath('grids_info.json')
+            grids_info_file.write_text(json.dumps(grids_info, indent=2))
+
+            ase_pf_folder = pf_folder.joinpath('ASE')
+            ase_pf_folder.mkdir(parents=True, exist_ok=True)
+            ase_pf_file = ase_pf_folder.joinpath(f'{grid_id}.pf')
+            pass_ase_grid = pass_ase_grid.astype(int)
+            np.savetxt(ase_pf_file, pass_ase_grid, fmt='%d')
+            grids_info_file = ase_pf_folder.joinpath('grids_info.json')
+            grids_info_file.write_text(json.dumps(grids_info, indent=2))
+
     return (summary, summary_grid, da_grids, hours_above, states_schedule,
             fail_to_comply, grids_info)
 

honeybee_radiance_postprocess/metrics.py

@@ -295,11 +295,16 @@ def ase_array2d(
             Defaults to 1000.
 
     Returns:
-        A NumPy float of the ASE as a percentage (decimal).
+        A Tuple with two values.
+
+        -   ase: NumPy float of the ASE as a percentage (decimal).
+
+        -   h_above: 1D NumPy array of the number of hours above the direct
+            threshold.
     """
     check_array_dim(array, 2)
     h_above = (array > direct_threshold).sum(axis=1)
-    ase = (h_above > occ_hours).sum() / array.shape[0] * 100
+    ase = (h_above >= occ_hours).sum() / array.shape[0] * 100
 
     return ase, h_above
 

{honeybee_radiance_postprocess-0.4.497.dist-info → honeybee_radiance_postprocess-0.4.499.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.497
+Version: 0.4.499
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools

{honeybee_radiance_postprocess-0.4.497.dist-info → honeybee_radiance_postprocess-0.4.499.dist-info}/RECORD

@@ -8,19 +8,19 @@ honeybee_radiance_postprocess/dynamic.py,sha256=RPJh2SsjASYJCsG5QRkazVCvzWjzMxm9
 honeybee_radiance_postprocess/electriclight.py,sha256=E7uhq7-YtZ02F9a1FbEdrXnxmYJNOFnfLF0Yw3JLQ-g,732
 honeybee_radiance_postprocess/en17037.py,sha256=h3W1ewnVsLSBamArowMkQKYaJfpKV8updJxQuTkB31k,10800
 honeybee_radiance_postprocess/helper.py,sha256=qz5kaJxzy1tGBfVYYXc2cEToOCoj0YLOtwjr3LVI3YU,9000
-honeybee_radiance_postprocess/metrics.py,sha256=6EHCuXf5jnhh6GglI9mTd0MFpfhfPFoKMf4b5gKRTMI,14038
+honeybee_radiance_postprocess/metrics.py,sha256=yrUbdUfqQHWr2lGPhG9BRtG7eHbEaOrrjH9kAkL-6RA,14180
 honeybee_radiance_postprocess/reader.py,sha256=p4A91amyCI16lRRn0bhZdInsg-qJV0Jas3v4YVhRx-4,2674
 honeybee_radiance_postprocess/type_hints.py,sha256=4R0kZgacQrqzoh8Tq7f8MVzUDzynV-C_jlh80UV6GPE,1122
 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=SC7qM1ryPuvP8aDfHuj6qRfWxY1PhExOaSL7mjl12Mc,3147
+honeybee_radiance_postprocess/cli/breeam.py,sha256=-mkQDUgFksfPiZwMgbp4i-qh2PYzl-hGc7LFmsVpS90,3144
 honeybee_radiance_postprocess/cli/datacollection.py,sha256=Wb3UX03uW4OUZP7jWHftKfdf3aO_FSXjrnrziR3taf0,4541
 honeybee_radiance_postprocess/cli/grid.py,sha256=gqnU3-HdggWCUg9mA1RLZJYHM7tH0v6r2E_X2SSkAig,11256
-honeybee_radiance_postprocess/cli/leed.py,sha256=bxGX2UBehYNcaPJWHL2yEasSP6dATD7B0aNNQOflqqM,3712
+honeybee_radiance_postprocess/cli/leed.py,sha256=vup_tVcSnSO5R7U_WPVDAhtSSRrPzTUgV4j9lyxvxEk,5546
 honeybee_radiance_postprocess/cli/merge.py,sha256=oOqqud3VSo-3f3coDoUILcp78OI4DKxXLWCS1bi3PC4,5752
 honeybee_radiance_postprocess/cli/mtxop.py,sha256=UZJnjNpPjDmShy1-Mxos4H2vTUqk_yP3ZyaC1_LLFeI,5015
 honeybee_radiance_postprocess/cli/postprocess.py,sha256=ZN7G79gDq3Dag2vUwliFWxxZp-gk3ON2sIm9RSwCXDw,39317
@@ -34,7 +34,7 @@ honeybee_radiance_postprocess/ies/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBu
 honeybee_radiance_postprocess/ies/lm.py,sha256=6f1LDiAWGEX7IvU8OavGC6POlXpgpYp_QFBCHhowo0s,9370
 honeybee_radiance_postprocess/ies/lm_schedule.py,sha256=ci58GXq2PntJ4yNUdI_x4UCRmq6KrLes-u7GeboX058,9954
 honeybee_radiance_postprocess/leed/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
-honeybee_radiance_postprocess/leed/leed.py,sha256=Md7ASfnNq6enxJpaBzLmglTv7Zg9q7pPo8r9RHKRoCU,34240
+honeybee_radiance_postprocess/leed/leed.py,sha256=-oHi5dxPeJQaWBL7BKyK_ZxxMehQuoVcgQyWMQdq8EA,35383
 honeybee_radiance_postprocess/leed/leed_schedule.py,sha256=s3by1sv1DtOlCawvaMvnIDvEo5D8ATEJvWQ_rEeJIHg,9956
 honeybee_radiance_postprocess/results/__init__.py,sha256=1agBQbfT4Tf8KqSZzlfKYX8MeZryY4jJ1KB4HWqaDDk,182
 honeybee_radiance_postprocess/results/annual_daylight.py,sha256=11d4J1iIuITKuoWyWa-2_2WdrHYBULC0YP-mWBWi4JQ,34724
@@ -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.497.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.497.dist-info/METADATA,sha256=k0n7qpu61YLso-VOa_2PnLI4o0pqepFoUXinVEgJwgY,2238
-honeybee_radiance_postprocess-0.4.497.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_radiance_postprocess-0.4.497.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.497.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.497.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.499.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.499.dist-info/METADATA,sha256=UAvJbhNQzMbKJvAPAPh3o7_pOwiIhR81h1NIlpcuK3g,2238
+honeybee_radiance_postprocess-0.4.499.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_radiance_postprocess-0.4.499.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.499.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.499.dist-info/RECORD,,