changed the object 'angle' ; fetch the dataframe from 'angle_new.csv'

Analysis/0411_unp-left_p-right-uturn/0409_previous_method.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -11,7 +11,628 @@
     "import numpy as np\n",
     "import sys\n",
     "sys.path.append('../../Scripts')\n",
-    "from preprocess_daily import DailyPreprocessor"
+    "from preprocess_daily import DailyPreprocessor\n",
+    "from generate_signals import SignalGenerator"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "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"
+     ]
+    }
+   ],
+   "source": [
+    "self = DailyPreprocessor()\n",
+    "self.load_data()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "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. 중간산출물을 생성합니다.\n"
+     ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "이동류정보 불러오는 중: 100%|██████████| 17280/17280 [00:13<00:00, 1281.32it/s]\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "2-1. 매칭 테이블들을 생성했습니다.\n",
+      "2-2. 비보호우회전(g)을 배정했습니다.\n",
+      "2-3. 직진 및 좌회전(G)을 배정했습니다.\n",
+      "2-2. node2num_cycles.json를 저장했습니다.\n",
+      "3. 이슈사항을 저장합니다.\n"
+     ]
+    }
+   ],
+   "source": [
+    "self.main()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "이동류정보 불러오는 중: 100%|██████████| 17280/17280 [01:00<00:00, 286.13it/s]\n"
+     ]
+    }
+   ],
+   "source": [
+    "self.make_match1()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 8,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>inter_no</th>\n",
+       "      <th>phase_no</th>\n",
+       "      <th>ring_type</th>\n",
+       "      <th>move_no</th>\n",
+       "      <th>inc_dir</th>\n",
+       "      <th>out_dir</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>A</td>\n",
+       "      <td>8</td>\n",
+       "      <td>남</td>\n",
+       "      <td>북</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>B</td>\n",
+       "      <td>4</td>\n",
+       "      <td>북</td>\n",
+       "      <td>남</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>A</td>\n",
+       "      <td>7</td>\n",
+       "      <td>북</td>\n",
+       "      <td>동</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>B</td>\n",
+       "      <td>3</td>\n",
+       "      <td>남</td>\n",
+       "      <td>서</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>175</td>\n",
+       "      <td>3</td>\n",
+       "      <td>A</td>\n",
+       "      <td>6</td>\n",
+       "      <td>동</td>\n",
+       "      <td>서</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "   inter_no  phase_no ring_type  move_no inc_dir out_dir\n",
+       "0       175         1         A        8       남       북\n",
+       "1       175         1         B        4       북       남\n",
+       "2       175         2         A        7       북       동\n",
+       "3       175         2         B        3       남       서\n",
+       "4       175         3         A        6       동       서"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>inter_no</th>\n",
+       "      <th>phase_no</th>\n",
+       "      <th>ring_type</th>\n",
+       "      <th>move_no</th>\n",
+       "      <th>inc_dir</th>\n",
+       "      <th>out_dir</th>\n",
+       "      <th>inc_angle</th>\n",
+       "      <th>out_angle</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>A</td>\n",
+       "      <td>8</td>\n",
+       "      <td>남</td>\n",
+       "      <td>북</td>\n",
+       "      <td>179</td>\n",
+       "      <td>004</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>B</td>\n",
+       "      <td>4</td>\n",
+       "      <td>북</td>\n",
+       "      <td>남</td>\n",
+       "      <td>003</td>\n",
+       "      <td>176</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>A</td>\n",
+       "      <td>7</td>\n",
+       "      <td>북</td>\n",
+       "      <td>동</td>\n",
+       "      <td>001</td>\n",
+       "      <td>095</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>B</td>\n",
+       "      <td>3</td>\n",
+       "      <td>남</td>\n",
+       "      <td>서</td>\n",
+       "      <td>179</td>\n",
+       "      <td>270</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>175</td>\n",
+       "      <td>3</td>\n",
+       "      <td>A</td>\n",
+       "      <td>6</td>\n",
+       "      <td>동</td>\n",
+       "      <td>서</td>\n",
+       "      <td>090</td>\n",
+       "      <td>270</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "   inter_no  phase_no ring_type  move_no inc_dir out_dir inc_angle out_angle\n",
+       "0       175         1         A        8       남       북       179       004\n",
+       "1       175         1         B        4       북       남       003       176\n",
+       "2       175         2         A        7       북       동       001       095\n",
+       "3       175         2         B        3       남       서       179       270\n",
+       "4       175         3         A        6       동       서       090       270"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "self.make_match2()\n",
+    "self.make_match3()\n",
+    "self.make_match4()\n",
+    "display(self.match3.head())\n",
+    "display(self.match4.head())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "0     090180\n",
+       "1     270090\n",
+       "2     179270\n",
+       "3     001180\n",
+       "4     270000\n",
+       "5     090270\n",
+       "6     001090\n",
+       "7     179000\n",
+       "8     180270\n",
+       "9     359180\n",
+       "10    270356\n",
+       "11    180356\n",
+       "12    090180\n",
+       "13    268090\n",
+       "14    179270\n",
+       "15    000180\n",
+       "16    268000\n",
+       "17    090270\n",
+       "18    000090\n",
+       "19    179000\n",
+       "20    090180\n",
+       "21    270090\n",
+       "22    180270\n",
+       "23    000180\n",
+       "24    270000\n",
+       "25    090270\n",
+       "26    000090\n",
+       "27    180000\n",
+       "28    090180\n",
+       "29    270090\n",
+       "30    180270\n",
+       "31    000180\n",
+       "32    270000\n",
+       "33    090270\n",
+       "34    000090\n",
+       "35    180000\n",
+       "36    270090\n",
+       "37    090270\n",
+       "38    000180\n",
+       "39    180000\n",
+       "40    090180\n",
+       "41    270090\n",
+       "42    180270\n",
+       "43    000180\n",
+       "44    270000\n",
+       "45    090270\n",
+       "46    000090\n",
+       "47    180000\n",
+       "Name: angle_code, dtype: object"
+      ]
+     },
+     "execution_count": 7,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "self.angle_new.angle_code"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>inter_no</th>\n",
+       "      <th>phase_no</th>\n",
+       "      <th>ring_type</th>\n",
+       "      <th>move_no</th>\n",
+       "      <th>inc_dir</th>\n",
+       "      <th>out_dir</th>\n",
+       "      <th>inc_angle</th>\n",
+       "      <th>out_angle</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>A</td>\n",
+       "      <td>8</td>\n",
+       "      <td>남</td>\n",
+       "      <td>북</td>\n",
+       "      <td>179</td>\n",
+       "      <td>179</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>B</td>\n",
+       "      <td>4</td>\n",
+       "      <td>북</td>\n",
+       "      <td>남</td>\n",
+       "      <td>001</td>\n",
+       "      <td>001</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>A</td>\n",
+       "      <td>7</td>\n",
+       "      <td>북</td>\n",
+       "      <td>동</td>\n",
+       "      <td>001</td>\n",
+       "      <td>001</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>B</td>\n",
+       "      <td>3</td>\n",
+       "      <td>남</td>\n",
+       "      <td>서</td>\n",
+       "      <td>179</td>\n",
+       "      <td>179</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>175</td>\n",
+       "      <td>3</td>\n",
+       "      <td>A</td>\n",
+       "      <td>6</td>\n",
+       "      <td>동</td>\n",
+       "      <td>서</td>\n",
+       "      <td>090</td>\n",
+       "      <td>090</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "   inter_no  phase_no ring_type  move_no inc_dir out_dir 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"
+      ]
+     },
+     "execution_count": 26,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# helper dictionaries\n",
+    "im2inc_angle = dict() # a dictionary that maps (inter_no, move_no) to inc_angle\n",
+    "im2out_angle = dict() # a dictionary that maps (inter_no, move_no) to out_angle\n",
+    "for row in self.angle_new.itertuples():\n",
+    "    inter_no = row.inter_no\n",
+    "    move_no = row.move_no\n",
+    "    angle_code = row.angle_code\n",
+    "    im2inc_angle[(inter_no, move_no)] = angle_code[:3]\n",
+    "    im2out_angle[(inter_no, move_no)] = angle_code[3:]\n",
+    "for inter_no in self.inter_nos:\n",
+    "    im2inc_angle[(inter_no, 17)] = np.nan\n",
+    "    im2out_angle[(inter_no, 17)] = np.nan\n",
+    "    im2inc_angle[(inter_no, 18)] = np.nan\n",
+    "    im2out_angle[(inter_no, 18)] = np.nan\n",
+    "\n",
+    "# 진입, 진출 방위각 매칭\n",
+    "self.match4 = self.match3.copy()\n",
+    "for i, row in self.match4.iterrows():\n",
+    "    inter_no = row.inter_no\n",
+    "    move_no = row.move_no\n",
+    "    self.match4.at[i, 'inc_angle'] = im2inc_angle[(inter_no, move_no)]\n",
+    "    self.match4.at[i, 'out_angle'] = im2inc_angle[(inter_no, move_no)]\n",
+    "self.match4.head()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>inter_no</th>\n",
+       "      <th>move_no</th>\n",
+       "      <th>angle_code</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>175</td>\n",
+       "      <td>1</td>\n",
+       "      <td>090180</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>175</td>\n",
+       "      <td>2</td>\n",
+       "      <td>270090</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>175</td>\n",
+       "      <td>3</td>\n",
+       "      <td>179270</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>175</td>\n",
+       "      <td>4</td>\n",
+       "      <td>001180</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>175</td>\n",
+       "      <td>5</td>\n",
+       "      <td>270000</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "   inter_no  move_no angle_code\n",
+       "0       175        1     090180\n",
+       "1       175        2     270090\n",
+       "2       175        3     179270\n",
+       "3       175        4     001180\n",
+       "4       175        5     270000"
+      ]
+     },
+     "execution_count": 14,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "self.angle_new.head()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 32,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "array(['090180', '270090', '179270', '001180', '270000', '090270',\n",
+       "       '001090', '179000', '180270', '359180', '270356', '180356',\n",
+       "       '090180', '268090', '179270', '000180', '268000', '090270',\n",
+       "       '000090', '179000', '090180', '270090', '180270', '000180',\n",
+       "       '270000', '090270', '000090', '180000', '090180', '270090',\n",
+       "       '180270', '000180', '270000', '090270', '000090', '180000',\n",
+       "       '270090', '090270', '000180', '180000', '090180', '270090',\n",
+       "       '180270', '000180', '270000', '090270', '000090', '180000'],\n",
+       "      dtype=object)"
+      ]
+     },
+     "execution_count": 32,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 33,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "angle_codes = np.array(self.angle_new.angle_code)\n",
+    "of_length_6 = [len(code)==6 for code in angle_codes]\n",
+    "if not all(of_length_6):\n",
+    "    msg = f\"1-4-3-2. 여섯자리가 아닌 각도코드가 존재합니다.\"\n",
+    "    self.issues.append(msg)\n",
+    "angle_codes = [[code[:3],code[3:]] for code in angle_codes]\n",
+    "angle_codes = [int(item) for sublist in angle_codes for item in sublist]\n",
+    "angle_codes = [0<=code<360 for code in angle_codes]\n",
+    "if not all(angle_codes):\n",
+    "    msg = f\"1-4-3-2. 0과 359 사이의 값을 벗어나는 방위각이 존재합니다.\"\n",
+    "    self.issues.append(msg)\n"
    ]
   },
   {

Data/tables/angle_new.csv

@@ -1,49 +1,49 @@
-,inter_no,move_no,angle_code
-0,175,1,090180
-1,175,2,270090
-2,175,3,179270
-3,175,4,001180
-4,175,5,270000
-5,175,6,090270
-6,175,7,001090
-7,175,8,179000
-8,176,3,180270
-9,176,4,359180
-10,176,5,270356
-11,176,8,180356
-12,177,1,090180
-13,177,2,268090
-14,177,3,179270
-15,177,4,000180
-16,177,5,268000
-17,177,6,090270
-18,177,7,000090
-19,177,8,179000
-20,178,1,090180
-21,178,2,270090
-22,178,3,180270
-23,178,4,000180
-24,178,5,270000
-25,178,6,090270
-26,178,7,000090
-27,178,8,180000
-28,201,1,090180
-29,201,2,270090
-30,201,3,180270
-31,201,4,000180
-32,201,5,270000
-33,201,6,090270
-34,201,7,000090
-35,201,8,180000
-36,202,2,270090
-37,202,6,090270
-38,206,4,000180
-39,206,8,180000
-40,210,1,090180
-41,210,2,270090
-42,210,3,180270
-43,210,4,000180
-44,210,5,270000
-45,210,6,090270
-46,210,7,000090
-47,210,8,180000
+inter_no,move_no,angle_code
+175,1,090180
+175,2,270090
+175,3,179270
+175,4,001180
+175,5,270000
+175,6,090270
+175,7,001090
+175,8,179000
+176,3,180270
+176,4,359180
+176,5,270356
+176,8,180356
+177,1,090180
+177,2,268090
+177,3,179270
+177,4,000180
+177,5,268000
+177,6,090270
+177,7,000090
+177,8,179000
+178,1,090180
+178,2,270090
+178,3,180270
+178,4,000180
+178,5,270000
+178,6,090270
+178,7,000090
+178,8,180000
+201,1,090180
+201,2,270090
+201,3,180270
+201,4,000180
+201,5,270000
+201,6,090270
+201,7,000090
+201,8,180000
+202,2,270090
+202,6,090270
+206,4,000180
+206,8,180000
+210,1,090180
+210,2,270090
+210,3,180270
+210,4,000180
+210,5,270000
+210,6,090270
+210,7,000090
+210,8,180000

Data/tables/plan.csv

@@ -1,16 +1,16 @@
 inter_no,start_hour,start_minute,dura_A1,dura_A2,dura_A3,dura_A4,dura_A5,dura_A6,dura_A7,dura_A8,dura_B1,dura_B2,dura_B3,dura_B4,dura_B5,dura_B6,dura_B7,dura_B8,cycle,offset,yellow_A1,yellow_B1,yellow_A2,yellow_B2,yellow_A3,yellow_B3,yellow_A4,yellow_B4,yellow_A5,yellow_B5,yellow_A6,yellow_B6,yellow_A7,yellow_B7,yellow_A8,yellow_B8,red_A1,red_B1,red_A2,red_B2,red_A3,red_B3,red_A4,red_B4,red_A5,red_B5,red_A6,red_B6,red_A7,red_B7,red_A8,red_B8
-175,00,00,37,39,55,29,0,0,0,0,37,39,25,59,0,0,0,0,160,57,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-175,07,00,40,42,55,33,0,0,0,0,40,42,29,59,0,0,0,0,170,40,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-175,09,00,43,45,55,37,0,0,0,0,43,45,33,59,0,0,0,0,180,28,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-175,18,30,46,48,55,41,0,0,0,0,46,48,37,59,0,0,0,0,190,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-176,00,00,37,73,40,0,0,0,0,0,37,73,40,0,0,0,0,0,150,131,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-176,07,00,37,93,40,0,0,0,0,0,37,93,40,0,0,0,0,0,170,153,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-176,09,00,37,103,40,0,0,0,0,0,37,103,40,0,0,0,0,0,180,169,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-176,18,30,37,113,40,0,0,0,0,0,37,113,40,0,0,0,0,0,190,185,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,00,00,36,20,68,26,0,0,0,0,36,20,68,26,0,0,0,0,150,35,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,07,00,40,25,71,34,0,0,0,0,40,25,71,34,0,0,0,0,170,33,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,09,00,43,27,70,40,0,0,0,0,43,27,70,40,0,0,0,0,180,41,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,18,30,45,32,77,36,0,0,0,0,45,32,77,36,0,0,0,0,190,49,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,00,00,37,39,55,29,0,0,0,0,37,39,25,59,0,0,0,0,160,57,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,07,00,40,42,55,33,0,0,0,0,40,42,29,59,0,0,0,0,170,40,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,09,00,43,45,55,37,0,0,0,0,43,45,33,59,0,0,0,0,180,28,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,18,30,46,48,55,41,0,0,0,0,46,48,37,59,0,0,0,0,190,18,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+176,00,00,37,73,40,0,0,0,0,0,37,73,40,0,0,0,0,0,150,131,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+176,07,00,37,93,40,0,0,0,0,0,37,93,40,0,0,0,0,0,170,153,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+176,09,00,37,103,40,0,0,0,0,0,37,103,40,0,0,0,0,0,180,169,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+176,18,30,37,113,40,0,0,0,0,0,37,113,40,0,0,0,0,0,190,185,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+177,00,00,36,20,68,26,0,0,0,0,36,20,68,26,0,0,0,0,150,35,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+177,07,00,40,25,71,34,0,0,0,0,40,25,71,34,0,0,0,0,170,33,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+177,09,00,43,27,70,40,0,0,0,0,43,27,70,40,0,0,0,0,180,41,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+177,18,30,45,32,77,36,0,0,0,0,45,32,77,36,0,0,0,0,190,49,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
 178,00,00,38,39,40,23,0,0,0,0,38,39,40,23,0,0,0,0,140,50,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
 178,07,00,38,39,42,41,0,0,0,0,38,39,62,21,0,0,0,0,160,90,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
 178,09,00,38,39,43,50,0,0,0,0,38,39,71,22,0,0,0,0,170,80,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
@@ -19,15 +19,15 @@ inter_no,start_hour,start_minute,dura_A1,dura_A2,dura_A3,dura_A4,dura_A5,dura_A6
 201,07,00,30,36,18,58,18,0,0,0,30,36,18,58,18,0,0,0,160,132,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 201,09,00,33,36,25,58,18,0,0,0,33,36,25,58,18,0,0,0,170,134,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 201,18,30,36,50,18,58,18,0,0,0,36,50,18,58,18,0,0,0,180,137,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-202,00,00,39,101,0,0,0,0,0,0,39,101,0,0,0,0,0,0,140,103,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-202,07,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-202,09,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-202,18,30,48,122,0,0,0,0,0,0,48,122,0,0,0,0,0,0,170,103,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,00,00,33,35,26,26,0,0,0,0,33,35,26,26,0,0,0,0,120,10,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,07,00,44,44,26,26,0,0,0,0,44,44,26,26,0,0,0,0,140,7,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,09,00,45,53,26,26,0,0,0,0,45,53,26,26,0,0,0,0,150,17,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,18,30,46,62,26,26,0,0,0,0,46,62,26,26,0,0,0,0,160,10,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-210,00,00,43,29,56,22,0,0,0,0,24,48,56,22,0,0,0,0,150,115,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-210,07,00,43,39,65,23,0,0,0,0,24,58,65,23,0,0,0,0,170,131,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-210,09,00,43,43,70,24,0,0,0,0,28,58,70,24,0,0,0,0,180,137,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-210,18,30,43,47,75,25,0,0,0,0,24,66,75,25,0,0,0,0,190,143,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+202,00,00,39,101,0,0,0,0,0,0,39,101,0,0,0,0,0,0,140,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+202,07,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+202,09,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+202,18,30,48,122,0,0,0,0,0,0,48,122,0,0,0,0,0,0,170,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,00,00,33,35,26,26,0,0,0,0,33,35,26,26,0,0,0,0,120,10,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,07,00,44,44,26,26,0,0,0,0,44,44,26,26,0,0,0,0,140,7,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,09,00,45,53,26,26,0,0,0,0,45,53,26,26,0,0,0,0,150,17,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,18,30,46,62,26,26,0,0,0,0,46,62,26,26,0,0,0,0,160,10,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+210,00,00,43,29,56,22,0,0,0,0,24,48,56,22,0,0,0,0,150,115,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+210,07,00,43,39,65,23,0,0,0,0,24,58,65,23,0,0,0,0,170,131,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+210,09,00,43,43,70,24,0,0,0,0,28,58,70,24,0,0,0,0,180,137,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+210,18,30,43,47,75,25,0,0,0,0,24,66,75,25,0,0,0,0,190,143,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1

Data/tables/raw_tables/0409_make_sample_table.ipynb

@@ -3686,7 +3686,7 @@
     "        angle = pd.DataFrame({'inter_no':[inter_no],'move_no':[move_no], 'angle_code':[angle_code]})\n",
     "        angles.append(angle)\n",
     "angles = pd.concat(angles).reset_index(drop=True)\n",
-    "angles.to_csv('../angle_new.csv')"
+    "angles.to_csv('../angle_new.csv', index=0)"
    ]
   },
   {

Intermediates/match6.csv

@@ -1,12 +1,12 @@
 ,inter_no,node_id,phase_no,ring_type,move_no,state
-0,175,i0,1,A,8,grrrgrrrgGGGGrgrr
-1,175,i0,1,B,4,gGGrgrrrgrrrrrgrr
-2,175,i0,2,A,7,grrGgrrrgrrrrrgrr
-3,175,i0,2,B,3,grrrgrrrgrrrrGgrr
-4,175,i0,3,A,6,grrrgGGrgrrrrrgrr
-5,175,i0,3,B,1,grrrgrrGgrrrrrgrr
-6,175,i0,4,A,5,grrrgrrrgrrrrrgrG
-7,175,i0,4,B,2,grrrgrrrgrrrrrgGr
+0,175,i0,1,A,8,grrrrrrrgrrrrrrrr
+1,175,i0,1,B,4,grrrrrrrgrrrrrrrr
+2,175,i0,2,A,7,grrrrrrrgrrrrrrrr
+3,175,i0,2,B,3,grrrrrrrgrrrrrrrr
+4,175,i0,3,A,6,grrrrrrrgrrrrrrrr
+5,175,i0,3,B,1,grrrrrrrgrrrrrrrr
+6,175,i0,4,A,5,grrrrrrrgrrrrrrrr
+7,175,i0,4,B,2,grrrrrrrgrrrrrrrr
 8,175,u00,1,A,8,ggggrgggg
 9,175,u00,1,B,4,ggggrgggg
 10,175,u00,2,A,7,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,grrGGGrgrr
-17,176,i1,1,B,4,gGGrrrrgrr
-18,176,i1,2,A,8,grrGGGrgrr
-19,176,i1,2,B,3,grrrrrGgrr
-20,176,i1,3,A,5,grrrrrrgGG
-21,176,i1,3,B,18,grrrrrrgrr
-22,177,i2,1,A,8,rrgrGGG
-23,177,i2,1,B,4,GGgrrrr
-24,177,i2,2,A,7,rrgrrrr
-25,177,i2,2,B,3,rrgrrrr
-26,177,i2,3,A,17,rrgrrrr
-27,177,i2,3,B,18,rrgrrrr
-28,177,i2,4,A,5,rrgrGGG
-29,177,i2,4,B,1,rrgrrrr
+16,176,i1,1,A,8,grrgggrrrr
+17,176,i1,1,B,4,grrgggrrrr
+18,176,i1,2,A,8,grrgggrrrr
+19,176,i1,2,B,3,grrgggrrrr
+20,176,i1,3,A,5,grrgggrrrr
+21,176,i1,3,B,18,grrgggrrrr
+22,177,i2,1,A,8,ggrgrrr
+23,177,i2,1,B,4,ggrgrrr
+24,177,i2,2,A,7,ggrgrrr
+25,177,i2,2,B,3,ggrgrrr
+26,177,i2,3,A,17,ggrgrrr
+27,177,i2,3,B,18,ggrgrrr
+28,177,i2,4,A,5,ggrgrrr
+29,177,i2,4,B,1,ggrgrrr
 30,177,u20,1,A,8,ggrggg
 31,177,u20,1,B,4,ggrggg
 32,177,u20,2,A,7,ggGggg
@@ -45,14 +45,14 @@
 43,178,c30,3,B,20,rrrrrr
 44,178,c30,4,A,20,rrrrrr
 45,178,c30,4,B,20,rrrrrr
-46,178,i3,1,A,8,grrrrgrrrrgGGGrgrrrr
-47,178,i3,1,B,4,gGGGrgrrrrgrrrrgrrrr
-48,178,i3,2,A,7,grrrGgrrrrgrrrrgrrrr
-49,178,i3,2,B,3,grrrrgrrrrgrrrGgrrrr
-50,178,i3,3,A,5,grrrrgrrrrgrrrrgrrrG
-51,178,i3,3,B,2,grrrrgrrrrgrrrrgGGGr
-52,178,i3,4,A,6,grrrrgGGGrgrrrrgrrrr
-53,178,i3,4,B,1,grrrrgrrrGgrrrrgrrrr
+46,178,i3,1,A,8,grrrrrrrrrgrrrrrrrrr
+47,178,i3,1,B,4,grrrrrrrrrgrrrrrrrrr
+48,178,i3,2,A,7,grrrrrrrrrgrrrrrrrrr
+49,178,i3,2,B,3,grrrrrrrrrgrrrrrrrrr
+50,178,i3,3,A,5,grrrrrrrrrgrrrrrrrrr
+51,178,i3,3,B,2,grrrrrrrrrgrrrrrrrrr
+52,178,i3,4,A,6,grrrrrrrrrgrrrrrrrrr
+53,178,i3,4,B,1,grrrrrrrrrgrrrrrrrrr
 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,grrrrrrrgGGrgrrr
-79,201,i8,1,B,3,grrrrrrrgrrGgrrr
-80,201,i8,2,A,5,grrrrrrrgrrrgrrG
-81,201,i8,2,B,2,grrrrrrrgrrrgGGr
-82,201,i8,3,A,6,grrrGGGrgrrrgrrr
-83,201,i8,3,B,2,grrrrrrrgrrrgGGr
-84,201,i8,4,A,6,grrrGGGrgrrrgrrr
-85,201,i8,4,B,1,grrrrrrGgrrrgrrr
-86,201,i8,5,A,7,grrGrrrrgrrrgrrr
-87,201,i8,5,B,4,gGGrrrrrgrrrgrrr
-88,202,i9,1,A,6,GGrr
-89,202,i9,1,B,2,rrGG
-90,202,i9,2,A,17,rrrr
-91,202,i9,2,B,18,rrrr
-92,206,i7,1,A,8,rrrggGG
-93,206,i7,1,B,4,GGrggrr
-94,206,i7,2,A,17,rrrggrr
-95,206,i7,2,B,18,rrrggrr
-96,206,i7,3,A,8,rrrggGG
-97,206,i7,3,B,4,GGrggrr
-98,206,i7,4,A,17,rrrggrr
-99,206,i7,4,B,18,rrrggrr
-100,210,i6,1,A,6,grrrgGGGrgrrgrrr
-101,210,i6,1,B,18,grrrgrrrrgrrgrrr
-102,210,i6,2,A,5,grrrgrrrrgrrgrrG
-103,210,i6,2,B,2,grrrgrrrrgrrgGGr
-104,210,i6,3,A,7,grrGgrrrrgrrgrrr
-105,210,i6,3,B,4,gGGrgrrrrgrrgrrr
-106,210,i6,4,A,8,grrrgrrrrgGGgrrr
-107,210,i6,4,B,3,grrrgrrrrgrrgrrr
+78,201,i8,1,A,8,rrrrrrrrgrrrrrrr
+79,201,i8,1,B,3,rrrrrrrrgrrrrrrr
+80,201,i8,2,A,5,rrrrrrrrgrrrrrrr
+81,201,i8,2,B,2,rrrrrrrrgrrrrrrr
+82,201,i8,3,A,6,rrrrrrrrgrrrrrrr
+83,201,i8,3,B,2,rrrrrrrrgrrrrrrr
+84,201,i8,4,A,6,rrrrrrrrgrrrrrrr
+85,201,i8,4,B,1,rrrrrrrrgrrrrrrr
+86,201,i8,5,A,7,rrrrrrrrgrrrrrrr
+87,201,i8,5,B,4,rrrrrrrrgrrrrrrr
+88,202,i9,1,A,6,gggg
+89,202,i9,1,B,2,gggg
+90,202,i9,2,A,17,gggg
+91,202,i9,2,B,18,gggg
+92,206,i7,1,A,8,ggrggrr
+93,206,i7,1,B,4,ggrggrr
+94,206,i7,2,A,17,ggrggrr
+95,206,i7,2,B,18,ggrggrr
+96,206,i7,3,A,8,ggrggrr
+97,206,i7,3,B,4,ggrggrr
+98,206,i7,4,A,17,ggrggrr
+99,206,i7,4,B,18,ggrggrr
+100,210,i6,1,A,6,rrrrrrrrrrrrgrrr
+101,210,i6,1,B,18,rrrrrrrrrrrrgrrr
+102,210,i6,2,A,5,rrrrrrrrrrrrgrrr
+103,210,i6,2,B,2,rrrrrrrrrrrrgrrr
+104,210,i6,3,A,7,rrrrrrrrrrrrgrrr
+105,210,i6,3,B,4,rrrrrrrrrrrrgrrr
+106,210,i6,4,A,8,rrrrrrrrrrrrgrrr
+107,210,i6,4,B,3,rrrrrrrrrrrrgrrr
 108,210,u60,1,A,6,ggggggggr
 109,210,u60,1,B,18,ggggggggr
 110,210,u60,2,A,5,ggggggggG

Intermediates/matching.csv

@@ -1,77 +1,77 @@
 ,inter_no,node_id,move_no,state
-0,175,i0,1,grrrgrrGgrrrrrgrr
-1,175,i0,2,grrrgrrrgrrrrrgGr
-2,175,i0,3,grrrgrrrgrrrrGgrr
-3,175,i0,4,gGGrgrrrgrrrrrgrr
-4,175,i0,5,grrrgrrrgrrrrrgrG
-5,175,i0,6,grrrgGGrgrrrrrgrr
-6,175,i0,7,grrGgrrrgrrrrrgrr
-7,175,i0,8,grrrgrrrgGGGGrgrr
-8,175,i0,21,grrrgrrrgrrrrrgrr
-9,175,i0,21,grrrgrrrgrrrrrgrr
-10,175,i0,21,grrrgrrrgrrrrrgrr
-11,175,i0,21,grrrgrrrgrrrrrgrr
+0,175,i0,1,grrrGrrrgrrrrrrrr
+1,175,i0,2,grrrrrrrgrrrrrrrG
+2,175,i0,3,grrrrrrrgrrrrrrrr
+3,175,i0,4,grrrrrrrgrrrrrrrr
+4,175,i0,5,grrrrrrrgrrrrrGrr
+5,175,i0,6,grrrrrrGgrrrrrrrr
+6,175,i0,7,grrrrrrrgrrrrrrrr
+7,175,i0,8,grrrrrrrgrrrrrrrr
+8,175,i0,21,grrrrrrrgrrrrrrrr
+9,175,i0,21,grrrrrrrgrrrrrrrr
+10,175,i0,21,grrrrrrrgrrrrrrrr
+11,175,i0,21,grrrrrrrgrrrrrrrr
 12,175,u00,7,ggggGgggg
-13,176,i1,3,grrrrrGgrr
-14,176,i1,4,gGGrrrrgrr
-15,176,i1,5,grrrrrrgGG
-16,176,i1,8,grrGGGrgrr
-17,176,i1,21,grrrrrrgrr
-18,176,i1,21,grrrrrrgrr
-19,177,i2,1,rrgrrrr
-20,177,i2,2,rrgGrrr
-21,177,i2,3,rrgrrrr
-22,177,i2,4,GGgrrrr
-23,177,i2,5,rrgrGGG
-24,177,i2,6,rrgrrrr
-25,177,i2,7,rrgrrrr
-26,177,i2,8,rrgrGGG
-27,177,i2,21,rrgrrrr
-28,177,i2,21,rrgrrrr
-29,177,i2,21,rrgrrrr
-30,177,i2,21,rrgrrrr
+13,176,i1,3,grrgggrrrr
+14,176,i1,4,grrgggrrrr
+15,176,i1,5,grrgggrGrr
+16,176,i1,8,grrgggrrrr
+17,176,i1,21,grrgggrrrr
+18,176,i1,21,grrgggrrrr
+19,177,i2,1,ggGgrrr
+20,177,i2,2,ggrgGGG
+21,177,i2,3,ggrgrrr
+22,177,i2,4,ggrgrrr
+23,177,i2,5,ggrgrrr
+24,177,i2,6,ggrgrrr
+25,177,i2,7,ggrgrrr
+26,177,i2,8,ggrgrrr
+27,177,i2,21,ggrgrrr
+28,177,i2,21,ggrgrrr
+29,177,i2,21,ggrgrrr
+30,177,i2,21,ggrgrrr
 31,177,u20,7,ggGggg
-32,178,i3,1,grrrrgrrrGgrrrrgrrrr
-33,178,i3,2,grrrrgrrrrgrrrrgGGGr
-34,178,i3,3,grrrrgrrrrgrrrGgrrrr
-35,178,i3,4,gGGGrgrrrrgrrrrgrrrr
-36,178,i3,5,grrrrgrrrrgrrrrgrrrG
-37,178,i3,6,grrrrgGGGrgrrrrgrrrr
-38,178,i3,7,grrrGgrrrrgrrrrgrrrr
-39,178,i3,8,grrrrgrrrrgGGGrgrrrr
-40,178,i3,21,grrrrgrrrrgrrrrgrrrr
-41,178,i3,21,grrrrgrrrrgrrrrgrrrr
-42,178,i3,21,grrrrgrrrrgrrrrgrrrr
-43,178,i3,21,grrrrgrrrrgrrrrgrrrr
+32,178,i3,1,grrrrGrrrrgrrrrrrrrr
+33,178,i3,2,grrrrrrrrrgrrrrrrrrG
+34,178,i3,3,grrrrrrrrrgrrrrrrrrr
+35,178,i3,4,grrrrrrrrrgrrrrrrrrr
+36,178,i3,5,grrrrrrrrrgrrrrGrrrr
+37,178,i3,6,grrrrrrrrGgrrrrrrrrr
+38,178,i3,7,grrrrrrrrrgrrrrrrrrr
+39,178,i3,8,grrrrrrrrrgrrrrrrrrr
+40,178,i3,21,grrrrrrrrrgrrrrrrrrr
+41,178,i3,21,grrrrrrrrrgrrrrrrrrr
+42,178,i3,21,grrrrrrrrrgrrrrrrrrr
+43,178,i3,21,grrrrrrrrrgrrrrrrrrr
 44,178,u30,6,ggggGggg
 45,178,u31,8,ggggGggg
 46,178,u32,4,gggggggG
-47,201,i8,1,grrrrrrGgrrrgrrr
-48,201,i8,2,grrrrrrrgrrrgGGr
-49,201,i8,3,grrrrrrrgrrGgrrr
-50,201,i8,4,gGGrrrrrgrrrgrrr
-51,201,i8,5,grrrrrrrgrrrgrrG
-52,201,i8,6,grrrGGGrgrrrgrrr
-53,201,i8,7,grrGrrrrgrrrgrrr
-54,201,i8,8,grrrrrrrgGGrgrrr
-55,201,i8,21,grrrrrrrgrrrgrrr
-56,201,i8,21,grrrrrrrgrrrgrrr
-57,201,i8,21,grrrrrrrgrrrgrrr
-58,201,i8,21,grrrrrrrgrrrgrrr
-59,202,i9,2,rrGG
-60,202,i9,6,GGrr
-61,206,i7,4,GGrggrr
-62,206,i7,8,rrrggGG
-63,210,i6,1,grrrgrrrGgrrgrrr
-64,210,i6,2,grrrgrrrrgrrgGGr
-65,210,i6,3,grrrgrrrrgrrgrrr
-66,210,i6,4,gGGrgrrrrgrrgrrr
-67,210,i6,5,grrrgrrrrgrrgrrG
-68,210,i6,6,grrrgGGGrgrrgrrr
-69,210,i6,7,grrGgrrrrgrrgrrr
-70,210,i6,8,grrrgrrrrgGGgrrr
-71,210,i6,21,grrrgrrrrgrrgrrr
-72,210,i6,21,grrrgrrrrgrrgrrr
-73,210,i6,21,grrrgrrrrgrrgrrr
-74,210,i6,21,grrrgrrrrgrrgrrr
+47,201,i8,1,rrrrrrrrgrrrrrrr
+48,201,i8,2,rrrrrrrrgrrrrrrr
+49,201,i8,3,rrrrrrrrgrrrrrrr
+50,201,i8,4,rrrGrrrrgrrrrrrr
+51,201,i8,5,rrrrrrrrgrrrGrrr
+52,201,i8,6,rrrrrrrGgrrrrrrr
+53,201,i8,7,Grrrrrrrgrrrrrrr
+54,201,i8,8,rrrrrrrrgrrrrrrr
+55,201,i8,21,rrrrrrrrgrrrrrrr
+56,201,i8,21,rrrrrrrrgrrrrrrr
+57,201,i8,21,rrrrrrrrgrrrrrrr
+58,201,i8,21,rrrrrrrrgrrrrrrr
+59,202,i9,2,gggg
+60,202,i9,6,gggg
+61,206,i7,4,ggrggrr
+62,206,i7,8,ggrggrr
+63,210,i6,1,rrrrGrrrrrrrgrrr
+64,210,i6,2,rrrrrrrrrrrrgrrr
+65,210,i6,3,rrrrrrrrrGrrgrrr
+66,210,i6,4,rrrrrrrrrrrrgrrr
+67,210,i6,5,rrrrrrrrrrrrgrrr
+68,210,i6,6,rrrrrrrrrrrrgrrr
+69,210,i6,7,Grrrrrrrrrrrgrrr
+70,210,i6,8,rrrrrrrrrrrrgrrr
+71,210,i6,21,rrrrrrrrrrrrgrrr
+72,210,i6,21,rrrrrrrrrrrrgrrr
+73,210,i6,21,rrrrrrrrrrrrgrrr
+74,210,i6,21,rrrrrrrrrrrrgrrr
 75,210,u60,5,ggggggggG

Intermediates/node2init.json

@@ -1 +1 @@
-{"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"]}
+{"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"]}

