renamed modules and classes

mlair/reference_data_handler/abstract_reference_data_handler.py → mlair/reference_models/abstract_reference_model.py

@@ -36,12 +36,13 @@ class AbstractReferenceModel(ABC):
         return res
 
 
-class AbstractReferenceb2share(AbstractReferenceModel):
+class AbstractReferenceB2share(AbstractReferenceModel):
     """
     Abstract class for reference models located on b2share (eudat or fz-juelich)
     See also https://github.com/EUDAT-Training/B2SHARE-Training/blob/master/api/01_Retrieve_existing_record.md
 
     """
+
     def __init__(self, b2share_hosturl: str, b2share_bucket: str, b2share_key: str):
         super().__init__()
         self.b2share_hosturl = b2share_hosturl
@@ -63,3 +64,6 @@ class AbstractReferenceb2share(AbstractReferenceModel):
                       out=f"{tmp_download_path}{self.b2share_key}",
                       bar=self.bar_custom
                       )
+
+    def make_reference_available_locally(self):
+        raise NotImplementedError

mlair/reference_data_handler/intellio3_v1_reference.py → mlair/reference_models/reference_model_intellio3_v1.py

@@ -11,10 +11,10 @@ import xarray as xr
 import shutil
 
 from mlair.configuration.path_config import check_path_and_create
-from mlair.reference_data_handler.abstract_reference_data_handler import AbstractReferenceb2share
+from mlair.reference_models.abstract_reference_model import AbstractReferenceB2share
 
 
-class IntelliO3Reference(AbstractReferenceb2share):
+class IntelliO3Reference(AbstractReferenceB2share):
     """
     Reference handler that extracts IntelliO3-ts v1.0 forecasts (Kleinert, 2021).
 
@@ -57,15 +57,14 @@ class IntelliO3Reference(AbstractReferenceb2share):
         :return: base dir of tmp path and list of forecast files
         :rtype: tuple(str, list(str))
         """
-        for root, dirs, file_names in os.walk(self.tmp_extract_path+self.orig_forecast_path):
+        for base_dir, dirs, file_names in os.walk(self.tmp_extract_path + self.orig_forecast_path):
             pass
-        return root, file_names
+        return base_dir, file_names
 
     def read_and_drop(self, sel_coords: dict = None):
         """
         Reads original forecast files, renames coord type and store forecasts as NetCdf4 files
         :param sel_coords:
-        :type sel_coords:
         """
         if sel_coords is None:
             sel_coords = {'type': 'CNN'}

run.py

@@ -5,6 +5,7 @@ import argparse
 from mlair.workflows import DefaultWorkflow
 from mlair.helpers import remove_items
 from mlair.configuration.defaults import DEFAULT_PLOT_LIST
+import os
 
 
 def load_stations():
@@ -20,9 +21,14 @@ def load_stations():
 
 def main(parser_args):
     plots = remove_items(DEFAULT_PLOT_LIST, "PlotConditionalQuantiles")
-    workflow = DefaultWorkflow(stations=load_stations(),
-                               train_model=False, create_new_model=False, network="UBA",
-                               evaluate_bootstraps=False, plot_list=["PlotStationMap"], **parser_args.__dict__)
+    workflow = DefaultWorkflow(  # stations=load_stations(),
+        # stations=["DEBW087","DEBW013", "DEBW107",  "DEBW076"],
+        stations=["DEBW013", "DEBW087", "DEBW107", "DEBW076"],
+        train_model=False, create_new_model=True, network="UBA",
+        evaluate_bootstraps=False,  # plot_list=["PlotCompetitiveSkillScore"],
+        competitors=["test_model", "test_model2"],
+        competitor_path=os.path.join(os.getcwd(), "data", "comp_test"),
+        **parser_args.__dict__)
     workflow.run()
 
 

run_mixed_sampling.py

@@ -25,9 +25,9 @@ def main(parser_args):
                 interpolation_limit=(3, 1), overwrite_local_data=False,
                 sampling=("hourly", "daily"),
                 statistics_per_var=stats,
-                create_new_model=False, train_model=False, epochs=1,
-                window_history_size=48,
-                window_history_offset=17,
+                create_new_model=True, train_model=False, epochs=1,
+                window_history_size=6 * 24 + 16,
+                window_history_offset=16,
                 kz_filter_length=[100 * 24, 15 * 24],
                 kz_filter_iter=[4, 5],
                 start="2006-01-01",

test/test_reference_data_handler/test_abstract_reference_data_handler.py

 import pytest
 import mock
 
-from mlair.reference_data_handler.abstract_reference_data_handler import AbstractReferenceModel
-from mlair.reference_data_handler.abstract_reference_data_handler import AbstractReferenceb2share
+from mlair.reference_models.abstract_reference_model import AbstractReferenceModel
+from mlair.reference_models.abstract_reference_model import AbstractReferenceB2share
 
 
 class TestAbstractReferenceDataHandler:
@@ -32,13 +32,13 @@ class TestAbstractReferenceb2share:
         b2share_hosturl = "b2share.url"
         b2share_bucket = "1111-2222-3333"
         b2share_key = "b2share_key.tar.gz"
-        return AbstractReferenceb2share(b2share_hosturl, b2share_bucket, b2share_key)
+        return AbstractReferenceB2share(b2share_hosturl, b2share_bucket, b2share_key)
 
     def test_inheritance(self):
-        assert issubclass(AbstractReferenceb2share, AbstractReferenceModel)
+        assert issubclass(AbstractReferenceB2share, AbstractReferenceModel)
 
     def test_init(self, ar):
-        assert isinstance(ar, AbstractReferenceb2share)
+        assert isinstance(ar, AbstractReferenceB2share)
         assert ar.b2share_hosturl == "b2share.url"
         assert ar.b2share_bucket == "1111-2222-3333"
         assert ar.b2share_key == "b2share_key.tar.gz"

test/test_reference_data_handler/test_intellio3_v1_reference.py

 import pytest
 
-
-from mlair.reference_data_handler.intellio3_v1_reference import IntelliO3Reference
-from mlair.reference_data_handler.abstract_reference_data_handler import AbstractReferenceb2share
+from mlair.reference_models.reference_model_intellio3_v1 import IntelliO3Reference
+from mlair.reference_models.abstract_reference_model import AbstractReferenceB2share
 
 
 class TestIntelliO3Reference:
@@ -29,7 +28,7 @@ class TestIntelliO3Reference:
         assert io3.ref_store_path == "DummyExtraPath/"
 
     def test_inheritance(self):
-        assert issubclass(IntelliO3Reference, AbstractReferenceb2share)
+        assert issubclass(IntelliO3Reference, AbstractReferenceB2share)
 
     def test_untar_forecasts(self, io3):
         pass