honeybee-radiance-postprocess 0.4.547__tar.gz → 0.4.549__tar.gz

{honeybee_radiance_postprocess-0.4.547 → honeybee_radiance_postprocess-0.4.549}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.547
+Version: 0.4.549
 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.184
+Requires-Dist: honeybee-radiance==1.66.185
 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.547 → honeybee_radiance_postprocess-0.4.549}/honeybee_radiance_postprocess/leed/leed.py

@@ -426,9 +426,9 @@ def leed_states_schedule(
                 states_schedule[key] = value
             else:
                 if use_states:
-                    merged_array = np.logical_or(states_schedule[key], value).astype(int)
+                    merged_array = np.logical_or(np.array(states_schedule[key]), np.array(value)).astype(int)
                 else:
-                    merged_array = np.minimum(states_schedule[key], value)
+                    merged_array = np.minimum(np.array(states_schedule[key]), np.array(value))
                 states_schedule[key] = merged_array
 
     occupancy_hoys = schedule_to_hoys(schedule, results.sun_up_hours)

{honeybee_radiance_postprocess-0.4.547 → honeybee_radiance_postprocess-0.4.549}/honeybee_radiance_postprocess/results/annual_daylight.py

@@ -622,8 +622,7 @@ class AnnualDaylight(Results):
                 su_mean_array = array.mean(axis=0)
                 su_uniformity_ratio = su_min_array / su_mean_array
 
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array, mask=self.occ_mask)
+                array_filter = filter_array2d(array, mask=self.occ_mask)
                 min_array = array_filter.min(axis=0)
                 mean_array = array_filter.mean(axis=0)
                 uniformity_ratio = min_array / mean_array

{honeybee_radiance_postprocess-0.4.547 → honeybee_radiance_postprocess-0.4.549}/honeybee_radiance_postprocess/results/results.py

@@ -21,7 +21,7 @@ from ladybug.header import Header
 from ..annual import occupancy_schedule_8_to_6
 from ..metrics import (average_values_array2d, cumulative_values_array2d,
     peak_values_array2d)
-from ..util import filter_array, hoys_mask, check_array_dim, \
+from ..util import filter_array2d, hoys_mask, check_array_dim, \
     _filter_grids_by_pattern
 from .. import type_hints
 from ..dynamic import DynamicSchedule, ApertureGroupSchedule
@@ -85,16 +85,7 @@ class _ResultsFolder(object):
             assert isinstance(grid_info, dict), \
                 'Object in grids information must be a dictionary. ' \
                 f'Got object of type {type(grid_info)}.'
-            if 'light_path' in grid_info.keys():
-                _grid_info = []
-                for light_path in grid_info['light_path']:
-                    if Path(self.folder, light_path[0]).exists():
-                        _grid_info.append((light_path))
-                grid_info['light_path'] = _grid_info
-                if not grid_info['light_path']:
-                    # if light path is empty
-                    grid_info['light_path'] = [['__static_apertures__']]
-            else:
+            if not grid_info.get('light_path', None):
                 # if light path key is nonexistent
                 grid_info['light_path'] = [['__static_apertures__']]
         self._grids_info = grids_info
@@ -408,9 +399,7 @@ class Results(_ResultsFolder):
         for grid_info in grids_info:
             array = self._array_from_states(grid_info, states=states, res_type=res_type)
             if np.any(array):
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array, mask=mask
-                )
+                array_filter = filter_array2d(array, mask=mask)
                 array_total = array_filter.sum(axis=1)
             else:
                 array_total = np.zeros(grid_info['count'])
@@ -528,8 +517,7 @@ class Results(_ResultsFolder):
         for grid_info in grids_info:
             array = self._array_from_states(grid_info, states=states, res_type=res_type)
             if np.any(array):
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array, mask=mask)
+                array_filter = filter_array2d(array, mask=mask)
                 results = average_values_array2d(
                     array_filter, full_length)
             else:
@@ -600,8 +588,7 @@ class Results(_ResultsFolder):
         for grid_info in grids_info:
             array = self._array_from_states(grid_info, states=states, res_type=res_type)
             if np.any(array):
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array, mask=mask)
+                array_filter = filter_array2d(array, mask=mask)
                 if not hoys:
                     # concatenate zero array
                     zero_array = \
@@ -687,8 +674,7 @@ class Results(_ResultsFolder):
         for grid_info in grids_info:
             array = self._array_from_states(grid_info, states=states, res_type=res_type)
             if np.any(array):
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array, mask=mask)
+                array_filter = filter_array2d(array, mask=mask)
                 results = cumulative_values_array2d(
                     array_filter, self.timestep, t_step_multiplier)
             else:
@@ -769,8 +755,7 @@ class Results(_ResultsFolder):
             max_i = None
             array = self._array_from_states(grid_info, states=states, res_type=res_type)
             if np.any(array):
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array, mask=mask)
+                array_filter = filter_array2d(array, mask=mask)
                 results, max_i = peak_values_array2d(
                     array_filter, coincident=coincident)
             else:

{honeybee_radiance_postprocess-0.4.547 → honeybee_radiance_postprocess-0.4.549}/honeybee_radiance_postprocess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.547
+Version: 0.4.549
 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.184
+Requires-Dist: honeybee-radiance==1.66.185
 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.549/honeybee_radiance_postprocess.egg-info/requires.txt

@@ -0,0 +1,2 @@
+honeybee-radiance==1.66.185
+numpy<2.0.0

honeybee_radiance_postprocess-0.4.549/requirements.txt

@@ -0,0 +1,2 @@
+honeybee-radiance==1.66.185
+numpy<2.0.0

honeybee_radiance_postprocess-0.4.547/honeybee_radiance_postprocess.egg-info/requires.txt

@@ -1,2 +0,0 @@
-honeybee-radiance==1.66.184
-numpy<2.0.0

honeybee_radiance_postprocess-0.4.547/requirements.txt

@@ -1,2 +0,0 @@
-honeybee-radiance==1.66.184
-numpy<2.0.0