diff --git a/Analysis/0411_unp-left_p-right-uturn/debug.py b/Analysis/0411_unp-left_p-right-uturn/debug.py new file mode 100644 index 000000000..5ebbf032a --- /dev/null +++ b/Analysis/0411_unp-left_p-right-uturn/debug.py @@ -0,0 +1,11 @@ +import os +import pandas as pd +import numpy as np +import sys +sys.path.append('Scripts') +from preprocess_daily import DailyPreprocessor +from generate_signals import SignalGenerator +self = SignalGenerator() +self.prepare_data() +self.process_history() +self.process_movement() diff --git a/Scripts/__pycache__/generate_signals.cpython-38.pyc b/Scripts/__pycache__/generate_signals.cpython-38.pyc index ad0fa8a2b..566e14de0 100644 Binary files a/Scripts/__pycache__/generate_signals.cpython-38.pyc and b/Scripts/__pycache__/generate_signals.cpython-38.pyc differ diff --git a/Scripts/__pycache__/preprocess_daily.cpython-38.pyc b/Scripts/__pycache__/preprocess_daily.cpython-38.pyc index 7e8415151..2db4b3cd5 100644 Binary files a/Scripts/__pycache__/preprocess_daily.cpython-38.pyc and b/Scripts/__pycache__/preprocess_daily.cpython-38.pyc differ diff --git a/Scripts/preprocess_daily.py b/Scripts/preprocess_daily.py index ad8ccbbcb..bed3e4d29 100644 --- a/Scripts/preprocess_daily.py +++ b/Scripts/preprocess_daily.py @@ -530,12 +530,12 @@ class DailyPreprocessor(): uturn_not_assigned = cmatch[['inc_edge_id','out_edge_id']].isna().any(axis=1).all() 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] + # 보행신호시 + elif pedes_flag.any(): + cmatch.loc[pedes_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id] # 보행신호이동류(17) 발생시 elif crosswalk_on.any(): cmatch.loc[crosswalk_on, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id]