Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(results): Use class property when filtering grids #75

Merged
merged 1 commit into from Nov 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions honeybee_radiance_postprocess/results.py
Expand Up @@ -15,7 +15,8 @@
from .metrics import (da_array2d, cda_array2d, udi_array2d, udi_lower_array2d,
udi_upper_array2d, ase_array2d, average_values_array2d,
cumulative_values_array2d, peak_values_array2d)
from .util import filter_array, hoys_mask, check_array_dim
from .util import filter_array, hoys_mask, check_array_dim, \
_filter_grids_by_pattern
from .annualdaylight import _annual_daylight_config
from .electriclight import array_to_dimming_fraction
from . import type_hints
Expand Down Expand Up @@ -1490,7 +1491,8 @@ def _filter_grids(self, grids_filter: str = '*') -> list:
list: List of grid information for filtered grids.
"""
if grids_filter != '*':
grids_info, _ = _process_input_folder(self.folder, grids_filter)
grids_info = \
_filter_grids_by_pattern(self.grids_info, grids_filter)
else:
grids_info = self.grids_info

Expand Down
17 changes: 17 additions & 0 deletions honeybee_radiance_postprocess/util.py
Expand Up @@ -2,6 +2,8 @@
from typing import Tuple
import numpy as np

from honeybee_radiance.writer import _filter_by_pattern


def binary_mtx_dimension(filepath: str) -> Tuple[int, int, int, int]:
"""Return binary Radiance matrix dimensions if exist.
Expand Down Expand Up @@ -155,3 +157,18 @@ def recursive_dict_merge(dict_1: dict, dict_2: dict):
recursive_dict_merge(dict_1[k], dict_2[k])
else:
dict_1[k] = dict_2[k]


def _filter_grids_by_pattern(grids_info, filter_pattern):
"""Filter grids_info by a pattern.

Args:
grids_info: Grid information.
filter_pattern: Pattern to filter grids by.

Returns:
A list of filtered grids.
"""
grids = _filter_by_pattern(grids_info, filter=filter_pattern)

return grids