fix mtc and sandag ci tests

wsp-sag · Dec 11, 2023 · 51f9a24 · 51f9a24
1 parent e4e73d3
commit 51f9a24
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/activitysim/examples/placeholder_psrc/configs/stop_frequency_annotate_tours_preprocessor.csv b/activitysim/examples/placeholder_psrc/configs/stop_frequency_annotate_tours_preprocessor.csv
@@ -47,4 +47,4 @@ AccesibilityAtDestination if non_motorized,pracc,"pracc.where(~tour_mode_is_non_
 ,destination_area_type,"reindex(land_use.area_type, df.destination)"
 ,is_mixed,df.composition=='mixed'
 ,is_adults_tour,df.composition=='adults'
-,is_social,df.primary_purpose=='social'
+,is_social,primary_purpose=='social'
diff --git a/activitysim/examples/prototype_mtc/configs/stop_frequency_annotate_tours_preprocessor.csv b/activitysim/examples/prototype_mtc/configs/stop_frequency_annotate_tours_preprocessor.csv
@@ -47,3 +47,5 @@ AccesibilityAtDestination if transit,pracc,"pracc.where(~tour_mode_is_transit, _
 AccesibilityAtDestination if non_motorized,pracc,"pracc.where(~tour_mode_is_non_motorized, reindex(accessibility.nmRetail, df.destination))"
 ,destination_area_type,"reindex(land_use.area_type, df.destination)"
 ,is_mixed,df.composition=='mixed'
+,is_adults_tour,df.composition=='adults'
+,is_social,primary_purpose=='social'
diff --git a/activitysim/examples/prototype_mtc/configs/stop_frequency_eatout.csv b/activitysim/examples/prototype_mtc/configs/stop_frequency_eatout.csv
@@ -47,6 +47,6 @@ util_alternative_specific_constant_for_the_total_number_of_stops,Alternative spe
 util_alternative_specific_constant_for_outbound_stops_on_joint_tours,Alternative specific constant for outbound stops on joint tours,is_joint,,,,,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_1out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_1out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_1out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_1out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_2out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_2out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_2out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_2out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_3out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_3out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_3out_0in,coef_alternative_specific_constant_for_outbound_stops_on_joint_tours_3out_0in
 util_alternative_specific_constant_for_return_stops_on_joint_tours,Alternative specific constant for return  stops on joint tours,is_joint,,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_1in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_3in,,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_1in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_3in,,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_1in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_3in,,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_1in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_return_stops_on_joint_tours_0out_3in
 util_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours,Alternative specific constant for the total number of stops on joint tours,is_joint,,,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_1out_3in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_1out_3in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_2out_3in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_0out_2in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_1out_3in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_2out_3in,coef_alternative_specific_constant_for_the_total_number_of_stops_on_joint_tours_2out_3in
-util_dummy_for_an_outbound_visiting_tour,Dummy for an outbound visiting tour,primary_purpose == 'social',,,,,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour
-util_dummy_for_a_return_visiting_tour,Dummy for a return visiting tour,primary_purpose == 'social',,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour
-util_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,Dummy for a visiting tour with both outbound and return leg,primary_purpose == 'social',,,,,,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg
+util_dummy_for_an_outbound_visiting_tour,Dummy for an outbound visiting tour,is_social,,,,,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour,coef_dummy_for_an_outbound_visiting_tour
+util_dummy_for_a_return_visiting_tour,Dummy for a return visiting tour,is_social,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour,coef_dummy_for_a_return_visiting_tour
+util_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,Dummy for a visiting tour with both outbound and return leg,is_social,,,,,,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg,coef_dummy_for_a_visiting_tour_with_both_outbound_and_return_leg
diff --git a/activitysim/examples/prototype_mtc/configs/stop_frequency_shopping.csv b/activitysim/examples/prototype_mtc/configs/stop_frequency_shopping.csv
@@ -27,7 +27,7 @@ util_number_of_visit_tours_tours_undertaken_by_the_person,Number of visit tours
 util_number_of_shop_tours_undertaken_by_the_houshold,Number of shop tours undertaken by the houshold,num_hh_shop_tours,,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold,coef_number_of_shop_tours_undertaken_by_the_houshold
 util_number_of_persons_participating_in_the_tour_outgoing_stops_interaction,Number of persons participating in the tour.Outgoing stops interaction,is_joint * number_of_participants,,,,,,,,,,,,,,,,
 util_number_of_persons_participating_in_the_tour_return_stops_interaction,Number of persons participating in the tour.Return stops interaction,is_joint * number_of_participants,,,,,,,,,,,,,,,,
-util_dummy_for_only_adults_participate_in_the_tour,Dummy for only adults participate in the tour,composition=='adults',,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour
+util_dummy_for_only_adults_participate_in_the_tour,Dummy for only adults participate in the tour,is_adults_tour,,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour,coef_dummy_for_only_adults_participate_in_the_tour
 util_am_peak_departure_between_6am_and_7_am_including_interacted_with_outbound_tours,AM Peak departure between 6AM and 7 AM (including) Interacted with outbound tours,(start>5) & (start<8),,,,,,,,,,,,,,,,
 util_arrival_later_than_17_00_,Arrival later than 17:00.,(end > 16),,,,,,,,,,,,,,,,
 util_evening_arrival_19_00_interacted_with_return_tours,Evening Arrival (>=19:00) Interacted with return tours,(end > 18),,,,,,,,,,,,,,,,