honeybee-radiance-postprocess 0.4.484__py2.py3-none-any.whl → 0.4.486__py2.py3-none-any.whl

honeybee_radiance_postprocess/ies/lm.py

@@ -1,28 +1,14 @@
 """Functions for IES LM post-processing."""
 from typing import Tuple, Union
-from pathlib import Path
 from collections import defaultdict
-import json
 import itertools
 import numpy as np
 
-from ladybug.analysisperiod import AnalysisPeriod
-from ladybug.datatype.generic import GenericType
-from ladybug.color import Colorset
-from ladybug.datacollection import HourlyContinuousCollection
-from ladybug.datatype.fraction import Fraction
-from ladybug.datatype.time import Time
-from ladybug.legend import LegendParameters
-from ladybug.header import Header
-from honeybee.model import Model
-from honeybee.units import conversion_factor_to_meters
-from honeybee_radiance.writer import _filter_by_pattern
 from honeybee_radiance.postprocess.annual import filter_schedule_by_hours
 
-from ..metrics import da_array2d, ase_array2d
 from ..annual import schedule_to_hoys, occupancy_schedule_8_to_6
 from ..results.annual_daylight import AnnualDaylight
-from ..util import filter_array, recursive_dict_merge
+from ..util import filter_array
 from ..dynamic import DynamicSchedule, ApertureGroupSchedule
 from .lm_schedule import shd_trans_schedule_descending, states_schedule_descending
 
