honeybee-radiance-postprocess 0.4.441__py2.py3-none-any.whl → 0.4.443__py2.py3-none-any.whl

honeybee_radiance_postprocess/cli/__init__.py

@@ -9,6 +9,7 @@ from .schedule import schedule
 from .translate import translate
 from .viewfactor import view_factor
 from .merge import merge
+from .datacollection import datacollection
 
 
 # command group for all postprocess extension commands.
@@ -26,6 +27,7 @@ postprocess.add_command(schedule)
 postprocess.add_command(translate)
 postprocess.add_command(view_factor)
 postprocess.add_command(merge)
+postprocess.add_command(datacollection, name='data-collection')
 
 # add postprocess sub-commands to honeybee CLI
 main.add_command(postprocess)

honeybee_radiance_postprocess/cli/datacollection.py

@@ -0,0 +1,128 @@
+"""Commands to work with data collections."""
+import sys
+import logging
+import numpy as np
+from pathlib import Path
+import click
+import json
+
+from ladybug.datacollection import HourlyContinuousCollection, \
+    HourlyDiscontinuousCollection
+from ladybug.header import Header
+from ladybug.datautil import collections_to_csv
+
+
+_logger = logging.getLogger(__name__)
+
+
+@click.group(help='Commands to work with data collections.')
+def datacollection():
+    pass
+
+
+@datacollection.command('npy-to-datacollections')
+@click.argument(
+    'npy-file', type=click.Path(exists=True, dir_okay=False, resolve_path=True)
+)
+@click.argument(
+    'data-type', type=click.Path(exists=True, dir_okay=False, resolve_path=True)
+)
+@click.argument(
+    'grid-name', type=click.STRING
+)
+@click.option(
+    '--output-file', '-f', help='Optional file to output the JSON strings of '
+    'the data collections. By default, it will be printed to stdout',
+    type=click.File('w'), default='-', show_default=True
+)
+def npy_to_datacollections(npy_file, data_type, grid_name, output_file):
+    """Read an npy file and convert every row to a data collection.
+
+    The data collection will be saved in a JSON file. If no output file is
+    specified it will be send to stdout instead.
+
+    \b
+    Args:
+        npy-file: Path to npy file.
+        data-type: A JSON file with the data type.
+        grid-name: The name of the grid. This is used in the metadata of the
+            header.
+    """
+    with open(data_type) as json_file:
+        data_header = Header.from_dict(json.load(json_file))
+    a_per = data_header.analysis_period
+    continuous = True if a_per.st_hour == 0 and a_per.end_hour == 23 else False
+    if not continuous:
+        dates = a_per.datetimes
+    metadata = {'grid': grid_name}
+    try:
+        data_matrix = np.load(npy_file).tolist()
+        grid_data = []
+        for i, row in enumerate(data_matrix):
+            header = data_header.duplicate()
+            header.metadata = metadata.copy()
+            header.metadata['sensor_index'] = i
+            data = HourlyContinuousCollection(header, row) if continuous else \
+                HourlyDiscontinuousCollection(header, row, dates)
+            grid_data.append(data.to_dict())
+        output_file.write(json.dumps(grid_data))
+    except Exception:
+        _logger.exception('Failed to convert npy to data collections.')
+        sys.exit(1)
+    else:
+        sys.exit(0)
+
+
+@datacollection.command('folder-to-datacollections')
+@click.argument(
+    'folder', type=click.Path(exists=True, dir_okay=True, resolve_path=True)
+)
+@click.argument(
+    'data-type', type=click.Path(exists=True, dir_okay=False, resolve_path=True)
+)
+@click.option(
+    '--sub-folder', '-sf', type=click.STRING, default='datacollections',
+    show_default=True
+)
+def folder_to_datacollections(folder, data_type, sub_folder):
+    """Read an npy file and convert every row to a data collection.
+
+    The data collections will be saved as CSV files in subfolder.
+
+    \b
+    Args:
+        npy-file: Path to npy file.
+        data-type: A JSON file with the data type.
+        grid-name: The name of the grid. This is used in the metadata of the
+            header.
+    """
+    with open(Path(folder, 'grids_info.json')) as json_file:
+        grid_list = json.load(json_file)
+    with open(data_type) as json_file:
+        data_header = Header.from_dict(json.load(json_file))
+    a_per = data_header.analysis_period
+    continuous = True if a_per.st_hour == 0 and a_per.end_hour == 23 else False
+    if not continuous:
+        dates = a_per.datetimes
+    try:
+        for grid in grid_list:
+            grid_name = grid['full_id'] if 'full_id' in grid else 'id'
+            metadata = {'grid': grid_name}
+            grid_file = Path(folder, '{}.npy'.format(grid_name))
+            data_matrix = np.load(grid_file).tolist()
+            grid_data = []
+            for i, row in enumerate(data_matrix):
+                header = data_header.duplicate()
+                header.metadata = metadata.copy()
+                header.metadata['sensor_index'] = i
+                data = HourlyContinuousCollection(header, row) if continuous else \
+                    HourlyDiscontinuousCollection(header, row, dates)
+                grid_data.append(data)
+
+            file_name = grid_name + '.csv'
+            collections_to_csv(grid_data, Path(folder, sub_folder), file_name)
+    except Exception:
+        _logger.exception('Failed to convert folder of files to data collections.')
+        sys.exit(1)
+    else:
+        sys.exit(0)

