|
@ -530,12 +530,12 @@ class DailyPreprocessor(): |
|
|
uturn_not_assigned = cmatch[['inc_edge_id','out_edge_id']].isna().any(axis=1).all() |
|
|
uturn_not_assigned = cmatch[['inc_edge_id','out_edge_id']].isna().any(axis=1).all() |
|
|
|
|
|
|
|
|
if uturn_not_assigned: |
|
|
if uturn_not_assigned: |
|
|
# 보행신호시 |
|
|
|
|
|
if pedes_flag.any(): |
|
|
|
|
|
cmatch.loc[pedes_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] |
|
|
|
|
|
# 좌회전시 |
|
|
# 좌회전시 |
|
|
elif right_flag.any(): |
|
|
|
|
|
|
|
|
if right_flag.any(): |
|
|
cmatch.loc[right_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] |
|
|
cmatch.loc[right_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] |
|
|
|
|
|
# 보행신호시 |
|
|
|
|
|
elif pedes_flag.any(): |
|
|
|
|
|
cmatch.loc[pedes_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] |
|
|
# 보행신호이동류(17) 발생시 |
|
|
# 보행신호이동류(17) 발생시 |
|
|
elif crosswalk_on.any(): |
|
|
elif crosswalk_on.any(): |
|
|
cmatch.loc[crosswalk_on, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] |
|
|
cmatch.loc[crosswalk_on, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] |
|
|