Merge pull request #3 from ActivitySim/veh_type_optimization

Optimized Vehicle Type Model Configs

Author: jpn--

ext-configs/vehicle_type_choice.yaml

@@ -82,6 +82,38 @@ preprocessor:
     - persons
     - households
 
+alts_preprocessor:
+  SPEC: vehicle_type_choice_annotate_alts_preprocessor
+  DF: alts_wide
+
+COLS_TO_INCLUDE_IN_CHOOSER_TABLE:
+  - avg_hh_dist_to_work
+  - income
+  - hh_per_mi
+  - auto_ownership
+  - hh_veh_gt_drivers
+  - total_hh_dist_to_work_cap
+  - num_children
+  - num_hh_veh_owned
+  - num_hh_Van
+  - num_hh_SUV
+  - num_hh_Pickup
+  - num_hh_Motorcycle
+  - num_hh_Hybrid
+  - num_hh_BEV
+  - num_hh_PEV
+  - num_hh_EV
+  - home_is_rural
+
+COLS_TO_INCLUDE_IN_ALTERNATIVES_TABLE:
+  - age
+  - fuel_type_num_coded
+  - body_type_num_coded
+  - Range
+  - MPG
+  - NumMakes
+  - NumModels
+
 # annotate_persons:
 #   SPEC: annotate_persons_vehicle_type
 #   DF: persons

ext-configs/vehicle_type_choice_annotate_alts_preprocessor.csv

@@ -0,0 +1,7 @@
+Description,Target,Expression
+mapping fuel type to integers,fuel_type_num_coded,"df.fuel_type.map({'BEV': 1, 'Diesel': 2, 'Gas': 3, 'Hybrid': 4, 'PEV': 5}).astype(int)"
+mapping body type to integers,body_type_num_coded,"df.body_type.map({'Car': 1, 'Motorcycle': 2, 'Pickup': 3, 'SUV': 4, 'Van': 5}).astype(int)"
+# moving log terms to preprocessor to avoid expensive log calculations,,
+log number of models available,logged_models,"np.log(1 + df.NumModels)"
+log number of makes available,logged_makes,"np.log(1 + df.NumMakes)"
+logged chargers per capita,logged_chargers_per_capita,"np.log(1 + CHARGERS_PER_CAP)"