Merge pull request #173 from lekoenig/172-edit-smk-date-formatting

Edit date formatting in Snakefile_base.smk

Author: lkoenig-usgs

2a_model/src/models/Snakefile_base.smk

@@ -128,22 +128,22 @@ def filter_predictions(all_preds_file, partition, out_file):
 
 
         if partition == "trn":
-            df_preds_filt = df_preds_trn_sites[(df_preds_trn_sites.date >= config['train_start_date'][0]) &
-                                               (df_preds_trn_sites.date < config['train_end_date'][0])]
+            df_preds_filt = df_preds_trn_sites[(df_preds_trn_sites.date >= config['train_start_date']) &
+                                               (df_preds_trn_sites.date < config['train_end_date'])]
         elif partition == "val":
             # get all of the data in the validation sites and in the validation period
             # this assumes that the test period follows the validation period which follows the train period
-            df_preds_filt_val = df_preds_val_sites[df_preds_val_sites.date < config['test_start_date'][0]]
-            df_preds_filt_trn = df_preds_trn_sites[(df_preds_trn_sites.date < config['val_end_date'][0]) &
-                                                   (df_preds_trn_sites.date >= config['val_start_date'][0])]
+            df_preds_filt_val = df_preds_val_sites[df_preds_val_sites.date < config['test_start_date']]
+            df_preds_filt_trn = df_preds_trn_sites[(df_preds_trn_sites.date < config['val_end_date']) &
+                                                   (df_preds_trn_sites.date >= config['val_start_date'])]
             df_preds_filt = pd.concat([df_preds_filt_val , df_preds_filt_trn], axis=0)
 
         elif partition == "val_times":
             # get the data in just the validation times at train and val sites
-            df_preds_filt_val = df_preds_val_sites[(df_preds_val_sites.date < config['val_end_date'][0]) &
-                                                   (df_preds_val_sites.date >= config['val_start_date'][0])]
-            df_preds_filt_trn = df_preds_trn_sites[(df_preds_trn_sites.date < config['val_end_date'][0]) &
-                                                   (df_preds_trn_sites.date >= config['val_start_date'][0])]
+            df_preds_filt_val = df_preds_val_sites[(df_preds_val_sites.date < config['val_end_date']) &
+                                                   (df_preds_val_sites.date >= config['val_start_date'])]
+            df_preds_filt_trn = df_preds_trn_sites[(df_preds_trn_sites.date < config['val_end_date']) &
+                                                   (df_preds_trn_sites.date >= config['val_start_date'])]
             df_preds_filt = pd.concat([df_preds_filt_val , df_preds_filt_trn], axis=0)