From 6ae7b41d8fda541c5f189d23f29b6e2f4b44b0ba Mon Sep 17 00:00:00 2001
From: govin08 <govindah08@gmail.com>
Date: Tue, 16 Apr 2024 13:51:33 +0900
Subject: [PATCH] deleted seemingly unnecessary lines (they are indeed
 unncessary I think)

---
 .../0416_initialize_state.ipynb               |  50 +-
 Intermediates/node2init.json                  |   2 +-
 Results/sn_1704419400.add.xml                 | 892 +++++++++---------
 Scripts/preprocess_daily.py                   |  25 -
 4 files changed, 474 insertions(+), 495 deletions(-)

diff --git a/Analysis/0411_unp-left_p-right-uturn/0416_initialize_state.ipynb b/Analysis/0411_unp-left_p-right-uturn/0416_initialize_state.ipynb
index 60694bb4f..4f173818a 100644
--- a/Analysis/0411_unp-left_p-right-uturn/0416_initialize_state.ipynb
+++ b/Analysis/0411_unp-left_p-right-uturn/0416_initialize_state.ipynb
@@ -472,13 +472,35 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 28,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "i8 grrrrrrrgrrrgrrr\n",
+      "i6 grrrgrrrrgrrgrrr\n",
+      "i1 grrrrrrgrr\n",
+      "i0 grrrgrrrgrrrrrgrr\n",
+      "i7 rrrggrr\n",
+      "i3 grrrrgrrrrgrrrrgrrrr\n",
+      "i9 rrrr\n",
+      "i2 rrggrrr\n",
+      "c30 rrrrrr\n",
+      "u00 GGGGrGGGG\n",
+      "u20 GGrGGG\n",
+      "u30 GGGGrGGG\n",
+      "u31 GGGGrGGG\n",
+      "u32 GGGGGGGr\n",
+      "u60 GGGGGGGGr\n"
+     ]
+    }
+   ],
    "source": [
     "self.nodes = [self.net.getNode(node_id) for node_id in self.node_ids]\n",
     "self.node2init = {}\n",
-    "# 유턴노드를 제외한 모든 노드에 대하여 초기화 신호 지정\n",
+    "# 유턴노드를 제외한 모든 노드 (우회전, 삼지교차로직진 : g, 그외 : r)\n",
     "for node_id in set(self.node_ids) - set(self.u_turn_ids):\n",
     "    node = self.net.getNode(node_id)\n",
     "    conns = [(c.getJunctionIndex(), c) for c in node.getConnections()]\n",
@@ -501,7 +523,7 @@
     "        state.append('r' if are_foes else 'g')\n",
     "    self.node2init[node_id] = state\n",
     "\n",
-    "# 유턴노드에 대하여 초기화 신호 지정\n",
+    "# 유턴노드 (유턴x : G, 유턴 : G)\n",
     "for node_id in self.u_turn_ids:\n",
     "    node = self.net.getNode(node_id)\n",
     "    conns = [(c.getJunctionIndex(), c) for c in node.getConnections()]\n",
@@ -511,9 +533,23 @@
     "    for i, ci in conns:\n",
     "        if ci.getTLLinkIndex() < 0:\n",
     "            continue\n",
-    "        is_uturn = (i == self.uid2uindex[node_id])\n",
-    "        state.append('r' if is_uturn else 'G')\n",
-    "    self.node2init[node_id] = state"
+    "        state.append('G')\n",
+    "    self.node2init[node_id] = state\n",
+    "\n",
+    "# 신호가 부여되어 있는 경우에는 r을 부여 (우회전 : g, 그외 : r / 유턴x : G, 유턴 : r)\n",
+    "for _, row in self.match6.dropna(subset=['inc_edge_id', 'out_edge_id']).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",
+    "    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",
+    "            self.node2init[node_id][index] = 'r'\n",
+    "for node_id in self.node2init:\n",
+    "    print(node_id, ''.join(self.node2init[node_id]))"
    ]
   },
   {
diff --git a/Intermediates/node2init.json b/Intermediates/node2init.json
index 0c08741ba..231c0d756 100644
--- a/Intermediates/node2init.json
+++ b/Intermediates/node2init.json
@@ -1 +1 @@
-{"i2": ["r", "r", "g", "g", "r", "r", "r"], "i6": ["g", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "g", "r", "r", "r"], "c30": ["r", "r", "r", "r", "r", "r"], "i8": ["g", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r", "g", "r", "r", "r"], "i7": ["r", "r", "r", "g", "g", "r", "r"], "i3": ["g", "r", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "r", "r"], "i1": ["g", "r", "r", "r", "r", "r", "r", "g", "r", "r"], "i9": ["r", "r", "r", "r"], "i0": ["g", "r", "r", "r", "g", "r", "r", "r", "g", "r", "r", "r", "r", "r", "g", "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
+{"i0": ["g", "r", "r", "r", "g", "r", "r", "r", "g", "r", "r", "r", "r", "r", "g", "r", "r"], "i3": ["g", "r", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "r", "r"], "c30": ["r", "r", "r", "r", "r", "r"], "i7": ["r", "r", "r", "g", "g", "r", "r"], "i9": ["r", "r", "r", "r"], "i1": ["g", "r", "r", "r", "r", "r", "r", "g", "r", "r"], "i6": ["g", "r", "r", "r", "g", "r", "r", "r", "r", "g", "r", "r", "g", "r", "r", "r"], "i2": ["r", "r", "g", "g", "r", "r", "r"], "i8": ["g", "r", "r", "r", "r", "r", "r", "r", "g", "r", "r", "r", "g", "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 0591ccb48..124820561 100644
--- a/Results/sn_1704419400.add.xml
+++ b/Results/sn_1704419400.add.xml
@@ -1,209 +1,189 @@
 <additional>
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-40">
+    <tlLogic id="c30" type="static" programID="c30_prog" offset="-60">
       <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="33" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="16" state="GGGGGG"/>
       <phase duration="4" state="yyyyyy"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="33" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="32" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="33" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="16" state="GGGGGG"/>
       <phase duration="4" state="yyyyyy"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="33" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="32" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="33" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="16" state="GGGGGG"/>
       <phase duration="4" state="yyyyyy"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="33" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="32" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="33" state="GGGGGG"/>
       <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
+      <phase duration="2" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
     </tlLogic>
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-169">
-      <phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="18" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-60">
       <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="38" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="5" state="grrygrrrgrrrrygrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgrr"/>
+      <phase duration="26" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="15" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgGr"/>
+      <phase duration="30" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="36" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="38" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="5" state="grrygrrrgrrrrygrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgrr"/>
+      <phase duration="26" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="15" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgGr"/>
+      <phase duration="30" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="36" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="38" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="5" state="grrygrrrgrrrrygrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgrr"/>
+      <phase duration="26" state="grrrgGGGgrrrrrgrr"/>
       <phase duration="22" state="grrrgGGygrrrrrgrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-49">
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-60">
       <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="99" state="grrGGGGgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="36" state="grrrrrrgGG"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="35" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="gGGrrrrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="33" state="gGGGGGrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="32" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="99" state="grrGGGGgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="36" state="grrrrrrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="35" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="gGGrrrrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="33" state="gGGGGGrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="32" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="99" state="grrGGGGgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="36" state="grrrrrrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="35" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="gGGrrrrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="33" state="gGGGGGrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="32" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="99" state="grrGGGrgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
     </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-110">
-      <phase duration="40" state="GGggGGG"/>
-      <phase duration="3" state="yyggyyy"/>
+    <tlLogic id="i2" type="static" programID="i2_prog" offset="-131">
+      <phase duration="38" state="GGggGGG"/>
+      <phase duration="5" state="yyggyyy"/>
       <phase duration="1" state="rrggrrr"/>
-      <phase duration="23" state="rrggrrr"/>
-      <phase duration="3" state="rrggrrr"/>
+      <phase duration="21" state="rrggrrr"/>
+      <phase duration="5" state="rrggrrr"/>
       <phase duration="1" state="rrggrrr"/>
-      <phase duration="39" state="GGggGGG"/>
-      <phase duration="3" state="yyggyyy"/>
+      <phase duration="37" state="GGggGGG"/>
+      <phase duration="5" state="yyggyyy"/>
       <phase duration="1" state="rrggrrr"/>
-      <phase duration="23" state="rrggrrr"/>
-      <phase duration="3" state="rrggrrr"/>
+      <phase duration="21" state="rrggrrr"/>
+      <phase duration="5" state="rrggrrr"/>
       <phase duration="1" state="rrggrrr"/>
-      <phase duration="39" state="GGggGGG"/>
-      <phase duration="3" state="yyggyyy"/>
+      <phase duration="37" state="GGggGGG"/>
+      <phase duration="5" state="yyggyyy"/>
       <phase duration="1" state="rrggrrr"/>
-      <phase duration="23" state="rrggrrr"/>
-      <phase duration="3" state="rrggrrr"/>
+      <phase duration="21" state="rrggrrr"/>
+      <phase duration="5" state="rrggrrr"/>
       <phase duration="1" state="rrggrrr"/>
-      <phase duration="39" state="GGggGGG"/>
+      <phase duration="37" state="GGggGGG"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-40">
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-60">
       <phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
     </tlLogic>
-    <tlLogic id="i6" type="static" programID="i6_prog" offset="-10">
+    <tlLogic id="i6" type="static" programID="i6_prog" offset="-20">
       <phase duration="1" state="grrrgGGGrgrrgrrr"/>
       <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
@@ -261,7 +241,7 @@
       <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-140">
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-60">
       <phase duration="41" state="GGrggGG"/>
       <phase duration="4" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
@@ -306,348 +286,336 @@
       <phase duration="1" state="rrrggrr"/>
       <phase duration="21" state="GGrggGG"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-39">
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-120">
       <phase duration="29" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
       <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="12" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="27" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
       <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="12" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="27" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
       <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="12" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="27" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-120">
+    <tlLogic id="i9" type="static" programID="i9_prog" offset="-150">
       <phase duration="42" state="GGGG"/>
       <phase duration="4" state="yyyy"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="110" state="rrrr"/>
+      <phase duration="2" state="rrrr"/>
+      <phase duration="108" state="rrrr"/>
       <phase duration="4" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrGG"/>
-      <phase duration="0" state="GGrr"/>
-      <phase duration="42" state="GGGG"/>
+      <phase duration="2" state="rrrr"/>
+      <phase duration="40" state="GGGG"/>
       <phase duration="4" state="yyyy"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="110" state="rrrr"/>
+      <phase duration="2" state="rrrr"/>
+      <phase duration="108" state="rrrr"/>
       <phase duration="4" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrGG"/>
-      <phase duration="0" state="GGrr"/>
-      <phase duration="42" state="GGGG"/>
+      <phase duration="2" state="rrrr"/>
+      <phase duration="40" state="GGGG"/>
       <phase duration="4" state="yyyy"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="110" state="rrrr"/>
+      <phase duration="2" state="rrrr"/>
+      <phase duration="108" state="rrrr"/>
       <phase duration="4" state="rrrr"/>
-      <phase duration="0" state="GGGG"/>
-      <phase duration="0" state="rrrr"/>
-      <phase duration="0" state="rrGG"/>
-      <phase duration="42" state="GGrr"/>
+      <phase duration="2" state="rrrr"/>
+      <phase duration="40" state="GGGG"/>
     </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-169">
-      <phase duration="39" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="40" state="ggggGgggg"/>
-      <phase duration="4" state="ggggygggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="28" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="18" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="32" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="38" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="40" state="ggggGgggg"/>
-      <phase duration="4" state="ggggygggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="28" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="16" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="32" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="38" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="40" state="ggggGgggg"/>
-      <phase duration="4" state="ggggygggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="28" state="ggggrgggg"/>
-      <phase duration="22" state="ggggrgggg"/>
+    <tlLogic id="u00" type="static" programID="u00_prog" offset="-60">
+      <phase duration="38" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="5" state="GGGGyGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="26" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="15" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="30" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="36" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="5" state="GGGGyGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="26" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="15" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="30" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="36" state="GGGGrGGGG"/>
+      <phase duration="5" state="GGGGrGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="5" state="GGGGyGGGG"/>
+      <phase duration="2" state="GGGGrGGGG"/>
+      <phase duration="26" state="GGGGrGGGG"/>
+      <phase duration="22" state="GGGGrGGGG"/>
     </tlLogic>
-    <tlLogic id="u20" type="static" programID="u20_prog" offset="-110">
-      <phase duration="40" state="ggrggg"/>
-      <phase duration="3" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="23" state="ggGggg"/>
-      <phase duration="3" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="39" state="ggrggg"/>
-      <phase duration="3" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="23" state="ggGggg"/>
-      <phase duration="3" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="39" state="ggrggg"/>
-      <phase duration="3" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="23" state="ggGggg"/>
-      <phase duration="3" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="39" state="ggrggg"/>
+    <tlLogic id="u20" type="static" programID="u20_prog" offset="-131">
+      <phase duration="38" state="GGrGGG"/>
+      <phase duration="5" state="GGrGGG"/>
+      <phase duration="1" state="GGrGGG"/>
+      <phase duration="21" state="GGGGGG"/>
+      <phase duration="5" state="GGyGGG"/>
+      <phase duration="1" state="GGrGGG"/>
+      <phase duration="37" state="GGrGGG"/>
+      <phase duration="5" state="GGrGGG"/>
+      <phase duration="1" state="GGrGGG"/>
+      <phase duration="21" state="GGGGGG"/>
+      <phase duration="5" state="GGyGGG"/>
+      <phase duration="1" state="GGrGGG"/>
+      <phase duration="37" state="GGrGGG"/>
+      <phase duration="5" state="GGrGGG"/>
+      <phase duration="1" state="GGrGGG"/>
+      <phase duration="21" state="GGGGGG"/>
+      <phase duration="5" state="GGyGGG"/>
+      <phase duration="1" state="GGrGGG"/>
+      <phase duration="37" state="GGrGGG"/>
     </tlLogic>
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-40">
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
+    <tlLogic id="u30" type="static" programID="u30_prog" offset="-60">
+      <phase duration="34" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="16" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="32" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="16" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="32" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="16" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="32" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
     </tlLogic>
-    <tlLogic id="u31" type="static" programID="u31_prog" offset="-40">
-      <phase duration="34" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
+    <tlLogic id="u31" type="static" programID="u31_prog" offset="-60">
+      <phase duration="34" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="16" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="32" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="16" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="32" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="16" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="32" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGyGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="33" state="GGGGrGGG"/>
+      <phase duration="4" state="GGGGrGGG"/>
+      <phase duration="2" state="GGGGrGGG"/>
+      <phase duration="37" state="GGGGrGGG"/>
     </tlLogic>
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-40">
-      <phase duration="34" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="17" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="33" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="17" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="33" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="17" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="33" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
-      <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
+    <tlLogic id="u32" type="static" programID="u32_prog" offset="-60">
+      <phase duration="34" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGy"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="33" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="37" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="16" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="32" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGy"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="33" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="37" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="16" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="32" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGy"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="33" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="37" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="16" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="32" state="GGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGy"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="33" state="GGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGr"/>
+      <phase duration="2" state="GGGGGGGr"/>
+      <phase duration="37" state="GGGGGGGr"/>
     </tlLogic>
-    <tlLogic id="u60" type="static" programID="u60_prog" offset="-10">
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="4" state="ggggggggy"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="19" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="4" state="ggggggggy"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="19" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="4" state="ggggggggy"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="19" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="23" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="10" state="ggggggggr"/>
-      <phase duration="4" state="ggggggggr"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="38" state="ggggggggG"/>
-      <phase duration="4" state="ggggggggy"/>
-      <phase duration="1" state="ggggggggr"/>
-      <phase duration="65" state="ggggggggr"/>
+    <tlLogic id="u60" type="static" programID="u60_prog" offset="-20">
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="23" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="10" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGGy"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="65" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="19" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="23" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="10" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGGy"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="65" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="19" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="23" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="10" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGGy"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="65" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="19" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="23" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="10" state="GGGGGGGGr"/>
+      <phase duration="4" state="GGGGGGGGr"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="38" state="GGGGGGGGG"/>
+      <phase duration="4" state="GGGGGGGGy"/>
+      <phase duration="1" state="GGGGGGGGr"/>
+      <phase duration="65" state="GGGGGGGGr"/>
     </tlLogic>
 </additional>
\ No newline at end of file
diff --git a/Scripts/preprocess_daily.py b/Scripts/preprocess_daily.py
index 256b3ac08..d75ecea35 100644
--- a/Scripts/preprocess_daily.py
+++ b/Scripts/preprocess_daily.py
@@ -764,31 +764,6 @@ class DailyPreprocessor():
                     if index >= 0:
                         self.node2init[node_id][index] = 'r'
 
-        # 연등교차로
-        for _, row in self.coord.iterrows():
-            node_id = row.node_id
-            inc_edge_id = row.inc_edge_id
-            out_edge_id = row.out_edge_id
-            if not (pd.isna(inc_edge_id) and pd.isna(out_edge_id)):
-                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:
-                        self.node2init[node_id][index] = 'r'
-        # 유턴교차로
-        for _, row in self.u_turn.iterrows():
-            node_id = row.child_id
-            inc_edge_id = row.inc_edge_id
-            out_edge = row.out_edge_id
-            if not (pd.isna(inc_edge_id) and pd.isna(out_edge_id)):
-                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:
-                        self.node2init[node_id][index] = 'r'
-
         # json 파일로 저장
         with open(os.path.join(self.path_intermediates, 'node2init.json'), 'w') as file:
             json.dump(self.node2init, file)