honeybee-radiance-postprocess 0.4.421__py2.py3-none-any.whl → 0.4.423__py2.py3-none-any.whl

honeybee_radiance_postprocess/cli/leed.py

@@ -28,24 +28,32 @@ def leed():
 @click.option(
     '--shade-transmittance', '-st', help='A value to use as a multiplier in place of '
     'solar shading. Value for shade transmittance must be 1 > value > 0.',
-    default=0.05, show_default=True, type=click.FLOAT
+    default=0.02, show_default=True, type=click.FLOAT
 )
 @click.option(
     '--shade-transmittance-file', '-stf', help='A JSON file with a dictionary '
     'where aperture groups are keys, and the value for each key is the shade '
     'transmittance. Values for shade transmittance must be 1 > value > 0. '
     'If any aperture groups are missing in the JSON file, its shade transmittance '
-    'value will be set to the value of the shade transmittance option (0.05 by '
+    'value will be set to the value of the --shade-transmittance option (0.02 by '
     'default).', default=None, show_default=True,
     type=click.Path(exists=False, file_okay=True, dir_okay=False, resolve_path=True)
 )
+@click.option(
+    '--use-shade-transmittance/--use-states', help='A flag to select if the '
+    'post-processing should use a shade transmittance or the simulated states '
+    'of aperture groups. Using states should only be selected if the annual '
+    'daylight simulation included ray tracing of a second (blind) state for '
+    'each aperture group.',
+    is_flag=True, default=True, show_default=True
+)
 @click.option(
     '--sub-folder', '-sf', help='Relative path for subfolder to write output '
     'files.', default='leed_summary', show_default=True
 )
 def daylight_option_one(
     folder, shade_transmittance, shade_transmittance_file, grids_filter,
-    sub_folder
+    use_shade_transmittance, sub_folder
 ):
     """Calculate credits for LEED v4.1 Daylight Option 1.
 
@@ -60,7 +68,12 @@ def daylight_option_one(
         folder: Results folder. This folder is an output folder of annual daylight
             recipe. The daylight simulation must include aperture groups.
     """
-    if shade_transmittance_file and os.path.isfile(shade_transmittance_file):
+    use_states = not use_shade_transmittance
+    if (
+        shade_transmittance_file
+        and os.path.isfile(shade_transmittance_file)
+        and use_shade_transmittance
+    ):
         with open(shade_transmittance_file) as json_file:
             shd_trans = json.load(json_file)
         results = AnnualDaylight(folder)
