Skip to content

Commit 65e6597

Browse files
committed
add telecommute time variable in cdap and nmtf
1 parent 8d5e447 commit 65e6597

14 files changed

Lines changed: 78 additions & 198 deletions

configs_dev/annotate_persons.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ school_segment university,school_segment,"np.where(is_university, SCHOOL_SEGMENT
3838
#,,
3939
is_worker,is_worker,"persons.pemploy.isin([PEMPLOY_FULL, PEMPLOY_PART])"
4040
,is_out_of_home_worker,is_worker
41+
,is_telecommuter,"np.where(persons.telework_time >= 3, True, False)"
4142
#,,
4243
home_zone_id,home_zone_id,"reindex(households.home_zone_id, persons.household_id)"
4344
,_mean_work,distributed_time_factor_work_mean

configs_dev/cdap_coefficients.csv

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@ coef_part_time_worker_interaction_with_telecommute_2_3_days_week_H,0.957,F
5454
coef_part_time_worker_interaction_with_telecommute_2_3_days_week_N,1.37,F
5555
coef_part_time_worker_interaction_with_telecommute_4_days_week_H,1.24,F
5656
coef_part_time_worker_interaction_with_telecommute_4_days_week_N,1.48,F
57+
coef_full_time_worker_interaction_with_telecommuter_N,0,F
58+
coef_full_time_worker_interaction_with_telecommuter_H,0,F
59+
coef_part_time_worker_interaction_with_telecommuter_N,0,F
60+
coef_part_time_worker_interaction_with_telecommuter_H,0,F
61+
coef_university_student_interaction_with_telecommuter_N,0,F
62+
coef_university_student_interaction_with_telecommuter_H,0,F
63+
coef_full_time_worker_interaction_with_telecommute_hours_N,0,F
64+
coef_full_time_worker_interaction_with_telecommute_hours_week_H,0,F
65+
coef_part_time_worker_interaction_with_telecommute_hours_N,0,F
66+
coef_part_time_worker_interaction_with_telecommute_hours_week_H,0,F
67+
coef_university_student_interaction_with_telecommute_hours_N,0,F
68+
coef_university_student_interaction_with_telecommute_hours_week_H,0,F
5769
coef_full_time_worker_interaction_with_work_from_home_N,0.408,F
5870
coef_full_time_worker_interaction_with_high_non_mand_accessibility_N,0.389,F
5971
coef_full_time_worker_interaction_with_medium_high_non_mand_accessibility_N,0.153,F

