Skip to content

Commit 5cf9cd7

Browse files
dhensledhensle
committed
log to preprocessor and no strings comps
1 parent 304cafd commit 5cf9cd7

6 files changed

+132
-105
lines changed

‎ext-configs/school_escorting_inbound.csv‎

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

‎ext-configs/school_escorting_outbound.csv‎

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

‎ext-configs/school_escorting_outbound_cond.csv‎

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

‎ext-configs/school_escorting_preprocessor_inbound.csv‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ Gender - chauffer 1,gender_chauf1,"reindex(persons.sex, df.chauf_id1)"
77
Gender - chauffer 2,gender_chauf2,"reindex(persons.sex, df.chauf_id2)"
88
Age - chauffer 1,age_chauf1,"reindex(persons.age, df.chauf_id1)"
99
Age - chauffer 2,age_chauf2,"reindex(persons.age, df.chauf_id2)"
10-
Daily activity pattern - chauffer 1,cdap_chauf1,"reindex(persons.cdap_activity, df.chauf_id1)"
11-
Daily activity pattern - chauffer 2,cdap_chauf2,"reindex(persons.cdap_activity, df.chauf_id2)"
10+
Daily activity pattern - chauffer 1,_cdap_chauf1,"reindex(persons.cdap_activity, df.chauf_id1)"
11+
Daily activity pattern - chauffer 2,_cdap_chauf2,"reindex(persons.cdap_activity, df.chauf_id2)"
12+
chauffer 1 cdap is M,cdap_chauf1_is_M,"_cdap_chauf1 == 'M'"
13+
chauffer 2 cdap is M,cdap_chauf2_is_M,"_cdap_chauf2 == 'M'"
14+
chauffer 1 cdap is_not M,cdap_chauf1_is_not_M,"_cdap_chauf1 != 'M'"
15+
chauffer 2 cdap is_not M,cdap_chauf2_is_not_M,"_cdap_chauf2 != 'M'"
16+
chauffer 1 cdap is H,cdap_chauf1_is_H,"_cdap_chauf1 == 'H'"
17+
chauffer 2 cdap is H,cdap_chauf2_is_H,"_cdap_chauf2 == 'H'"
1218
Age - child 1,age_child1,"reindex(persons.age, df.child_id1)"
1319
Age - child 2,age_child2,"reindex(persons.age, df.child_id2)"
1420
Age - child 3,age_child3,"reindex(persons.age, df.child_id3)"
@@ -48,6 +54,9 @@ Auto time school to home - child 3,time_school_to_home3,"np.where(school_locatio
4854
Auto dist home to school - child 1,dist_school_to_home1,"np.where(school_location_child1 > 0, skim_dict.lookup(_valid_school_location_child1, df.home_zone_id, ('SOV_DIST', 'PM')), 0)"
4955
Auto dist home to school - child 2,dist_school_to_home2,"np.where(school_location_child2 > 0, skim_dict.lookup(_valid_school_location_child2, df.home_zone_id, ('SOV_DIST', 'PM')), 0)"
5056
Auto dist home to school - child 3,dist_school_to_home3,"np.where(school_location_child3 > 0, skim_dict.lookup(_valid_school_location_child3, df.home_zone_id, ('SOV_DIST', 'PM')), 0)"
57+
logged auto dist home to school - child 1,log_dist_school_to_home1,"np.log(1 + dist_school_to_home1)"
58+
logged auto dist home to school - child 2,log_dist_school_to_home2,"np.log(1 + dist_school_to_home2)"
59+
logged auto dist home to school - child 3,log_dist_school_to_home3,"np.log(1 + dist_school_to_home3)"
5160
Auto dist intra school taz - child 1,dist_intra_school1,"np.where(school_location_child1 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child1, ('SOV_DIST', 'PM')), 0)"
5261
Auto dist intra school taz - child 2,dist_intra_school2,"np.where(school_location_child2 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child2, ('SOV_DIST', 'PM')), 0)"
5362
Auto dist intra school taz - child 3,dist_intra_school3,"np.where(school_location_child3 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child3, ('SOV_DIST', 'PM')), 0)"

