From 95844b6941b5804daa1b2cf8b88bcd953b461ed4 Mon Sep 17 00:00:00 2001 From: govin08 Date: Fri, 12 Apr 2024 09:51:41 +0900 Subject: [PATCH] preprocess_daily.py error : inc_angle equals to out_angle, added restore object method. --- .../0411_unp-left.ipynb | 1389 +++++++++-------- Intermediates/match6.csv | 120 +- Intermediates/matching.csv | 140 +- Intermediates/node2init.json | 2 +- Results/sn_1704419400.add.xml | 770 ++++----- .../preprocess_daily.cpython-38.pyc | Bin 24828 -> 24828 bytes Scripts/preprocess_daily.py | 20 +- 7 files changed, 1303 insertions(+), 1138 deletions(-) diff --git a/Analysis/0411_unp-left_p-right-uturn/0411_unp-left.ipynb b/Analysis/0411_unp-left_p-right-uturn/0411_unp-left.ipynb index 74f6e21e9..3829fea41 100644 --- a/Analysis/0411_unp-left_p-right-uturn/0411_unp-left.ipynb +++ b/Analysis/0411_unp-left_p-right-uturn/0411_unp-left.ipynb @@ -31,14 +31,26 @@ "\n", "필요한 객체들 목록\n", "\n", - "- `i2dire2rvec` : `inter_no` $\\mapsto$ `dire2rvec`\n", + "- `int2dire2rvec` : `inter_no` $\\mapsto$ `dire2rvec`\n", " - `dire2rvec` : `dire` $\\mapsto$ `rvec`\n", - "- `i2f` : `inter_no` $\\mapsto$ `f_edges`\n", - "- `i2t` : `inter_no` $\\mapsto$ `t_edges`\n", - "- `i2f2dire` : `inter_no` $\\mapsto$ `f21dire`\n", - " - `f2dire` : `from_edge` $\\mapsto$ `dire`\n", - "- `i2t2dire` : `inter_no` $\\mapsto$ `t21dire`\n", - " - `t2dire` : `to_edge` $\\mapsto$ `dire`" + "- `int2incs` : `inter_no` $\\mapsto$ `inc_edge_ids`\n", + "- `int2outs` : `inter_no` $\\mapsto$ `out_edge_ids`\n", + "- `int2inc2dire` : `inter_no` $\\mapsto$ `int2dire`\n", + " - `inc2dire` : `out_edge_id` $\\mapsto$ `dire`\n", + "- `int2out2dire` : `inter_no` $\\mapsto$ `out2dire`\n", + " - `out2dire` : `inc_edge_id` $\\mapsto$ `dire`\n", + "- `int2inc2vec` : `inter_no` $\\mapsto$ `int2vec`\n", + " - `inc2vec` : `out_edge_id` $\\mapsto$ `vec`\n", + "- `int2out2vec` : `inter_no` $\\mapsto$ `out2vec`\n", + " - `out2vec` : `inc_edge_id` $\\mapsto$ `vec`\n", + "\n", + "좌회전 판단\n", + "\n", + "Given `inter_no`, `inc_edge_id` and `out_edge_id`, we have `inc_vec = int2inc2vec[inter_no][inc_edge_id]` and `out_vec = int2out2vec[inter_no][out_edge_id]`.\n", + "Rotate `inc_vec` by 90, 180 and 270 degrees clockwise, to define \n", + "`out_vec_left`, `out_vec_straight` and `out_vec_right`.\n", + "Define `out_vecs={'right':out_vec_left, 'straight':out_vec_straight, 'right':out_vec_right}`.\n", + "Select the key that maximize the similarity of the corresponding value of the key and `inc_vec`." ] }, { @@ -71,7 +83,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 8, "metadata": {}, "outputs": [ { @@ -115,7 +127,7 @@ " 남\n", " 북\n", " 179\n", - " 179\n", + " 000\n", " \n", " \n", " 1\n", @@ -126,7 +138,7 @@ " 북\n", " 남\n", " 001\n", - " 001\n", + " 180\n", " \n", " \n", " 2\n", @@ -137,7 +149,7 @@ " 북\n", " 동\n", " 001\n", - " 001\n", + " 090\n", " \n", " \n", " 3\n", @@ -148,7 +160,7 @@ " 남\n", " 서\n", " 179\n", - " 179\n", + " 270\n", " \n", " \n", " 4\n", @@ -159,7 +171,7 @@ " 동\n", " 서\n", " 090\n", - " 090\n", + " 270\n", " \n", " \n", "\n", @@ -167,11 +179,11 @@ ], "text/plain": [ " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle out_angle\n", - "0 175 1 A 8 남 북 179 179\n", - "1 175 1 B 4 북 남 001 001\n", - "2 175 2 A 7 북 동 001 001\n", - "3 175 2 B 3 남 서 179 179\n", - "4 175 3 A 6 동 서 090 090" + "0 175 1 A 8 남 북 179 000\n", + "1 175 1 B 4 북 남 001 180\n", + "2 175 2 A 7 북 동 001 090\n", + "3 175 2 B 3 남 서 179 270\n", + "4 175 3 A 6 동 서 090 270" ] }, "metadata": {}, @@ -221,9 +233,9 @@ " 남\n", " 북\n", " 179\n", - " 179\n", + " 000\n", " -571542797_02\n", - " 571542797_02\n", + " 571500487_01\n", " i0\n", " \n", " \n", @@ -235,9 +247,9 @@ " 북\n", " 남\n", " 001\n", - " 001\n", + " 180\n", " -571500487_01\n", - " 571500487_01\n", + " 571542797_02\n", " i0\n", " \n", " \n", @@ -249,9 +261,9 @@ " 북\n", " 동\n", " 001\n", - " 001\n", + " 090\n", " -571500487_01\n", - " 571500487_01\n", + " 571545870_01\n", " i0\n", " \n", " \n", @@ -263,9 +275,9 @@ " 남\n", " 서\n", " 179\n", - " 179\n", + " 270\n", " -571542797_02\n", - " 571542797_02\n", + " 571510153_01\n", " i0\n", " \n", " \n", @@ -277,9 +289,9 @@ " 동\n", " 서\n", " 090\n", - " 090\n", + " 270\n", " 571545870_02\n", - " 571545870_01\n", + " 571510153_01\n", " i0\n", " \n", " \n", @@ -295,56 +307,16 @@ "4 175 3 A 6 동 서 090 \n", "\n", " out_angle inc_edge_id out_edge_id node_id \n", - "0 179 -571542797_02 571542797_02 i0 \n", - "1 001 -571500487_01 571500487_01 i0 \n", - "2 001 -571500487_01 571500487_01 i0 \n", - "3 179 -571542797_02 571542797_02 i0 \n", - "4 090 571545870_02 571545870_01 i0 " + "0 000 -571542797_02 571500487_01 i0 \n", + "1 180 -571500487_01 571542797_02 i0 \n", + "2 090 -571500487_01 571545870_01 i0 \n", + "3 270 -571542797_02 571510153_01 i0 \n", + "4 270 571545870_02 571510153_01 i0 " ] }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "display(self.match4.head())\n", - "display(self.match5.head())" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "1. 데이터를 로드합니다.\n", - "1-1. 네트워크가 로드되었습니다.\n", - "1-2. 테이블들이 로드되었습니다.\n" - ] }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "1-3. 네트워크의 모든 clean state requirement들을 체크했습니다.\n", - "1-4. 테이블들의 무결성 검사를 완료했습니다.\n", - "2-1. 매칭 테이블들을 생성했습니다.\n" - ] - } - ], - "source": [ - "self.load_data()\n", - "self.get_matches()" - ] - }, - { - "cell_type": "code", - "execution_count": 9, - "metadata": {}, - "outputs": [ { "data": { "text/html": [ @@ -389,9 +361,9 @@ " 남\n", " 북\n", " 179\n", - " 179\n", + " 000\n", " -571542797_02\n", - " 571542797_02\n", + " 571500487_01\n", " i0\n", " \n", " \n", @@ -403,9 +375,9 @@ " 북\n", " 남\n", " 001\n", - " 001\n", + " 180\n", " -571500487_01\n", - " 571500487_01\n", + " 571542797_02\n", " i0\n", " \n", " \n", @@ -417,9 +389,9 @@ " 북\n", " 동\n", " 001\n", - " 001\n", + " 090\n", " -571500487_01\n", - " 571500487_01\n", + " 571545870_01\n", " i0\n", " \n", " \n", @@ -431,9 +403,9 @@ " 남\n", " 서\n", " 179\n", - " 179\n", + " 270\n", " -571542797_02\n", - " 571542797_02\n", + " 571510153_01\n", " i0\n", " \n", " \n", @@ -445,780 +417,951 @@ " 동\n", " 서\n", " 090\n", - " 090\n", - " 571545870_02\n", - " 571545870_01\n", - " i0\n", - " \n", - " \n", - " 5\n", - " 175\n", - " 3\n", - " B\n", - " 1\n", - " 동\n", - " 남\n", - " 090\n", - " 090\n", - " 571545870_02\n", - " 571545870_01\n", - " i0\n", - " \n", - " \n", - " 6\n", - " 175\n", - " 4\n", - " A\n", - " 5\n", - " 서\n", - " 북\n", " 270\n", - " 270\n", - " 571510153_02\n", + " 571545870_02\n", " 571510153_01\n", " i0\n", " \n", - " \n", - " 7\n", - " 175\n", - " 4\n", - " B\n", - " 2\n", - " 서\n", - " 동\n", - " 270\n", - " 270\n", - " 571510153_02\n", - " 571510153_01\n", - " i0\n", + " \n", + "\n", + "" + ], + "text/plain": [ + " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", + "0 175 1 A 8 남 북 179 \n", + "1 175 1 B 4 북 남 001 \n", + "2 175 2 A 7 북 동 001 \n", + "3 175 2 B 3 남 서 179 \n", + "4 175 3 A 6 동 서 090 \n", + "\n", + " out_angle inc_edge_id out_edge_id node_id \n", + "0 000 -571542797_02 571500487_01 i0 \n", + "1 180 -571500487_01 571542797_02 i0 \n", + "2 090 -571500487_01 571545870_01 i0 \n", + "3 270 -571542797_02 571510153_01 i0 \n", + "4 270 571545870_02 571510153_01 i0 " + ] + }, + "metadata": {}, + "output_type": "display_data" + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "True\n" + ] + } + ], + "source": [ + "display(self.match4.head())\n", + "display(self.match5.head())\n", + "display(self.match6.head())\n", + "print((self.match5.head()==self.match6.head()).all().all())" + ] + }, + { + "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", + "2-1. 매칭 테이블들을 생성했습니다.\n" + ] + } + ], + "source": [ + "self.load_data()\n", + "self.get_matches()" + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [ + { + "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", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", - " \n", + " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", - " \n", + " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", " \n", - " \n", - " \n", + " \n", + " \n", " \n", - " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \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_id
81751401782A8남북17917920NaNNaNNaNNaNu00571542116_01-571542116_02.96c30
91751411782B4북남00100120NaNNaNNaNNaNu00571542116_02.96571542116_02.164c30
101752421783A7북동001001571500487_02571500487_01.32u00
111752B3남서17917920NaNNaNu00
121753A6동서090090NaNNaNu00571542116_01-571542116_02.96c30
13175431783B1동남09009020NaNNaNu00NaNNaN571542116_02.96571542116_02.164c30
14175441784A5서북27027020NaNNaNu00NaNNaN571542116_01-571542116_02.96c30
15175451784B2서동27027020NaNNaNu00NaNNaN571542116_02.96571542116_02.164c30
16176461781A8남북180180-571542810_01571542810_01i1000571540304_02571556450_01i3
17176471781B4북남359359571542797_02.99-571542797_02.99i1000180571556450_02571540304_01i3
18176481782A8남7북180180-571542810_01571542810_01i1동000090571556450_02571500475_01i3
19176491782B3남서180180-571542810_01571542810_01i1270571540304_02571540303_01i3
20176501783A5서북270270571543469_02571543469_01i1000571540303_02.21571556450_01i3
21176511783B18NaNNaNNaNNaNNaNNaNi12서동270090571540303_02.21571500475_01i3
22177521784A6동서090270-571500475_01571540303_01i3
531784B1동남090180-571500475_01571540304_01i3
541781A8남북179179-571542809_01571542809_01i2180000NaNNaNu30
23177551781B4북남000000571542811_02571542811_01i2180NaNNaNu30
24177561782A7북동000000571542811_02571542811_01i2090NaNNaNu30
25177571782B3남서179179-571542809_01571542809_01i2180270NaNNaNu30
26177581783A17NaNNaNNaNNaN5서북270000NaNNaNi2u30
27177591783B18NaNNaNNaNNaN2서동270090NaNNaNi2u30
28177601784A56동서북268268-571542809_01571542809_01i2090270571556452_01571556452_02u30
29177611784B1동남090090571542107_02571542107_01i2180NaNNaNu30
30177621781A8남북179179NaNNaNu20180000571500475_02571500475_01.26u31
31177631781B4북남000000180NaNNaNu20u31
32177641782A7북동000000571542810_01.51571542810_02u20090NaNNaNu31
33177651782B3남서179179180270NaNNaNu20u31
34177661783A17NaNNaNNaNNaN5서북270000NaNNaNu20u31
35177671783B18NaNNaNNaNNaN2서동270090NaNNaNu20u31
36177681784A56동서북268268090270NaNNaNu20u31
37177691784B1동남090090180NaNNaNu20u31
38701781A20NaNNaNNaNNaN8남북180000NaNNaNc30u32
39711781B20NaNNaNNaNNaNNaNNaNc304북남000180571540303_02-571540303_02u32
40721782A20NaNNaN7북동000090NaNNaN571542116_01-571542116_02.96c30u32
41731782B20NaNNaN3남서180270NaNNaN571542116_02.96571542116_02.164c30u32
42741783A20NaNNaN5서북270000NaNNaN571542116_01-571542116_02.96c30u32
43751783B20NaNNaN2서동270090NaNNaN571542116_02.96571542116_02.164c30u32
44761784A20NaNNaN6동서090270NaNNaN571542116_01-571542116_02.96c30u32
45771784B20NaNNaN1동남090180NaNNaN571542116_02.96571542116_02.164c30u32
46178782011A8남북180180571540304_02571540304_01i3000-571500569_01571500583_02i8
47178792011B4북3남000000571556450_02571556450_01i3서180270-571500569_01571500618_01i8
48178802012A75서북동000270000571556450_02571556450_01i3571500618_02571500583_02i8
49178812012B3남2서180180571540304_02571540304_01i3동270090571500618_02571500617_01i8
50178822013A56동서북270090270571540303_02.21571540303_01i3571500617_02571500618_01i8
51178832013B2서동270270571540303_02.21571540303_01i3090571500618_02571500617_01i8
52178842014A6동서090090-571500475_01571500475_01i3270571500617_02571500618_01i8
53178852014B1동남090180571500617_02571500569_01i8
862015A7북동000090571500583_01571500617_01i8
872015B4북남000180571500583_01571500569_01i8
882021A6동서090-571500475_01571500475_01i3270571510152_02-571510152_01i9
54178892021B2서동270090571510152_01571510152_01.65i9
902022A17NaNNaNNaNNaNNaNNaNi9
912022B18NaNNaNNaNNaNNaNNaNi9
922061A8남북180180NaNNaNu30000-571511538_02571542073_02i7
55178932061B4북남000000NaNNaNu30180571542073_01571511538_02i7
56178942062A7북동00000017NaNNaNu30NaNNaNNaNNaNi7
57178952062B3남서18018018NaNNaNu30NaNNaNNaNNaNi7
58178962063A5서8남북270270180000-571511538_02571542073_02i7
972063B4북남000180571542073_01571511538_02i7
982064A17NaNNaNu30NaNNaNNaNNaNi7
591783992064B2서동27027018NaNNaNu30NaNNaNNaNNaNi7
\n", @@ -1226,46 +1369,6 @@ ], "text/plain": [ " inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n", - "0 175 1 A 8 남 북 179 \n", - "1 175 1 B 4 북 남 001 \n", - "2 175 2 A 7 북 동 001 \n", - "3 175 2 B 3 남 서 179 \n", - "4 175 3 A 6 동 서 090 \n", - "5 175 3 B 1 동 남 090 \n", - "6 175 4 A 5 서 북 270 \n", - "7 175 4 B 2 서 동 270 \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", - "16 176 1 A 8 남 북 180 \n", - "17 176 1 B 4 북 남 359 \n", - "18 176 2 A 8 남 북 180 \n", - "19 176 2 B 3 남 서 180 \n", - "20 176 3 A 5 서 북 270 \n", - "21 176 3 B 18 NaN NaN NaN \n", - "22 177 1 A 8 남 북 179 \n", - "23 177 1 B 4 북 남 000 \n", - "24 177 2 A 7 북 동 000 \n", - "25 177 2 B 3 남 서 179 \n", - "26 177 3 A 17 NaN NaN NaN \n", - "27 177 3 B 18 NaN NaN NaN \n", - "28 177 4 A 5 서 북 268 \n", - "29 177 4 B 1 동 남 090 \n", - "30 177 1 A 8 남 북 179 \n", - "31 177 1 B 4 북 남 000 \n", - "32 177 2 A 7 북 동 000 \n", - "33 177 2 B 3 남 서 179 \n", - "34 177 3 A 17 NaN NaN NaN \n", - "35 177 3 B 18 NaN NaN NaN \n", - "36 177 4 A 5 서 북 268 \n", - "37 177 4 B 1 동 남 090 \n", - "38 178 1 A 20 NaN NaN NaN \n", - "39 178 1 B 20 NaN NaN NaN \n", "40 178 2 A 20 NaN NaN NaN \n", "41 178 2 B 20 NaN NaN NaN \n", "42 178 3 A 20 NaN NaN NaN \n", @@ -1286,77 +1389,117 @@ "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", + "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", + "70 178 1 A 8 남 북 180 \n", + "71 178 1 B 4 북 남 000 \n", + "72 178 2 A 7 북 동 000 \n", + "73 178 2 B 3 남 서 180 \n", + "74 178 3 A 5 서 북 270 \n", + "75 178 3 B 2 서 동 270 \n", + "76 178 4 A 6 동 서 090 \n", + "77 178 4 B 1 동 남 090 \n", + "78 201 1 A 8 남 북 180 \n", + "79 201 1 B 3 남 서 180 \n", + "80 201 2 A 5 서 북 270 \n", + "81 201 2 B 2 서 동 270 \n", + "82 201 3 A 6 동 서 090 \n", + "83 201 3 B 2 서 동 270 \n", + "84 201 4 A 6 동 서 090 \n", + "85 201 4 B 1 동 남 090 \n", + "86 201 5 A 7 북 동 000 \n", + "87 201 5 B 4 북 남 000 \n", + "88 202 1 A 6 동 서 090 \n", + "89 202 1 B 2 서 동 270 \n", + "90 202 2 A 17 NaN NaN NaN \n", + "91 202 2 B 18 NaN NaN NaN \n", + "92 206 1 A 8 남 북 180 \n", + "93 206 1 B 4 북 남 000 \n", + "94 206 2 A 17 NaN NaN NaN \n", + "95 206 2 B 18 NaN NaN NaN \n", + "96 206 3 A 8 남 북 180 \n", + "97 206 3 B 4 북 남 000 \n", + "98 206 4 A 17 NaN NaN NaN \n", + "99 206 4 B 18 NaN NaN NaN \n", "\n", " out_angle inc_edge_id out_edge_id node_id \n", - "0 179 -571542797_02 571542797_02 i0 \n", - "1 001 -571500487_01 571500487_01 i0 \n", - "2 001 -571500487_01 571500487_01 i0 \n", - "3 179 -571542797_02 571542797_02 i0 \n", - "4 090 571545870_02 571545870_01 i0 \n", - "5 090 571545870_02 571545870_01 i0 \n", - "6 270 571510153_02 571510153_01 i0 \n", - "7 270 571510153_02 571510153_01 i0 \n", - "8 179 NaN NaN u00 \n", - "9 001 NaN NaN u00 \n", - "10 001 571500487_02 571500487_01.32 u00 \n", - "11 179 NaN NaN u00 \n", - "12 090 NaN NaN u00 \n", - "13 090 NaN NaN u00 \n", - "14 270 NaN NaN u00 \n", - "15 270 NaN NaN u00 \n", - "16 180 -571542810_01 571542810_01 i1 \n", - "17 359 571542797_02.99 -571542797_02.99 i1 \n", - "18 180 -571542810_01 571542810_01 i1 \n", - "19 180 -571542810_01 571542810_01 i1 \n", - "20 270 571543469_02 571543469_01 i1 \n", - "21 NaN NaN NaN i1 \n", - "22 179 -571542809_01 571542809_01 i2 \n", - "23 000 571542811_02 571542811_01 i2 \n", - "24 000 571542811_02 571542811_01 i2 \n", - "25 179 -571542809_01 571542809_01 i2 \n", - "26 NaN NaN NaN i2 \n", - "27 NaN NaN NaN i2 \n", - "28 268 -571542809_01 571542809_01 i2 \n", - "29 090 571542107_02 571542107_01 i2 \n", - "30 179 NaN NaN u20 \n", - "31 000 NaN NaN u20 \n", - "32 000 571542810_01.51 571542810_02 u20 \n", - "33 179 NaN NaN u20 \n", - "34 NaN NaN NaN u20 \n", - "35 NaN NaN NaN u20 \n", - "36 268 NaN NaN u20 \n", - "37 090 NaN NaN u20 \n", - "38 NaN NaN NaN c30 \n", - "39 NaN NaN NaN c30 \n", "40 NaN 571542116_01 -571542116_02.96 c30 \n", "41 NaN 571542116_02.96 571542116_02.164 c30 \n", "42 NaN 571542116_01 -571542116_02.96 c30 \n", "43 NaN 571542116_02.96 571542116_02.164 c30 \n", "44 NaN 571542116_01 -571542116_02.96 c30 \n", "45 NaN 571542116_02.96 571542116_02.164 c30 \n", - "46 180 571540304_02 571540304_01 i3 \n", - "47 000 571556450_02 571556450_01 i3 \n", - "48 000 571556450_02 571556450_01 i3 \n", - "49 180 571540304_02 571540304_01 i3 \n", - "50 270 571540303_02.21 571540303_01 i3 \n", - "51 270 571540303_02.21 571540303_01 i3 \n", - "52 090 -571500475_01 571500475_01 i3 \n", - "53 090 -571500475_01 571500475_01 i3 \n", - "54 180 NaN NaN u30 \n", - "55 000 NaN NaN u30 \n", - "56 000 NaN NaN u30 \n", - "57 180 NaN NaN u30 \n", - "58 270 NaN NaN u30 \n", - "59 270 NaN NaN u30 " + "46 000 571540304_02 571556450_01 i3 \n", + "47 180 571556450_02 571540304_01 i3 \n", + "48 090 571556450_02 571500475_01 i3 \n", + "49 270 571540304_02 571540303_01 i3 \n", + "50 000 571540303_02.21 571556450_01 i3 \n", + "51 090 571540303_02.21 571500475_01 i3 \n", + "52 270 -571500475_01 571540303_01 i3 \n", + "53 180 -571500475_01 571540304_01 i3 \n", + "54 000 NaN NaN u30 \n", + "55 180 NaN NaN u30 \n", + "56 090 NaN NaN u30 \n", + "57 270 NaN NaN u30 \n", + "58 000 NaN NaN u30 \n", + "59 090 NaN NaN u30 \n", + "60 270 571556452_01 571556452_02 u30 \n", + "61 180 NaN NaN u30 \n", + "62 000 571500475_02 571500475_01.26 u31 \n", + "63 180 NaN NaN u31 \n", + "64 090 NaN NaN u31 \n", + "65 270 NaN NaN u31 \n", + "66 000 NaN NaN u31 \n", + "67 090 NaN NaN u31 \n", + "68 270 NaN NaN u31 \n", + "69 180 NaN NaN u31 \n", + "70 000 NaN NaN u32 \n", + "71 180 571540303_02 -571540303_02 u32 \n", + "72 090 NaN NaN u32 \n", + "73 270 NaN NaN u32 \n", + "74 000 NaN NaN u32 \n", + "75 090 NaN NaN u32 \n", + "76 270 NaN NaN u32 \n", + "77 180 NaN NaN u32 \n", + "78 000 -571500569_01 571500583_02 i8 \n", + "79 270 -571500569_01 571500618_01 i8 \n", + "80 000 571500618_02 571500583_02 i8 \n", + "81 090 571500618_02 571500617_01 i8 \n", + "82 270 571500617_02 571500618_01 i8 \n", + "83 090 571500618_02 571500617_01 i8 \n", + "84 270 571500617_02 571500618_01 i8 \n", + "85 180 571500617_02 571500569_01 i8 \n", + "86 090 571500583_01 571500617_01 i8 \n", + "87 180 571500583_01 571500569_01 i8 \n", + "88 270 571510152_02 -571510152_01 i9 \n", + "89 090 571510152_01 571510152_01.65 i9 \n", + "90 NaN NaN NaN i9 \n", + "91 NaN NaN NaN i9 \n", + "92 000 -571511538_02 571542073_02 i7 \n", + "93 180 571542073_01 571511538_02 i7 \n", + "94 NaN NaN NaN i7 \n", + "95 NaN NaN NaN i7 \n", + "96 000 -571511538_02 571542073_02 i7 \n", + "97 180 571542073_01 571511538_02 i7 \n", + "98 NaN NaN NaN i7 \n", + "99 NaN NaN NaN i7 " ] }, - "execution_count": 9, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "self.match6[:60]" + "self.match6[40:100]" ] }, { @@ -1402,7 +1545,7 @@ " 동\n", " 남\n", " 571545870_02\n", - " 571500487_01\n", + " 571542797_02\n", " i0\n", " \n", " \n", @@ -1412,7 +1555,7 @@ " 서\n", " 동\n", " 571510153_02\n", - " 571500487_01\n", + " 571545870_01\n", " i0\n", " \n", " \n", @@ -1422,7 +1565,7 @@ " 남\n", " 서\n", " -571542797_02\n", - " 571542797_02\n", + " 571510153_01\n", " i0\n", " \n", " \n", @@ -1432,7 +1575,7 @@ " 북\n", " 남\n", " -571500487_01\n", - " 571500487_01\n", + " 571542797_02\n", " i0\n", " \n", " \n", @@ -1442,7 +1585,7 @@ " 서\n", " 북\n", " 571510153_02\n", - " 571542797_02\n", + " 571500487_01\n", " i0\n", " \n", " \n", @@ -1462,7 +1605,7 @@ " 북\n", " 서\n", " 571511538_02.121\n", - " 571542115_01\n", + " 571500535_01\n", " i6\n", " \n", " \n", @@ -1472,7 +1615,7 @@ " 서\n", " 남\n", " 571500535_02.18\n", - " 571511538_01\n", + " 571500585_01\n", " i6\n", " \n", " \n", @@ -1482,7 +1625,7 @@ " 남\n", " 동\n", " 571500585_02\n", - " 571500535_01\n", + " 571542115_01\n", " i6\n", " \n", " \n", @@ -1492,7 +1635,7 @@ " 동\n", " 북\n", " -571542115_01\n", - " 571500535_01\n", + " 571511538_01\n", " i6\n", " \n", " \n", @@ -1512,16 +1655,16 @@ ], "text/plain": [ " inter_no move_no inc_dire out_dire inc_edge_id out_edge_id \\\n", - "0 175 1 동 남 571545870_02 571500487_01 \n", - "1 175 2 서 동 571510153_02 571500487_01 \n", - "2 175 3 남 서 -571542797_02 571542797_02 \n", - "3 175 4 북 남 -571500487_01 571500487_01 \n", - "4 175 5 서 북 571510153_02 571542797_02 \n", + "0 175 1 동 남 571545870_02 571542797_02 \n", + "1 175 2 서 동 571510153_02 571545870_01 \n", + "2 175 3 남 서 -571542797_02 571510153_01 \n", + "3 175 4 북 남 -571500487_01 571542797_02 \n", + "4 175 5 서 북 571510153_02 571500487_01 \n", ".. ... ... ... ... ... ... \n", - "71 210 21 북 서 571511538_02.121 571542115_01 \n", - "72 210 21 서 남 571500535_02.18 571511538_01 \n", - "73 210 21 남 동 571500585_02 571500535_01 \n", - "74 210 21 동 북 -571542115_01 571500535_01 \n", + "71 210 21 북 서 571511538_02.121 571500535_01 \n", + "72 210 21 서 남 571500535_02.18 571500585_01 \n", + "73 210 21 남 동 571500585_02 571542115_01 \n", + "74 210 21 동 북 -571542115_01 571511538_01 \n", "75 210 5 서 북 571500535_02 -571500535_02 \n", "\n", " node_id \n", diff --git a/Intermediates/match6.csv b/Intermediates/match6.csv index e1cfce3a8..a4ee5b145 100644 --- a/Intermediates/match6.csv +++ b/Intermediates/match6.csv @@ -1,12 +1,12 @@ ,inter_no,node_id,phase_no,ring_type,move_no,inc_edge_id,out_edge_id,state -0,175,i0,1,A,8,-571542797_02,571542797_02,grrrrrrrgrrrrrrrr -1,175,i0,1,B,4,-571500487_01,571500487_01,grrrrrrrgrrrrrrrr -2,175,i0,2,A,7,-571500487_01,571500487_01,grrrrrrrgrrrrrrrr -3,175,i0,2,B,3,-571542797_02,571542797_02,grrrrrrrgrrrrrrrr -4,175,i0,3,A,6,571545870_02,571545870_01,grrrrrrrgrrrrrrrr -5,175,i0,3,B,1,571545870_02,571545870_01,grrrrrrrgrrrrrrrr -6,175,i0,4,A,5,571510153_02,571510153_01,grrrrrrrgrrrrrrrr -7,175,i0,4,B,2,571510153_02,571510153_01,grrrrrrrgrrrrrrrr +0,175,i0,1,A,8,-571542797_02,571500487_01,grrrgrrrgGGGGrgrr +1,175,i0,1,B,4,-571500487_01,571542797_02,gGGrgrrrgrrrrrgrr +2,175,i0,2,A,7,-571500487_01,571545870_01,grrGgrrrgrrrrrgrr +3,175,i0,2,B,3,-571542797_02,571510153_01,grrrgrrrgrrrrGgrr +4,175,i0,3,A,6,571545870_02,571510153_01,grrrgGGrgrrrrrgrr +5,175,i0,3,B,1,571545870_02,571542797_02,grrrgrrGgrrrrrgrr +6,175,i0,4,A,5,571510153_02,571500487_01,grrrgrrrgrrrrrgrG +7,175,i0,4,B,2,571510153_02,571545870_01,grrrgrrrgrrrrrgGr 8,175,u00,1,A,8,,,ggggrgggg 9,175,u00,1,B,4,,,ggggrgggg 10,175,u00,2,A,7,571500487_02,571500487_01.32,ggggGgggg @@ -15,20 +15,20 @@ 13,175,u00,3,B,1,,,ggggrgggg 14,175,u00,4,A,5,,,ggggrgggg 15,175,u00,4,B,2,,,ggggrgggg -16,176,i1,1,A,8,-571542810_01,571542810_01,grrgggrrrr -17,176,i1,1,B,4,571542797_02.99,-571542797_02.99,grrgggrrrr -18,176,i1,2,A,8,-571542810_01,571542810_01,grrgggrrrr -19,176,i1,2,B,3,-571542810_01,571542810_01,grrgggrrrr -20,176,i1,3,A,5,571543469_02,571543469_01,grrgggrrrr -21,176,i1,3,B,18,,,grrgggrrrr -22,177,i2,1,A,8,-571542809_01,571542809_01,ggrgrrr -23,177,i2,1,B,4,571542811_02,571542811_01,ggrgrrr -24,177,i2,2,A,7,571542811_02,571542811_01,ggrgrrr -25,177,i2,2,B,3,-571542809_01,571542809_01,ggrgrrr -26,177,i2,3,A,17,,,ggrgrrr -27,177,i2,3,B,18,,,ggrgrrr -28,177,i2,4,A,5,-571542809_01,571542809_01,ggrgrrr -29,177,i2,4,B,1,571542107_02,571542107_01,ggrgrrr +16,176,i1,1,A,8,-571542810_01,-571542797_02.99,grrGGGrgrr +17,176,i1,1,B,4,571542797_02.99,571542810_01,gGGrrrrgrr +18,176,i1,2,A,8,-571542810_01,-571542797_02.99,grrGGGrgrr +19,176,i1,2,B,3,-571542810_01,571543469_01,grrrrrGgrr +20,176,i1,3,A,5,571543469_02,-571542797_02.99,grrrrrrgGG +21,176,i1,3,B,18,,,grrrrrrgrr +22,177,i2,1,A,8,-571542809_01,571542811_01,rrgrGGG +23,177,i2,1,B,4,571542811_02,571542809_01,GGgrrrr +24,177,i2,2,A,7,571542811_02,571542107_01,rrgrrrr +25,177,i2,2,B,3,-571542809_01,571542809_01,rrgrrrr +26,177,i2,3,A,17,,,rrgrrrr +27,177,i2,3,B,18,,,rrgrrrr +28,177,i2,4,A,5,-571542809_01,571542811_01,rrgrGGG +29,177,i2,4,B,1,571542107_02,571542809_01,rrgrrrr 30,177,u20,1,A,8,,,ggrggg 31,177,u20,1,B,4,,,ggrggg 32,177,u20,2,A,7,571542810_01.51,571542810_02,ggGggg @@ -45,14 +45,14 @@ 43,178,c30,3,B,20,571542116_02.96,571542116_02.164,rrrGGG 44,178,c30,4,A,20,571542116_01,-571542116_02.96,GGGrrr 45,178,c30,4,B,20,571542116_02.96,571542116_02.164,rrrGGG -46,178,i3,1,A,8,571540304_02,571540304_01,grrrrrrrrrgrrrrrrrrr -47,178,i3,1,B,4,571556450_02,571556450_01,grrrrrrrrrgrrrrrrrrr -48,178,i3,2,A,7,571556450_02,571556450_01,grrrrrrrrrgrrrrrrrrr -49,178,i3,2,B,3,571540304_02,571540304_01,grrrrrrrrrgrrrrrrrrr -50,178,i3,3,A,5,571540303_02.21,571540303_01,grrrrrrrrrgrrrrrrrrr -51,178,i3,3,B,2,571540303_02.21,571540303_01,grrrrrrrrrgrrrrrrrrr -52,178,i3,4,A,6,-571500475_01,571500475_01,grrrrrrrrrgrrrrrrrrr -53,178,i3,4,B,1,-571500475_01,571500475_01,grrrrrrrrrgrrrrrrrrr +46,178,i3,1,A,8,571540304_02,571556450_01,grrrrgrrrrgGGGrgrrrr +47,178,i3,1,B,4,571556450_02,571540304_01,gGGGrgrrrrgrrrrgrrrr +48,178,i3,2,A,7,571556450_02,571500475_01,grrrGgrrrrgrrrrgrrrr +49,178,i3,2,B,3,571540304_02,571540303_01,grrrrgrrrrgrrrGgrrrr +50,178,i3,3,A,5,571540303_02.21,571556450_01,grrrrgrrrrgrrrrgrrrG +51,178,i3,3,B,2,571540303_02.21,571500475_01,grrrrgrrrrgrrrrgGGGr +52,178,i3,4,A,6,-571500475_01,571540303_01,grrrrgGGGrgrrrrgrrrr +53,178,i3,4,B,1,-571500475_01,571540304_01,grrrrgrrrGgrrrrgrrrr 54,178,u30,1,A,8,,,ggggrggg 55,178,u30,1,B,4,,,ggggrggg 56,178,u30,2,A,7,,,ggggrggg @@ -77,36 +77,36 @@ 75,178,u32,3,B,2,,,gggggggr 76,178,u32,4,A,6,,,gggggggr 77,178,u32,4,B,1,,,gggggggr -78,201,i8,1,A,8,-571500569_01,571500569_01,rrrrrrrrgrrrrrrr -79,201,i8,1,B,3,-571500569_01,571500569_01,rrrrrrrrgrrrrrrr -80,201,i8,2,A,5,571500618_02,571500618_01,rrrrrrrrgrrrrrrr -81,201,i8,2,B,2,571500618_02,571500618_01,rrrrrrrrgrrrrrrr -82,201,i8,3,A,6,571500617_02,571500617_01,rrrrrrrrgrrrrrrr -83,201,i8,3,B,2,571500618_02,571500618_01,rrrrrrrrgrrrrrrr -84,201,i8,4,A,6,571500617_02,571500617_01,rrrrrrrrgrrrrrrr -85,201,i8,4,B,1,571500617_02,571500617_01,rrrrrrrrgrrrrrrr -86,201,i8,5,A,7,571500583_01,571500583_02,rrrrrrrrgrrrrrrr -87,201,i8,5,B,4,571500583_01,571500583_02,rrrrrrrrgrrrrrrr -88,202,i9,1,A,6,571510152_02,571510152_01.65,gggg -89,202,i9,1,B,2,571510152_01,-571510152_01,gggg -90,202,i9,2,A,17,,,gggg -91,202,i9,2,B,18,,,gggg -92,206,i7,1,A,8,-571511538_02,571511538_02,ggrggrr -93,206,i7,1,B,4,571542073_01,571542073_02,ggrggrr -94,206,i7,2,A,17,,,ggrggrr -95,206,i7,2,B,18,,,ggrggrr -96,206,i7,3,A,8,-571511538_02,571511538_02,ggrggrr -97,206,i7,3,B,4,571542073_01,571542073_02,ggrggrr -98,206,i7,4,A,17,,,ggrggrr -99,206,i7,4,B,18,,,ggrggrr -100,210,i6,1,A,6,-571542115_01,571542115_01,rrrrrrrrrrrrgrrr -101,210,i6,1,B,18,,,rrrrrrrrrrrrgrrr -102,210,i6,2,A,5,571500535_02.18,571500535_01,rrrrrrrrrrrrgrrr -103,210,i6,2,B,2,571500535_02.18,571500535_01,rrrrrrrrrrrrgrrr -104,210,i6,3,A,7,571511538_02.121,571511538_01,rrrrrrrrrrrrgrrr -105,210,i6,3,B,4,571511538_02.121,571511538_01,rrrrrrrrrrrrgrrr -106,210,i6,4,A,8,571500585_02,571500585_01,rrrrrrrrrrrrgrrr -107,210,i6,4,B,3,571500585_02,571500585_01,rrrrrrrrrrrrgrrr +78,201,i8,1,A,8,-571500569_01,571500583_02,grrrrrrrgGGrgrrr +79,201,i8,1,B,3,-571500569_01,571500618_01,grrrrrrrgrrGgrrr +80,201,i8,2,A,5,571500618_02,571500583_02,grrrrrrrgrrrgrrG +81,201,i8,2,B,2,571500618_02,571500617_01,grrrrrrrgrrrgGGr +82,201,i8,3,A,6,571500617_02,571500618_01,grrrGGGrgrrrgrrr +83,201,i8,3,B,2,571500618_02,571500617_01,grrrrrrrgrrrgGGr +84,201,i8,4,A,6,571500617_02,571500618_01,grrrGGGrgrrrgrrr +85,201,i8,4,B,1,571500617_02,571500569_01,grrrrrrGgrrrgrrr +86,201,i8,5,A,7,571500583_01,571500617_01,grrGrrrrgrrrgrrr +87,201,i8,5,B,4,571500583_01,571500569_01,gGGrrrrrgrrrgrrr +88,202,i9,1,A,6,571510152_02,-571510152_01,GGrr +89,202,i9,1,B,2,571510152_01,571510152_01.65,rrGG +90,202,i9,2,A,17,,,rrrr +91,202,i9,2,B,18,,,rrrr +92,206,i7,1,A,8,-571511538_02,571542073_02,rrrggGG +93,206,i7,1,B,4,571542073_01,571511538_02,GGrggrr +94,206,i7,2,A,17,,,rrrggrr +95,206,i7,2,B,18,,,rrrggrr +96,206,i7,3,A,8,-571511538_02,571542073_02,rrrggGG +97,206,i7,3,B,4,571542073_01,571511538_02,GGrggrr +98,206,i7,4,A,17,,,rrrggrr +99,206,i7,4,B,18,,,rrrggrr +100,210,i6,1,A,6,-571542115_01,571500535_01,grrrgGGGrgrrgrrr +101,210,i6,1,B,18,,,grrrgrrrrgrrgrrr +102,210,i6,2,A,5,571500535_02.18,571511538_01,grrrgrrrrgrrgrrG +103,210,i6,2,B,2,571500535_02.18,571542115_01,grrrgrrrrgrrgGGr +104,210,i6,3,A,7,571511538_02.121,571542115_01,grrGgrrrrgrrgrrr +105,210,i6,3,B,4,571511538_02.121,571500585_01,gGGrgrrrrgrrgrrr +106,210,i6,4,A,8,571500585_02,571511538_01,grrrgrrrrgGGgrrr +107,210,i6,4,B,3,571500585_02,571500535_01,grrrgrrrrgrrgrrr 108,210,u60,1,A,6,,,ggggggggr 109,210,u60,1,B,18,,,ggggggggr 110,210,u60,2,A,5,571500535_02,-571500535_02,ggggggggG diff --git a/Intermediates/matching.csv b/Intermediates/matching.csv index a58751066..52c5f7912 100644 --- a/Intermediates/matching.csv +++ b/Intermediates/matching.csv @@ -1,77 +1,77 @@ ,inter_no,node_id,move_no,inc_edge_id,out_edge_id,state -0,175,i0,1,571545870_02,571500487_01,grrrGrrrgrrrrrrrr -1,175,i0,2,571510153_02,571500487_01,grrrrrrrgrrrrrrrG -2,175,i0,3,-571542797_02,571542797_02,grrrrrrrgrrrrrrrr -3,175,i0,4,-571500487_01,571500487_01,grrrrrrrgrrrrrrrr -4,175,i0,5,571510153_02,571542797_02,grrrrrrrgrrrrrGrr -5,175,i0,6,571545870_02,571542797_02,grrrrrrGgrrrrrrrr -6,175,i0,7,-571500487_01,571500487_01,grrrrrrrgrrrrrrrr -7,175,i0,8,-571542797_02,571542797_02,grrrrrrrgrrrrrrrr -8,175,i0,21,-571500487_01,571542797_02,grrrrrrrgrrrrrrrr -9,175,i0,21,571510153_02,571500487_01,grrrrrrrgrrrrrrrr -10,175,i0,21,-571542797_02,571500487_01,grrrrrrrgrrrrrrrr -11,175,i0,21,571545870_02,571542797_02,grrrrrrrgrrrrrrrr +0,175,i0,1,571545870_02,571542797_02,grrrgrrGgrrrrrgrr +1,175,i0,2,571510153_02,571545870_01,grrrgrrrgrrrrrgGr +2,175,i0,3,-571542797_02,571510153_01,grrrgrrrgrrrrGgrr +3,175,i0,4,-571500487_01,571542797_02,gGGrgrrrgrrrrrgrr +4,175,i0,5,571510153_02,571500487_01,grrrgrrrgrrrrrgrG +5,175,i0,6,571545870_02,571510153_01,grrrgGGrgrrrrrgrr +6,175,i0,7,-571500487_01,571545870_01,grrGgrrrgrrrrrgrr +7,175,i0,8,-571542797_02,571500487_01,grrrgrrrgGGGGrgrr +8,175,i0,21,-571500487_01,571510153_01,grrrgrrrgrrrrrgrr +9,175,i0,21,571510153_02,571542797_02,grrrgrrrgrrrrrgrr +10,175,i0,21,-571542797_02,571545870_01,grrrgrrrgrrrrrgrr +11,175,i0,21,571545870_02,571500487_01,grrrgrrrgrrrrrgrr 12,175,u00,7,571500487_02,571500487_01.32,ggggGgggg -13,176,i1,3,-571542810_01,571542810_01,grrgggrrrr -14,176,i1,4,571542797_02.99,-571542797_02.99,grrgggrrrr -15,176,i1,5,571543469_02,571542810_01,grrgggrGrr -16,176,i1,8,-571542810_01,571542810_01,grrgggrrrr -17,176,i1,21,571542797_02.99,571542810_01,grrgggrrrr -18,176,i1,21,571543469_02,-571542797_02.99,grrgggrrrr -19,177,i2,1,571542107_02,571542811_01,ggGgrrr -20,177,i2,2,-571542809_01,571542811_01,ggrgGGG -21,177,i2,3,-571542809_01,571542809_01,ggrgrrr -22,177,i2,4,571542811_02,571542811_01,ggrgrrr -23,177,i2,5,-571542809_01,571542809_01,ggrgrrr -24,177,i2,6,571542107_02,571542809_01,ggrgrrr -25,177,i2,7,571542811_02,571542811_01,ggrgrrr -26,177,i2,8,-571542809_01,571542809_01,ggrgrrr -27,177,i2,21,571542811_02,571542809_01,ggrgrrr -28,177,i2,21,-571542809_01,571542811_01,ggrgrrr -29,177,i2,21,-571542809_01,571542811_01,ggrgrrr -30,177,i2,21,571542107_02,571542809_01,ggrgrrr +13,176,i1,3,-571542810_01,571543469_01,grrrrrGgrr +14,176,i1,4,571542797_02.99,571542810_01,gGGrrrrgrr +15,176,i1,5,571543469_02,-571542797_02.99,grrrrrrgGG +16,176,i1,8,-571542810_01,-571542797_02.99,grrGGGrgrr +17,176,i1,21,571542797_02.99,571543469_01,grrrrrrgrr +18,176,i1,21,571543469_02,571542810_01,grrrrrrgrr +19,177,i2,1,571542107_02,571542809_01,rrgrrrr +20,177,i2,2,-571542809_01,571542107_01,rrgGrrr +21,177,i2,3,-571542809_01,571542809_01,rrgrrrr +22,177,i2,4,571542811_02,571542809_01,GGgrrrr +23,177,i2,5,-571542809_01,571542811_01,rrgrGGG +24,177,i2,6,571542107_02,571542809_01,rrgrrrr +25,177,i2,7,571542811_02,571542107_01,rrgrrrr +26,177,i2,8,-571542809_01,571542811_01,rrgrGGG +27,177,i2,21,571542811_02,571542809_01,rrgrrrr +28,177,i2,21,-571542809_01,571542809_01,rrgrrrr +29,177,i2,21,-571542809_01,571542107_01,rrgrrrr +30,177,i2,21,571542107_02,571542811_01,rrgrrrr 31,177,u20,7,571542810_01.51,571542810_02,ggGggg -32,178,i3,1,-571500475_01,571556450_01,grrrrGrrrrgrrrrrrrrr -33,178,i3,2,571540303_02.21,571556450_01,grrrrrrrrrgrrrrrrrrG -34,178,i3,3,571540304_02,571540304_01,grrrrrrrrrgrrrrrrrrr -35,178,i3,4,571556450_02,571556450_01,grrrrrrrrrgrrrrrrrrr -36,178,i3,5,571540303_02.21,571540304_01,grrrrrrrrrgrrrrGrrrr -37,178,i3,6,-571500475_01,571540304_01,grrrrrrrrGgrrrrrrrrr -38,178,i3,7,571556450_02,571556450_01,grrrrrrrrrgrrrrrrrrr -39,178,i3,8,571540304_02,571540304_01,grrrrrrrrrgrrrrrrrrr -40,178,i3,21,571556450_02,571540304_01,grrrrrrrrrgrrrrrrrrr -41,178,i3,21,571540303_02.21,571556450_01,grrrrrrrrrgrrrrrrrrr -42,178,i3,21,571540304_02,571556450_01,grrrrrrrrrgrrrrrrrrr -43,178,i3,21,-571500475_01,571540304_01,grrrrrrrrrgrrrrrrrrr +32,178,i3,1,-571500475_01,571540304_01,grrrrgrrrGgrrrrgrrrr +33,178,i3,2,571540303_02.21,571500475_01,grrrrgrrrrgrrrrgGGGr +34,178,i3,3,571540304_02,571540303_01,grrrrgrrrrgrrrGgrrrr +35,178,i3,4,571556450_02,571540304_01,gGGGrgrrrrgrrrrgrrrr +36,178,i3,5,571540303_02.21,571556450_01,grrrrgrrrrgrrrrgrrrG +37,178,i3,6,-571500475_01,571540303_01,grrrrgGGGrgrrrrgrrrr +38,178,i3,7,571556450_02,571500475_01,grrrGgrrrrgrrrrgrrrr +39,178,i3,8,571540304_02,571556450_01,grrrrgrrrrgGGGrgrrrr +40,178,i3,21,571556450_02,571540303_01,grrrrgrrrrgrrrrgrrrr +41,178,i3,21,571540303_02.21,571540304_01,grrrrgrrrrgrrrrgrrrr +42,178,i3,21,571540304_02,571500475_01,grrrrgrrrrgrrrrgrrrr +43,178,i3,21,-571500475_01,571556450_01,grrrrgrrrrgrrrrgrrrr 44,178,u30,6,571556452_01,571556452_02,ggggGggg 45,178,u31,8,571500475_02,571500475_01.26,ggggGggg 46,178,u32,4,571540303_02,-571540303_02,gggggggG -47,201,i8,1,571500617_02,571500617_01,rrrrrrrrgrrrrrrr -48,201,i8,2,571500618_02,571500618_01,rrrrrrrrgrrrrrrr -49,201,i8,3,-571500569_01,571500569_01,rrrrrrrrgrrrrrrr -50,201,i8,4,571500583_01,571500617_01,rrrGrrrrgrrrrrrr -51,201,i8,5,571500618_02,571500569_01,rrrrrrrrgrrrGrrr -52,201,i8,6,571500617_02,571500569_01,rrrrrrrGgrrrrrrr -53,201,i8,7,571500583_01,571500618_01,Grrrrrrrgrrrrrrr -54,201,i8,8,-571500569_01,571500569_01,rrrrrrrrgrrrrrrr -55,201,i8,21,571500583_01,571500569_01,rrrrrrrrgrrrrrrr -56,201,i8,21,571500618_02,571500617_01,rrrrrrrrgrrrrrrr -57,201,i8,21,-571500569_01,571500618_01,rrrrrrrrgrrrrrrr -58,201,i8,21,571500617_02,571500569_01,rrrrrrrrgrrrrrrr -59,202,i9,2,571510152_01,-571510152_01,gggg -60,202,i9,6,571510152_02,571510152_01.65,gggg -61,206,i7,4,571542073_01,571542073_02,ggrggrr -62,206,i7,8,-571511538_02,571511538_02,ggrggrr -63,210,i6,1,-571542115_01,571511538_01,rrrrGrrrrrrrgrrr -64,210,i6,2,571500535_02.18,571500535_01,rrrrrrrrrrrrgrrr -65,210,i6,3,571500585_02,571542115_01,rrrrrrrrrGrrgrrr -66,210,i6,4,571511538_02.121,571511538_01,rrrrrrrrrrrrgrrr -67,210,i6,5,571500535_02.18,571500535_01,rrrrrrrrrrrrgrrr -68,210,i6,6,-571542115_01,571542115_01,rrrrrrrrrrrrgrrr -69,210,i6,7,571511538_02.121,571500535_01,Grrrrrrrrrrrgrrr -70,210,i6,8,571500585_02,571500535_01,rrrrrrrrrrrrgrrr -71,210,i6,21,571511538_02.121,571542115_01,rrrrrrrrrrrrgrrr -72,210,i6,21,571500535_02.18,571511538_01,rrrrrrrrrrrrgrrr -73,210,i6,21,571500585_02,571500535_01,rrrrrrrrrrrrgrrr -74,210,i6,21,-571542115_01,571500535_01,rrrrrrrrrrrrgrrr +47,201,i8,1,571500617_02,571500569_01,grrrrrrGgrrrgrrr +48,201,i8,2,571500618_02,571500617_01,grrrrrrrgrrrgGGr +49,201,i8,3,-571500569_01,571500618_01,grrrrrrrgrrGgrrr +50,201,i8,4,571500583_01,571500569_01,gGGrrrrrgrrrgrrr +51,201,i8,5,571500618_02,571500583_02,grrrrrrrgrrrgrrG +52,201,i8,6,571500617_02,571500618_01,grrrGGGrgrrrgrrr +53,201,i8,7,571500583_01,571500617_01,grrGrrrrgrrrgrrr +54,201,i8,8,-571500569_01,571500583_02,grrrrrrrgGGrgrrr +55,201,i8,21,571500583_01,571500618_01,grrrrrrrgrrrgrrr +56,201,i8,21,571500618_02,571500569_01,grrrrrrrgrrrgrrr +57,201,i8,21,-571500569_01,571500617_01,grrrrrrrgrrrgrrr +58,201,i8,21,571500617_02,571500583_02,grrrrrrrgrrrgrrr +59,202,i9,2,571510152_01,571510152_01.65,rrGG +60,202,i9,6,571510152_02,-571510152_01,GGrr +61,206,i7,4,571542073_01,571511538_02,GGrggrr +62,206,i7,8,-571511538_02,571542073_02,rrrggGG +63,210,i6,1,-571542115_01,571500585_01,grrrgrrrGgrrgrrr +64,210,i6,2,571500535_02.18,571542115_01,grrrgrrrrgrrgGGr +65,210,i6,3,571500585_02,571500535_01,grrrgrrrrgrrgrrr +66,210,i6,4,571511538_02.121,571500585_01,gGGrgrrrrgrrgrrr +67,210,i6,5,571500535_02.18,571511538_01,grrrgrrrrgrrgrrG +68,210,i6,6,-571542115_01,571500535_01,grrrgGGGrgrrgrrr +69,210,i6,7,571511538_02.121,571542115_01,grrGgrrrrgrrgrrr +70,210,i6,8,571500585_02,571511538_01,grrrgrrrrgGGgrrr +71,210,i6,21,571511538_02.121,571500535_01,grrrgrrrrgrrgrrr +72,210,i6,21,571500535_02.18,571500585_01,grrrgrrrrgrrgrrr +73,210,i6,21,571500585_02,571542115_01,grrrgrrrrgrrgrrr +74,210,i6,21,-571542115_01,571511538_01,grrrgrrrrgrrgrrr 75,210,u60,5,571500535_02,-571500535_02,ggggggggG diff --git a/Intermediates/node2init.json b/Intermediates/node2init.json index 9412e0bea..dbdab239b 100644 --- a/Intermediates/node2init.json +++ b/Intermediates/node2init.json @@ -1 +1 @@ -{"c30": ["r", "r", "r", "r", "r", "r"], "i0": ["g", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r", "r", "r", "r", "r", "r"], "i1": ["g", "r", "r", "g", "g", "g", "r", "r", "r", "r"], "i2": ["g", "g", "r", "g", "r", "r", "r"], "i3": ["g", "r", "r", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r", "r", "r", "r", "r", "r", "r"], "i6": ["r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r"], "i7": ["g", "g", "r", "g", "g", "r", "r"], "i8": ["r", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r", "r", "r", "r", "r"], "i9": ["g", "g", "g", "g"], "u00": ["g", "g", "g", "g", "r", "g", "g", "g", "g"], "u20": ["g", "g", "r", "g", "g", "g"], "u30": ["g", "g", "g", "g", "r", "g", "g", "g"], "u31": ["g", "g", "g", "g", "r", "g", "g", "g"], "u32": ["g", "g", "g", "g", "g", "g", "g", "r"], "u60": ["g", "g", "g", "g", "g", "g", "g", "g", "r"]} \ No newline at end of file +{"c30": ["r", "r", "r", "r", "r", "r"], "i0": ["g", "r", "r", "r", "g", "r", "r", "r", "g", "r", "r", "r", "r", "r", "g", "r", "r"], "i1": ["g", "r", "r", "r", "r", "r", "r", "g", "r", "r"], "i2": ["r", "r", "g", "r", "r", "r", "r"], "i3": ["g", "r", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "r", "r"], "i6": ["g", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "g", "r", "r", "r"], "i7": ["r", "r", "r", "g", "g", "r", "r"], "i8": ["g", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r", "g", "r", "r", "r"], "i9": ["r", "r", "r", "r"], "u00": ["g", "g", "g", "g", "r", "g", "g", "g", "g"], "u20": ["g", "g", "r", "g", "g", "g"], "u30": ["g", "g", "g", "g", "r", "g", "g", "g"], "u31": ["g", "g", "g", "g", "r", "g", "g", "g"], "u32": ["g", "g", "g", "g", "g", "g", "g", "r"], "u60": ["g", "g", "g", "g", "g", "g", "g", "g", "r"]} \ No newline at end of file diff --git a/Results/sn_1704419400.add.xml b/Results/sn_1704419400.add.xml index 03ffa6465..f275d3679 100644 --- a/Results/sn_1704419400.add.xml +++ b/Results/sn_1704419400.add.xml @@ -1,50 +1,50 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -84,290 +84,310 @@ - + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -388,7 +408,7 @@ - + @@ -428,242 +448,242 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - - - + - - + + - - - - - + + - + + + + - - + + - - - - - + + - + + + + - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ 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 42639abc3728e9cc0fc679f20ba1f6ab11ffb658..1021878b8ea79d093182fa103069a26c7dd49dac 100644 GIT binary patch delta 28 icmex!knzt!My^m^UM>b8nA5zGD@=!xX>+2^Y!d*6=?HEB delta 28 icmex!knzt!My^m^UM>b8P%GWY6{f?;xH(a0wg~`$JqPIk diff --git a/Scripts/preprocess_daily.py b/Scripts/preprocess_daily.py index 83965fd17..2e15c1153 100644 --- a/Scripts/preprocess_daily.py +++ b/Scripts/preprocess_daily.py @@ -31,6 +31,7 @@ class DailyPreprocessor(): self.load_tables() self.check_networks() self.check_tables() + self.restore_objects() # 1-1. 네트워크 불러오기 def load_networks(self): @@ -95,7 +96,6 @@ class DailyPreprocessor(): self.check_inter_info() self.check_angle() print("1-4. 테이블들의 무결성 검사를 완료했습니다.") - pass # 1-4-1. 신호계획(plan) 검사 def check_plan(self): @@ -184,6 +184,15 @@ class DailyPreprocessor(): msg = f"1-4-3-2. 0과 359 사이의 값을 벗어나는 방위각이 존재합니다." self.issues.append(msg) + # 1-5. 주요 객체 (리스트, 딕셔너리) 저장 + def restore_objects(self): + self.node2inter = dict(zip(self.inter_node['node_id'], self.inter_node['inter_no'])) + self.parent_ids = sorted(self.inter_node[self.inter_node.inter_type=='parent'].node_id.unique()) + self.child_ids = sorted(self.inter_node[self.inter_node.inter_type=='child'].node_id.unique()) + self.uturn_ids = sorted(self.uturn.child_id.unique()) + self.coord_ids = sorted(self.coord.child_id.unique()) + print("1-5. 주요 객체 (리스트, 딕셔너리)들을 저장했습니다.") + # 2. 중간산출물 만들기 def get_intermediates(self): print('2. 중간산출물을 생성합니다.') @@ -306,7 +315,7 @@ class DailyPreprocessor(): inter_no = row.inter_no move_no = row.move_no self.match4.at[i, 'inc_angle'] = im2inc_angle[(inter_no, move_no)] - self.match4.at[i, 'out_angle'] = im2inc_angle[(inter_no, move_no)] + self.match4.at[i, 'out_angle'] = im2out_angle[(inter_no, move_no)] self.match4.head() # 2-1-5 @@ -378,13 +387,6 @@ class DailyPreprocessor(): 컬럼명 : inter_no, phase_no, ring_type, move_no, inc_dire, out_dire, inc_angle, out_angle, inc_edge_id, out_edge_id, node_id ''' - self.node2inter = dict(zip(self.inter_node['node_id'], self.inter_node['inter_no'])) - - self.parent_ids = sorted(self.inter_node[self.inter_node.inter_type=='parent'].node_id.unique()) - self.child_ids = sorted(self.inter_node[self.inter_node.inter_type=='child'].node_id.unique()) - self.uturn_ids = sorted(self.uturn.child_id.unique()) - self.coord_ids = sorted(self.coord.child_id.unique()) - # ids ids = {'node_ids' : self.node_ids, 'parent_ids': self.parent_ids,