honeybee-radiance-postprocess 0.4.383__tar.gz → 0.4.385__tar.gz

{honeybee-radiance-postprocess-0.4.383 → honeybee-radiance-postprocess-0.4.385}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.383
+Version: 0.4.385
 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.383 → honeybee-radiance-postprocess-0.4.385}/honeybee_radiance_postprocess/cli/abnt.py

@@ -7,6 +7,7 @@ import click
 import numpy as np
 
 from honeybee.model import Model
+from ladybug_geometry.geometry3d.face import Face3D
 
 from ..vis_metadata import _abnt_nbr_15575_daylight_levels_vis_metadata
 
@@ -56,7 +57,8 @@ def abnt_nbr_15575(
         return x1, x2, y1, y2
 
     def get_value(x, y, x_coords, y_coords, values):
-        index = np.where((x_coords == x) & (y_coords == y))
+        tolerance = 0.001
+        index = np.where((np.abs(x_coords - x) <= tolerance) & (np.abs(y_coords - y) <= tolerance))
         return values[index][0]
 
     def perform_interpolation(x, y, x_coords, y_coords, pit_values):
@@ -105,10 +107,13 @@ def abnt_nbr_15575(
             illuminance_levels_folder.mkdir(parents=True, exist_ok=True)
 
         summary_file = sub_folder.joinpath('abnt_nbr_15575.json')
+        summary_rooms_file = sub_folder.joinpath('abnt_nbr_15575_rooms.json')
         folder_names = ['4_930AM', '4_330PM', '10_930AM', '10_330PM']
 
         metric_info_dict = _abnt_nbr_15575_daylight_levels_vis_metadata()
         summary_output = {}
+        summary_rooms_output = {}
+        pof_sensor_grids = {}
         for _subfolder in folder_names:
             res_folder = folder.joinpath(_subfolder, 'results')
             with open(res_folder.joinpath('grids_info.json')) as data_f:
@@ -123,7 +128,22 @@ def abnt_nbr_15575(
 
                 x_coords = sensor_points[:, 0]
                 y_coords = sensor_points[:, 1]
-                x, y = sensor_grid.mesh.center.x, sensor_grid.mesh.center.y
+
+                pof_sensor_grid = \
+                    pof_sensor_grids.get(grid_info['full_id'], None)
+                # if pof is not calculated for this grid
+                if pof_sensor_grid is None:
+                    faces_3d = [Face3D(face_vertices) for face_vertices in sensor_grid.mesh.face_vertices]
+                    face_3d_union = Face3D.join_coplanar_faces(faces_3d, 0.05)
+                    assert len(face_3d_union) == 1
+                    if face_3d_union[0].is_convex:
+                        centroid = face_3d_union[0].centroid
+                        pof_sensor_grids[grid_info['full_id']] = (centroid.x, centroid.y)
+                    else:
+                        pof = face_3d_union[0].pole_of_inaccessibility(0.01)
+                        pof_sensor_grids[grid_info['full_id']] = (pof.x, pof.y)
+
+                x, y = pof_sensor_grids[grid_info['full_id']]
                 f_xy = perform_interpolation(x, y, x_coords, y_coords, pit_values)
 
                 if f_xy >= 120:
@@ -135,6 +155,19 @@ def abnt_nbr_15575(
                 else:
                     level = 'Não atende'
 
+                room_summary = \
+                    summary_rooms_output.get(grid_info['full_id'], None)
+                if room_summary is None:
+                    summary_rooms_output[grid_info['full_id']] = {
+                        'nível': level,
+                        'iluminância': f_xy,
+                        'grids_info': grid_info
+                    }
+                else:
+                    if f_xy < room_summary['iluminância']:
+                        room_summary['nível'] = level
+                        room_summary['iluminância'] = f_xy
+
                 sub_output.append(
                     {
                         'nível': level,
@@ -166,6 +199,9 @@ def abnt_nbr_15575(
         with summary_file.open(mode='w', encoding='utf-8') as output_file:
             json.dump(summary_output, output_file, indent=4, ensure_ascii=False)
 
+        with summary_rooms_file.open(mode='w', encoding='utf-8') as output_file:
+            json.dump(summary_rooms_output, output_file, indent=4, ensure_ascii=False)
+
     except Exception:
         _logger.exception('Failed to calculate ABNT NBR 15575 metrics.')
         sys.exit(1)

{honeybee-radiance-postprocess-0.4.383 → honeybee-radiance-postprocess-0.4.385}/honeybee_radiance_postprocess.egg-info/PKG-INFO

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