Results/sn_1704417000.add.xml

@@ -1,5 +1,5 @@
 <additional>
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-130">
+    <tlLogic id="c30" type="static" programID="c30_prog" offset="-170">
       <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
@@ -44,436 +44,456 @@
       <phase duration="1" state="rrrrrr"/>
       <phase duration="38" state="rrrrrr"/>
     </tlLogic>
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-110">
-      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="5" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="31" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="37" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="5" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="31" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="37" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="5" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="22" state="grrrgGGygrrrrrgrr"/>
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-99">
+      <phase duration="39" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
+      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
+      <phase duration="4" state="grrryrrGgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="17" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="4" state="grrrrrrygrrrrrrrG"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrG"/>
+      <phase duration="32" state="grrrrrrrgrrrrrGrG"/>
+      <phase duration="4" state="grrrrrrrgrrrrryry"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
+      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
+      <phase duration="4" state="grrryrrGgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="17" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="4" state="grrrrrrygrrrrrrrG"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrG"/>
+      <phase duration="32" state="grrrrrrrgrrrrrGrG"/>
+      <phase duration="4" state="grrrrrrrgrrrrryry"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
+      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
+      <phase duration="22" state="grrryrrGgrrrrrrrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-180">
-      <phase duration="33" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
-      <phase duration="4" state="grryyyygrr"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
-      <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
-      <phase duration="4" state="grryyyygrr"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
-      <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
-      <phase duration="4" state="grryyyygrr"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
-      <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-30">
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="36" state="grrgggrGrr"/>
+      <phase duration="4" state="grrgggryrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="36" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggryrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="36" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggryrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
     </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-30">
