From c15237028a8c4fba267f8678b02134a0f3e834cf Mon Sep 17 00:00:00 2001 From: govin08 Date: Wed, 17 Apr 2024 15:55:17 +0900 Subject: [PATCH] 2-4 assign_signals modified codes for matching --- .../0417_assign_signal.ipynb | 1253 ++--------------- Results/sn_1704419100.add.xml | 624 ++++---- Results/sn_1704419400.add.xml | 630 ++++----- .../preprocess_daily.cpython-38.pyc | Bin 29558 -> 30482 bytes Scripts/preprocess_daily.py | 29 +- 5 files changed, 721 insertions(+), 1815 deletions(-) diff --git a/Analysis/0411_unp-left_p-right-uturn/0417_assign_signal.ipynb b/Analysis/0411_unp-left_p-right-uturn/0417_assign_signal.ipynb index 11d9a02a1..0b599fc2d 100644 --- a/Analysis/0411_unp-left_p-right-uturn/0417_assign_signal.ipynb +++ b/Analysis/0411_unp-left_p-right-uturn/0417_assign_signal.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 69, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -18,7 +18,7 @@ }, { "cell_type": "code", - "execution_count": 77, + "execution_count": 2, "metadata": {}, "outputs": [ { @@ -49,7 +49,7 @@ " 'i9': {}}" ] }, - "execution_count": 77, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -65,7 +65,7 @@ }, { "cell_type": "code", - "execution_count": 124, + "execution_count": 3, "metadata": {}, "outputs": [ { @@ -80,1142 +80,8 @@ "1-5. 주요 객체 (리스트, 딕셔너리)들을 저장했습니다.\n", "2-1. 매칭 테이블들을 생성했습니다.\n", "2-2. 초기화 신호가 지정되었습니다. (우회전 : g)\n", - "2-3. 유턴 인덱스 / 비보호좌회전 인덱스를 지정했습니다.\n", - "uturn not assigned\n", - "99 GGGGgGGGG\n" - ] - }, - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
inter_nophase_noring_typemove_noinc_direout_direinc_angleout_angleinc_edge_idout_edge_idnode_idturn_typestate
81751A8남북179000NaNNaNu00straightGGGGgGGGG
91751B4북남001180NaNNaNu00straightGGGGgGGGG
101752A7북동001090571500487_02571500487_01.32u00leftGGGGgGGGG
111752B3남서179270NaNNaNu00leftGGGGgGGGG
121753A6동서090270NaNNaNu00straightGGGGgGGGG
131753B1동남090180NaNNaNu00leftGGGGgGGGG
141754A5서북270000NaNNaNu00leftGGGGgGGGG
151754B2서동270090NaNNaNu00straightGGGGgGGGG
\n", - "
" - ], - "text/plain": [ - " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "8 175 1 A 8 남 북 179 \n", - "9 175 1 B 4 북 남 001 \n", - "10 175 2 A 7 북 동 001 \n", - "11 175 2 B 3 남 서 179 \n", - "12 175 3 A 6 동 서 090 \n", - "13 175 3 B 1 동 남 090 \n", - "14 175 4 A 5 서 북 270 \n", - "15 175 4 B 2 서 동 270 \n", - "\n", - " out_angle inc_edge_id out_edge_id node_id turn_type state \n", - "8 000 NaN NaN u00 straight GGGGgGGGG \n", - "9 180 NaN NaN u00 straight GGGGgGGGG \n", - "10 090 571500487_02 571500487_01.32 u00 left GGGGgGGGG \n", - "11 270 NaN NaN u00 left GGGGgGGGG \n", - "12 270 NaN NaN u00 straight GGGGgGGGG \n", - "13 180 NaN NaN u00 left GGGGgGGGG \n", - "14 000 NaN NaN u00 left GGGGgGGGG \n", - "15 090 NaN NaN u00 straight GGGGgGGGG " - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "uturn not assigned\n", - "99 GGgGGG\n" - ] - }, - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
inter_nophase_noring_typemove_noinc_direout_direinc_angleout_angleinc_edge_idout_edge_idnode_idturn_typestate
261771A8남북179000NaNNaNu20straightGGgGGG
271771B4북남000180NaNNaNu20straightGGgGGG
281772A17NaNNaNNaNNaN571542810_01.51571542810_02u20NaNGGgGGG
291772B18NaNNaNNaNNaNNaNNaNu20NaNGGgGGG
\n", - "
" - ], - "text/plain": [ - " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "26 177 1 A 8 남 북 179 \n", - "27 177 1 B 4 북 남 000 \n", - "28 177 2 A 17 NaN NaN NaN \n", - "29 177 2 B 18 NaN NaN NaN \n", - "\n", - " out_angle inc_edge_id out_edge_id node_id turn_type state \n", - "26 000 NaN NaN u20 straight GGgGGG \n", - "27 180 NaN NaN u20 straight GGgGGG \n", - "28 NaN 571542810_01.51 571542810_02 u20 NaN GGgGGG \n", - "29 NaN NaN NaN u20 NaN GGgGGG " - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "uturn not assigned\n", - "99 GGGGgGGG\n" - ] - }, - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
inter_nophase_noring_typemove_noinc_direout_direinc_angleout_angleinc_edge_idout_edge_idnode_idturn_typestate
461781A8남북180000NaNNaNu30straightGGGGgGGG
471781B4북남000180NaNNaNu30straightGGGGgGGG
481782A7북동000090NaNNaNu30leftGGGGgGGG
491782B3남서180270NaNNaNu30leftGGGGgGGG
501783A5서북270000NaNNaNu30leftGGGGgGGG
511783B2서동270090NaNNaNu30straightGGGGgGGG
521784A6동서090270571556452_01571556452_02u30straightGGGGgGGG
531784B1동남090180NaNNaNu30leftGGGGgGGG
\n", - "
" - ], - "text/plain": [ - " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "46 178 1 A 8 남 북 180 \n", - "47 178 1 B 4 북 남 000 \n", - "48 178 2 A 7 북 동 000 \n", - "49 178 2 B 3 남 서 180 \n", - "50 178 3 A 5 서 북 270 \n", - "51 178 3 B 2 서 동 270 \n", - "52 178 4 A 6 동 서 090 \n", - "53 178 4 B 1 동 남 090 \n", - "\n", - " out_angle inc_edge_id out_edge_id node_id turn_type state \n", - "46 000 NaN NaN u30 straight GGGGgGGG \n", - "47 180 NaN NaN u30 straight GGGGgGGG \n", - "48 090 NaN NaN u30 left GGGGgGGG \n", - "49 270 NaN NaN u30 left GGGGgGGG \n", - "50 000 NaN NaN u30 left GGGGgGGG \n", - "51 090 NaN NaN u30 straight GGGGgGGG \n", - "52 270 571556452_01 571556452_02 u30 straight GGGGgGGG \n", - "53 180 NaN NaN u30 left GGGGgGGG " - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "uturn not assigned\n", - "99 GGGGgGGG\n" - ] - }, - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
inter_nophase_noring_typemove_noinc_direout_direinc_angleout_angleinc_edge_idout_edge_idnode_idturn_typestate
541781A8남북180000571500475_02571500475_01.26u31straightGGGGgGGG
551781B4북남000180NaNNaNu31straightGGGGgGGG
561782A7북동000090NaNNaNu31leftGGGGgGGG
571782B3남서180270NaNNaNu31leftGGGGgGGG
581783A5서북270000NaNNaNu31leftGGGGgGGG
591783B2서동270090NaNNaNu31straightGGGGgGGG
601784A6동서090270NaNNaNu31straightGGGGgGGG
611784B1동남090180NaNNaNu31leftGGGGgGGG
\n", - "
" - ], - "text/plain": [ - " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "54 178 1 A 8 남 북 180 \n", - "55 178 1 B 4 북 남 000 \n", - "56 178 2 A 7 북 동 000 \n", - "57 178 2 B 3 남 서 180 \n", - "58 178 3 A 5 서 북 270 \n", - "59 178 3 B 2 서 동 270 \n", - "60 178 4 A 6 동 서 090 \n", - "61 178 4 B 1 동 남 090 \n", - "\n", - " out_angle inc_edge_id out_edge_id node_id turn_type state \n", - "54 000 571500475_02 571500475_01.26 u31 straight GGGGgGGG \n", - "55 180 NaN NaN u31 straight GGGGgGGG \n", - "56 090 NaN NaN u31 left GGGGgGGG \n", - "57 270 NaN NaN u31 left GGGGgGGG \n", - "58 000 NaN NaN u31 left GGGGgGGG \n", - "59 090 NaN NaN u31 straight GGGGgGGG \n", - "60 270 NaN NaN u31 straight GGGGgGGG \n", - "61 180 NaN NaN u31 left GGGGgGGG " - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "uturn not assigned\n", - "99 GGGGGGGg\n" - ] - }, - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
inter_nophase_noring_typemove_noinc_direout_direinc_angleout_angleinc_edge_idout_edge_idnode_idturn_typestate
621781A8남북180000NaNNaNu32straightGGGGGGGg
631781B4북남000180571540303_02-571540303_02u32straightGGGGGGGg
641782A7북동000090NaNNaNu32leftGGGGGGGg
651782B3남서180270NaNNaNu32leftGGGGGGGg
661783A5서북270000NaNNaNu32leftGGGGGGGg
671783B2서동270090NaNNaNu32straightGGGGGGGg
681784A6동서090270NaNNaNu32straightGGGGGGGg
691784B1동남090180NaNNaNu32leftGGGGGGGg
\n", - "
" - ], - "text/plain": [ - " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "62 178 1 A 8 남 북 180 \n", - "63 178 1 B 4 북 남 000 \n", - "64 178 2 A 7 북 동 000 \n", - "65 178 2 B 3 남 서 180 \n", - "66 178 3 A 5 서 북 270 \n", - "67 178 3 B 2 서 동 270 \n", - "68 178 4 A 6 동 서 090 \n", - "69 178 4 B 1 동 남 090 \n", - "\n", - " out_angle inc_edge_id out_edge_id node_id turn_type state \n", - "62 000 NaN NaN u32 straight GGGGGGGg \n", - "63 180 571540303_02 -571540303_02 u32 straight GGGGGGGg \n", - "64 090 NaN NaN u32 left GGGGGGGg \n", - "65 270 NaN NaN u32 left GGGGGGGg \n", - "66 000 NaN NaN u32 left GGGGGGGg \n", - "67 090 NaN NaN u32 straight GGGGGGGg \n", - "68 270 NaN NaN u32 straight GGGGGGGg \n", - "69 180 NaN NaN u32 left GGGGGGGg " - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "uturn not assigned\n", - "99 GGGGGGGGg\n" + "2-3. 유턴 인덱스 / 비보호좌회전 인덱스를 지정했습니다.\n" ] - }, - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
inter_nophase_noring_typemove_noinc_direout_direinc_angleout_angleinc_edge_idout_edge_idnode_idturn_typestate
1002101A6동서090270NaNNaNu60straightGGGGGGGGg
1012101B18NaNNaNNaNNaNNaNNaNu60NaNGGGGGGGGg
1022102A5서북270000571500535_02-571500535_02u60leftGGGGGGGGg
1032102B2서동270090NaNNaNu60straightGGGGGGGGg
1042103A7북동000090NaNNaNu60leftGGGGGGGGg
1052103B4북남000180NaNNaNu60straightGGGGGGGGg
1062104A8남북180000NaNNaNu60straightGGGGGGGGg
1072104B3남서180270NaNNaNu60leftGGGGGGGGg
\n", - "
" - ], - "text/plain": [ - " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "100 210 1 A 6 동 서 090 \n", - "101 210 1 B 18 NaN NaN NaN \n", - "102 210 2 A 5 서 북 270 \n", - "103 210 2 B 2 서 동 270 \n", - "104 210 3 A 7 북 동 000 \n", - "105 210 3 B 4 북 남 000 \n", - "106 210 4 A 8 남 북 180 \n", - "107 210 4 B 3 남 서 180 \n", - "\n", - " out_angle inc_edge_id out_edge_id node_id turn_type state \n", - "100 270 NaN NaN u60 straight GGGGGGGGg \n", - "101 NaN NaN NaN u60 NaN GGGGGGGGg \n", - "102 000 571500535_02 -571500535_02 u60 left GGGGGGGGg \n", - "103 090 NaN NaN u60 straight GGGGGGGGg \n", - "104 090 NaN NaN u60 left GGGGGGGGg \n", - "105 180 NaN NaN u60 straight GGGGGGGGg \n", - "106 000 NaN NaN u60 straight GGGGGGGGg \n", - "107 270 NaN NaN u60 left GGGGGGGGg " - ] - }, - "metadata": {}, - "output_type": "display_data" } ], "source": [ @@ -1278,6 +144,115 @@ " self.match6.loc[self.match6.node_id==node_id, 'state'] = state" ] }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "1. 데이터를 로드합니다.\n", + "1-1. 네트워크가 로드되었습니다.\n", + "1-2. 테이블들이 로드되었습니다.\n", + "1-3. 네트워크의 모든 clean state requirement들을 체크했습니다.\n", + "1-4. 테이블들의 무결성 검사를 완료했습니다.\n", + "1-5. 주요 객체 (리스트, 딕셔너리)들을 저장했습니다.\n", + "2-1. 매칭 테이블들을 생성했습니다.\n", + "2-2. 초기화 신호가 지정되었습니다. (우회전 : g)\n", + "2-3. 유턴 인덱스 / 비보호좌회전 인덱스를 지정했습니다.\n" + ] + } + ], + "source": [ + "self = DailyPreprocessor()\n", + "self.load_data() # 1. 데이터 불러오기\n", + "self.get_matches() # 2-1\n", + "self.initialize_state() # 2-2\n", + "self.assign_indices() # 2-3\n", + "# assign signals on matching\n", + "self.matching['init_state'] = self.matching['node_id'].map(self.node2init)\n", + "self.matching['state'] = self.matching['init_state'].map(lambda x:''.join(x))\n", + "# matching의 각 행을 순회\n", + "for row in self.matching.itertuples(index=True):\n", + " node_id = row.node_id\n", + " move_no = row.move_no\n", + " inc_edge_id = row.inc_edge_id\n", + " out_edge_id = row.out_edge_id\n", + " state = copy.deepcopy(self.node2init)[node_id]\n", + "\n", + " if move_no != 21:\n", + " inc_edge = self.net.getEdge(inc_edge_id)\n", + " out_edge = self.net.getEdge(out_edge_id)\n", + " for conn in inc_edge.getConnections(out_edge):\n", + " index = conn.getTLLinkIndex()\n", + " if index >= 0:\n", + " state[index] = 'G'\n", + " self.matching.at[row.Index, 'state'] = ''.join(state)\n" + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [], + "source": [ + "self = DailyPreprocessor()\n", + "self.load_data() # 1. 데이터 불러오기\n", + "self.get_matches() # 2-1\n", + "self.initialize_state() # 2-2\n", + "self.assign_indices() # 2-3\n", + "\n", + "for i, row in self.matching.iterrows():\n", + " node_id = row.node_id\n", + " move_no = row.move_no\n", + " inc_edge_id = row.inc_edge_id\n", + " out_edge_id = row.out_edge_id\n", + " state_list = copy.deepcopy(self.node2init[node_id])\n", + " self.matching.at[i, 'state'] = ''.join(state_list)\n", + " if (pd.isna(inc_edge_id)) or (pd.isna(out_edge_id)):\n", + " continue\n", + " inc_edge = self.net.getEdge(inc_edge_id)\n", + " out_edge = self.net.getEdge(out_edge_id)\n", + " for conn in inc_edge.getConnections(out_edge):\n", + " index = conn.getTLLinkIndex()\n", + " if index >= 0:\n", + " state_list[index] = 'G'\n", + " self.matching.at[i, 'state'] = ''.join(state_list)\n" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "self = DailyPreprocessor()\n", + "self.load_data() # 1. 데이터 불러오기\n", + "self.get_matches() # 2-1\n", + "self.initialize_state() # 2-2\n", + "self.assign_indices() # 2-3\n", + "\n", + "# matching : 신호 배정\n", + "for i, row in self.matching.iterrows():\n", + " node_id = row.node_id\n", + " move_no = row.move_no\n", + " inc_edge_id = row.inc_edge_id\n", + " out_edge_id = row.out_edge_id\n", + " state_list = copy.deepcopy(self.node2init[node_id])\n", + " self.matching.at[i, 'state'] = ''.join(state_list)\n", + " if (pd.isna(inc_edge_id)) or (pd.isna(out_edge_id)):\n", + " continue\n", + " inc_edge = self.net.getEdge(inc_edge_id)\n", + " out_edge = self.net.getEdge(out_edge_id)\n", + " for conn in inc_edge.getConnections(out_edge):\n", + " index = conn.getTLLinkIndex()\n", + " if index >= 0:\n", + " state_list[index] = 'G'\n", + " self.matching.at[i, 'state'] = ''.join(state_list)\n" + ] + }, { "cell_type": "code", "execution_count": 47, diff --git a/Results/sn_1704419100.add.xml b/Results/sn_1704419100.add.xml index 8f2a5f2c3..a0efaeea5 100644 --- a/Results/sn_1704419100.add.xml +++ b/Results/sn_1704419100.add.xml @@ -1,50 +1,50 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -84,176 +84,161 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -326,7 +311,7 @@ - + @@ -383,28 +368,28 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -444,230 +429,215 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/Results/sn_1704419400.add.xml b/Results/sn_1704419400.add.xml index 1e3aa312b..4acd109ed 100644 --- a/Results/sn_1704419400.add.xml +++ b/Results/sn_1704419400.add.xml @@ -1,50 +1,50 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -84,176 +84,158 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + - - + + - - + + + + + - - + + - - + + - - + + - + - + @@ -326,7 +308,7 @@ - + @@ -383,28 +365,28 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -444,230 +426,212 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - + + + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/Scripts/__pycache__/preprocess_daily.cpython-38.pyc b/Scripts/__pycache__/preprocess_daily.cpython-38.pyc index b6468416e0e04a2bb7a0beb8f9364b6bf4cb5a06..12e8d554ba6c2046d8e1a58a51dbcc7dfac2c6f0 100644 GIT binary patch delta 1518 zcmZuwUrbw77(d_PQcCGRN@*#BaW^Je)ew`-WfEjD;$lq1n1z@$VkMkXddtdsdpj3A zwKzIO*k;{fEB=AB{s|g==mstrjSoILA2cRD?8%q;KrcS}VB+*U7dFvwZ|--$^L@YX z`+mQ3?)~F8xbi!=hg~iQ!RzNUUE?RdzV5y|2DgQa9YZ_F?x1}z)`|A%*bR>#VG>)1 zPiCWTt#RB5_Oic12Fb{`A{y`M<1|DnkaM!8vYR_Az=_tPd3Y16AE*7qXe|f0Qh_35 zyp~@teO)g?+AH$o-Qt(HKflNv+{qpN1fz?4_mOzn+3K#8gZOT%K#1&6x$+{-HRXVV zrsP~`Lpd8F+PN!4a&GQMvXeOvcXJP}z1&-*dW0+7o3x>KHqUL0aL)x4!hAu(ZQR3J zf`kzn2@-52o9z;n>M-^(KX<)PSS$CSMTuyG%MG(|9*Q*WM7o<;(}9C;=BTW;Iw+hb zv1hK?=;Y0_h|GM7=zPJjmm3j4|G$@(iv2SB7I~A518ZZUf}J;Op+PbWIUnwuFKNrQ z@D^-UFuGX#EC32%WX>YLEoYAWSB}xeo49S3N~EL}(A0m~Z66!5Dv0KZ@bEs?!92{% znpu6^9wMAXEhXgx#zCzc51eR+SZ9S+3Xg z<9qdWbG4w>mWs9cMRnKQQg!o2)m+Ac%DTCNbC(cMyHwq4)Zx?=i$xPm?Ng^6537k3 zi=9J1J0OMbRbcfkRZm(YP|RwuSf5sdMk#}fXIYsmiOjssN^=G7i1ULUPh}g2?z?k0? z!Jj>&VBAJ1nLa9BN~+?gA-{jxmo>6_N=;1}>S!jDh^JyqY$QhD0TIw%eY9Ji;PSn8 zdLJ%tH$HW4EOy37Or`XS%uGr1m;`o7uN}l?EkMJ5@wwLja>S7_MvYi>GLbR#qcT4r zk;kPufhIyvAB%X;j!tG{ndqny&05gZp#znu*Z@L^5?FIorqEvy}} z4(M2WKKU9zQv5jiC#2VIo$d$E$@^rkBN=TiFtr8nicr!8*>iy!nCnx2!vkklhHJ%?0uCB-&;yx^qnJlTEQCHa2<4D`5* delta 607 zcmYk2&ubG=5XawavT3r}%_iCWwy}sZ@?hBE-gm$Aoi}ekyw^YA*H?%w7=|YJ zIkh-pXWnhc{;t4XGVmPh4DPW`Rg0`wt2?I7+akO!^XfcT1`%6_Stp4hG}gcq%a$h` z3n4Fjt{kN=)k38#Mqim@5`(MaprejDeyT5K#L^BGYm@ZQ4o`N|e#Q&-VI4Y^eXmOI zZmdJQ;sr4LAi!0Hp4msquceL;QS(BcRuVMk-h*OZlydaGem1hH zTzB{QVm1k!H}s)?LU+p`gnL2C6unxpjA^!K0$iSCLvI^PFiw9OPmb*Jm>ZQMZ`e&q znP4gDZeIGAq&IW)rCFqpiMY1KQJPQbEYfmo`dA!tPzWR;bnwbL2%4gU4lxLW2D(xh zd}}=gxJk~V-*9_SZI{8kB)N+6_-&ROgDv+vz&+aNt_H73y!PqT*r#Cge!W$ri;ssP k8M?ES=-q= 0: - state[index] = 'G' - self.matching.at[row.Index, 'state'] = ''.join(state) - + state_list = copy.deepcopy(self.node2init[node_id]) + self.matching.at[i, 'state'] = ''.join(state_list) + if (pd.isna(inc_edge_id)) or (pd.isna(out_edge_id)): + continue + inc_edge = self.net.getEdge(inc_edge_id) + out_edge = self.net.getEdge(out_edge_id) + for conn in inc_edge.getConnections(out_edge): + index = conn.getTLLinkIndex() + if index >= 0: + state_list[index] = 'G' + self.matching.at[i, 'state'] = ''.join(state_list) self.matching = self.matching.dropna(subset='state') self.matching = self.matching.reset_index(drop=True) self.matching = self.matching[['inter_no', 'node_id', 'move_no', 'inc_edge_id', 'out_edge_id', 'state']]