configs_dev/cdap_indiv_and_hhsize1.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ Part-time worker interaction with telecommutes 4 days per week,(ptype == 2) & (t
9999
#University student interaction with telecommutes 1 day per week,(ptype == 3) & (pemploy == 2) & (telecommute_frequency=='1_day_week'),,coef_university_student_interaction_with_telecommute_1_day_week_N,coef_university_student_interaction_with_telecommute_1_day_week_H
100100
#University student interaction with telecommutes 2-3 days per week,(ptype == 3) & (pemploy == 2) & (telecommute_frequency=='2_3_days_week'),,coef_university_student_interaction_with_telecommute_2_3_days_week_N,coef_university_student_interaction_with_telecommute_2_3_days_week_H
101101
#University student interaction with telecommutes 4 days per week,(ptype == 3) & (pemploy == 2) & (telecommute_frequency=='4_days_week'),,coef_university_student_interaction_with_telecommute_4_days_week_N,coef_university_student_interaction_with_telecommute_4_days_week_H
102+
Full-time worker interaction with telecommuting 3+ hours,(ptype == 1) & (is_telecommuter),,coef_full_time_worker_interaction_with_telecommuter_N,coef_full_time_worker_interaction_with_telecommuter_H
103+
Part-time worker interaction with telecommuting 3+ hours,(ptype == 2) & (is_telecommuter),,coef_part_time_worker_interaction_with_telecommuter_N,coef_part_time_worker_interaction_with_telecommuter_H
104+
University student interaction with telecommuing 3+ hours,(ptype == 3) & (pemploy == 2) & (is_telecommuter),,coef_university_student_interaction_with_telecommuter_N,coef_university_student_interaction_with_telecommuter_H
105+
Full-time worker interaction with telecommuting hours,(ptype == 1) & (telework_time),,coef_full_time_worker_interaction_with_telecommute_hours_N,coef_full_time_worker_interaction_with_telecommute_hours_week_H
106+
Part-time worker interaction with telecommuting hours,(ptype == 2) & (telework_time),,coef_part_time_worker_interaction_with_telecommute_hours_N,coef_part_time_worker_interaction_with_telecommute_hours_week_H
107+
University student interaction with telecommuing hours,(ptype == 3) & (pemploy == 2) & (telework_time),,coef_university_student_interaction_with_telecommute_hours_N,coef_university_student_interaction_with_telecommute_hours_week_H
102108
Full time worker who works from home,(ptype == 1)&(work_from_home),coef_UNAVAILABLE,coef_full_time_worker_interaction_with_work_from_home_N,
103109
Part time worker who works from home,(ptype == 2)&(work_from_home),coef_UNAVAILABLE,,
104110
#University student workers who works from home,(ptype == 3)&(work_from_home),,,

configs_dev/disaggregate_accessibility.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ CREATE_TABLES:
6464
grade: 0 # Not attending
6565
timeFactorWork: 1 # mean
6666
timeFactorNonWork: 1 # mean
67+
telework_time: 0 # not teleworking
6768
mapped_fields:
6869
pnum:
6970
age:

configs_dev/non_mandatory_tour_frequency.csv

Lines changed: 39 additions & 33 deletions
Large diffs are not rendered by default.

configs_dev/non_mandatory_tour_frequency_coeffs_PTYPE_DRIVING.csv

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,6 @@ coef_high_income_group_and_tour_frequency_is_2,0,T
6969
coef_high_income_group_and_tour_frequency_is_3,0,T
7070
coef_high_income_group_and_tour_frequency_is_4,0,T
7171
coef_high_income_group_and_tour_frequency_is_5_plus,0,T
72-
coef_tcf_1day_and_tour_frequency_is_1,0,T
73-
coef_tcf_1day_and_tour_frequency_is_2,0,T
74-
coef_tcf_1day_and_tour_frequency_is_3,0,T
75-
coef_tcf_1day_and_tour_frequency_is_4,0,T
76-
coef_tcf_1day_and_tour_frequency_is_5_plus,0,T
77-
coef_tcf_2_3day_and_tour_frequency_is_1,0,T
78-
coef_tcf_2_3day_and_tour_frequency_is_2,0,T
79-
coef_tcf_2_3day_and_tour_frequency_is_3,0,T
80-
coef_tcf_2_3day_and_tour_frequency_is_4,0,T
81-
coef_tcf_2_3day_and_tour_frequency_is_5_plus,0,T
82-
coef_tcf_4day_and_tour_frequency_is_1,0,T
83-
coef_tcf_4day_and_tour_frequency_is_2,0,T
84-
coef_tcf_4day_and_tour_frequency_is_3,0,T
85-
coef_tcf_4day_and_tour_frequency_is_4,0,T
86-
coef_tcf_4day_and_tour_frequency_is_5_plus,0,T
8772
coef_num_workers_and_tour_frequency_is_1,0,T
8873
coef_num_workers_and_tour_frequency_is_2,0,T
8974
coef_num_workers_and_tour_frequency_is_3,0,T
@@ -123,24 +108,6 @@ coef_low_income_group_and_escort_tour,0,T
123108
coef_mediumlow_income_group_and_escort_tour,0,T
124109
coef_mediumhigh_income_group_and_escort_tour,0,T
125110
coef_high_income_group_and_escort_tour,0,T
126-
coef_tcf_1day_and_shopping_tour,0,T
127-
coef_tcf_1day_and_maintenance_tour,0,T
128-
coef_tcf_1day_and_eating_out_tour,0,T
129-
coef_tcf_1day_and_discretionary_tour,0,T
130-
coef_tcf_1day_and_visiting_tour,0,T
131-
coef_tcf_1day_and_escort_tour,0,T
132-
coef_tcf_2_3day_and_shopping_tour,0,T
133-
coef_tcf_2_3day_and_maintenance_tour,0,T
134-
coef_tcf_2_3day_and_eating_out_tour,0,T
135-
coef_tcf_2_3day_and_discretionary_tour,0,T
136-
coef_tcf_2_3day_and_visiting_tour,0,T
137-
coef_tcf_2_3day_and_escort_tour,0,T
138-
coef_tcf_4day_and_shopping_tour,0,T
139-
coef_tcf_4day_and_maintenance_tour,0,T
140-
coef_tcf_4day_and_eating_out_tour,0,T
141-
coef_tcf_4day_and_discretionary_tour,0,T
142-
coef_tcf_4day_and_visiting_tour,0,T
143-
coef_tcf_4day_and_escort_tour,0,T
144111
coef_num_workers_and_shopping_tour,0,T
145112
coef_num_workers_and_maintenance_tour,0,T
146113
coef_num_workers_and_eating_out_tour,0,T

configs_dev/non_mandatory_tour_frequency_coeffs_PTYPE_FULL.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ coef_work_from_home_and_tour_frequency_is_2,0,T
7474
coef_work_from_home_and_tour_frequency_is_3,0,T
7575
coef_work_from_home_and_tour_frequency_is_4,0,T
7676
coef_work_from_home_and_tour_frequency_is_5_plus,0,T
77+
coef_telecommuter_and_tour_frequency_is_1,0,T
78+
coef_telecommuter_and_tour_frequency_is_2,0,T
79+
coef_telecommuter_and_tour_frequency_is_3_plus,0,T
80+
coef_telecommute_hours_and_tour_frequency_is_1,0,T
81+
coef_telecommute_hours_and_tour_frequency_is_2,0,T
82+
coef_telecommute_hours_and_tour_frequency_is_3_plus,0,T
7783
coef_tcf_1day_and_tour_frequency_is_1,0,T
7884
coef_tcf_1day_and_tour_frequency_is_2,0,T
7985
coef_tcf_1day_and_tour_frequency_is_3,0,T

configs_dev/non_mandatory_tour_frequency_coeffs_PTYPE_NONWORK.csv

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,6 @@ coef_high_income_group_and_tour_frequency_is_2,1.0633,F
6969
coef_high_income_group_and_tour_frequency_is_3,1.7742,F
7070
coef_high_income_group_and_tour_frequency_is_4,2.3941,F
7171
coef_high_income_group_and_tour_frequency_is_5_plus,2.3941,F
72-
coef_tcf_1day_and_tour_frequency_is_1,0,T
73-
coef_tcf_1day_and_tour_frequency_is_2,0,T
74-
coef_tcf_1day_and_tour_frequency_is_3,0,T
75-
coef_tcf_1day_and_tour_frequency_is_4,0,T
76-
coef_tcf_1day_and_tour_frequency_is_5_plus,0,T
77-
coef_tcf_2_3day_and_tour_frequency_is_1,0,T
78-
coef_tcf_2_3day_and_tour_frequency_is_2,0,T
79-
coef_tcf_2_3day_and_tour_frequency_is_3,0,T
80-
coef_tcf_2_3day_and_tour_frequency_is_4,0,T
81-
coef_tcf_2_3day_and_tour_frequency_is_5_plus,0,T
82-
coef_tcf_4day_and_tour_frequency_is_1,0,T
83-
coef_tcf_4day_and_tour_frequency_is_2,0,T
84-
coef_tcf_4day_and_tour_frequency_is_3,0,T
85-
coef_tcf_4day_and_tour_frequency_is_4,0,T
86-
coef_tcf_4day_and_tour_frequency_is_5_plus,0,T
8772
coef_num_workers_and_tour_frequency_is_1,0,T
8873
coef_num_workers_and_tour_frequency_is_2,0,T
8974
coef_num_workers_and_tour_frequency_is_3,0,T
@@ -138,24 +123,6 @@ coef_low_income_group_and_escort_tour,0,T
138123
coef_mediumlow_income_group_and_escort_tour,0,T
139124
coef_mediumhigh_income_group_and_escort_tour,0,T
140125
coef_high_income_group_and_escort_tour,0,T
141-
coef_tcf_1day_and_shopping_tour,0,T
142-
coef_tcf_1day_and_maintenance_tour,0,T
143-
coef_tcf_1day_and_eating_out_tour,0,T
144-
coef_tcf_1day_and_discretionary_tour,0,T
145-
coef_tcf_1day_and_visiting_tour,0,T
146-
coef_tcf_1day_and_escort_tour,0,T
147-
coef_tcf_2_3day_and_shopping_tour,0,T
148-
coef_tcf_2_3day_and_maintenance_tour,0,T
149-
coef_tcf_2_3day_and_eating_out_tour,0,T
150-
coef_tcf_2_3day_and_discretionary_tour,0,T
151-
coef_tcf_2_3day_and_visiting_tour,0,T
152-
coef_tcf_2_3day_and_escort_tour,0,T
153-
coef_tcf_4day_and_shopping_tour,0,T
154-
coef_tcf_4day_and_maintenance_tour,0,T
155-
coef_tcf_4day_and_eating_out_tour,0,T
156-
coef_tcf_4day_and_discretionary_tour,0,T
157-
coef_tcf_4day_and_visiting_tour,0,T
158-
coef_tcf_4day_and_escort_tour,0,T
159126
coef_num_workers_and_shopping_tour,0,T
160127
coef_num_workers_and_maintenance_tour,0,T
161128
coef_num_workers_and_eating_out_tour,0,T

configs_dev/non_mandatory_tour_frequency_coeffs_PTYPE_PART.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ coef_work_from_home_and_tour_frequency_is_2,0,T
7474
coef_work_from_home_and_tour_frequency_is_3,0,T
7575
coef_work_from_home_and_tour_frequency_is_4,0,T
7676
coef_work_from_home_and_tour_frequency_is_5_plus,0,T
77+
coef_telecommuter_and_tour_frequency_is_1,0,T
78+
coef_telecommuter_and_tour_frequency_is_2,0,T
79+
coef_telecommuter_and_tour_frequency_is_3_plus,0,T
80+
coef_telecommute_hours_and_tour_frequency_is_1,0,T
81+
coef_telecommute_hours_and_tour_frequency_is_2,0,T
82+
coef_telecommute_hours_and_tour_frequency_is_3_plus,0,T
7783
coef_tcf_1day_and_tour_frequency_is_1,0,T
7884
coef_tcf_1day_and_tour_frequency_is_2,0,T
7985
coef_tcf_1day_and_tour_frequency_is_3,0,T

configs_dev/non_mandatory_tour_frequency_coeffs_PTYPE_PRESCHOOL.csv

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,6 @@ coef_high_income_group_and_tour_frequency_is_2,0,T
6969
coef_high_income_group_and_tour_frequency_is_3,0,T
7070
coef_high_income_group_and_tour_frequency_is_4,0,T
7171
coef_high_income_group_and_tour_frequency_is_5_plus,0,T
72-
coef_tcf_1day_and_tour_frequency_is_1,0,T
73-
coef_tcf_1day_and_tour_frequency_is_2,0,T
74-
coef_tcf_1day_and_tour_frequency_is_3,0,T
75-
coef_tcf_1day_and_tour_frequency_is_4,0,T
76-
coef_tcf_1day_and_tour_frequency_is_5_plus,0,T
77-
coef_tcf_2_3day_and_tour_frequency_is_1,0,T
78-
coef_tcf_2_3day_and_tour_frequency_is_2,0,T
79-
coef_tcf_2_3day_and_tour_frequency_is_3,0,T
80-
coef_tcf_2_3day_and_tour_frequency_is_4,0,T
81-
coef_tcf_2_3day_and_tour_frequency_is_5_plus,0,T
82-
coef_tcf_4day_and_tour_frequency_is_1,0,T
83-
coef_tcf_4day_and_tour_frequency_is_2,0,T
84-
coef_tcf_4day_and_tour_frequency_is_3,0,T
85-
coef_tcf_4day_and_tour_frequency_is_4,0,T
86-
coef_tcf_4day_and_tour_frequency_is_5_plus,0,T
8772
coef_num_workers_and_tour_frequency_is_1,0,T
8873
coef_num_workers_and_tour_frequency_is_2,0,T
8974
coef_num_workers_and_tour_frequency_is_3,0,T
@@ -123,24 +108,6 @@ coef_low_income_group_and_escort_tour,0,T
123108
coef_mediumlow_income_group_and_escort_tour,0,T
124109
coef_mediumhigh_income_group_and_escort_tour,0,T
125110
coef_high_income_group_and_escort_tour,0,T
126-
coef_tcf_1day_and_shopping_tour,0,T
127-
coef_tcf_1day_and_maintenance_tour,0,T
128-
coef_tcf_1day_and_eating_out_tour,0,T
129-
coef_tcf_1day_and_discretionary_tour,0,T
130-
coef_tcf_1day_and_visiting_tour,0,T
131-
coef_tcf_1day_and_escort_tour,0,T
132-
coef_tcf_2_3day_and_shopping_tour,0,T
133-
coef_tcf_2_3day_and_maintenance_tour,0,T
134-
coef_tcf_2_3day_and_eating_out_tour,0,T
135-
coef_tcf_2_3day_and_discretionary_tour,0,T
136-
coef_tcf_2_3day_and_visiting_tour,0,T
137-
coef_tcf_2_3day_and_escort_tour,0,T
138-
coef_tcf_4day_and_shopping_tour,0,T
139-
coef_tcf_4day_and_maintenance_tour,0,T
140-
coef_tcf_4day_and_eating_out_tour,0,T
141-
coef_tcf_4day_and_discretionary_tour,0,T
142-
coef_tcf_4day_and_visiting_tour,0,T
143-
coef_tcf_4day_and_escort_tour,0,T
144111
coef_num_workers_and_shopping_tour,0,T
145112
coef_num_workers_and_maintenance_tour,0,T
146113
coef_num_workers_and_eating_out_tour,0,T

0 commit comments

Comments
 (0)