From a0a015a216b2b299620001a91eb9aade112e9788 Mon Sep 17 00:00:00 2001 From: wachsylon Date: Fri, 2 Oct 2020 12:23:24 +0200 Subject: [PATCH 1/2] Added a function to search the time_ranges of the catalog --- intake_esm/search.py | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/intake_esm/search.py b/intake_esm/search.py index 4bc26339..f021ac7e 100644 --- a/intake_esm/search.py +++ b/intake_esm/search.py @@ -5,7 +5,78 @@ import numpy as np import pandas as pd +from datetime import datetime +def _search_time(df, needed_timerange): +#Some checks for the format: + if len(needed_timerange) != 2 : + message="Timerange must have start and end values." + warn(message) + return pd.DataFrame(columns=columns) + if type(needed_timerange) == tuple: + needed_timerange = list(needed_timerange) + try: + int(needed_timerange[0]) + int(needed_timerange[1]) + except: + message="Timerange values must be convertable into integers." + warn(message) + return pd.DataFrame(columns=columns) + +#Functions used in the actual code: + def combine_alternately(S1, S2): + i = 0 + while i < len(S2): + yield S1[i] + yield S2[i] + i = i + 1 + yield S1[i] + + def limit_format(fmt, date): + last_entry = int((len(date) - 2) / 2) + return fmt[:last_entry] + + def select_fmt(date): + fmt = ['%Y','%m','%d','%H','%M','%s'] + nondigits = [x for x in date if not x.isdigit()] + fmt = combine_alternately(fmt, nondigits) if nondigits else limit_format(fmt, date) + fmt = ''.join(fmt) + return fmt + + def strptime(date): + return datetime.strptime(date, select_fmt(date)) + + def within_timerange(needed_timerange, given_timerange): + n_start = strptime(needed_timerange[0]) + n_stop = strptime(needed_timerange[1]) + + try: + g_start = strptime(given_timerange[0]) + g_stop = strptime(given_timerange[1]) + except: + g_start = n_start + g_stop = n_stop + + if g_start <= n_start and n_start <= g_stop: + return True + elif g_start <= n_stop and n_stop <= g_stop: + return True + elif n_start <= g_start and g_stop <= n_stop: + return True + else: + return False + + rows, columns = df.shape + given_timeranges = df['time_range'].to_list() + i = 0 + drop = [] + while i < rows: + if isinstance(given_timeranges[i], str): + within = within_timerange(needed_timerange, given_timeranges[i].split('-')) + if not within: drop.append(i) + i = i + 1 + drop = df.index[drop] + return df.drop(drop) def _unique(df, columns=None): if isinstance(columns, str): From 9b41445ef3674b93f3723d1d324bfa69afffa095 Mon Sep 17 00:00:00 2001 From: wachsylon Date: Fri, 2 Oct 2020 13:13:27 +0200 Subject: [PATCH 2/2] Passed the tests --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ac20f74c..c66874f9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog History ================= +- Support time range subsetting + (:pr:`291`) `Fabian Wachsmann`_ + Intake-esm v2020.08.15 ====================== @@ -445,6 +448,7 @@ Internal Changes .. _`Anderson Banihirwe`: https://github.com/andersy005 .. _`Brian Bonnlander`: https://github.com/bonnland .. _`Charles Blackmon-Luca`: https://github.com/charlesbluca +.. _`Fabian Wachsmann`: https://github.com/wachsylon .. _`Julia Kent`: https://github.com/jukent .. _`Matthew Long`: https://github.com/matt-long .. _`Naomi Henderson`: https://github.com/naomi-henderson