From 0efdfb1655d81f2018b6125597066ed3f7d4c3e7 Mon Sep 17 00:00:00 2001
From: leufen1 <l.leufen@fz-juelich.de>
Date: Fri, 30 Oct 2020 10:12:00 +0100
Subject: [PATCH] finished renaming of data handlers
---
mlair/data_handler/__init__.py | 2 +-
mlair/data_handler/advanced_data_handler.py | 14 ++++++++------
...tion_neighbors.py => data_handler_neighbors.py} | 0
...eparation.py => data_handler_single_station.py} | 0
mlair/data_handler/default_data_handler.py | 1 -
mlair/run_modules/pre_processing.py | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
rename mlair/data_handler/{data_preparation_neighbors.py => data_handler_neighbors.py} (100%)
rename mlair/data_handler/{station_preparation.py => data_handler_single_station.py} (100%)
diff --git a/mlair/data_handler/__init__.py b/mlair/data_handler/__init__.py
index 01d66003..495b6e7c 100644
--- a/mlair/data_handler/__init__.py
+++ b/mlair/data_handler/__init__.py
@@ -13,4 +13,4 @@ from .bootstraps import BootStraps
from .iterator import KerasIterator, DataCollection
from .default_data_handler import DefaultDataHandler
from .abstract_data_handler import AbstractDataHandler
-from .data_preparation_neighbors import DataHandlerNeighbors
+from .data_handler_neighbors import DataHandlerNeighbors
diff --git a/mlair/data_handler/advanced_data_handler.py b/mlair/data_handler/advanced_data_handler.py
index c2d210bf..f04748e8 100644
--- a/mlair/data_handler/advanced_data_handler.py
+++ b/mlair/data_handler/advanced_data_handler.py
@@ -10,15 +10,18 @@ import datetime as dt
from mlair.data_handler import AbstractDataHandler
-from typing import Union, List
+from typing import Union, List, Tuple, Dict
+import logging
+from functools import reduce
+from mlair.helpers.join import EmptyQueryResult
+from mlair.helpers import TimeTracking
number = Union[float, int]
num_or_list = Union[number, List[number]]
def run_data_prep():
-
- from .data_preparation_neighbors import DataHandlerNeighbors
+ from .data_handler_neighbors import DataHandlerNeighbors
data = DummyDataHandler("main_class")
data.get_X()
data.get_Y()
@@ -33,8 +36,7 @@ def run_data_prep():
def create_data_prep():
-
- from .data_preparation_neighbors import DataHandlerNeighbors
+ from .data_handler_neighbors import DataHandlerNeighbors
path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "testdata")
station_type = None
network = 'UBA'
@@ -98,7 +100,7 @@ class DummyDataHandler(AbstractDataHandler):
if __name__ == "__main__":
- from mlair.data_handler.station_preparation import DataHandlerSingleStation
+ from mlair.data_handler.data_handler_single_station import DataHandlerSingleStation
from mlair.data_handler.iterator import KerasIterator, DataCollection
data_prep = create_data_prep()
data_collection = DataCollection(data_prep)
diff --git a/mlair/data_handler/data_preparation_neighbors.py b/mlair/data_handler/data_handler_neighbors.py
similarity index 100%
rename from mlair/data_handler/data_preparation_neighbors.py
rename to mlair/data_handler/data_handler_neighbors.py
diff --git a/mlair/data_handler/station_preparation.py b/mlair/data_handler/data_handler_single_station.py
similarity index 100%
rename from mlair/data_handler/station_preparation.py
rename to mlair/data_handler/data_handler_single_station.py
diff --git a/mlair/data_handler/default_data_handler.py b/mlair/data_handler/default_data_handler.py
index d8ec3c4f..8ed4f874 100644
--- a/mlair/data_handler/default_data_handler.py
+++ b/mlair/data_handler/default_data_handler.py
@@ -16,7 +16,6 @@ import numpy as np
import xarray as xr
from mlair.data_handler.abstract_data_handler import AbstractDataHandler
-from mlair.data_handler.data_handler_single_station import DataHandlerSingleStation
from mlair.helpers import remove_items, to_list
from mlair.helpers.join import EmptyQueryResult
diff --git a/mlair/run_modules/pre_processing.py b/mlair/run_modules/pre_processing.py
index f074863e..9b8ebbb2 100644
--- a/mlair/run_modules/pre_processing.py
+++ b/mlair/run_modules/pre_processing.py
@@ -11,7 +11,7 @@ import numpy as np
import pandas as pd
from mlair.data_handler import DataCollection, AbstractDataHandler
-from mlair.helpers import TimeTracking, to_list
+from mlair.helpers import TimeTracking
from mlair.configuration import path_config
from mlair.helpers.join import EmptyQueryResult
from mlair.run_modules.run_environment import RunEnvironment
--
GitLab