honeybee-radiance-postprocess 0.4.430__tar.gz → 0.4.431__tar.gz

{honeybee-radiance-postprocess-0.4.430 → honeybee-radiance-postprocess-0.4.431}/PKG-INFO

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

@@ -245,8 +245,9 @@ def abnt_nbr_15575(
                 if pof_sensor_grid is None:
                     if room_center:
                         floor_face = Face3D.join_coplanar_faces(
-                            room.horizontal_floor_boundaries(), 0.05
-                        )[0]
+                            room.horizontal_floor_boundaries(
+                                tolerance=0.001),
+                            0.05)[0]
                         if floor_face.is_convex:
                             centroid = floor_face.centroid
                         else:
@@ -256,7 +257,9 @@ def abnt_nbr_15575(
                             centroid + Vector3D(0, 0, dz)
                     else:
                         faces_3d = [
-                            Face3D(face_vertices) for face_vertices in sensor_grid.mesh.face_vertices]
+                            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

{honeybee-radiance-postprocess-0.4.430 → honeybee-radiance-postprocess-0.4.431}/honeybee_radiance_postprocess/reader.py

@@ -6,7 +6,7 @@ from .util import binary_mtx_dimension
 
 def binary_to_array(
         binary_file: str, nrows: int = None, ncols: int = None,
-        ncomp: int = None, line_count: int = 0) -> np.ndarray:
+        ncomp: int = None, fmt=None, line_count: int = 0) -> np.ndarray:
     """Read a Radiance binary file as a NumPy array.
 
     Args:
@@ -14,21 +14,28 @@ def binary_to_array(
         nrows: Number of rows in the Radiance file.
         ncols: Number of columns in the Radiance file.
         ncomp: Number of components of each element in the Radiance file.
+        fmt: Format of the Radiance file. Can be either "ascii", "float", or "double.
         line_count: Number of lines to skip in the input file. Usually used to
             skip the header.
 
     Returns:
         A NumPy array.
     """
+    if (nrows or ncols or ncomp or fmt) is None:
+        # get nrows, ncols and header line count
+        nrows, ncols, ncomp, line_count, fmt = binary_mtx_dimension(binary_file)
     with open(binary_file, 'rb') as reader:
-        if (nrows or ncols or ncomp) is None:
-            # get nrows, ncols and header line count
-            nrows, ncols, ncomp, line_count = binary_mtx_dimension(binary_file)
         # skip first n lines from reader
         for i in range(line_count):
             reader.readline()
 
-        array = np.fromfile(reader, dtype=np.float32)
+        if fmt == 'ascii':
+            array = np.loadtxt(reader, dtype=np.float32)
+        elif fmt == 'float':
+            array = np.fromfile(reader, dtype=np.float32)
+        elif fmt == 'double':
+            array = np.fromfile(reader, dtype=np.float64)
+
         if ncomp != 1:
             array = array.reshape(nrows, ncols, ncomp)
         else:
@@ -57,7 +64,7 @@ def ascii_to_array(
         if (nrows or ncols or ncomp) is None:
             # get nrows, ncols and header line count
             # we can reuse binary_mtx_dimension though the input file is ascii
-            nrows, ncols, ncomp, line_count = binary_mtx_dimension(ascii_file)
+            nrows, ncols, ncomp, line_count, fmt = binary_mtx_dimension(ascii_file)
 
         array = np.loadtxt(reader, dtype=np.float32, skiprows=line_count)
         if ncomp != 1:

{honeybee-radiance-postprocess-0.4.430 → honeybee-radiance-postprocess-0.4.431}/honeybee_radiance_postprocess/util.py

@@ -5,7 +5,7 @@ import numpy as np
 from honeybee_radiance.writer import _filter_by_pattern
 
 
-def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int]:
+def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int, str]:
     """Return binary Radiance matrix dimensions if exist.
 
     This function returns NROWS, NCOLS, NCOMP and number of header lines including the
@@ -15,7 +15,7 @@ def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int]:
         filepath: Full path to Radiance file.
 
     Returns:
-        nrows, ncols, ncomp, line_count
+        nrows, ncols, ncomp, line_count, fmt
     """
     try:
         inf = open(filepath, 'rb', encoding='utf-8')
@@ -42,6 +42,7 @@ def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int]:
             if line[:6] == 'NCOMP=':
                 ncomp = int(line.split('=')[-1])
             if line[:7] == 'FORMAT=':
+                fmt = line.split('=')[-1]
                 break
 
         if not nrows or not ncols:
@@ -51,7 +52,7 @@ def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int]:
                 f'elements.'
             )
             raise ValueError(error_message)
-        return nrows, ncols, ncomp, len(header_lines) + 1
+        return nrows, ncols, ncomp, len(header_lines) + 1, fmt
     finally:
         inf.close()
 

{honeybee-radiance-postprocess-0.4.430 → honeybee-radiance-postprocess-0.4.431}/honeybee_radiance_postprocess.egg-info/PKG-INFO

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