From f4aaa3ae3ca665be367de12768efee1b9ad4da13 Mon Sep 17 00:00:00 2001 From: "Mads M. Pedersen" <mmpe@dtu.dk> Date: Wed, 22 Feb 2017 09:08:59 +0100 Subject: [PATCH] Added power sensor in DLC_test.xlsx --- wetb/dlc/high_level.py | 4 +++- wetb/dlc/tests/test_files/DLC_test.xlsx | Bin 16973 -> 17089 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wetb/dlc/high_level.py b/wetb/dlc/high_level.py index 3c60746..6c29c45 100644 --- a/wetb/dlc/high_level.py +++ b/wetb/dlc/high_level.py @@ -126,7 +126,9 @@ class DLCHighLevel(object): def sensor_info(self, sensors=[]): if sensors != []: - return self.sensor_df[functools.reduce(np.logical_or, [((self.sensor_df.get(f, pd.DataFrame([""] * len(self.sensor_df.name))[0]).values != "") | (self.sensor_df.name == f)) for f in np.atleast_1d(sensors)])] + sensors = np.atleast_1d(sensors) + empty_column = pd.DataFrame([""] * len(self.sensor_df.name))[0] + return self.sensor_df[functools.reduce(np.logical_or, [((self.sensor_df.get(f, empty_column).values != "") | (self.sensor_df.name == f)) for f in sensors])] else: return self.sensor_df diff --git a/wetb/dlc/tests/test_files/DLC_test.xlsx b/wetb/dlc/tests/test_files/DLC_test.xlsx index 8c6c9a112a2c323f220dd424c392b56ea4b101c4..5945bc4a9399508b45140e4feaacf7d84caa659c 100644 GIT binary patch delta 3526 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 delta 3412 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 -- GitLab