honeybee-radiance-postprocess 0.4.581__py3-none-any.whl → 0.4.584__py3-none-any.whl

honeybee_radiance_postprocess/cli/postprocess.py

@@ -14,8 +14,7 @@ except ImportError:
 
 from ladybug.location import Location
 from ladybug.wea import Wea
-from honeybee_radiance_postprocess.results.annual_daylight import AnnualDaylight
-from honeybee_radiance_postprocess.results.annual_irradiance import AnnualIrradiance
+from honeybee_radiance_postprocess.results import AnnualDaylight, AnnualIrradiance
 from honeybee_radiance_postprocess.metrics import da_array2d, cda_array2d, \
     udi_array2d, udi_lower_array2d, udi_upper_array2d
 from honeybee_radiance_postprocess.reader import binary_to_array
@@ -505,7 +504,7 @@ def annual_to_data(
         sys.exit(0)
 
 
-@post_process.command('annual-summary')
+@post_process.command('annual-statistics')
 @click.argument(
     'folder',
     type=click.Path(exists=True, file_okay=False, dir_okay=True, resolve_path=True)
@@ -536,12 +535,12 @@ def annual_to_data(
 
 @click.option(
     '--sub-folder', '-sf', help='Optional relative path for subfolder to write output '
-    'metric files.', default='metrics'
+    'statistics files.', default='statistics'
 )
-def annual_summary(
+def annual_statistics(
     folder, hoys_file, states, grids_filter, total, sensor, sub_folder
 ):
-    """Get annual summary statistics (average, median, minimum, maximum, cumulative).
+    """Get annual statistics (average, median, minimum, maximum, cumulative).
 
     \b
     Args:
@@ -564,12 +563,25 @@ def annual_summary(
 
         axis = 1 if sensor is True else 0
 
-        results = AnnualDaylight(folder)
-        results.annual_summary_to_folder(
+        study_info_file = Path(folder).joinpath('study_info.json')
+        if study_info_file.exists():
+            with open(study_info_file) as file:
+                study_info = json.load(file)
+            study_type = study_info.get('study_type', 'annual-daylight')
+        else:
+            study_type = 'annual-daylight'
+
+        if study_type == 'annual-daylight':
+            results = AnnualDaylight(folder)
+        elif study_type == 'annual-irradiance':
+            results = AnnualIrradiance(folder)
+        else:
+            raise ValueError(f'Unknown study type: {study_type}.')
+        results.annual_statistics_to_folder(
             sub_folder, hoys=hoys, states=states, grids_filter=grids_filter,
             res_type=res_type, axis=axis)
     except Exception:
-        _logger.exception('Failed to calculate annual summary.')
+        _logger.exception('Failed to calculate annual statistics.')
         sys.exit(1)
     else:
         sys.exit(0)

honeybee_radiance_postprocess/results/results.py

@@ -797,10 +797,10 @@ class Results(_ResultsFolder):
         info_file = metric_folder.joinpath('grids_info.json')
         info_file.write_text(json.dumps(grids_info))
 
-    def annual_summary(
+    def annual_statistics(
             self, hoys: list = None, states: DynamicSchedule = None, grids_filter: str = '*',
             res_type: str = 'total', axis: int = 1):
-        """Compute annual summary statistics (average, median, minimum, maximum,
+        """Compute annual statistics (average, median, minimum, maximum,
         cumulative) for each sensor or timestep.
 
         If hoys is left as None, the average will be computed for all study hours,
@@ -926,10 +926,10 @@ class Results(_ResultsFolder):
         return (average_values, median_values, minimum_values, maximum_values,
                 cumulative_values, grids_info)
 
-    def annual_summary_to_folder(
+    def annual_statistics_to_folder(
             self, target_folder: str, hoys: list = None, states: DynamicSchedule = None,
             grids_filter: str = '*', res_type: str = 'total', axis: int = 1):
-        """Compute annual summary statistics (average, median, minimum, maximum,
+        """Compute summary statistics (average, median, minimum, maximum,
         cumulative) for each sensor or timestep and write the values to a folder.
 
         If hoys is left as None, the average will be computed for all study hours,
@@ -962,7 +962,7 @@ class Results(_ResultsFolder):
             maximum_values,
             cumulative_values,
             grids_info
-        ) = self.annual_summary(
+        ) = self.annual_statistics(
             hoys=hoys, states=states, grids_filter=grids_filter,
             res_type=res_type, axis=axis
         )

honeybee_radiance_postprocess/util.py

@@ -86,14 +86,10 @@ def filter_array2d(array: np.ndarray, mask: np.ndarray) -> np.ndarray:
     Returns:
         A filtered NumPy array.
     """
-    if is_cpu:
-        array_filter = np.apply_along_axis(
-            filter_array, 1, array, mask=mask)
-    else:
+    if mask is not None:
         mask = np.asarray(mask).astype(bool)
-        array_filter = array[:, mask]
-
-    return array_filter
+        array = array[:, mask]
+    return array
 
 
 def filter_array(array: np.ndarray, mask: np.ndarray) -> np.ndarray:

{honeybee_radiance_postprocess-0.4.581.dist-info → honeybee_radiance_postprocess-0.4.584.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-radiance-postprocess
-Version: 0.4.581
+Version: 0.4.584
 Summary: Postprocessing of Radiance results and matrices
 Home-page: https://github.com/ladybug-tools/honeybee-radiance-postprocess
 Author: Ladybug Tools
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-radiance==1.66.214
+Requires-Dist: honeybee-radiance==1.66.215
 Requires-Dist: numpy<2.0.0
 Dynamic: author
 Dynamic: author-email

{honeybee_radiance_postprocess-0.4.581.dist-info → honeybee_radiance_postprocess-0.4.584.dist-info}/RECORD

@@ -11,7 +11,7 @@ honeybee_radiance_postprocess/helper.py,sha256=NzGWfEmYlSzg4CpTuB9PMRSpKCIbN7gsD
 honeybee_radiance_postprocess/metrics.py,sha256=XvRDcAu9-5UHzJvafvegbtwab8-oPchu_lw03UgjylE,15303
 honeybee_radiance_postprocess/reader.py,sha256=fEuqU-87vloLofwMxdCLKV4ZXoW1eMOXydsTgUwMCFk,2762
 honeybee_radiance_postprocess/type_hints.py,sha256=39kLNk9FxcQVGdL6bkP49jIFsf_1brP6r6w3khl9hqc,1212
-honeybee_radiance_postprocess/util.py,sha256=h7fipG9it_cfIk-kFP3X_IassVmfmphPiLxpydW43R4,6295
+honeybee_radiance_postprocess/util.py,sha256=DSWO6WsOG2z7CGk-sJpXybRx87u4Y7uiitrCIelPWFI,6189
 honeybee_radiance_postprocess/vis_metadata.py,sha256=7ywIgdiuNKcctxifhpy7-Q2oaSX2ngQBeA0Kh7q1Gg0,1780
 honeybee_radiance_postprocess/breeam/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
 honeybee_radiance_postprocess/breeam/breeam.py,sha256=cSco6g0Qyv1XgfyY18Z9rabQfWPLGRBcYQumdMv5Y4k,20672
@@ -23,7 +23,7 @@ honeybee_radiance_postprocess/cli/grid.py,sha256=IMjfyw-XPaoSu550T_BuulRSawla8kY
 honeybee_radiance_postprocess/cli/leed.py,sha256=vup_tVcSnSO5R7U_WPVDAhtSSRrPzTUgV4j9lyxvxEk,5546
 honeybee_radiance_postprocess/cli/merge.py,sha256=NgQ5RM1-GrJQs_25IPzBvQ5PAn6oTKiB_N9SeHBxgCA,5840
 honeybee_radiance_postprocess/cli/mtxop.py,sha256=pbQsc4EnzsRStBX1-KcgIKmuTlVYiG1IyNjiqbwS2V0,5103
-honeybee_radiance_postprocess/cli/postprocess.py,sha256=nR0Mk7f_WCmYjpqkcxKs9tN7EWj6moFsYKnj6vUlGS0,41890
+honeybee_radiance_postprocess/cli/postprocess.py,sha256=OqOmmagOOxWQ7Vf9VBYoweCupdGbfyjiY6ig9duKPTU,42370
 honeybee_radiance_postprocess/cli/schedule.py,sha256=6uIy98Co4zm-ZRcELo4Lfx_aN3lNiqPe-BSimXwt1F8,3877
 honeybee_radiance_postprocess/cli/translate.py,sha256=W3G5aBN7pGx5sX3VoV1xZM6HL06Fw95iJb7vV-r6u7w,7396
 honeybee_radiance_postprocess/cli/two_phase.py,sha256=njkWBRxOqdRSp0JxLloWTGWmKruyONetgnIbjXhrrXw,8393
@@ -39,12 +39,12 @@ honeybee_radiance_postprocess/leed/leed_schedule.py,sha256=8NUISE6RbENK1IgMA5cC2
 honeybee_radiance_postprocess/results/__init__.py,sha256=1agBQbfT4Tf8KqSZzlfKYX8MeZryY4jJ1KB4HWqaDDk,182
 honeybee_radiance_postprocess/results/annual_daylight.py,sha256=ulv8kZvS6UkhCjaXSJKXQeVhUReRdx4M0tGvy7rA8CI,34586
 honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=nA1VubesNDtRxgXpHSZxFMV67XxUntIHIu5H9qtDBSk,8483
-honeybee_radiance_postprocess/results/results.py,sha256=9A_4i6Vl5R4ZBeCFsJZz9D_y_t2_XW3cWeMdShVIXVo,66852
+honeybee_radiance_postprocess/results/results.py,sha256=CZZeyBTLVQt69qGdiePQsBIi1ppwIpqkp9lUpXv9orM,66846
 honeybee_radiance_postprocess/well/__init__.py,sha256=kQXElEqFnLGNnrMSpA51XDHoqBup849FHeAqWASIy6w,45
 honeybee_radiance_postprocess/well/well.py,sha256=FzxaLo3IdlvFZZ1UtblBk9zsKl_EfsCKIcAgfucq-nE,24762
-honeybee_radiance_postprocess-0.4.581.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.581.dist-info/METADATA,sha256=VuGW8rd_g2nVrQ2nNaA9ZWsQmx_zfVdHaOhD5zbU2Jc,2575
-honeybee_radiance_postprocess-0.4.581.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-honeybee_radiance_postprocess-0.4.581.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.581.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.581.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.584.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.584.dist-info/METADATA,sha256=rrfb55zO-UeTxzyUZfXNCnoQWszSZKljWlIRd3aWqA0,2575
+honeybee_radiance_postprocess-0.4.584.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+honeybee_radiance_postprocess-0.4.584.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.584.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.584.dist-info/RECORD,,