finished renaming of data handlers

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

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)

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
 

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