Merge pull request #54 from RSGInc/tour-purpose-work-map

move tour_purpose_work_map to locals_person_trips in settings

bca4abm/tests/configs/person_trips.csv

@@ -1,5 +1,5 @@
 Description,Target,Expression
-,_work, @trips.tour_purpose.map(settings['tour_purpose_work_map'])
+,_work, @trips.tour_purpose.map(TOUR_PURPOSE_WORK_MAP)
 #
 monetized auto ivt,auto_time, @-0.5 * trips.hh_expansion_factor * (trips.build_auto_time - trips.base_auto_time) * _work.map(WORK_IVT_VOT_MAP)/60.0 * DISCOUNT_RATE * ANNUALIZATION_FACTOR
 monetized transit ivt,transit_time, @-0.5 * trips.hh_expansion_factor * (trips.build_transit_time - trips.base_transit_time) * _work.map(WORK_IVT_VOT_MAP)/60.0 * DISCOUNT_RATE * ANNUALIZATION_FACTOR

bca4abm/tests/configs/settings.yaml

@@ -34,6 +34,16 @@ locals_physical_activity:
 
 
 locals_person_trips:
+  # map trips table tour_purpose to work/notwork boolean
+  TOUR_PURPOSE_WORK_MAP:
+    0: 0   # home
+    1: 1   # work
+    2: 0   # school
+    3: 0   # escort
+    4: 0   # chore
+    5: 0   # shop
+    6: 0   # meal
+    7: 0   # social
   # work/nonwork in-vehicle-time value of time
   WORK_IVT_VOT_MAP:
       0: 6.0     # nonwork
@@ -182,16 +192,6 @@ buildtrips_baselos_column_map:
   parkcost: base_park_cost
   farecost: base_fare_cost
 
-tour_purpose_work_map:
-    0: 0   # home
-    1: 1   # work
-    2: 0   # school
-    3: 0   # escort
-    4: 0   # chore
-    5: 0   # shop
-    6: 0   # meal
-    7: 0   # social
-
 # expected column headers in aggregate_data_manifest.csv
 # this is as much to document the expected columns as anything
 # but it does allow you to use different column headers
@@ -209,7 +209,6 @@ aggregate_data_manifest_column_map:
   toll_table_name: toll_table_name
   toll_dollars_per_unit: toll_units
 
-
 link_data_manifest_column_map:
   description: description
   link_file_name: link_file_name