From 08dba668cad2a2d311bdee5c7ddf23995de1b426 Mon Sep 17 00:00:00 2001
From: luenensc <peter.luenenschloss@ufz.de>
Date: Sat, 9 Mar 2024 09:59:25 +0100
Subject: [PATCH] black/changelock
---
CHANGELOG.md | 1 -
saqc/funcs/generic.py | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec5745c7a..3409d90b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
[List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.5.0...develop)
### Added
- `generics`: target broadcasting and numpy array support
-- `flagGeneric`: target broadcasting
- `SaQC`: automatic translation of incoming flags
- Option to change the flagging scheme after initialization
- `flagByClick`: manually assign flags using a graphical user interface
diff --git a/saqc/funcs/generic.py b/saqc/funcs/generic.py
index 165190ce8..56c00bb25 100644
--- a/saqc/funcs/generic.py
+++ b/saqc/funcs/generic.py
@@ -83,15 +83,17 @@ def _inferBroadcast(obj, trg_shape) -> pd.DataFrame:
return np.full(trg_shape, obj)
return obj
+
def _inferDF(obj, cols, index):
# infer dataframe if result is numpy array of fitting shape
if isinstance(obj, np.ndarray):
lc = len(cols)
li = len(index)
- if (obj.shape == (li,lc)) or (obj.shape == (li,)):
+ if (obj.shape == (li, lc)) or (obj.shape == (li,)):
return pd.DataFrame(obj, columns=cols, index=index)
return obj
+
def _castResult(obj) -> DictOfSeries:
# Note: the actual keys aka. column names
# we use here to create a DictOfSeries
--
GitLab