honeybee_radiance_postprocess/cli/grid.py

@@ -146,7 +146,8 @@ def merge_metrics_folder(input_folder, output_folder, dist_info, grids_info):
 
 def restore_original_distribution(
         input_folder, output_folder, extension='npy', dist_info=None,
-        output_extension='ill', as_text=False, fmt='%.2f', delimiter='tab'):
+        output_extension='ill', as_text=False, fmt='%.2f', input_delimiter=',',
+        delimiter='tab'):
     """Restructure files to the original distribution based on the distribution info.
     
     It will assume that the files in the input folder are NumPy files. However,
@@ -166,6 +167,8 @@ def restore_original_distribution(
         as_text: Set to True if the output files should be saved as text instead
             of NumPy files.
         fmt: Format for the output files when saved as text.
+        input_delimiter: Delimiter for the input files. This is used only if the
+            input files are text files.
         delimiter: Delimiter for the output files when saved as text.
     """
     if not dist_info:
@@ -200,8 +203,16 @@ def restore_original_distribution(
                 src_file = new_file
                 try:
                     array = np.load(src_file)
-                except Exception:
-                    array = binary_to_array(src_file)
+                except:
+                    try:
+                        array = binary_to_array(src_file)
+                    except:
+                        try:
+                            array = np.loadtxt(
+                                src_file, delimiter=input_delimiter)
+                        except Exception:
+                            raise RuntimeError(
+                                f'Failed to load input file "{src_file}"')
             slice_array = array[st:end+1,:]
 
             out_arrays.append(slice_array)
@@ -217,6 +228,8 @@ def restore_original_distribution(
                 delimiter = '\t'
             elif delimiter == 'space':
                 delimiter = ' '
+            elif delimiter == 'comma':
+                delimiter = ','
             np.savetxt(output_file.with_suffix(f'.{output_extension}'),
                        out_array, fmt=fmt, delimiter=delimiter)
 

honeybee_radiance_postprocess/leed/leed.py

@@ -557,9 +557,11 @@ def leed_option_one(
     pass_sda_blinds_down_grids = []
     for grid_info in grids_info:
         light_paths = [lp[0] for lp in grid_info['light_path']]
-        arrays = []
-        arrays_blinds_up = []
-        arrays_blinds_down = []
+        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()]
+        arrays_blinds_up = [base_zero_array.copy()]
+        arrays_blinds_down = [base_zero_array.copy()]
         # combine total array for all light paths
         if use_states:
             array = results._array_from_states(grid_info, states=states_schedule)
@@ -567,16 +569,24 @@ def leed_option_one(
 
             for light_path in light_paths:
                 # do an extra pass to calculate with blinds always up or down
-                array_blinds_up = results._get_array(
-                    grid_info, light_path, state=0, res_type='total')
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array_blinds_up, occ_mask)
-                arrays_blinds_up.append(array_filter)
-                array_blinds_down = results._get_array(
-                    grid_info, light_path, state=1, res_type='total')
-                array_filter = np.apply_along_axis(
-                    filter_array, 1, array_blinds_down, occ_mask)
-                arrays_blinds_down.append(array_filter)
+                if light_path != '__static_apertures__':
+                    array_blinds_up = results._get_array(
+                        grid_info, light_path, state=0, res_type='total')
+                    array_filter = np.apply_along_axis(
+                        filter_array, 1, array_blinds_up, occ_mask)
+                    arrays_blinds_up.append(array_filter)
+                    array_blinds_down = results._get_array(
+                        grid_info, light_path, state=1, res_type='total')
+                    array_filter = np.apply_along_axis(
+                        filter_array, 1, array_blinds_down, occ_mask)
+                    arrays_blinds_down.append(array_filter)
+                else:
+                    static_array = results._get_array(
+                        grid_info, light_path, state=0, res_type='total')
+                    array_filter = np.apply_along_axis(
+                        filter_array, 1, static_array, occ_mask)
+                    arrays_blinds_up.append(array_filter)
+                    arrays_blinds_down.append(array_filter)
         else:
             for light_path in light_paths:
                 array = results._get_array(

{honeybee_radiance_postprocess-0.4.441.dist-info → honeybee_radiance_postprocess-0.4.443.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-radiance-postprocess
-Version: 0.4.441
+Version: 0.4.443
 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.441.dist-info → honeybee_radiance_postprocess-0.4.443.dist-info}/RECORD

@@ -13,9 +13,10 @@ honeybee_radiance_postprocess/reader.py,sha256=p4A91amyCI16lRRn0bhZdInsg-qJV0Jas
 honeybee_radiance_postprocess/type_hints.py,sha256=4R0kZgacQrqzoh8Tq7f8MVzUDzynV-C_jlh80UV6GPE,1122
 honeybee_radiance_postprocess/util.py,sha256=uxqop4TsUMp8l8iLQf784NJINprHCgj00GZHvTth1C0,5603
 honeybee_radiance_postprocess/vis_metadata.py,sha256=7ywIgdiuNKcctxifhpy7-Q2oaSX2ngQBeA0Kh7q1Gg0,1780
-honeybee_radiance_postprocess/cli/__init__.py,sha256=uR3Q-VEhA6ZJPszRvOg_He8qm9HVFm_UxZTCfpLzLGw,851
+honeybee_radiance_postprocess/cli/__init__.py,sha256=_mYHnIOpH0qJ4QK56SB3qUT2Duuts2GR2U_0t_uE-2s,958
 honeybee_radiance_postprocess/cli/abnt.py,sha256=RmEjhxdEK6Uks3S10rQs6n8cup9qv036qRwh_wj1taA,15705
-honeybee_radiance_postprocess/cli/grid.py,sha256=6peLEAPVe-iw05_wdRpFruZLqO8myvC-_QT5W1q5sk8,10677
+honeybee_radiance_postprocess/cli/datacollection.py,sha256=Wb3UX03uW4OUZP7jWHftKfdf3aO_FSXjrnrziR3taf0,4541
+honeybee_radiance_postprocess/cli/grid.py,sha256=gqnU3-HdggWCUg9mA1RLZJYHM7tH0v6r2E_X2SSkAig,11256
 honeybee_radiance_postprocess/cli/leed.py,sha256=bxGX2UBehYNcaPJWHL2yEasSP6dATD7B0aNNQOflqqM,3712
 honeybee_radiance_postprocess/cli/merge.py,sha256=oOqqud3VSo-3f3coDoUILcp78OI4DKxXLWCS1bi3PC4,5752
 honeybee_radiance_postprocess/cli/mtxop.py,sha256=UZJnjNpPjDmShy1-Mxos4H2vTUqk_yP3ZyaC1_LLFeI,5015
@@ -26,15 +27,15 @@ honeybee_radiance_postprocess/cli/two_phase.py,sha256=xA6ayPv26DM5fuMkLhBMYGklf_
 honeybee_radiance_postprocess/cli/util.py,sha256=Be9cGmYhcV2W37ma6SgQPCWCpWLLLlroxRYN_l58kY0,4077
 honeybee_radiance_postprocess/cli/viewfactor.py,sha256=kU36YRzLya5PReYREjTfw3zOcWKHYZjVlVclyuR7Cqk,5245
 honeybee_radiance_postprocess/leed/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
-honeybee_radiance_postprocess/leed/leed.py,sha256=rbvhq51Dfhx4aZFcKWqOXp3FfgFy5YDRkHYn9wKHQpc,32631
+honeybee_radiance_postprocess/leed/leed.py,sha256=I3bcPbIvO2ppujmpetLPY82zZwdPAuYp67heDypIlDs,33329
 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-0.4.441.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.441.dist-info/METADATA,sha256=f7fl5XxoeXdNh5dt9Htl1Kcs9nt2VUeUm08tsTdTMag,2246
-honeybee_radiance_postprocess-0.4.441.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
-honeybee_radiance_postprocess-0.4.441.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.441.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.441.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.443.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.443.dist-info/METADATA,sha256=mBLPX8Ix6oVlmGWu4_sAfzrfJ52N1heitBXT55gx54E,2246
+honeybee_radiance_postprocess-0.4.443.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
+honeybee_radiance_postprocess-0.4.443.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.443.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.443.dist-info/RECORD,,