honeybee-radiance-postprocess 0.4.385__py2.py3-none-any.whl → 0.4.387__py2.py3-none-any.whl

honeybee_radiance_postprocess/cli/postprocess.py

@@ -770,7 +770,7 @@ def annual_metrics_file(
     '--grids-info', '-gi', help='An optional JSON file with grid information. '
     'If no file is provided the command will look for a file in the folder.',
     default=None, show_default=True,
-    type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True)
+    type=click.Path(exists=False, file_okay=True, dir_okay=False, resolve_path=True)
 )
 @click.option(
     '--name', '-n', help='Optional filename of grid summary.',
@@ -792,6 +792,9 @@ def grid_summary_metric(
 ):
     """Calculate a grid summary.
 
+    If the grids info file is omitted it is a requirement that there is a grids
+    info file in the main folder or in each sub folder.
+
     \b
     Args:
         folder: A folder with results.
@@ -801,9 +804,11 @@ def grid_summary_metric(
         folder = Path(folder)
 
         # get grids information
-        if grids_info:
+        if grids_info and Path(grids_info).is_file():
             with open(grids_info) as gi:
                 grids_info = json.load(gi)
+        else:
+            grids_info = None
 
         # get grid metrics
         if grid_metrics and Path(grid_metrics).is_file():

honeybee_radiance_postprocess/leed.py

@@ -25,7 +25,8 @@ from .util import filter_array, recursive_dict_merge
 
 
 def _create_grid_summary(
-    grid_info, sda_grid, ase_grid, pass_sda, pass_ase, total_floor,
+    grid_info, sda_grid, sda_blinds_up_grid, sda_blinds_down_grid, ase_grid,
+    pass_sda, pass_sda_blind_up, pass_sda_blinds_down, pass_ase, total_floor,
     area_weighted=True):
     """Create a LEED summary for a single grid.
 
@@ -65,6 +66,8 @@ def _create_grid_summary(
                 'full_id': grid_id,
                 'ase': round(ase_grid, 2),
                 'sda': round(sda_grid, 2),
+                'sda_blinds_up': round(sda_blinds_up_grid, 2),
+                'sda_blinds_down': round(sda_blinds_down_grid, 2),
                 'floor_area_passing_ase': round(pass_ase, 2),
                 'floor_area_passing_sda': round(pass_sda, 2),
                 'total_floor_area': round(total_floor, 2)
@@ -77,6 +80,8 @@ def _create_grid_summary(
                 'full_id': grid_id,
                 'ase': round(ase_grid, 2),
                 'sda': round(sda_grid, 2),
+                'sda_blinds_up': round(sda_blinds_up_grid, 2),
+                'sda_blinds_down': round(sda_blinds_down_grid, 2),
                 'sensor_count_passing_ase': int(round(pass_ase, 2)),
                 'sensor_count_passing_sda': int(round(pass_sda, 2)),
                 'total_sensor_count': total_floor
@@ -90,8 +95,9 @@ def _create_grid_summary(
 
 def _leed_summary(
     pass_ase_grids: list, pass_sda_grids: list, grids_info: list,
-    grid_areas: list) -> Tuple[dict, dict]:
-    """_summary_
+    grid_areas: list, pass_sda_blinds_up_grids: list,
+    pass_sda_blinds_down_grids: list) -> Tuple[dict, dict]:
+    """Create combined summary and summary for each grid individually.
 
     Args:
         pass_ase_grids: A list where each sublist is a list of True/False that
@@ -115,18 +121,29 @@ def _leed_summary(
         total_area = 0
         total_area_pass_ase = 0
         total_area_pass_sda = 0
-        for (pass_ase, pass_sda, grid_area, grid_info) in \
-            zip(pass_ase_grids, pass_sda_grids, grid_areas, grids_info):
+        for (pass_ase, pass_sda, grid_area, grid_info, pass_sda_blinds_up,
+             pass_sda_blinds_down) in \
+            zip(pass_ase_grids, pass_sda_grids, grid_areas, grids_info,
+                pass_sda_blinds_up_grids, pass_sda_blinds_down_grids):
             total_grid_area = grid_area.sum()
+
             area_pass_ase = grid_area[pass_ase].sum()
-            area_pass_sda = grid_area[pass_sda].sum()
             ase_grid = (total_grid_area - area_pass_ase) / total_grid_area * 100
+
+            area_pass_sda = grid_area[pass_sda].sum()
+            area_pass_sda_blind_up = grid_area[pass_sda_blinds_up].sum()
+            area_pass_sda_blinds_down = grid_area[pass_sda_blinds_down].sum()
             sda_grid = area_pass_sda / total_grid_area * 100
+            sda_blinds_up_grid = area_pass_sda_blind_up / total_grid_area * 100
+            sda_blinds_down_grid = area_pass_sda_blinds_down / total_grid_area * 100
+
             # grid summary
             grid_summary = \
                 _create_grid_summary(
-                    grid_info, sda_grid, ase_grid, area_pass_sda, area_pass_ase,
-                    total_grid_area, area_weighted=True
+                    grid_info, sda_grid, sda_blinds_up_grid, sda_blinds_down_grid,
+                    ase_grid, area_pass_sda, area_pass_sda_blind_up,
+                    area_pass_sda_blinds_down, area_pass_ase, total_grid_area,
+                    area_weighted=True
                 )
 
             recursive_dict_merge(summary_grid, grid_summary)
@@ -145,18 +162,28 @@ def _leed_summary(
         total_sensor_count = 0
         total_sensor_count_pass_ase = 0
         total_sensor_count_pass_sda = 0
-        for (pass_ase, pass_sda, grid_info) in \
-            zip(pass_ase_grids, pass_sda_grids, grids_info):
+        for (pass_ase, pass_sda, grid_info, pass_sda_blinds_up,
+             pass_sda_blinds_down) in \
+            zip(pass_ase_grids, pass_sda_grids, grids_info,
+                pass_sda_blinds_up_grids, pass_sda_blinds_down_grids):
             grid_count = grid_info['count']
             sensor_count_pass_ase = pass_ase.sum()
-            sensor_count_pass_sda = pass_sda.sum()
             ase_grid = (grid_count - sensor_count_pass_ase) / grid_count * 100
+
+            sensor_count_pass_sda = pass_sda.sum()
+            sensor_count_pass_sda_blinds_up = pass_sda_blinds_up.sum()
+            sensor_count_pass_sda_blinds_down = pass_sda_blinds_down.sum()
             sda_grid = sensor_count_pass_sda / grid_count * 100
+            sda_blinds_up_grid = sensor_count_pass_sda_blinds_up / grid_count * 100
+            sda_blinds_down_grid = sensor_count_pass_sda_blinds_down / grid_count * 100
+
             # grid summary
             grid_summary = \
                 _create_grid_summary(
-                    grid_info, sda_grid, ase_grid, sensor_count_pass_sda,
-                    sensor_count_pass_ase, grid_count, area_weighted=False
+                    grid_info, sda_grid, sda_blinds_up_grid, sda_blinds_down_grid,
+                    ase_grid, sensor_count_pass_sda, sensor_count_pass_sda_blinds_up,
+                    sensor_count_pass_sda_blinds_down, sensor_count_pass_ase,
+                    grid_count, area_weighted=False
                 )
 
             recursive_dict_merge(summary_grid, grid_summary)
@@ -478,9 +505,9 @@ def leed_states_schedule(
                     (combination_array >= 1000).sum(axis=0) / grid_count
                 array_list_combinations.append(combination_percentage)
             array_combinations = np.array(array_list_combinations)
-            array_combinations[array_combinations > 0.02] = np.NINF
+            array_combinations[array_combinations > 0.02] = -np.inf
 
-            grid_comply = np.where(np.all(array_combinations==np.NINF, axis=0))[0]
+            grid_comply = np.where(np.all(array_combinations==-np.inf, axis=0))[0]
             if grid_comply.size != 0:
                 grid_comply = np.array(results.sun_up_hours)[grid_comply]
                 fail_to_comply[grid_info['name']] = \
@@ -628,9 +655,13 @@ def leed_option_one(
     # spatial daylight autonomy
     da_grids = []
     pass_sda_grids = []
+    pass_sda_blinds_up_grids = []
+    pass_sda_blinds_down_grids = []
     for grid_info in grids_info:
         light_paths = [lp[0] for lp in grid_info['light_path']]
         arrays = []
+        arrays_blinds_up = []
+        arrays_blinds_down = []
         # combine total array for all light paths
         for light_path in light_paths:
             array = results._get_array(grid_info, light_path, res_type='total')
@@ -641,19 +672,31 @@ def leed_option_one(
                 shd_trans_array = states_schedule[light_path][sun_up_hours]
                 shd_trans_array = shd_trans_array[occ_mask.astype(bool)]
                 arrays.append(array_filter * shd_trans_array)
+                arrays_blinds_up.append(array_filter)
+                arrays_blinds_down.append(array_filter * shd_trans_dict[light_path])
             else:
                 arrays.append(array_filter)
+                arrays_blinds_up.append(array_filter)
+                arrays_blinds_down.append(array_filter)
         array = sum(arrays)
+        array_blinds_up = sum(arrays_blinds_up)
+        array_blinds_down = sum(arrays_blinds_down)
         # calculate da per grid
         da_grid = da_array2d(array, total_occ=total_occ, threshold=threshold)
         da_grids.append(da_grid)
+        da_blinds_up_grid = da_array2d(
+            array_blinds_up, total_occ=total_occ, threshold=threshold)
+        da_blinds_down_grid = da_array2d(
+            array_blinds_down, total_occ=total_occ, threshold=threshold)
         # calculate sda per grid
-        pass_sda = da_grid >= target_time
-        pass_sda_grids.append(pass_sda)
+        pass_sda_grids.append(da_grid >= target_time)
+        pass_sda_blinds_up_grids.append(da_blinds_up_grid >= target_time)
+        pass_sda_blinds_down_grids.append(da_blinds_down_grid >= target_time)
 
     # create summaries for all grids and each grid individually
     summary, summary_grid = _leed_summary(
-        pass_ase_grids, pass_sda_grids, grids_info, grid_areas=grid_areas)
+        pass_ase_grids, pass_sda_grids, grids_info, grid_areas,
+        pass_sda_blinds_up_grids, pass_sda_blinds_down_grids)
 
     # credits
     if not fail_to_comply:

{honeybee_radiance_postprocess-0.4.385.dist-info → honeybee_radiance_postprocess-0.4.387.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.385
+Version: 0.4.387
 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.385.dist-info → honeybee_radiance_postprocess-0.4.387.dist-info}/RECORD

@@ -7,7 +7,7 @@ honeybee_radiance_postprocess/dynamic.py,sha256=RPJh2SsjASYJCsG5QRkazVCvzWjzMxm9
 honeybee_radiance_postprocess/electriclight.py,sha256=E7uhq7-YtZ02F9a1FbEdrXnxmYJNOFnfLF0Yw3JLQ-g,732
 honeybee_radiance_postprocess/en17037.py,sha256=5c5ahfzad12FqMwBL7c0sLOKHzLKSTXtlYFfaNhzA3w,10848
 honeybee_radiance_postprocess/helper.py,sha256=qz5kaJxzy1tGBfVYYXc2cEToOCoj0YLOtwjr3LVI3YU,9000
-honeybee_radiance_postprocess/leed.py,sha256=XTi5gvACqCbwB58ctDL4fpkB0AHjW7A4M3h5gH28g1w,33461
+honeybee_radiance_postprocess/leed.py,sha256=egdWC5nU81dlm7Xq_kKLqDWVeYdbghr2b7XZYmZ_YN0,35986
 honeybee_radiance_postprocess/metrics.py,sha256=6EHCuXf5jnhh6GglI9mTd0MFpfhfPFoKMf4b5gKRTMI,14038
 honeybee_radiance_postprocess/reader.py,sha256=6myKzfGC1pO8zPixg1kKrKjPihHabTKUh2t5BlJvij0,2367
 honeybee_radiance_postprocess/type_hints.py,sha256=4R0kZgacQrqzoh8Tq7f8MVzUDzynV-C_jlh80UV6GPE,1122
@@ -18,7 +18,7 @@ honeybee_radiance_postprocess/cli/abnt.py,sha256=fTMqgzuaZ6d7BE8CI4GWQBr1_r-qWhp
 honeybee_radiance_postprocess/cli/grid.py,sha256=6peLEAPVe-iw05_wdRpFruZLqO8myvC-_QT5W1q5sk8,10677
 honeybee_radiance_postprocess/cli/leed.py,sha256=QBR6AMJJWuZ0TevyMi2tXCWMLdS-ZSqtVTZDgqxwa7M,3112
 honeybee_radiance_postprocess/cli/mtxop.py,sha256=UZJnjNpPjDmShy1-Mxos4H2vTUqk_yP3ZyaC1_LLFeI,5015
-honeybee_radiance_postprocess/cli/postprocess.py,sha256=JbYPqJqL7iYSyj22yn0g-ImwdTUcMnXI27x0U8gGOsw,38989
+honeybee_radiance_postprocess/cli/postprocess.py,sha256=CnUsIE3fWUZWLBeIjSW_wte9ptKKx-oaNDBGo63YHF4,39202
 honeybee_radiance_postprocess/cli/schedule.py,sha256=6uIy98Co4zm-ZRcELo4Lfx_aN3lNiqPe-BSimXwt1F8,3877
 honeybee_radiance_postprocess/cli/translate.py,sha256=18zkcGeRZALJ5Z82NEB3XZ-iEX2cHyneobGWV-IXWE0,6789
 honeybee_radiance_postprocess/cli/two_phase.py,sha256=1nZF4jyZ_C7CAfiHCz1UUOEwDaB4yOXr9ga0HIrhOB0,7033
@@ -27,9 +27,9 @@ honeybee_radiance_postprocess/results/__init__.py,sha256=1agBQbfT4Tf8KqSZzlfKYX8
 honeybee_radiance_postprocess/results/annual_daylight.py,sha256=o4Y5kbD3a4X4KRfsbOlWzgrnNKU365GcivM6qQGUGXU,31605
 honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=5zwrr4MNeHUebbSRpSBbscPOZUs2AHmYCQfIIbdYImY,8298
 honeybee_radiance_postprocess/results/results.py,sha256=jkjsxTuvVfBus6tM2UjQE3ZKPooLInWEd2guqO61v9E,53600
-honeybee_radiance_postprocess-0.4.385.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.385.dist-info/METADATA,sha256=4jb_DnWRE1U3g9BHMZSA6b7hTG3C-4fgQwkQkFPK4JU,2245
-honeybee_radiance_postprocess-0.4.385.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
-honeybee_radiance_postprocess-0.4.385.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.385.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.385.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.387.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.387.dist-info/METADATA,sha256=dg1xvqmzHgPcqY6vdOLB_4P3Qt0pCMFL8cmjfdCScBM,2245
+honeybee_radiance_postprocess-0.4.387.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
+honeybee_radiance_postprocess-0.4.387.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.387.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.387.dist-info/RECORD,,