honeybee-radiance-postprocess 0.4.337__py2.py3-none-any.whl → 0.4.340__py2.py3-none-any.whl

honeybee_radiance_postprocess/cli/grid.py

@@ -31,7 +31,28 @@ def grid():
     '. Alternatively, the command will look for a _redist_info.json file inside the '
     'folder.', type=click.Path(file_okay=True, dir_okay=False, resolve_path=True)
 )
-def merge_grid_folder(input_folder, output_folder, extension, dist_info):
+@click.option(
+    '--output-extension', '-oe',
+    help='Output file extension. This is only used if as_text is set to True. '
+    'Otherwise the output extension will be npy.', default='ill', type=click.STRING
+)
+@click.option(
+    '--as-text', '-at',
+    help='Set to True if the output files should be saved as text instead of '
+    'NumPy files.', default=False, type=click.BOOL
+)
+@click.option(
+    '--fmt',
+    help='Format for the output files when saved as text.', default='%.2f',
+    type=click.STRING
+)
+@click.option(
+    '--delimiter',
+    help='Delimiter for the output files when saved as text.',
+    type=click.Choice(['space', 'tab']), default='tab'
+)
+def merge_grid_folder(input_folder, output_folder, extension, dist_info,
+                      output_extension, as_text, fmt, delimiter):
     """Restructure files in a distributed folder.
 
     \b
@@ -46,7 +67,9 @@ def merge_grid_folder(input_folder, output_folder, extension, dist_info):
         # handle optional case for Functions input
         if dist_info and not Path(dist_info).is_file():
             dist_info = None
-        restore_original_distribution(input_folder, output_folder, extension, dist_info)
+        restore_original_distribution(
+            input_folder, output_folder, extension, dist_info, output_extension,
+            as_text, fmt, delimiter)
     except Exception:
         _logger.exception('Failed to restructure data from folder.')
         sys.exit(1)
@@ -122,7 +145,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):
+        input_folder, output_folder, extension='npy', dist_info=None,
+        output_extension='ill', as_text=False, fmt='%.2f', 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,
@@ -137,6 +161,12 @@ def restore_original_distribution(
             studies.
         dist_info: Path to dist_info.json file. If None, the function will try to load
             ``_redist_info.json`` file from inside the input_folder. (Default: None).
+        output_extension: Output file extension. This is only used if as_text
+            is set to True. Otherwise the output extension will be ```npy``.
+        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.
+        delimiter: Delimiter for the output files when saved as text.
     """
     if not dist_info:
         _redist_info_file = Path(input_folder, '_redist_info.json')