@@ -123,8 +109,16 @@ def dynamic_schedule_direct_illuminance(
     shd_trans_dict = {}
 
     for grid_info in grids_info:
+        grid_states_schedule = defaultdict(list)
+
         grid_count = grid_info['count']
-        light_paths = [lp[0] for lp in grid_info['light_path']]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
 
         shade_transmittances, shd_trans_dict = (
             shade_transmittance_per_light_path(
@@ -186,11 +180,16 @@ def dynamic_schedule_direct_illuminance(
             max_indices = array_combinations_filter.argmax(axis=0)
             # select the combination for each hour
             combinations = [combinations[idx] for idx in max_indices]
+
             # merge the combinations of dicts
             for combination in combinations:
                 for light_path, value in combination.items():
                     if light_path != '__static_apertures__':
-                        states_schedule[light_path].append(value)
+                        grid_states_schedule[light_path].append(value)
+
+        for key, value in grid_states_schedule.items():
+            if key not in states_schedule:
+                states_schedule[key] = value
 
     occupancy_hoys = schedule_to_hoys(schedule, results.sun_up_hours)
 

honeybee_radiance_postprocess/leed/leed.py

@@ -340,7 +340,13 @@ def leed_states_schedule(
 
     for grid_info in grids_info:
         grid_count = grid_info['count']
-        light_paths = [lp[0] for lp in grid_info['light_path']]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
 
         shade_transmittances, shd_trans_dict = (
             shade_transmittance_per_light_path(
@@ -525,7 +531,13 @@ def leed_option_one(
     pass_ase_grids = []
     ase_hr_pct = []
     for (grid_info, grid_area) in zip(grids_info, grid_areas):
-        light_paths = [lp[0] for lp in grid_info['light_path']]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
         arrays = []
         # combine direct array for all light paths
         for light_path in light_paths:
@@ -558,7 +570,13 @@ def leed_option_one(
     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']]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
         base_zero_array = np.apply_along_axis(filter_array, 1, np.zeros(
             (grid_info['count'], len(results.sun_up_hours))), occ_mask)
         arrays = [base_zero_array.copy()]

honeybee_radiance_postprocess/results/results.py

@@ -1188,7 +1188,13 @@ class Results(_ResultsFolder):
         Returns:
             dict: A filtered states dictionary.
         """
-        light_paths = [elem for lp in grid_info['light_path'] for elem in lp]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
         if states:
             states = states.filter_by_identifiers(light_paths)
         else:
@@ -1351,7 +1357,13 @@ class Results(_ResultsFolder):
                     break
             else:
                 raise Exception(f'Grid info with full_id "{grid_info}" not found.')
-        light_paths = [elem for lp in grid_info['light_path'] for elem in lp]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
 
         return light_paths
 

honeybee_radiance_postprocess/well/well.py

@@ -1,9 +1,7 @@
 """Functions for WELL post-processing."""
 from typing import Tuple, Union
 from pathlib import Path
-from collections import defaultdict
 import json
-import itertools
 import numpy as np
 
 from ladybug.analysisperiod import AnalysisPeriod
@@ -239,7 +237,13 @@ def well_annual_daylight(
     l01_pass_sda_blinds_up_grids = []
     l01_pass_sda_blinds_down_grids = []
     for grid_info in grids_info:
-        light_paths = [lp[0] for lp in grid_info['light_path']]
+        light_paths = []
+        for lp in grid_info['light_path']:
+            for _lp in lp:
+                if _lp == '__static_apertures__' and len(lp) > 1:
+                    pass
+                else:
+                    light_paths.append(_lp)
         base_zero_array = np.apply_along_axis(filter_array, 1, np.zeros(
             (grid_info['count'], len(results.sun_up_hours))), occ_mask)
         arrays_blinds_up = [base_zero_array.copy()]

{honeybee_radiance_postprocess-0.4.484.dist-info → honeybee_radiance_postprocess-0.4.486.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.484
+Version: 0.4.486
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: honeybee-radiance==1.66.138
-Requires-Dist: numpy>=1.21.6
+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)
 [![Coverage Status](https://coveralls.io/repos/github/ladybug-tools/honeybee-radiance-postprocess/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools/honeybee-radiance-postprocess)

{honeybee_radiance_postprocess-0.4.484.dist-info → honeybee_radiance_postprocess-0.4.486.dist-info}/RECORD

@@ -31,20 +31,20 @@ honeybee_radiance_postprocess/cli/util.py,sha256=Be9cGmYhcV2W37ma6SgQPCWCpWLLLlr
 honeybee_radiance_postprocess/cli/viewfactor.py,sha256=kU36YRzLya5PReYREjTfw3zOcWKHYZjVlVclyuR7Cqk,5245
 honeybee_radiance_postprocess/cli/well.py,sha256=A4i5scnWWOOwZFfC9vg8bUV2lOOJfbOb-HP8zCZy_ic,1888
 honeybee_radiance_postprocess/ies/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
-honeybee_radiance_postprocess/ies/lm.py,sha256=kHvwd2uT8Y-c2TjpvQzjLrWzwgayWjpzpbwS2S6cEvo,9570
+honeybee_radiance_postprocess/ies/lm.py,sha256=20o_W2b9PPAQBoENUSO1qyOAxE5sLsrshtxdprEmRE8,9350
 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=pZyVmHEL_T3MG5Mu7CQh9Y0Ku2wOJsv6UpNAn5J15uU,33457
+honeybee_radiance_postprocess/leed/leed.py,sha256=od7ooRncPypk1eeCvVKx4IPaCMCDJEtE1FlcbsQJlcs,34021
 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=ABb_S8kDPruhGkDsfREXMg6K0p8FRhAZ3QIRUZCQPAI,54888
+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=Troym2sdGMYyzW2MGuflCFr737eUWrDP6Pc-zju7LiA,21071
-honeybee_radiance_postprocess-0.4.484.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.484.dist-info/METADATA,sha256=Ew6MNbdO93prTciQT1fG4oyRZDBpsO-wJLSJrDsX1DA,2240
-honeybee_radiance_postprocess-0.4.484.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_radiance_postprocess-0.4.484.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.484.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.484.dist-info/RECORD,,
+honeybee_radiance_postprocess/well/well.py,sha256=94NHsv_iYAyjWPZ40RzVqORl4D3IjVAUcKTiq3bEt_M,21206
+honeybee_radiance_postprocess-0.4.486.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.486.dist-info/METADATA,sha256=SQ4bD8GuGAXNufIMUKvTrcEJBfd3UNunO2Nnqq9kIv0,2238
+honeybee_radiance_postprocess-0.4.486.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_radiance_postprocess-0.4.486.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.486.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.486.dist-info/RECORD,,