diff --git a/src/data_handling/data_preparation.py b/src/data_handling/data_preparation.py index 3f5431a35729bd32c222fcd69d043bbd6c4dcd49..70722b1f2e3a4521a26c3eda46104bfb481fecf1 100644 --- a/src/data_handling/data_preparation.py +++ b/src/data_handling/data_preparation.py @@ -31,7 +31,7 @@ class AbstractStationPrep(): self.path = os.path.abspath(path) self.station = helpers.to_list(station) self.statistics_per_var = statistics_per_var - self.target_dim = 'variable' + # self.target_dim = 'variable' self.kwargs = kwargs # internal @@ -107,7 +107,11 @@ class AbstractStationPrep(): :return: this array """ ind = pd.DataFrame({'val': index_value}, index=index_value) - res = xr.Dataset.from_dataframe(ind).to_array().rename({'index': index_name}).squeeze(dim=squeeze_dim, drop=True) + # res = xr.Dataset.from_dataframe(ind).to_array().rename({'index': index_name}).squeeze(dim=squeez/e_dim, drop=True) + res = xr.Dataset.from_dataframe(ind).to_array(squeeze_dim).rename({'index': index_name}).squeeze( + dim=squeeze_dim, + drop=True + ) res.name = index_name return res @@ -286,7 +290,7 @@ class StationPrep(AbstractStationPrep): self.station_type = station_type self.network = network self.sampling = sampling - self.variable_dim = target_dim + self.target_dim = target_dim self.target_var = target_var self.interpolate_dim = interpolate_dim self.window_history_size = window_history_size @@ -314,6 +318,7 @@ class StationPrep(AbstractStationPrep): return self.get_transposed_label() def make_samples(self): + self.load_data() self.make_history_window(self.target_dim, self.window_history_size, self.interpolate_dim) self.make_labels(self.target_dim, self.target_var, self.interpolate_dim, self.window_lead_time) self.make_observation(self.target_dim, self.target_var, self.interpolate_dim)