honeybee-radiance-postprocess 0.4.388__tar.gz → 0.4.390__tar.gz

{honeybee-radiance-postprocess-0.4.388 → honeybee-radiance-postprocess-0.4.390}/PKG-INFO

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

@@ -8,6 +8,7 @@ import numpy as np
 
 from honeybee.model import Model
 from ladybug_geometry.geometry3d.face import Face3D
+from ladybug_geometry.geometry3d.pointvector import Vector3D
 
 from ..vis_metadata import _abnt_nbr_15575_daylight_levels_vis_metadata
 
@@ -27,13 +28,17 @@ def abnt():
 )
 @click.argument('model-file', type=click.Path(
     exists=True, file_okay=True, dir_okay=False, resolve_path=True))
+@click.option(
+    '--room-center/--grid-center', '-rc/-gc', help='Flag to note whether the '
+    'evaluation of the center is at the room center or the grid center.',
+    default=True, show_default=True)
 @click.option(
     '--sub-folder', '-sf', help='Relative path for subfolder to write output '
     'files.', default='abnt_nbr_15575', type=click.Path(
     exists=False, file_okay=False, dir_okay=True, resolve_path=True, path_type=Path)
 )
 def abnt_nbr_15575(
-    folder, model_file, sub_folder
+    folder, model_file, room_center, sub_folder
 ):
     """Calculate metrics for ABNT NBR 15575.
 
@@ -96,7 +101,7 @@ def abnt_nbr_15575(
 
     try:
         folder = Path(folder)
-        hb_model = Model.from_file(model_file)
+        hb_model: Model = Model.from_file(model_file)
         sensor_grids = hb_model.properties.radiance.sensor_grids
         sg_full_identifier = {sg.full_identifier: sg for sg in sensor_grids}
 
@@ -106,9 +111,14 @@ def abnt_nbr_15575(
         if not illuminance_levels_folder.exists():
             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')
+        summary_rooms_csv = sub_folder.joinpath('abnt_nbr_15575_rooms.csv')
         folder_names = ['4_930AM', '4_330PM', '10_930AM', '10_330PM']
+        pit_mapper = {
+            '4_930AM': 'Abril 09:30',
+            '4_330PM': 'Abril 15:30',
+            '10_930AM': 'Outubro 09:30',
+            '10_330PM': 'Outubro 15:30'
+        }
 
         metric_info_dict = _abnt_nbr_15575_daylight_levels_vis_metadata()
         summary_output = {}
@@ -133,17 +143,25 @@ def abnt_nbr_15575(
                     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)
+                    if room_center:
+                        room = hb_model.rooms_by_identifier(
+                            [sensor_grid.room_identifier]
+                        )[0]
+                        pof_sensor_grids[grid_info['full_id']] = \
+                            room.center + Vector3D(0, 0, 0.75)
                     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']]
+                        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
+                        else:
+                            pof = face_3d_union[0].pole_of_inaccessibility(0.01)
+                            pof_sensor_grids[grid_info['full_id']] = pof
+
+                x = pof_sensor_grids[grid_info['full_id']].x
+                y = pof_sensor_grids[grid_info['full_id']].y
                 f_xy = perform_interpolation(x, y, x_coords, y_coords, pit_values)
 
                 if f_xy >= 120:
@@ -161,12 +179,14 @@ def abnt_nbr_15575(
                     summary_rooms_output[grid_info['full_id']] = {
                         'nível': level,
                         'iluminância': f_xy,
-                        'grids_info': grid_info
+                        'grids_info': grid_info,
+                        pit_mapper[_subfolder]: f_xy,
                     }
                 else:
                     if f_xy < room_summary['iluminância']:
                         room_summary['nível'] = level
                         room_summary['iluminância'] = f_xy
+                    room_summary[pit_mapper[_subfolder]] = f_xy
 
                 sub_output.append(
                     {
@@ -196,11 +216,48 @@ def abnt_nbr_15575(
             grids_info_file = folder.joinpath(_subfolder, 'grids_info.json')
             grids_info_file.write_text(json.dumps(grids_info, indent=2))
 
-        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)
+        # set up the default data types
+        dtype = [
+            ('Sensor Grid', 'O'),
+            ('Sensor Grid ID', 'O'),
+            ('Abril 09:30', np.float32),
+            ('Abril 15:30', np.float32),
+            ('Outubro 09:30', np.float32),
+            ('Outubro 15:30', np.float32),
+            ('Atendimento', 'O')
+        ]
+
+        # set up format
+        fmt = ['%s', '%s', '%.2f', '%.2f', '%.2f', '%.2f', '%s']
+
+        arrays = []
+        for room_summary in summary_rooms_output.values():
+            data = []
+            data.append(room_summary['grids_info']['name'])
+            data.append(room_summary['grids_info']['full_id'])
+            data.append(room_summary['Abril 09:30'])
+            data.append(room_summary['Abril 15:30'])
+            data.append(room_summary['Outubro 09:30'])
+            data.append(room_summary['Outubro 15:30'])
+            data.append(room_summary['nível'])
+            arrays.append(tuple(data))
+
+        # create structured array
+        struct_array = np.array(arrays, dtype=dtype)
+
+        header = [dt[0] for dt in dtype]
+        # write header to summary_rooms_csv
+        with summary_rooms_csv.open(mode='w', encoding='utf-8') as output_file:
+            output_file.write(','.join(header))
+            output_file.write('\n') # add newline after header
+
+        # write structured array to summary_rooms_csv
+        with summary_rooms_csv.open(mode='a', encoding='utf-8') as output_file:
+            np.savetxt(output_file, struct_array, delimiter=',', fmt=fmt)
+
+        center_points_file = sub_folder.joinpath('center_points.json')
+        data = [pof.to_dict() for pof in pof_sensor_grids.values()]
+        center_points_file.write_text(json.dumps(data, indent=4))
 
     except Exception:
         _logger.exception('Failed to calculate ABNT NBR 15575 metrics.')

{honeybee-radiance-postprocess-0.4.388 → honeybee-radiance-postprocess-0.4.390}/honeybee_radiance_postprocess/vis_metadata.py

@@ -16,31 +16,31 @@ def _abnt_nbr_15575_daylight_levels_vis_metadata():
     colors = [Color(255, 198, 143), Color(255, 255, 209), Color(192, 231, 189), Color(83, 169, 206)]
     illuminance_levels_lpar = \
         LegendParameters(min=0, max=3, colors=colors, segment_count=4,
-                         title='Illuminance Level')
+                         title='Níveis de iluminamento')
     illuminance_levels_lpar.ordinal_dictionary = level_value
 
     metric_info_dict = {
         '4_930AM': {
             'type': 'VisualizationMetaData',
-            'data_type': GenericType('Illuminance April 23rd 9:30am', '').to_dict(),
+            'data_type': GenericType('23 de abril 9:30h', '').to_dict(),
             'unit': '',
             'legend_parameters': illuminance_levels_lpar.to_dict()
         },
         '4_330PM': {
             'type': 'VisualizationMetaData',
-            'data_type': GenericType('Illuminance April 23rd 3:30pm', '').to_dict(),
+            'data_type': GenericType('23 de abril 15:30h', '').to_dict(),
             'unit': '',
             'legend_parameters': illuminance_levels_lpar.to_dict()
         },
         '10_930AM': {
             'type': 'VisualizationMetaData',
-            'data_type': GenericType('Illuminance October 23rd 9:30am', '').to_dict(),
+            'data_type': GenericType('23 de outubro 9:30h', '').to_dict(),
             'unit': '',
             'legend_parameters': illuminance_levels_lpar.to_dict()
         },
         '10_330PM': {
             'type': 'VisualizationMetaData',
-            'data_type': GenericType('Illuminance October 23rd 3:30pm', '').to_dict(),
+            'data_type': GenericType('23 de outubro 15:30h', '').to_dict(),
             'unit': '',
             'legend_parameters': illuminance_levels_lpar.to_dict()
         }

{honeybee-radiance-postprocess-0.4.388 → honeybee-radiance-postprocess-0.4.390}/honeybee_radiance_postprocess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.388
+Version: 0.4.390
 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.390/honeybee_radiance_postprocess.egg-info/requires.txt

@@ -0,0 +1,2 @@
+honeybee-radiance==1.66.70
+numpy>=1.21.6

honeybee-radiance-postprocess-0.4.390/requirements.txt

@@ -0,0 +1,2 @@
+honeybee-radiance==1.66.70
+numpy>=1.21.6

honeybee-radiance-postprocess-0.4.388/honeybee_radiance_postprocess.egg-info/requires.txt

@@ -1,2 +0,0 @@
-honeybee-radiance==1.66.69
-numpy>=1.21.6

honeybee-radiance-postprocess-0.4.388/requirements.txt

@@ -1,2 +0,0 @@
-honeybee-radiance==1.66.69
-numpy>=1.21.6