From 9bb783b0466edc5d4f728907662c648306ad9396 Mon Sep 17 00:00:00 2001 From: tomrink <rink@ssec.wisc.edu> Date: Fri, 16 Dec 2022 12:39:17 -0600 Subject: [PATCH] snapshot... --- modules/icing/pirep_goes.py | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 9e17a937..206f0b96 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -1701,8 +1701,8 @@ def tile_extract(icing_files, no_icing_files, trnfile='/home/rink/tiles_train.h5 if do_split: trn_idxs, vld_idxs, tst_idxs = split_data(icing_times) - # Below for now test data, just train and valid - # trn_idxs = np.concatenate([trn_idxs, tst_idxs]) + # Below for no test data, just train and valid + trn_idxs = np.concatenate([trn_idxs, tst_idxs]) else: trn_idxs = np.arange(icing_intensity.shape[0]) tst_idxs = None @@ -1788,27 +1788,27 @@ def tile_extract(icing_files, no_icing_files, trnfile='/home/rink/tiles_train.h5 write_file(trnfile, params, param_types, trn_data_dct, trn_icing_intensity, trn_icing_times, trn_icing_lons, trn_icing_lats, trn_icing_alt) if do_split: - # --- Comment out this block for not test data, just valid and train - tst_data_dct = {} - for ds_name in params: - tst_data_dct[ds_name] = data_dct[ds_name][tst_idxs,] - tst_icing_intensity = icing_intensity[tst_idxs,] - tst_icing_times = icing_times[tst_idxs,] - tst_icing_lons = icing_lons[tst_idxs,] - tst_icing_lats = icing_lats[tst_idxs,] - tst_icing_alt = icing_alt[tst_idxs,] - - # do sort - ds_indexes = np.argsort(tst_icing_times) - for ds_name in params: - tst_data_dct[ds_name] = tst_data_dct[ds_name][ds_indexes] - tst_icing_intensity = tst_icing_intensity[ds_indexes] - tst_icing_times = tst_icing_times[ds_indexes] - tst_icing_lons = tst_icing_lons[ds_indexes] - tst_icing_lats = tst_icing_lats[ds_indexes] - tst_icing_alt = tst_icing_alt[ds_indexes] - - write_file(tstfile, params, param_types, tst_data_dct, tst_icing_intensity, tst_icing_times, tst_icing_lons, tst_icing_lats, tst_icing_alt) + # --- Comment out this block for no test data, just valid and train + # tst_data_dct = {} + # for ds_name in params: + # tst_data_dct[ds_name] = data_dct[ds_name][tst_idxs,] + # tst_icing_intensity = icing_intensity[tst_idxs,] + # tst_icing_times = icing_times[tst_idxs,] + # tst_icing_lons = icing_lons[tst_idxs,] + # tst_icing_lats = icing_lats[tst_idxs,] + # tst_icing_alt = icing_alt[tst_idxs,] + # + # # do sort + # ds_indexes = np.argsort(tst_icing_times) + # for ds_name in params: + # tst_data_dct[ds_name] = tst_data_dct[ds_name][ds_indexes] + # tst_icing_intensity = tst_icing_intensity[ds_indexes] + # tst_icing_times = tst_icing_times[ds_indexes] + # tst_icing_lons = tst_icing_lons[ds_indexes] + # tst_icing_lats = tst_icing_lats[ds_indexes] + # tst_icing_alt = tst_icing_alt[ds_indexes] + # + # write_file(tstfile, params, param_types, tst_data_dct, tst_icing_intensity, tst_icing_times, tst_icing_lons, tst_icing_lats, tst_icing_alt) # ------------------------------------------------------------------- vld_data_dct = {} -- GitLab