-      <phase duration="39" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="35" state="rrgrGGG"/>
-      <phase duration="4" state="rrgrGGG"/>
-      <phase duration="1" state="rrgrGGG"/>
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="35" state="rrgrGGG"/>
-      <phase duration="4" state="rrgrGGG"/>
-      <phase duration="1" state="rrgrGGG"/>
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="35" state="rrgrGGG"/>
-      <phase duration="4" state="rrgrGGG"/>
-      <phase duration="1" state="rrgrGGG"/>
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="4" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="22" state="rrgrrrr"/>
-      <phase duration="4" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
-      <phase duration="65" state="rrgrrrr"/>
+    <tlLogic id="i2" type="static" programID="i2_prog" offset="-120">
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="63" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="33" state="ggGgrrr"/>
+      <phase duration="5" state="ggygrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="34" state="ggGgrrr"/>
+      <phase duration="5" state="ggygrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="34" state="ggGgrrr"/>
+      <phase duration="5" state="ggygrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-130">
-      <phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
-      <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
-      <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
-      <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
-      <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
-      <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
-      <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-170">
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
+      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
+      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
+      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
+      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
+      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
+      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
     </tlLogic>
-    <tlLogic id="i6" type="static" programID="i6_prog" offset="-140">
-      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
-      <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
-      <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
-      <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
-      <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
-      <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
-      <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
-      <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
+    <tlLogic id="i6" type="static" programID="i6_prog" offset="-70">
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-110">
-      <phase duration="41" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-60">
+      <phase duration="40" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="39" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="39" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="39" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-60">
-      <phase duration="29" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
-      <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
-      <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
-      <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
-      <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
-      <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
-      <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-10">
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="28" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="17" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="49" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="11" state="GrrGrrrrgrrrrrrr"/>
+      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
+      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
+      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
     </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-130">