@@ -178,7 +208,17 @@ def restore_original_distribution(
 
         out_array = np.concatenate(out_arrays)
         # save numpy array, .npy extension is added automatically
-        np.save(output_file, out_array)
+        if not as_text:
+            np.save(output_file, out_array)
+        else:
+            if output_extension.startswith('.'):
+                output_extension = output_extension[1:]
+            if delimiter == 'tab':
+                delimiter = '\t'
+            elif delimiter == 'space':
+                delimiter = ' '
+            np.savetxt(output_file.with_suffix(f'.{output_extension}'),
+                       out_array, fmt=fmt, delimiter=delimiter)
 
 
 def restore_original_distribution_metrics(

honeybee_radiance_postprocess/cli/postprocess.py

@@ -1042,7 +1042,7 @@ def convert_matrix_to_binary(
 def direct_sun_hours(
     input_matrix, divisor, output_folder
 ):
-    """Postprocess a Radiance matrix to direct sun hours and cumulative direct
+    """Post-process a Radiance matrix to direct sun hours and cumulative direct
     sun hours.
 
     \b
@@ -1058,16 +1058,16 @@ def direct_sun_hours(
     try:
         boolean_array = (array > 0) & (array <= np.inf)
 
-        direct_sun_hours_array = boolean_array.astype(int)
+        direct_sun_hours_array = boolean_array.astype(np.uint8)
         cumulative_array = direct_sun_hours_array.sum(axis=1) / divisor
 
         direct_sun_hours_file = Path(output_folder, 'direct_sun_hours')
         direct_sun_hours_file.parent.mkdir(parents=True, exist_ok=True)
         np.save(direct_sun_hours_file, direct_sun_hours_array)
 
-        cumulative_file = Path(output_folder, 'cumulative')
+        cumulative_file = Path(output_folder, 'cumulative.res')
         cumulative_file.parent.mkdir(parents=True, exist_ok=True)
-        np.save(cumulative_file, cumulative_array)
+        np.savetxt(cumulative_file, cumulative_array, fmt='%.2f')
     except Exception:
         _logger.exception('Failed to convert the input file to direct sun hours.')
         sys.exit(1)

{honeybee_radiance_postprocess-0.4.337.dist-info → honeybee_radiance_postprocess-0.4.340.dist-info}/METADATA

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

@@ -13,10 +13,10 @@ honeybee_radiance_postprocess/reader.py,sha256=6myKzfGC1pO8zPixg1kKrKjPihHabTKUh
 honeybee_radiance_postprocess/type_hints.py,sha256=4R0kZgacQrqzoh8Tq7f8MVzUDzynV-C_jlh80UV6GPE,1122
 honeybee_radiance_postprocess/util.py,sha256=-J5k1dhvyYJkb42jvTS_xxtokfGbmcucVPXdMWU1jUk,5098
 honeybee_radiance_postprocess/cli/__init__.py,sha256=4RkpR91GPXWatDE4I_27ce-N4FwolQoO6WO7H24DMXE,777
-honeybee_radiance_postprocess/cli/grid.py,sha256=35MwXzL7xRfV5LgDicEEYSyDAZ7Qjlvd-cA3YDA7JAw,8984
+honeybee_radiance_postprocess/cli/grid.py,sha256=6peLEAPVe-iw05_wdRpFruZLqO8myvC-_QT5W1q5sk8,10677
 honeybee_radiance_postprocess/cli/leed.py,sha256=QBR6AMJJWuZ0TevyMi2tXCWMLdS-ZSqtVTZDgqxwa7M,3112
 honeybee_radiance_postprocess/cli/mtxop.py,sha256=UZJnjNpPjDmShy1-Mxos4H2vTUqk_yP3ZyaC1_LLFeI,5015
-honeybee_radiance_postprocess/cli/postprocess.py,sha256=6lSQuaLEDXRkVXeTdzEgJy5mMQeWrc8K06n9SRUc948,38905
+honeybee_radiance_postprocess/cli/postprocess.py,sha256=y8O_GhiCqIk7czrwUs-4_-RD1TBE93pzOuoS4iakoww,38930
 honeybee_radiance_postprocess/cli/schedule.py,sha256=6uIy98Co4zm-ZRcELo4Lfx_aN3lNiqPe-BSimXwt1F8,3877
 honeybee_radiance_postprocess/cli/translate.py,sha256=18zkcGeRZALJ5Z82NEB3XZ-iEX2cHyneobGWV-IXWE0,6789
 honeybee_radiance_postprocess/cli/two_phase.py,sha256=1nZF4jyZ_C7CAfiHCz1UUOEwDaB4yOXr9ga0HIrhOB0,7033
@@ -25,9 +25,9 @@ honeybee_radiance_postprocess/results/__init__.py,sha256=1agBQbfT4Tf8KqSZzlfKYX8
 honeybee_radiance_postprocess/results/annual_daylight.py,sha256=o4Y5kbD3a4X4KRfsbOlWzgrnNKU365GcivM6qQGUGXU,31605
 honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=5zwrr4MNeHUebbSRpSBbscPOZUs2AHmYCQfIIbdYImY,8298
 honeybee_radiance_postprocess/results/results.py,sha256=t9tr-WHt-XpALIwClLb-xOZcWUZthnvfGED5g3NGDu8,53589
-honeybee_radiance_postprocess-0.4.337.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.337.dist-info/METADATA,sha256=mRGcxz_CozPU9zfnbk7tw-sTae1y35JtpUzkhwNjZko,2228
-honeybee_radiance_postprocess-0.4.337.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
-honeybee_radiance_postprocess-0.4.337.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.337.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.337.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.340.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.340.dist-info/METADATA,sha256=dHxlKhKMyE6CwEY9E75E51ko5ozeS7kPvPuVGaqAM7w,2228
+honeybee_radiance_postprocess-0.4.340.dist-info/WHEEL,sha256=unfA4MOaH0icIyIA5oH6E2sn2Hq5zKtLlHsWapZGwes,110
+honeybee_radiance_postprocess-0.4.340.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.340.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.340.dist-info/RECORD,,