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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renamed get_handler_stdev #115

Merged
merged 1 commit into from
Nov 17, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sup3r/preprocessing/batch_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -717,20 +717,20 @@ def get_handler_mean(self, feature_idx, handler_idx):
return np.nanmean(
self.data_handlers[handler_idx].data[..., feature_idx])

def get_handler_stdev(self, feature_idx, handler_idx, mean):
"""Get feature stdev for a given handler
def get_handler_variance(self, feature_idx, handler_idx, mean):
"""Get feature variance for a given handler

Parameters
----------
feature_idx : int
Index of feature to get stdev for
Index of feature to get variance for
handler_idx : int
Index of data handler to get stdev for
Index of data handler to get variance for

Returns
-------
float
Feature stdev
Feature variance
"""
istd = self.data_handlers[handler_idx].data[..., feature_idx] - mean
return np.nanmean(istd**2)
Expand Down Expand Up @@ -802,14 +802,14 @@ def get_stdevs_for_feature(self, feature, max_workers=None):
logger.debug(f'Calculating stdev for {feature}')
if max_workers == 1:
for didx, _ in enumerate(self.data_handlers):
self.stds[idx] += self.get_handler_stdev(idx, didx,
self.means[idx])
self.stds[idx] += self.get_handler_variance(idx, didx,
self.means[idx])
else:
with ThreadPoolExecutor(max_workers=max_workers) as exe:
futures = {}
now = dt.now()
for didx, _ in enumerate(self.data_handlers):
future = exe.submit(self.get_handler_stdev, idx, didx,
future = exe.submit(self.get_handler_variance, idx, didx,
self.means[idx])
futures[future] = didx

Expand Down