honeybee-radiance-postprocess 0.4.583__py3-none-any.whl → 0.4.585__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
@@ -564,7 +563,20 @@ def annual_statistics(
 
         axis = 1 if sensor is True else 0
 
-        results = AnnualDaylight(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)

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.583.dist-info → honeybee_radiance_postprocess-0.4.585.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-radiance-postprocess
-Version: 0.4.583
+Version: 0.4.585
 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.215
+Requires-Dist: honeybee-radiance==1.66.216
 Requires-Dist: numpy<2.0.0
 Dynamic: author
 Dynamic: author-email

{honeybee_radiance_postprocess-0.4.583.dist-info → honeybee_radiance_postprocess-0.4.585.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=6dSFievLH2wHNOyuTU7iNZXbmsX7ZeiHVct9S9NSY7M,41901
+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
@@ -42,9 +42,9 @@ honeybee_radiance_postprocess/results/annual_irradiance.py,sha256=nA1VubesNDtRxg
 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.583.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_radiance_postprocess-0.4.583.dist-info/METADATA,sha256=bscpX9IcyVdMZ276TFOiI8VV9T7waH9WY8YCL6MiASE,2575
-honeybee_radiance_postprocess-0.4.583.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-honeybee_radiance_postprocess-0.4.583.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
-honeybee_radiance_postprocess-0.4.583.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
-honeybee_radiance_postprocess-0.4.583.dist-info/RECORD,,
+honeybee_radiance_postprocess-0.4.585.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_radiance_postprocess-0.4.585.dist-info/METADATA,sha256=bjLh6JAPVVd0gI2kaThqu1_G4qGV3ADExFPa77OLjJg,2575
+honeybee_radiance_postprocess-0.4.585.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+honeybee_radiance_postprocess-0.4.585.dist-info/entry_points.txt,sha256=gFtVPx6UItXt27GfEZZO00eOZChJJEL6JwGSAB_O3rs,96
+honeybee_radiance_postprocess-0.4.585.dist-info/top_level.txt,sha256=4-sFbzy7ewP2EDqJV3jeFlAFx7SuxtoBBELWaKAnLdA,30
+honeybee_radiance_postprocess-0.4.585.dist-info/RECORD,,