-      <phase duration="42" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
+    <tlLogic id="i9" type="static" programID="i9_prog" offset="-50">
+      <phase duration="42" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="109" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="41" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="109" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="41" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="109" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="41" state="gggg"/>
     </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-110">
-      <phase duration="38" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+    <tlLogic id="u00" type="static" programID="u00_prog" offset="-99">
+      <phase duration="39" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="39" state="ggggGgggg"/>
-      <phase duration="5" state="ggggygggg"/>
+      <phase duration="40" state="ggggGgggg"/>
+      <phase duration="4" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="27" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="28" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="16" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="17" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="31" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="32" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="37" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="38" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="39" state="ggggGgggg"/>
-      <phase duration="5" state="ggggygggg"/>
+      <phase duration="40" state="ggggGgggg"/>
+      <phase duration="4" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="27" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="28" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="16" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="17" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="31" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="32" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="37" state="ggggrgggg"/>
-      <phase duration="5" state="ggggrgggg"/>
+      <phase duration="38" state="ggggrgggg"/>
+      <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="39" state="ggggGgggg"/>
-      <phase duration="5" state="ggggygggg"/>
+      <phase duration="40" state="ggggGgggg"/>
+      <phase duration="4" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="27" state="ggggrgggg"/>
+      <phase duration="28" state="ggggrgggg"/>
       <phase duration="22" state="ggggrgggg"/>
     </tlLogic>