@@ -73,7 +86,8 @@ def daylight_option_one(
     try:
         leed_option_one(
             folder, grids_filter=grids_filter,
-            shade_transmittance=shade_transmittance, sub_folder=sub_folder
+            shade_transmittance=shade_transmittance, use_states=use_states,
+            sub_folder=sub_folder
         )
     except Exception:
         _logger.exception('Failed to generate LEED summary.')

honeybee_radiance_postprocess/cli/postprocess.py

@@ -567,7 +567,7 @@ def point_in_time(
     default=1000, type=float, show_default=True
 )
 @click.option(
-    '--occ_hours', '-oh', help='The number of occupied hours that cannot '
+    '--occ-hours', '-oh', help='The number of occupied hours that cannot '
     'receive more than the direct_threshold.', default=250, type=int,
     show_default=True
 )

honeybee_radiance_postprocess/leed/leed.py

@@ -563,9 +563,10 @@ def leed_option_one(
         # combine total array for all light paths
         if use_states:
             array = results._array_from_states(grid_info, states=states_schedule)
-            array_filter = np.apply_along_axis(filter_array, 1, array, occ_mask)
+            array = np.apply_along_axis(filter_array, 1, array, occ_mask)
 
             for light_path in light_paths:
+                # do an extra pass to calculate with blinds always up or down
                 array_blinds_up = results._get_array(
                     grid_info, light_path, state=0, res_type='total')
                 array_filter = np.apply_along_axis(
@@ -578,7 +579,8 @@ def leed_option_one(
                 arrays_blinds_down.append(array_filter)
         else:
             for light_path in light_paths:
-                array = results._get_array(grid_info, light_path, res_type='total')
+                array = results._get_array(
+                    grid_info, light_path, res_type='total')
                 array_filter = np.apply_along_axis(
                     filter_array, 1, array, occ_mask)
                 if light_path != '__static_apertures__':
@@ -587,12 +589,14 @@ def leed_option_one(
                     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])
+                    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

honeybee_radiance_postprocess/leed/leed_schedule.py

@@ -208,7 +208,7 @@ def states_schedule_descending(
 
             # Use advanced indexing to replace values in new_array for these hours
             for hour_idx, array_idx in zip(replace_indices, array_indices):
-                new_array[:, :, hour_idx] = full_direct_blinds[
+                new_array[array_idx, :, hour_idx] = full_direct_blinds[
                     array_idx, :, hour_idx
                 ]
 
@@ -223,8 +223,9 @@ def states_schedule_descending(
             combinations.append(hour_dict)
 
         final_summed_array = np.sum(new_array, axis=0)
-        final_percentage_sensors_summed = np.sum(
-            final_summed_array >= 1000, axis=0) / grid_count
+        final_percentage_sensors_summed = (
+            final_summed_array >= 1000).sum(
+            axis=0) / grid_count
         final_indices_above_2_percent = np.where(
             final_percentage_sensors_summed > 0.02)[0]
         if np.any(final_indices_above_2_percent):

honeybee_radiance_postprocess/results/results.py

@@ -1221,7 +1221,6 @@ class Results(_ResultsFolder):
         Returns:
             A NumPy array based on the states settings.
         """
-        grid_count = grid_info['count']
         # get states that are relevant for the grid
         states = self._filter_grid_states(grid_info, states=states)
 
@@ -1229,29 +1228,35 @@ class Results(_ResultsFolder):
         for light_path, gr_schedule in states.dynamic_schedule.items():
             if gr_schedule.is_static:
                 state = gr_schedule.schedule[0]
+                # if state is -1 we continue since it is "turned off"
                 if state == -1:
                     continue
+                # load static array (state is static)
                 array = self._get_array(
                     grid_info, light_path, state=state, res_type=res_type)
                 arrays.append(array)
             else:
-                # create default 0 array
-                array = np.zeros((grid_count, len(self.sun_up_hours)))
+                # create default 0 array, we will add to this later
+                array = np.zeros((grid_info['count'], len(self.sun_up_hours)))
                 # slice states to match sun up hours
-                states_array = np.array(gr_schedule.schedule)[list(map(int, self.sun_up_hours))]
-                for state in set(states_array.tolist()):
+                states_array = np.array(gr_schedule.schedule)[
+                    list(map(int, self.sun_up_hours))]
+                for state in np.unique(states_array):
                     if state == -1:
+                        # if state is -1 we continue since it is "turned off"
                         continue
+                    # load static array (state is static)
                     _array = self._get_array(
                         grid_info, light_path, state=state, res_type=res_type)
-                    conds = [states_array == state, states_array != state]
-                    array = np.select(conds, [_array, array])
+                    # get indices and add values to base array
+                    states_indicies = states_array == state
+                    array[:, states_indicies] += _array[:, states_indicies]
                 arrays.append(array)
         array = sum(arrays)
 
         if not np.any(array):
             if zero_array:
-                array = np.zeros((grid_count, len(self.sun_up_hours)))
+                array = np.zeros((grid_info['count'], len(self.sun_up_hours)))
             else:
                 array = np.array([])
 

{honeybee_radiance_postprocess-0.4.421.dist-info → honeybee_radiance_postprocess-0.4.423.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.421
+Version: 0.4.423
 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.94)
+Requires-Dist: honeybee-radiance (==1.66.95)
 Requires-Dist: numpy (>=1.21.6)
 
 [![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.421.dist-info → honeybee_radiance_postprocess-0.4.423.dist-info}/RECORD

@@ -16,24 +16,24 @@ honeybee_radiance_postprocess/vis_metadata.py,sha256=7ywIgdiuNKcctxifhpy7-Q2oaSX
 honeybee_radiance_postprocess/cli/__init__.py,sha256=PVfwkuPFl4TnvQt8ovVm01JK0Alon81BaY-0tshAXyg,795
 honeybee_radiance_postprocess/cli/abnt.py,sha256=GNLmVVrEQ-1oKr5ZmBllY-KODhgJPjLVidQ_dQMcpFk,15537
 honeybee_radiance_postprocess/cli/grid.py,sha256=6peLEAPVe-iw05_wdRpFruZLqO8myvC-_QT5W1q5sk8,10677
-honeybee_radiance_postprocess/cli/leed.py,sha256=0ukRZ6J7lOsg3LoMyNDPtupO1GeqhiPH4C1NDDKvL5Q,3136
+honeybee_radiance_postprocess/cli/leed.py,sha256=bxGX2UBehYNcaPJWHL2yEasSP6dATD7B0aNNQOflqqM,3712
 honeybee_radiance_postprocess/cli/mtxop.py,sha256=UZJnjNpPjDmShy1-Mxos4H2vTUqk_yP3ZyaC1_LLFeI,5015
-honeybee_radiance_postprocess/cli/postprocess.py,sha256=CnUsIE3fWUZWLBeIjSW_wte9ptKKx-oaNDBGo63YHF4,39202
+honeybee_radiance_postprocess/cli/postprocess.py,sha256=pzZ419eBt_LNNilW1y47c4lGTFxmV7cJyWnjV78GzY8,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=xA6ayPv26DM5fuMkLhBMYGklf_j5ymowmncwJGXRgo8,7034
 honeybee_radiance_postprocess/cli/util.py,sha256=Be9cGmYhcV2W37ma6SgQPCWCpWLLLlroxRYN_l58kY0,4077
 honeybee_radiance_postprocess/cli/viewfactor.py,sha256=kU36YRzLya5PReYREjTfw3zOcWKHYZjVlVclyuR7Cqk,5245
 honeybee_radiance_postprocess/leed/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
-honeybee_radiance_postprocess/leed/leed.py,sha256=PlC0z_L-kdBUZ4-jarB8CAkkKJBKu77D2r2g8Hwy50g,32513
-honeybee_radiance_postprocess/leed/leed_schedule.py,sha256=5mcjBJE3xOZNbaMjRH2XHWwVJ1UJ4EYZA0fQCamL1yI,9937
+honeybee_radiance_postprocess/leed/leed.py,sha256=rbvhq51Dfhx4aZFcKWqOXp3FfgFy5YDRkHYn9wKHQpc,32631
+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
 honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=5zwrr4MNeHUebbSRpSBbscPOZUs2AHmYCQfIIbdYImY,8298
-honeybee_radiance_postprocess/results/results.py,sha256=teZBAGqNBu61vnk4phGAEf9Z4ewGLMe5zMDTaggQkQc,54545
-honeybee_radiance_postprocess-0.4.421.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.421.dist-info/METADATA,sha256=cqnN7HneOM1N7IFeb79-GsSAA6wlVfEZCiwpDql5Lgc,2245
-honeybee_radiance_postprocess-0.4.421.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
-honeybee_radiance_postprocess-0.4.421.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.421.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.421.dist-info/RECORD,,
+honeybee_radiance_postprocess/results/results.py,sha256=ABb_S8kDPruhGkDsfREXMg6K0p8FRhAZ3QIRUZCQPAI,54888
+honeybee_radiance_postprocess-0.4.423.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.423.dist-info/METADATA,sha256=fxcEXDXTt5ta8X6jQQNJHtNAY6qfEnRgMq0UHj0sMtw,2245
+honeybee_radiance_postprocess-0.4.423.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
+honeybee_radiance_postprocess-0.4.423.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.423.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.423.dist-info/RECORD,,