‎ext-configs/school_escorting_preprocessor_outbound.csv‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ Gender - chauffer 1,gender_chauf1,"reindex(persons.sex, df.chauf_id1)"
77
Gender - chauffer 2,gender_chauf2,"reindex(persons.sex, df.chauf_id2)"
88
Age - chauffer 1,age_chauf1,"reindex(persons.age, df.chauf_id1)"
99
Age - chauffer 2,age_chauf2,"reindex(persons.age, df.chauf_id2)"
10-
Daily activity pattern - chauffer 1,cdap_chauf1,"reindex(persons.cdap_activity, df.chauf_id1)"
11-
Daily activity pattern - chauffer 2,cdap_chauf2,"reindex(persons.cdap_activity, df.chauf_id2)"
10+
Daily activity pattern - chauffer 1,_cdap_chauf1,"reindex(persons.cdap_activity, df.chauf_id1)"
11+
Daily activity pattern - chauffer 2,_cdap_chauf2,"reindex(persons.cdap_activity, df.chauf_id2)"
12+
chauffer 1 cdap is M,cdap_chauf1_is_M,"_cdap_chauf1 == 'M'"
13+
chauffer 2 cdap is M,cdap_chauf2_is_M,"_cdap_chauf2 == 'M'"
14+
chauffer 1 cdap is_not M,cdap_chauf1_is_not_M,"_cdap_chauf1 != 'M'"
15+
chauffer 2 cdap is_not M,cdap_chauf2_is_not_M,"_cdap_chauf2 != 'M'"
16+
chauffer 1 cdap is H,cdap_chauf1_is_H,"_cdap_chauf1 == 'H'"
17+
chauffer 2 cdap is H,cdap_chauf2_is_H,"_cdap_chauf2 == 'H'"
1218
Age - child 1,age_child1,"reindex(persons.age, df.child_id1)"
1319
Age - child 2,age_child2,"reindex(persons.age, df.child_id2)"
1420
Age - child 3,age_child3,"reindex(persons.age, df.child_id3)"
@@ -43,6 +49,9 @@ Auto time school to home - child 3,time_school_to_home3,"np.where(school_locatio
4349
Auto dist home to school - child 1,dist_home_to_school1,"np.where(school_location_child1 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child1, ('SOV_DIST', 'AM')), 0)"
4450
Auto dist home to school - child 2,dist_home_to_school2,"np.where(school_location_child2 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child2, ('SOV_DIST', 'AM')), 0)"
4551
Auto dist home to school - child 3,dist_home_to_school3,"np.where(school_location_child3 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child3, ('SOV_DIST', 'AM')), 0)"
52+
logged auto dist home to school - child 1,log_dist_home_to_school1,"np.log(1 + dist_home_to_school1)"
53+
logged auto dist home to school - child 2,log_dist_home_to_school2,"np.log(1 + dist_home_to_school2)"
54+
logged auto dist home to school - child 3,log_dist_home_to_school3,"np.log(1 + dist_home_to_school3)"
4655
Auto dist intra school taz - child 1,dist_intra_school1,"np.where(school_location_child1 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child1, ('SOV_DIST', 'AM')), 0)"
4756
Auto dist intra school taz - child 2,dist_intra_school2,"np.where(school_location_child2 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child2, ('SOV_DIST', 'AM')), 0)"
4857
Auto dist intra school taz - child 3,dist_intra_school3,"np.where(school_location_child3 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child3, ('SOV_DIST', 'AM')), 0)"

‎ext-configs/school_escorting_preprocessor_outbound_cond.csv‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ Gender - chauffer 1,gender_chauf1,"reindex(persons.sex, df.chauf_id1)"
77
Gender - chauffer 2,gender_chauf2,"reindex(persons.sex, df.chauf_id2)"
88
Age - chauffer 1,age_chauf1,"reindex(persons.age, df.chauf_id1)"
99
Age - chauffer 2,age_chauf2,"reindex(persons.age, df.chauf_id2)"
10-
Daily activity pattern - chauffer 1,cdap_chauf1,"reindex(persons.cdap_activity, df.chauf_id1)"
11-
Daily activity pattern - chauffer 2,cdap_chauf2,"reindex(persons.cdap_activity, df.chauf_id2)"
10+
Daily activity pattern - chauffer 1,_cdap_chauf1,"reindex(persons.cdap_activity, df.chauf_id1)"
11+
Daily activity pattern - chauffer 2,_cdap_chauf2,"reindex(persons.cdap_activity, df.chauf_id2)"
12+
chauffer 1 cdap is M,cdap_chauf1_is_M,"_cdap_chauf1 == 'M'"
13+
chauffer 2 cdap is M,cdap_chauf2_is_M,"_cdap_chauf2 == 'M'"
14+
chauffer 1 cdap is_not M,cdap_chauf1_is_not_M,"_cdap_chauf1 != 'M'"
15+
chauffer 2 cdap is_not M,cdap_chauf2_is_not_M,"_cdap_chauf2 != 'M'"
16+
chauffer 1 cdap is H,cdap_chauf1_is_H,"_cdap_chauf1 == 'H'"
17+
chauffer 2 cdap is H,cdap_chauf2_is_H,"_cdap_chauf2 == 'H'"
1218
Age - child 1,age_child1,"reindex(persons.age, df.child_id1)"
1319
Age - child 2,age_child2,"reindex(persons.age, df.child_id2)"
1420
Age - child 3,age_child3,"reindex(persons.age, df.child_id3)"
@@ -43,6 +49,9 @@ Auto time school to home - child 3,time_school_to_home3,"np.where(school_locatio
4349
Auto dist home to school - child 1,dist_home_to_school1,"np.where(school_location_child1 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child1, ('SOV_DIST', 'AM')), 0)"
4450
Auto dist home to school - child 2,dist_home_to_school2,"np.where(school_location_child2 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child2, ('SOV_DIST', 'AM')), 0)"
4551
Auto dist home to school - child 3,dist_home_to_school3,"np.where(school_location_child3 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child3, ('SOV_DIST', 'AM')), 0)"
52+
logged auto dist home to school - child 1,log_dist_home_to_school1,"np.log(1 + dist_home_to_school1)"
53+
logged auto dist home to school - child 2,log_dist_home_to_school2,"np.log(1 + dist_home_to_school2)"
54+
logged auto dist home to school - child 3,log_dist_home_to_school3,"np.log(1 + dist_home_to_school3)"
4655
Auto dist intra school taz - child 1,dist_intra_school1,"np.where(school_location_child1 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child1, ('SOV_DIST', 'AM')), 0)"
4756
Auto dist intra school taz - child 2,dist_intra_school2,"np.where(school_location_child2 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child2, ('SOV_DIST', 'AM')), 0)"
4857
Auto dist intra school taz - child 3,dist_intra_school3,"np.where(school_location_child3 > 0, skim_dict.lookup(df.home_zone_id, _valid_school_location_child3, ('SOV_DIST', 'AM')), 0)"

0 commit comments

Comments
 (0)