-    <tlLogic id="u20" type="static" programID="u20_prog" offset="-30">
-      <phase duration="39" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+    <tlLogic id="u20" type="static" programID="u20_prog" offset="-120">
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="63" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="33" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="34" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="34" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
     </tlLogic>
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-130">
+    <tlLogic id="u30" type="static" programID="u30_prog" offset="-170">
       <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
@@ -518,7 +538,7 @@
       <phase duration="1" state="ggggrggg"/>
       <phase duration="38" state="ggggrggg"/>
     </tlLogic>
-    <tlLogic id="u31" type="static" programID="u31_prog" offset="-130">
+    <tlLogic id="u31" type="static" programID="u31_prog" offset="-170">
       <phase duration="34" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
@@ -563,7 +583,7 @@
       <phase duration="1" state="ggggrggg"/>
       <phase duration="38" state="ggggrggg"/>
     </tlLogic>
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-130">
+    <tlLogic id="u32" type="static" programID="u32_prog" offset="-170">
       <phase duration="34" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
@@ -608,7 +628,7 @@
       <phase duration="1" state="gggggggr"/>
       <phase duration="38" state="gggggggr"/>
     </tlLogic>
-    <tlLogic id="u60" type="static" programID="u60_prog" offset="-140">
+    <tlLogic id="u60" type="static" programID="u60_prog" offset="-70">
       <phase duration="1" state="ggggggggr"/>
       <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>

