Merge pull request #275 from danielsclint/ft_schedule_flex

bstabler · web-flow · commit 7db24a67342c · 2019-12-17T14:59:18.000-08:00
Provide more flexibility for defining mandatory schedule specifications.
diff --git a/activitysim/abm/models/mandatory_scheduling.py b/activitysim/abm/models/mandatory_scheduling.py
@@ -74,13 +74,9 @@ def mandatory_tour_scheduling(tours,
             mandatory_tours.tour_type.where(~is_university_tour, 'univ')
 
     # - spec dict segmented by primary_purpose
-    work_spec = simulate.read_model_spec(file_name='tour_scheduling_work.csv')
-    school_spec = simulate.read_model_spec(file_name='tour_scheduling_school.csv')
-    segment_specs = {
-        'work': work_spec,
-        'school': school_spec,
-        'univ': school_spec
-    }
+    specs = model_settings.get('SPEC', [])
+    segment_specs = {segment: simulate.read_model_spec(file_name=spec)
+                     for segment, spec in specs.items()}
 
     logger.info("Running mandatory_tour_scheduling with %d tours", len(tours))
     tdd_choices, timetable = vts.vectorize_tour_scheduling(
diff --git a/activitysim/abm/test/configs/mandatory_tour_scheduling.yaml b/activitysim/abm/test/configs/mandatory_tour_scheduling.yaml
@@ -21,6 +21,10 @@ LOGSUM_SETTINGS: tour_mode_choice.yaml
 
 SEGMENT_COL: primary_purpose
 
+SPEC:
+  work: tour_scheduling_work.csv
+  school: tour_scheduling_school.csv
+  univ: tour_scheduling_school.csv
 
 #CHOOSER_ORIG_COL_NAME: TAZ
 
diff --git a/example/configs/mandatory_tour_scheduling.yaml b/example/configs/mandatory_tour_scheduling.yaml
@@ -19,6 +19,10 @@ SIMULATE_CHOOSER_COLUMNS:
 
 LOGSUM_SETTINGS: tour_mode_choice.yaml
 
+SPEC:
+  work: tour_scheduling_work.csv
+  school: tour_scheduling_school.csv
+  univ: tour_scheduling_school.csv
 
 #CHOOSER_ORIG_COL_NAME: TAZ
 
