Merge pull request #234 from SANDAG/ABM3_develop_jtfspec

Corrected mixed party type to correct value

src/asim/configs/resident/joint_tour_frequency_composition.csv

@@ -58,7 +58,7 @@ util_constant_for_children_party_maintenance_tour,Constant for Children Party/ M
 util_constant_for_children_party_eating_out_tour,Constant for Children Party/ Eating Out Tour,@(df.purpose1==7)*(df.party1==2)+(df.purpose2==7)*(df.party2==2),coef_constant_for_children_party_eating_out_tour
 util_constant_for_children_party_visiting_tour,Constant for Children Party/ Visiting Tour,@(df.purpose1==8)*(df.party1==2)+(df.purpose2==8)*(df.party2==2),coef_constant_for_children_party_visiting_tour
 util_constant_for_children_party_discretionary_tour,Constant for Children Party/ Discretionary Tour,@(df.purpose1==9)*(df.party1==2)+(df.purpose2==9)*(df.party2==2),coef_constant_for_children_party_discretionary_tour
-util_constant_for_mixed_party_shopping_tour,Constant for Mixed Party/ Shopping Tour,@(df.purpose1==5)*(df.party1==2)+(df.purpose2==5)*(df.party2==2),coef_constant_for_mixed_party_shopping_tour
+util_constant_for_mixed_party_shopping_tour,Constant for Mixed Party/ Shopping Tour,@(df.purpose1==5)*(df.party1==3)+(df.purpose2==5)*(df.party2==3),coef_constant_for_mixed_party_shopping_tour
 util_constant_for_mixed_party_maintenance_tour,Constant for Mixed Party/ Maintenance Tour,@(df.purpose1==6)*(df.party1==3)+(df.purpose2==6)*(df.party2==3),coef_constant_for_mixed_party_maintenance_tour
 util_constant_for_mixed_party_eating_out_tour,Constant for Mixed Party/ Eating Out Tour,@(df.purpose1==7)*(df.party1==3)+(df.purpose2==7)*(df.party2==3),coef_constant_for_mixed_party_eating_out_tour
 util_constant_for_mixed_party_visiting_tour,Constant for Mixed Party/ Visiting Tour,@(df.purpose1==8)*(df.party1==3)+(df.purpose2==8)*(df.party2==3),coef_constant_for_mixed_party_visiting_tour
@@ -70,7 +70,7 @@ util_number_of_active_nonworkers_adult_party,Number of Active Non-workers /Adult
 util_number_of_active_retirees_adult_party,Number of Active Retirees /Adult Party,num_travel_active_retirees * (party1==1) + num_travel_active_retirees * (party2==1),coef_number_of_active_retirees_adult_party
 util_number_of_active_driving_age_school_children_children_party,Number of Active Driving Age School Children /Children Party,num_travel_active_driving_age_students * (party1==1) + num_travel_active_driving_age_students * (party2==1),coef_number_of_active_driving_age_school_children_children_party
 util_number_of_active_pre_driving_age_school_children_children_party,Number of Active Pre- Driving Age School Children /Children Party,num_travel_active_pre_driving_age_school_kids * (party1==2) + num_travel_active_pre_driving_age_school_kids * (party2==2),coef_number_of_active_pre_driving_age_school_children_children_party
-util_number_of_active_part_time_workers_mixed_party,Number of Active Part time workers /Mixed Party,num_travel_active_part_time_workers * (party1==2) + num_travel_active_part_time_workers * (party2==2),coef_number_of_active_part_time_workers_mixed_party
+util_number_of_active_part_time_workers_mixed_party,Number of Active Part time workers /Mixed Party,num_travel_active_part_time_workers * (party1==3) + num_travel_active_part_time_workers * (party2==3),coef_number_of_active_part_time_workers_mixed_party
 util_number_of_active_driving_age_school_children_mixed_party,Number of Active Driving Age School Children /Mixed Party,num_travel_active_driving_age_students * (party1==3) + num_travel_active_driving_age_students * (party2==3),coef_number_of_active_driving_age_school_children_mixed_party
 util_number_of_active_pre_driving_age_school_children_mixed_party,Number of Active Pre- Driving Age School Children /Mixed Party,num_travel_active_pre_driving_age_school_kids * (party1==3) + num_travel_active_pre_driving_age_school_kids * (party2==3),coef_number_of_active_pre_driving_age_school_children_mixed_party
 util_number_of_active_preschool_children_mixed_party,Number of Active Preschool Children /Mixed Party,num_travel_active_pre_school_kids * (party1==3) + num_travel_active_pre_school_kids * (party2==3),coef_number_of_active_preschool_children_mixed_party
@@ -89,7 +89,7 @@ util_adjustment_for_children_party_maintenance_tour,Adjustment for Children Part
 util_adjustment_for_children_party_eating_out_tour,Adjustment for Children Party/ Eating Out Tour,@(df.purpose1==7)*(df.party1==2)+(df.purpose2==7)*(df.party2==2),coef_adjustment_for_children_party_eating_out_tour
 util_adjustment_for_children_party_visiting_tour,Adjustment for Children Party/ Visiting Tour,@(df.purpose1==8)*(df.party1==2)+(df.purpose2==8)*(df.party2==2),coef_adjustment_for_children_party_visiting_tour
 util_adjustment_for_children_party_discretionary_tour,Adjustment for Children Party/ Discretionary Tour,@(df.purpose1==9)*(df.party1==2)+(df.purpose2==9)*(df.party2==2),coef_adjustment_for_children_party_discretionary_tour
-util_adjustment_for_mixed_party_shopping_tour,Adjustment for Mixed Party/ Shopping Tour,@(df.purpose1==5)*(df.party1==2)+(df.purpose2==5)*(df.party2==2),coef_adjustment_for_mixed_party_shopping_tour
+util_adjustment_for_mixed_party_shopping_tour,Adjustment for Mixed Party/ Shopping Tour,@(df.purpose1==5)*(df.party1==3)+(df.purpose2==5)*(df.party2==3),coef_adjustment_for_mixed_party_shopping_tour
 util_adjustment_for_mixed_party_maintenance_tour,Adjustment for Mixed Party/ Maintenance Tour,@(df.purpose1==6)*(df.party1==3)+(df.purpose2==6)*(df.party2==3),coef_adjustment_for_mixed_party_maintenance_tour
 util_adjustment_for_mixed_party_eating_out_tour,Adjustment for Mixed Party/ Eating Out Tour,@(df.purpose1==7)*(df.party1==3)+(df.purpose2==7)*(df.party2==3),coef_adjustment_for_mixed_party_eating_out_tour
 util_adjustment_for_mixed_party_visiting_tour,Adjustment for Mixed Party/ Visiting Tour,@(df.purpose1==8)*(df.party1==3)+(df.purpose2==8)*(df.party2==3),coef_adjustment_for_mixed_party_visiting_tour