Results/sn_1704418500.add.xml

@@ -1,423 +1,415 @@
 <additional>
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-150">
-      <phase duration="33" state="rrrrrr"/>
+    <tlLogic id="c30" type="static" programID="c30_prog" offset="-140">
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
       <phase duration="33" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
       <phase duration="33" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
       <phase duration="33" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
     </tlLogic>
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-40">
-      <phase duration="38" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="40" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="28" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="17" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="32" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="38" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="40" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="28" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="17" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="32" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="38" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="40" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="28" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="17" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="4" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="1" state="gGGGgGGGgGGGGGgGG"/>
-      <phase duration="32" state="gGGGgGGGgGGGGGgGG"/>
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-160">
+      <phase duration="39" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
+      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
+      <phase duration="4" state="grrryrrGgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="17" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="4" state="grrrrrrygrrrrrrrG"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrG"/>
+      <phase duration="32" state="grrrrrrrgrrrrrGrG"/>
+      <phase duration="4" state="grrrrrrrgrrrrryry"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
+      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
+      <phase duration="4" state="grrryrrGgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="17" state="grrrrrrGgrrrrrrrG"/>
+      <phase duration="4" state="grrrrrrygrrrrrrrG"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrG"/>
+      <phase duration="32" state="grrrrrrrgrrrrrGrG"/>
+      <phase duration="4" state="grrrrrrrgrrrrryry"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="40" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrgrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrGgrrrrrrrr"/>
+      <phase duration="28" state="grrrGrrGgrrrrrrrr"/>
+      <phase duration="22" state="grrryrrGgrrrrrrrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-40">
-      <phase duration="32" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="98" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="35" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="32" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="98" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="35" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="32" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="98" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="35" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="32" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="98" state="gGGGGGGgGG"/>
-      <phase duration="4" state="gGGGGGGgGG"/>
-      <phase duration="1" state="gGGGGGGgGG"/>
-      <phase duration="35" state="gGGGGGGgGG"/>
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-90">
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="36" state="grrgggrGrr"/>
+      <phase duration="4" state="grrgggryrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="36" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggryrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrGrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="36" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggryrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="33" state="grrgggrrrr"/>
+      <phase duration="4" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="0" state="grrgggrrrr"/>
+      <phase duration="99" state="grrgggrrrr"/>
     </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-131">
