Supplemental distribution now sees bi-directional skims(AM & PM skims…

… averaged)
psrc · Nov 6, 2014 · 364348c · 364348c
1 parent 31be067
commit 364348c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/input_configuration.py b/input_configuration.py
@@ -149,7 +149,8 @@
 externals_loc = 'R:/SoundCast/Inputs/2010/supplemental/generation/externals.csv'
 
 # Assuming AM skims (8 to 9 AM)
-skim_file_loc = 'inputs/7to8.h5'
+am_skim_file_loc = 'inputs/7to8.h5'
+pm_skim_file_loc = 'inputs/17to18.h5'
 base_skim_file_loc = 'R:/SoundCast/Inputs/2010/seed_skims/7to8.h5'
 trip_table_loc = 'outputs/prod_att.csv'
 output_dir = 'outputs/supplemental/'

diff --git a/scripts/supplemental/distribution.py b/scripts/supplemental/distribution.py
@@ -303,9 +303,12 @@ def main():
     init_dir(supplemental_loc)
 
     # Load skim data
-    cost_skim = load_skims(skim_file_loc, mode_name='svtl2g')
-    dist_skim = load_skims(skim_file_loc, mode_name='svtl1d', divide_by_100=True)
-
+    am_cost_skim = load_skims(am_skim_file_loc, mode_name='svtl2g')
+    am_dist_skim = load_skims(am_skim_file_loc, mode_name='svtl1d', divide_by_100=True)
+    pm_cost_skim = load_skims(pm_skim_file_loc, mode_name='svtl2g')
+    pm_dist_skim = load_skims(pm_skim_file_loc, mode_name='svtl1d', divide_by_100=True)
+    cost_skim = (am_cost_skim + pm_cost_skim) * .5
+    dist_skim = (am_cost_skim + pm_dist_skim) * .5
     # Import a network
     network_importer(my_project)