Browse Source

좌회전시 / 보행신호시 changed the order

master
김선중 1 year ago
parent
commit
0a4237db1d
4 changed files with 15 additions and 4 deletions
  1. +11
    -0
      Analysis/0411_unp-left_p-right-uturn/debug.py
  2. BIN
      Scripts/__pycache__/generate_signals.cpython-38.pyc
  3. BIN
      Scripts/__pycache__/preprocess_daily.cpython-38.pyc
  4. +4
    -4
      Scripts/preprocess_daily.py

+ 11
- 0
Analysis/0411_unp-left_p-right-uturn/debug.py View File

@ -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()

BIN
Scripts/__pycache__/generate_signals.cpython-38.pyc View File


BIN
Scripts/__pycache__/preprocess_daily.cpython-38.pyc View File


+ 4
- 4
Scripts/preprocess_daily.py View File

@ -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]

Loading…
Cancel
Save