-      <phase duration="38" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="22" state="GGggGGG"/>
-      <phase duration="4" state="yyggyyy"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="64" state="rrggrrr"/>
-      <phase duration="4" state="rrggrrr"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="35" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="38" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="22" state="GGggGGG"/>
-      <phase duration="4" state="yyggyyy"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="66" state="rrggrrr"/>
-      <phase duration="4" state="rrggrrr"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="35" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="38" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="22" state="GGggGGG"/>
-      <phase duration="4" state="yyggyyy"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="65" state="rrggrrr"/>
-      <phase duration="4" state="rrggrrr"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="35" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="38" state="GGggGGG"/>
-      <phase duration="4" state="GGggGGG"/>
-      <phase duration="1" state="GGggGGG"/>
-      <phase duration="22" state="GGggGGG"/>
-      <phase duration="4" state="yyggyyy"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="65" state="rrggrrr"/>
-      <phase duration="4" state="rrggrrr"/>
-      <phase duration="1" state="rrggrrr"/>
-      <phase duration="35" state="GGggGGG"/>
+    <tlLogic id="i2" type="static" programID="i2_prog" offset="-180">
+      <phase duration="38" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="34" state="ggGgrrr"/>
+      <phase duration="5" state="ggygrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="34" state="ggGgrrr"/>
+      <phase duration="5" state="ggygrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="34" state="ggGgrrr"/>
+      <phase duration="5" state="ggygrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="37" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="21" state="ggrgrrr"/>
+      <phase duration="5" state="ggrgrrr"/>
+      <phase duration="1" state="ggrgrrr"/>
+      <phase duration="64" state="ggrgrrr"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-150">
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="1" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="34" state="gGGGGgrrrrgGGGGgrrrr"/>
-      <phase duration="4" state="gGGGGgrrrrgGGGGgrrrr"/>
-      <phase duration="1" state="gGGGGgrrrrgGGGGgrrrr"/>
-      <phase duration="38" state="gGGGGgrrrrgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgrrrrgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgrrrrgGGGGgGGGG"/>
-      <phase duration="17" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="33" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="34" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="38" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="17" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="33" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="34" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="38" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="17" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="33" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="34" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="38" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="4" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="1" state="gGGGGgGGGGgGGGGgGGGG"/>
-      <phase duration="17" state="gGGGGgGGGGgGGGGgGGGG"/>
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-140">
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
+      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
+      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
+      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
+      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
+      <phase duration="4" state="grrrrrrrrrgrrrryrrry"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="17" state="grrrrGrrrGgrrrrrrrrr"/>
+      <phase duration="4" state="grrrryrrrygrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="33" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="34" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="4" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="1" state="grrrrrrrrrgrrrrrrrrr"/>
+      <phase duration="38" state="grrrrrrrrrgrrrrGrrrG"/>
     </tlLogic>
-    <tlLogic id="i6" type="static" programID="i6_prog" offset="-159">
-      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="4" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="38" state="grrrgGGGrgrrgGGG"/>
-      <phase duration="4" state="grrrgGGGrgrrgGGG"/>
-      <phase duration="1" state="grrrgGGGrgrrgGGG"/>
-      <phase duration="65" state="gGGGgGGGrgrrgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgrrgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgrrgGGG"/>
-      <phase duration="19" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="23" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="10" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="38" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="65" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="19" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="23" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="10" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="38" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="65" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="19" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="23" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="10" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="38" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="65" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="4" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="1" state="gGGGgGGGrgGGgGGG"/>
-      <phase duration="19" state="gGGGgGGGrgGGgGGG"/>
+    <tlLogic id="i6" type="static" programID="i6_prog" offset="-130">
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="yrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="19" state="rrrrrrrrrGrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrryrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="23" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="10" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="38" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="4" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="1" state="rrrrrrrrrrrrgrrr"/>
+      <phase duration="65" state="Grrrrrrrrrrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-90">
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-60">
+      <phase duration="40" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="39" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="39" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="39" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="47" state="ggrggrr"/>
+      <phase duration="5" state="ggrggrr"/>
+      <phase duration="1" state="ggrggrr"/>
+      <phase duration="20" state="ggrggrr"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-110">
-      <phase duration="28" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="31" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="20" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="53" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="13" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="28" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="31" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="20" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="53" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="13" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="28" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="31" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="20" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="53" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="13" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="28" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="31" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="20" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="53" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="4" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="1" state="gGGGGGGGgGGGgGGG"/>
-      <phase duration="13" state="gGGGGGGGgGGGgGGG"/>
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-151">
+      <phase duration="29" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
+      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
+      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrygrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="12" state="GrrGrrrrgrrrrrrr"/>
+      <phase duration="4" state="yrryrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="27" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="30" state="rrrrrrrrgrrrGrrr"/>
+      <phase duration="4" state="rrrrrrrrgrrryrrr"/>
+      <phase duration="2" state="rrrrrrrrgrrrrrrr"/>
+      <phase duration="19" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="4" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="2" state="rrrrrrrGgrrrrrrr"/>
+      <phase duration="52" state="rrrrrrrGgrrrrrrr"/>
     </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-30">
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
-      <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
+    <tlLogic id="i9" type="static" programID="i9_prog" offset="-110">
+      <phase duration="42" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="109" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="41" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="109" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="41" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="109" state="gggg"/>
+      <phase duration="4" state="gggg"/>
+      <phase duration="1" state="gggg"/>
+      <phase duration="41" state="gggg"/>
     </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-40">
-      <phase duration="38" state="ggggrgggg"/>
+    <tlLogic id="u00" type="static" programID="u00_prog" offset="-160">
+      <phase duration="39" state="ggggrgggg"/>
       <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
       <phase duration="40" state="ggggGgggg"/>
@@ -454,63 +446,55 @@
       <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="17" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
-      <phase duration="32" state="ggggrgggg"/>
+      <phase duration="22" state="ggggrgggg"/>
     </tlLogic>
-    <tlLogic id="u20" type="static" programID="u20_prog" offset="-131">
+    <tlLogic id="u20" type="static" programID="u20_prog" offset="-180">
       <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="64" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="34" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="66" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="34" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="34" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="37" state="ggrggg"/>
+      <phase duration="5" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
+      <phase duration="21" state="ggGggg"/>
+      <phase duration="5" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
+      <phase duration="64" state="ggrggg"/>
     </tlLogic>
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-150">
-      <phase duration="33" state="ggggrggg"/>
+    <tlLogic id="u30" type="static" programID="u30_prog" offset="-140">
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
       <phase duration="34" state="ggggrggg"/>
@@ -553,12 +537,9 @@
       <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"/>
     </tlLogic>
-    <tlLogic id="u31" type="static" programID="u31_prog" offset="-150">
-      <phase duration="33" state="ggggGggg"/>
+    <tlLogic id="u31" type="static" programID="u31_prog" offset="-140">
+      <phase duration="34" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
       <phase duration="34" state="ggggrggg"/>
@@ -601,12 +582,9 @@
       <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"/>
     </tlLogic>
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-150">
-      <phase duration="33" state="gggggggG"/>
+    <tlLogic id="u32" type="static" programID="u32_prog" offset="-140">
+      <phase duration="34" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
       <phase duration="34" state="gggggggr"/>
@@ -649,11 +627,9 @@
       <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"/>
     </tlLogic>
-    <tlLogic id="u60" type="static" programID="u60_prog" offset="-159">
+    <tlLogic id="u60" type="static" programID="u60_prog" offset="-130">
+      <phase duration="1" state="ggggggggr"/>
       <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
       <phase duration="1" state="ggggggggr"/>
@@ -709,8 +685,5 @@
       <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"/>
     </tlLogic>
 </additional>

Scripts/preprocess_daily.py

@@ -45,16 +45,17 @@ class DailyPreprocessor():
             'node_id':'str', 'inter_type':'str', 'parent_id':'str','child_id':'str',
             'direction':'str', 'condition':'str', 'inc_edge':'str', 'out_edge':'str',
             'end_unix':'int', 'inter_name':'str', 'inter_lat':'float', 'inter_lon':'float',
-            'group_no':'int', 'main_phase_no':'int', 'phase_no':'int','ring_type':'str'
-            }
+            'group_no':'int', 'main_phase_no':'int', 'phase_no':'int','ring_type':'str',
+            'angle_code':'str'}
         for alph in ['A', 'B']:
             for j in range(1,9):
-                loading_dtype[f'angle_{alph}{j}'] = 'str'
+                # loading_dtype[f'angle_{alph}{j}'] = 'str'
                 loading_dtype[f'dura_{alph}{j}'] = 'int'
        
         # 테이블 불러오기
         self.inter_info = pd.read_csv(os.path.join(self.path_tables, 'inter_info.csv'), dtype=loading_dtype)
-        self.angle      = pd.read_csv(os.path.join(self.path_tables, 'angle.csv'), dtype=loading_dtype)
+        # self.angle      = pd.read_csv(os.path.join(self.path_tables, 'angle.csv'), dtype=loading_dtype)
+        self.angle  = pd.read_csv(os.path.join(self.path_tables, 'angle_new.csv'), dtype=loading_dtype)
         self.plan       = pd.read_csv(os.path.join(self.path_tables, 'plan.csv'), dtype=loading_dtype)
         self.inter_node = pd.read_csv(os.path.join(self.path_tables, 'inter_node.csv'), dtype=loading_dtype)
         self.uturn      = pd.read_csv(os.path.join(self.path_tables, 'child_uturn.csv'), dtype=loading_dtype)
