diff options
| author | Daniel Friesel <daniel.friesel@uos.de> | 2020-10-23 08:00:30 +0200 |
|---|---|---|
| committer | Daniel Friesel <daniel.friesel@uos.de> | 2020-10-23 08:00:30 +0200 |
| commit | 34b1b9466af7501e651cf3664d96e12c8126f116 (patch) | |
| tree | 310d0d79bdf309241465370913b9065d9e2d6cb7 /lib | |
| parent | 670e7f51f81b7052e17c453991f39018a5c9b008 (diff) | |
minor refactoring
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lennart/DataProcessor.py | 2 | ||||
| -rw-r--r-- | lib/loader.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/lennart/DataProcessor.py b/lib/lennart/DataProcessor.py index 90cc54d..07d2a2b 100644 --- a/lib/lennart/DataProcessor.py +++ b/lib/lennart/DataProcessor.py @@ -188,10 +188,10 @@ class DataProcessor: data.append(ts) a = np.empty((len(data),)) + a[0::4] = min_value a[1::4] = max_value a[2::4] = max_value a[3::4] = min_value - a[4::4] = min_value return data, a # plotting by columns import matplotlib.pyplot as plt diff --git a/lib/loader.py b/lib/loader.py index 71183c5..0e46755 100644 --- a/lib/loader.py +++ b/lib/loader.py @@ -578,7 +578,7 @@ class RawData: # TODO es gibt next_transitions ohne 'plan' return True - def _merge_online_and_offline(self, measurement): + def _merge_online_and_mimosa(self, measurement): # Edits self.traces_by_fileno[measurement['fileno']][*]['trace'][*]['offline'] # and self.traces_by_fileno[measurement['fileno']][*]['trace'][*]['offline_aggregates'] in place # (appends data from measurement['energy_trace']) @@ -1050,7 +1050,7 @@ class RawData: if version == 0 or version == 1: if self._measurement_is_valid_01(measurement): - self._merge_online_and_offline(measurement) + self._merge_online_and_mimosa(measurement) num_valid += 1 else: logger.warning( |