@@ -170,8 +171,8 @@ class DailyPreprocessor():
             self.issues.append(msg)
 
         # 1-4-3-2. 각도 코드 검사
-        angle_codes = self.angle[[f'angle_{alph}{j}' for alph in ['A', 'B'] for j in range(1,9)]].values.flatten()
-        angle_codes = [code for code in angle_codes if not pd.isna(code) and code != 'stop']
+        angle_codes = np.array(self.angle.angle_code)
+        # angle_codes = [code for code in angle_codes if not pd.isna(code) and code != 'stop']
         of_length_6 = [len(code)==6 for code in angle_codes]
         if not all(of_length_6):
             msg = f"1-4-3-2. 여섯자리가 아닌 각도코드가 존재합니다."
@@ -205,11 +206,9 @@ class DailyPreprocessor():
     # 2-1-1
     def make_match1(self):
         '''
-        신호 DB에는 매 초마다 이동류정보가 업데이트 된다. 그리고 이 이동류정보를 매 5초마다 불러와서 사용하게 된다.
-        '../Data/tables/move/'에는 5초마다의 이동류정보가 저장되어 있다.
+        모든 inter_no(교차로번호)에 대한 A, B링 현시별 이동류정보
 
-        return : 통합된 이동류정보
-        - 모든 inter_no(교차로번호)에 대한 A, B링 현시별 이동류정보
+        컬럼 : inter_no, phase_A, phas_B, move_A, move_B
 
         match1을 만드는 데 시간이 소요되므로 한 번 만들어서 저장해두고 저장해둔 것을 쓴다.
         '''
@@ -232,9 +231,9 @@ class DailyPreprocessor():
     # 2-1-2
     def make_match2(self):
         '''
-        match1을 계층화함.
-        - match1의 컬럼 : inter_no, phas_A, phas_B, move_A, move_B
-        - match2의 컬럼 : inter_no, phase_no, ring_type, move_no
+        match1을 계층화한 테이블
+
+        컬럼 : inter_no, phase_no, ring_type, move_no
         '''
         # 계층화 (inter_no, phas_A, phas_B, move_A, move_B) -> ('inter_no', 'phase_no', 'ring_type', 'move_no')
         matchA = self.match1[['inter_no', 'phas_A', 'move_A']].copy()
@@ -250,15 +249,9 @@ class DailyPreprocessor():
     # 2-1-3
     def make_match3(self):
         '''
-        각 movement들에 방향(진입방향, 진출방향)을 매칭시켜 추가함.
-        - match2의 컬럼 : inter_no, phase_no, ring_type, move_no
-        - match3의 컬럼 : inter_no, phase_no, ring_type, move_no, inc_dir, out_dir
-
-        nema : 
-        - 컬럼 : move_no, inc_dir, out_dir
-        - 모든 종류의 이동류번호에 대하여 진입방향과 진출방향을 매칭시키는 테이블
-        - 이동류번호 : 1 ~ 16, 17, 18, 21
-        - 진입, 진출방향(8방위) : 동, 서, 남, 북, 북동, 북서, 남동, 남서
+        match2의 각 이동류번호에 진입방향, 진출방향을 매칭시킨 테이블
+
+        컬럼명 : inter_no, phase_no, ring_type, move_no, inc_dir, out_dir
         '''
         # nema 정보 불러오기 및 병합
         self.match3 = pd.merge(self.match2, self.nema, how='left', on='move_no').drop_duplicates()
@@ -266,33 +259,52 @@ class DailyPreprocessor():
     # 2-1-4
     def make_match4(self):
         '''
-        방위각 정보를 매칭시켜 추가함.
-        - match3의 컬럼 : inter_no, phase_no, ring_type, move_no, inc_dir, out_dir
-        - match4의 컬럼 : inter_no, phase_no, ring_type, move_no, inc_dir, out_dir, inc_angle, out_angle
+        match3의 각 이동류번호에 진입, 진출 방위각을 매칭시킨 테이블
 
-        angle_original : 
-        - 컬럼 : inter_no, angle_Aj, angle_Bj (j : 1 ~ 8)
-        - 모든 종류의 이동류번호에 대하여 진입방향과 진출방향을 매칭시키는 테이블
-        - 이동류번호 : 1 ~ 16, 17, 18, 21
-        - 진입, 진출방향(8방위) : 동, 서, 남, 북, 북동, 북서, 남동, 남서
+        컬럼명 : inter_no, phase_no, ring_type, move_no, inc_dir, out_dir, inc_angle, out_angle
         '''
 
-        # 계층화
-        angles = []
-        for i, row in self.angle.iterrows():
-            angle_codes = row[[f'angle_{alph}{j}' for alph in ['A', 'B'] for j in range(1,9)]]
-            new = pd.DataFrame({'inter_no':[row.inter_no] * 16, 'phase_no':list(range(1, 9))*2, 'ring_type':['A'] * 8 + ['B'] * 8, 'angle_code':angle_codes.to_list()})
-            angles.append(new)
-        angles = pd.concat(angles)
-        angles = angles.dropna().reset_index(drop=True)
-
-        # 병합
-        six_chars = angles.angle_code.apply(lambda x:len(x)==6)
-        angles.loc[six_chars,'inc_angle'] = angles.angle_code.apply(lambda x:x[:3])
-        angles.loc[six_chars,'out_angle'] = angles.angle_code.apply(lambda x:x[3:])
-        angles = angles.drop('angle_code', axis=1)
-        self.match4 = pd.merge(self.match3, angles, how='left', left_on=['inter_no', 'phase_no', 'ring_type'],
-                        right_on=['inter_no', 'phase_no', 'ring_type']).drop_duplicates()
+        # # 계층화
+        # angles = []
+        # for i, row in self.angle.iterrows():
+        #     angle_codes = row[[f'angle_{alph}{j}' for alph in ['A', 'B'] for j in range(1,9)]]
+        #     new = pd.DataFrame({'inter_no':[row.inter_no] * 16, 'phase_no':list(range(1, 9))*2,
+        #                         'ring_type':['A'] * 8 + ['B'] * 8, 'angle_code':angle_codes.to_list()})
+        #     angles.append(new)
+        # angles = pd.concat(angles)
+        # angles = angles.dropna().reset_index(drop=True)
+
+        # # 병합
+        # six_chars = angles.angle_code.apply(lambda x:len(x)==6)
+        # angles.loc[six_chars,'inc_angle'] = angles.angle_code.apply(lambda x:x[:3])
+        # angles.loc[six_chars,'out_angle'] = angles.angle_code.apply(lambda x:x[3:])
+        # angles = angles.drop('angle_code', axis=1)
+        # self.match4 = pd.merge(self.match3, angles, how='left', left_on=['inter_no', 'phase_no', 'ring_type'],
+        #                 right_on=['inter_no', 'phase_no', 'ring_type']).drop_duplicates()
+        
+        # helper dictionaries
+        im2inc_angle = dict() # a dictionary that maps (inter_no, move_no) to inc_angle
+        im2out_angle = dict() # a dictionary that maps (inter_no, move_no) to out_angle
+        for row in self.angle.itertuples():
+            inter_no = row.inter_no
+            move_no = row.move_no
+            angle_code = row.angle_code
+            im2inc_angle[(inter_no, move_no)] = angle_code[:3]
+            im2out_angle[(inter_no, move_no)] = angle_code[3:]
+        for inter_no in self.inter_nos:
+            im2inc_angle[(inter_no, 17)] = np.nan
+            im2out_angle[(inter_no, 17)] = np.nan
+            im2inc_angle[(inter_no, 18)] = np.nan
+            im2out_angle[(inter_no, 18)] = np.nan
+
+        # 진입, 진출 방위각 매칭
+        self.match4 = self.match3.copy()
+        for i, row in self.match4.iterrows():
+            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.head()
 
     # 2-1-5
     def make_match5(self):