sj.kim
/
siggen
1
1
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

deleted uid2uindex related thing. start making p2PLindices in 2-1-5

master
김선중 1 year ago
parent
f2550343b6
commit
00d7c6b7b8
4 changed files with 1209 additions and 448 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +802
    -14
      Analysis/0411_unp-left_p-right-uturn/0416_initialize_state.ipynb
  2. +401
    -424
      Results/sn_1704419100.add.xml
  3. BIN
      Scripts/__pycache__/preprocess_daily.cpython-38.pyc
  4. +6
    -10
      Scripts/preprocess_daily.py

+ 802
- 14
Analysis/0411_unp-left_p-right-uturn/0416_initialize_state.ipynb View File

@ -29,20 +29,808 @@
"1-2. 테이블들이 로드되었습니다.\n",
"1-3. 네트워크의 모든 clean state requirement들을 체크했습니다.\n",
"1-4. 테이블들의 무결성 검사를 완료했습니다.\n",
"1-5. 주요 객체 (리스트, 딕셔너리)들을 저장했습니다.\n",
"2-1. 매칭 테이블들을 생성했습니다.\n"
"1-5. 주요 객체 (리스트, 딕셔너리)들을 저장했습니다.\n"
]
}
],
"source": [
"self = DailyPreprocessor()\n",
"self.load_data() # 1. 데이터 불러오기\n",
"self.get_matches() # 2-1 매칭테이블 생성"
"self = DailyPreprocessor()\n",
"self.load_data() # 1. 데이터 불러오기\n",
"self.make_match1() # 2-1-1\n",
"self.make_match2() # 2-1-2\n",
"self.make_match3() # 2-1-3\n",
"self.make_match4() # 2-1-4\n",
"self.make_match5() # 2-1-5\n",
"self.make_match6() # 2-1-6"
]
},
{
"cell_type": "code",
"execution_count": 5,
"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_dire</th>\n",
" <th>out_dire</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>000</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>180</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>090</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",
" <tr>\n",
" <th>5</th>\n",
" <td>175</td>\n",
" <td>3</td>\n",
" <td>B</td>\n",
" <td>1</td>\n",
" <td>동</td>\n",
" <td>남</td>\n",
" <td>090</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>6</th>\n",
" <td>175</td>\n",
" <td>4</td>\n",
" <td>A</td>\n",
" <td>5</td>\n",
" <td>서</td>\n",
" <td>북</td>\n",
" <td>270</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
" <td>175</td>\n",
" <td>4</td>\n",
" <td>B</td>\n",
" <td>2</td>\n",
" <td>서</td>\n",
" <td>동</td>\n",
" <td>270</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>8</th>\n",
" <td>176</td>\n",
" <td>1</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>356</td>\n",
" </tr>\n",
" <tr>\n",
" <th>9</th>\n",
" <td>176</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>359</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
" <td>176</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>356</td>\n",
" </tr>\n",
" <tr>\n",
" <th>11</th>\n",
" <td>176</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>3</td>\n",
" <td>남</td>\n",
" <td>서</td>\n",
" <td>180</td>\n",
" <td>270</td>\n",
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
" <td>176</td>\n",
" <td>3</td>\n",
" <td>A</td>\n",
" <td>5</td>\n",
" <td>서</td>\n",
" <td>북</td>\n",
" <td>270</td>\n",
" <td>356</td>\n",
" </tr>\n",
" <tr>\n",
" <th>13</th>\n",
" <td>176</td>\n",
" <td>3</td>\n",
" <td>B</td>\n",
" <td>18</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>14</th>\n",
" <td>177</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>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>15</th>\n",
" <td>177</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>16</th>\n",
" <td>177</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>17</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>17</th>\n",
" <td>177</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>18</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>18</th>\n",
" <td>178</td>\n",
" <td>1</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>19</th>\n",
" <td>178</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>20</th>\n",
" <td>178</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>7</td>\n",
" <td>북</td>\n",
" <td>동</td>\n",
" <td>000</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>21</th>\n",
" <td>178</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>3</td>\n",
" <td>남</td>\n",
" <td>서</td>\n",
" <td>180</td>\n",
" <td>270</td>\n",
" </tr>\n",
" <tr>\n",
" <th>22</th>\n",
" <td>178</td>\n",
" <td>3</td>\n",
" <td>A</td>\n",
" <td>5</td>\n",
" <td>서</td>\n",
" <td>북</td>\n",
" <td>270</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>23</th>\n",
" <td>178</td>\n",
" <td>3</td>\n",
" <td>B</td>\n",
" <td>2</td>\n",
" <td>서</td>\n",
" <td>동</td>\n",
" <td>270</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>24</th>\n",
" <td>178</td>\n",
" <td>4</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",
" <tr>\n",
" <th>25</th>\n",
" <td>178</td>\n",
" <td>4</td>\n",
" <td>B</td>\n",
" <td>1</td>\n",
" <td>동</td>\n",
" <td>남</td>\n",
" <td>090</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>26</th>\n",
" <td>201</td>\n",
" <td>1</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>27</th>\n",
" <td>201</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>3</td>\n",
" <td>남</td>\n",
" <td>서</td>\n",
" <td>180</td>\n",
" <td>270</td>\n",
" </tr>\n",
" <tr>\n",
" <th>28</th>\n",
" <td>201</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>5</td>\n",
" <td>서</td>\n",
" <td>북</td>\n",
" <td>270</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>29</th>\n",
" <td>201</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>2</td>\n",
" <td>서</td>\n",
" <td>동</td>\n",
" <td>270</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>30</th>\n",
" <td>201</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",
" <tr>\n",
" <th>31</th>\n",
" <td>201</td>\n",
" <td>3</td>\n",
" <td>B</td>\n",
" <td>2</td>\n",
" <td>서</td>\n",
" <td>동</td>\n",
" <td>270</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>32</th>\n",
" <td>201</td>\n",
" <td>4</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",
" <tr>\n",
" <th>33</th>\n",
" <td>201</td>\n",
" <td>4</td>\n",
" <td>B</td>\n",
" <td>1</td>\n",
" <td>동</td>\n",
" <td>남</td>\n",
" <td>090</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>34</th>\n",
" <td>201</td>\n",
" <td>5</td>\n",
" <td>A</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>35</th>\n",
" <td>201</td>\n",
" <td>5</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>36</th>\n",
" <td>202</td>\n",
" <td>1</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",
" <tr>\n",
" <th>37</th>\n",
" <td>202</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>2</td>\n",
" <td>서</td>\n",
" <td>동</td>\n",
" <td>270</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>38</th>\n",
" <td>202</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>17</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>39</th>\n",
" <td>202</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>18</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>40</th>\n",
" <td>206</td>\n",
" <td>1</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>41</th>\n",
" <td>206</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>42</th>\n",
" <td>206</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>17</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>43</th>\n",
" <td>206</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>18</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>44</th>\n",
" <td>206</td>\n",
" <td>3</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>45</th>\n",
" <td>206</td>\n",
" <td>3</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>46</th>\n",
" <td>206</td>\n",
" <td>4</td>\n",
" <td>A</td>\n",
" <td>17</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>47</th>\n",
" <td>206</td>\n",
" <td>4</td>\n",
" <td>B</td>\n",
" <td>18</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>48</th>\n",
" <td>210</td>\n",
" <td>1</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",
" <tr>\n",
" <th>49</th>\n",
" <td>210</td>\n",
" <td>1</td>\n",
" <td>B</td>\n",
" <td>18</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" <td>NaN</td>\n",
" </tr>\n",
" <tr>\n",
" <th>50</th>\n",
" <td>210</td>\n",
" <td>2</td>\n",
" <td>A</td>\n",
" <td>5</td>\n",
" <td>서</td>\n",
" <td>북</td>\n",
" <td>270</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>51</th>\n",
" <td>210</td>\n",
" <td>2</td>\n",
" <td>B</td>\n",
" <td>2</td>\n",
" <td>서</td>\n",
" <td>동</td>\n",
" <td>270</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>52</th>\n",
" <td>210</td>\n",
" <td>3</td>\n",
" <td>A</td>\n",
" <td>7</td>\n",
" <td>북</td>\n",
" <td>동</td>\n",
" <td>000</td>\n",
" <td>090</td>\n",
" </tr>\n",
" <tr>\n",
" <th>53</th>\n",
" <td>210</td>\n",
" <td>3</td>\n",
" <td>B</td>\n",
" <td>4</td>\n",
" <td>북</td>\n",
" <td>남</td>\n",
" <td>000</td>\n",
" <td>180</td>\n",
" </tr>\n",
" <tr>\n",
" <th>54</th>\n",
" <td>210</td>\n",
" <td>4</td>\n",
" <td>A</td>\n",
" <td>8</td>\n",
" <td>남</td>\n",
" <td>북</td>\n",
" <td>180</td>\n",
" <td>000</td>\n",
" </tr>\n",
" <tr>\n",
" <th>55</th>\n",
" <td>210</td>\n",
" <td>4</td>\n",
" <td>B</td>\n",
" <td>3</td>\n",
" <td>남</td>\n",
" <td>서</td>\n",
" <td>180</td>\n",
" <td>270</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" inter_no phase_no ring_type move_no inc_dire out_dire inc_angle \\\n",
"0 175 1 A 8 남 북 179 \n",
"1 175 1 B 4 북 남 001 \n",
"2 175 2 A 7 북 동 001 \n",
"3 175 2 B 3 남 서 179 \n",
"4 175 3 A 6 동 서 090 \n",
"5 175 3 B 1 동 남 090 \n",
"6 175 4 A 5 서 북 270 \n",
"7 175 4 B 2 서 동 270 \n",
"8 176 1 A 8 남 북 180 \n",
"9 176 1 B 4 북 남 359 \n",
"10 176 2 A 8 남 북 180 \n",
"11 176 2 B 3 남 서 180 \n",
"12 176 3 A 5 서 북 270 \n",
"13 176 3 B 18 NaN NaN NaN \n",
"14 177 1 A 8 남 북 179 \n",
"15 177 1 B 4 북 남 000 \n",
"16 177 2 A 17 NaN NaN NaN \n",
"17 177 2 B 18 NaN NaN NaN \n",
"18 178 1 A 8 남 북 180 \n",
"19 178 1 B 4 북 남 000 \n",
"20 178 2 A 7 북 동 000 \n",
"21 178 2 B 3 남 서 180 \n",
"22 178 3 A 5 서 북 270 \n",
"23 178 3 B 2 서 동 270 \n",
"24 178 4 A 6 동 서 090 \n",
"25 178 4 B 1 동 남 090 \n",
"26 201 1 A 8 남 북 180 \n",
"27 201 1 B 3 남 서 180 \n",
"28 201 2 A 5 서 북 270 \n",
"29 201 2 B 2 서 동 270 \n",
"30 201 3 A 6 동 서 090 \n",
"31 201 3 B 2 서 동 270 \n",
"32 201 4 A 6 동 서 090 \n",
"33 201 4 B 1 동 남 090 \n",
"34 201 5 A 4 북 남 000 \n",
"35 201 5 B 4 북 남 000 \n",
"36 202 1 A 6 동 서 090 \n",
"37 202 1 B 2 서 동 270 \n",
"38 202 2 A 17 NaN NaN NaN \n",
"39 202 2 B 18 NaN NaN NaN \n",
"40 206 1 A 8 남 북 180 \n",
"41 206 1 B 4 북 남 000 \n",
"42 206 2 A 17 NaN NaN NaN \n",
"43 206 2 B 18 NaN NaN NaN \n",
"44 206 3 A 8 남 북 180 \n",
"45 206 3 B 4 북 남 000 \n",
"46 206 4 A 17 NaN NaN NaN \n",
"47 206 4 B 18 NaN NaN NaN \n",
"48 210 1 A 6 동 서 090 \n",
"49 210 1 B 18 NaN NaN NaN \n",
"50 210 2 A 5 서 북 270 \n",
"51 210 2 B 2 서 동 270 \n",
"52 210 3 A 7 북 동 000 \n",
"53 210 3 B 4 북 남 000 \n",
"54 210 4 A 8 남 북 180 \n",
"55 210 4 B 3 남 서 180 \n",
"\n",
" out_angle \n",
"0 000 \n",
"1 180 \n",
"2 090 \n",
"3 270 \n",
"4 270 \n",
"5 180 \n",
"6 000 \n",
"7 090 \n",
"8 356 \n",
"9 180 \n",
"10 356 \n",
"11 270 \n",
"12 356 \n",
"13 NaN \n",
"14 000 \n",
"15 180 \n",
"16 NaN \n",
"17 NaN \n",
"18 000 \n",
"19 180 \n",
"20 090 \n",
"21 270 \n",
"22 000 \n",
"23 090 \n",
"24 270 \n",
"25 180 \n",
"26 000 \n",
"27 270 \n",
"28 000 \n",
"29 090 \n",
"30 270 \n",
"31 090 \n",
"32 270 \n",
"33 180 \n",
"34 180 \n",
"35 180 \n",
"36 270 \n",
"37 090 \n",
"38 NaN \n",
"39 NaN \n",
"40 000 \n",
"41 180 \n",
"42 NaN \n",
"43 NaN \n",
"44 000 \n",
"45 180 \n",
"46 NaN \n",
"47 NaN \n",
"48 270 \n",
"49 NaN \n",
"50 000 \n",
"51 090 \n",
"52 090 \n",
"53 180 \n",
"54 000 \n",
"55 270 "
]
},
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"self.match4"
]
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 4,
"metadata": {},
"outputs": [
{
@ -51,13 +839,13 @@
"{'u00': 4, 'u20': 2, 'u30': 4, 'u31': 4, 'u32': 7, 'u60': 8}"
]
},
"execution_count": 3,
"execution_count": 4,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"self.uid2uindex"
"self.p2PLindices = dict() # parent id to protected left index\n"
]
},
{
@ -452,7 +1240,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 5,
"metadata": {},
"outputs": [
{
@ -461,7 +1249,7 @@
"{'u00': 4, 'u20': 2, 'u30': 4, 'u31': 4, 'u32': 7, 'u60': 8}"
]
},
"execution_count": 9,
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
@ -472,7 +1260,7 @@
},
{
"cell_type": "code",
"execution_count": 30,
"execution_count": 8,
"metadata": {},
"outputs": [
{
@ -539,7 +1327,6 @@
"# 신호가 부여되어 있는 경우에는 r을 부여 (우회전 : g, 그외 : r / 유턴x : G, 유턴 : r)\n",
"for _, row in self.match6.dropna(subset=['inc_edge_id', 'out_edge_id']).iterrows():\n",
" node_id = row.node_id\n",
" move_no = row.move_no\n",
" inc_edge_id = row.inc_edge_id\n",
" out_edge_id = row.out_edge_id\n",
" inc_edge = self.net.getEdge(inc_edge_id)\n",
@ -548,13 +1335,14 @@
" index = conn.getTLLinkIndex()\n",
" if index >= 0:\n",
" self.node2init[node_id][index] = 'r'\n",
"\n",
"for node_id in self.node2init:\n",
" print(node_id, ''.join(self.node2init[node_id]))"
]
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 7,
"metadata": {},
"outputs": [
{
@ -1143,7 +1931,7 @@
"\n",
"self.matching = self.matching.dropna(subset='state')\n",
"self.matching = self.matching.reset_index(drop=True)\n",
"self.matching = self.matching[['inter_no', 'node_id', 'move_no', 'inc_edge_id', 'out_edge_id', 'state']]\n"
"self.matching = self.matching[['inter_no', 'node_id', 'move_no', 'inc_edge_id', 'out_edge_id', 'state']]"
]
},
{

+ 401
- 424
Results/sn_1704419100.add.xml View File

@ -1,5 +1,5 @@
<additional>
<tlLogic id="c30" type="static" programID="c30_prog" offset="-80">
<tlLogic id="c30" type="static" programID="c30_prog" offset="-121">
<phase duration="34" state="rrrrrr"/>
<phase duration="4" state="rrrrrr"/>
<phase duration="1" state="rrrrrr"/>
@ -44,17 +44,17 @@
<phase duration="1" state="GGGGGG"/>
<phase duration="38" state="GGGGGG"/>
</tlLogic>
<tlLogic id="i0" type="static" programID="i0_prog" offset="-50">
<phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
<tlLogic id="i0" type="static" programID="i0_prog" offset="-150">
<phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
<phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="39" state="grrGgrrrgrrrrGgrr"/>
<phase duration="40" state="grrGgrrrgrrrrGgrr"/>
<phase duration="4" state="grrygrrrgrrrrygrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgrr"/>
<phase duration="28" state="grrrgGGGgrrrrrgrr"/>
<phase duration="4" state="grrrgGGygrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgGr"/>
<phase duration="16" state="grrrgGGrgrrrrrgGr"/>
<phase duration="17" state="grrrgGGrgrrrrrgGr"/>
<phase duration="4" state="grrrgyyrgrrrrrgGr"/>
<phase duration="1" state="grrrgrrrgrrrrrgGr"/>
<phase duration="32" state="grrrgrrrgrrrrrgGG"/>
@ -84,81 +84,61 @@
<phase duration="28" state="grrrgGGGgrrrrrgrr"/>
<phase duration="22" state="grrrgGGygrrrrrgrr"/>
</tlLogic>
<tlLogic id="i1" type="static" programID="i1_prog" offset="-110">
<tlLogic id="i1" type="static" programID="i1_prog" offset="-140">
<phase duration="33" state="gGGGGGrgrr"/>
<phase duration="4" state="gyyGGGrgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="0" state="grrGGGGgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="99" state="grrGGGGgrr"/>
<phase duration="1" state="grrGGGrgrr"/>
<phase duration="98" state="grrGGGGgrr"/>
<phase duration="4" state="grryyyygrr"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="0" state="grrrrrrgGG"/>
<phase duration="36" state="grrrrrrgGG"/>
<phase duration="1" state="grrrrrrgrr"/>
<phase duration="35" state="grrrrrrgGG"/>
<phase duration="4" state="grrrrrrgyy"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="0" state="gGGrrrrgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="33" state="gGGGGGrgrr"/>
<phase duration="1" state="grrrrrrgrr"/>
<phase duration="32" state="gGGGGGrgrr"/>
<phase duration="4" state="gyyGGGrgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="0" state="grrGGGGgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="99" state="grrGGGGgrr"/>
<phase duration="1" state="grrGGGrgrr"/>
<phase duration="98" state="grrGGGGgrr"/>
<phase duration="4" state="grryyyygrr"/>
<phase duration="0" state="grrrrrrgGG"/>
<phase duration="0" state="grrrrrrgGG"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="36" state="grrrrrrgrr"/>
<phase duration="1" state="grrrrrrgrr"/>
<phase duration="35" state="grrrrrrgGG"/>
<phase duration="4" state="grrrrrrgyy"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="0" state="gGGrrrrgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="33" state="gGGGGGrgrr"/>
<phase duration="1" state="grrrrrrgrr"/>
<phase duration="32" state="gGGGGGrgrr"/>
<phase duration="4" state="gyyGGGrgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="0" state="grrGGGGgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="99" state="grrGGGGgrr"/>
<phase duration="1" state="grrGGGrgrr"/>
<phase duration="98" state="grrGGGGgrr"/>
<phase duration="4" state="grryyyygrr"/>
<phase duration="0" state="grrrrrrgGG"/>
<phase duration="0" state="grrrrrrgGG"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="36" state="grrrrrrgrr"/>
<phase duration="1" state="grrrrrrgrr"/>
<phase duration="35" state="grrrrrrgGG"/>
<phase duration="4" state="grrrrrrgyy"/>
<phase duration="0" state="grrrrrrgrr"/>
<phase duration="0" state="gGGrrrrgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="33" state="gGGGGGrgrr"/>
<phase duration="1" state="grrrrrrgrr"/>
<phase duration="32" state="gGGGGGrgrr"/>
<phase duration="4" state="gyyGGGrgrr"/>
<phase duration="0" state="grrGGGGgrr"/>
<phase duration="0" state="grrGGGrgrr"/>
<phase duration="0" state="grrGGGGgrr"/>
<phase duration="99" state="grrGGGrgrr"/>
<phase duration="1" state="grrGGGrgrr"/>
<phase duration="98" state="grrGGGGgrr"/>
</tlLogic>
<tlLogic id="i2" type="static" programID="i2_prog" offset="-170">
<phase duration="40" state="GGggGGG"/>
<phase duration="3" state="yyggyyy"/>
<tlLogic id="i2" type="static" programID="i2_prog" offset="-180">
<phase duration="38" state="GGggGGG"/>
<phase duration="5" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="23" state="rrggrrr"/>
<phase duration="3" state="rrggrrr"/>
<phase duration="21" state="rrggrrr"/>
<phase duration="5" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="39" state="GGggGGG"/>
<phase duration="3" state="yyggyyy"/>
<phase duration="37" state="GGggGGG"/>
<phase duration="5" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="23" state="rrggrrr"/>
<phase duration="3" state="rrggrrr"/>
<phase duration="21" state="rrggrrr"/>
<phase duration="5" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="39" state="GGggGGG"/>
<phase duration="3" state="yyggyyy"/>
<phase duration="37" state="GGggGGG"/>
<phase duration="5" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="23" state="rrggrrr"/>
<phase duration="3" state="rrggrrr"/>
<phase duration="21" state="rrggrrr"/>
<phase duration="5" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="39" state="GGggGGG"/>
<phase duration="37" state="GGggGGG"/>
</tlLogic>
<tlLogic id="i3" type="static" programID="i3_prog" offset="-80">
<tlLogic id="i3" type="static" programID="i3_prog" offset="-121">
<phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
@ -203,110 +183,110 @@
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
</tlLogic>
<tlLogic id="i6" type="static" programID="i6_prog" offset="-70">
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<tlLogic id="i6" type="static" programID="i6_prog" offset="-111">
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgGGr"/>
<phase duration="10" state="grrrgGGGrgrrgGGr"/>
<phase duration="2" state="grrrgGGGrgrrgGGr"/>
<phase duration="9" state="grrrgGGGrgrrgGGr"/>
<phase duration="4" state="grrrgyyyrgrrgGGr"/>
<phase duration="1" state="grrrgrrrrgrrgGGr"/>
<phase duration="38" state="grrrgrrrrgrrgGGG"/>
<phase duration="2" state="grrrgrrrrgrrgGGr"/>
<phase duration="37" state="grrrgrrrrgrrgGGG"/>
<phase duration="4" state="grrrgrrrrgrrgyyy"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="65" state="gGGGgrrrrgrrgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="64" state="gGGGgrrrrgrrgrrr"/>
<phase duration="4" state="gyyygrrrrgrrgrrr"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="19" state="grrrgrrrrgGGgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="18" state="grrrgrrrrgGGgrrr"/>
<phase duration="4" state="grrrgrrrrgyygrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgGGr"/>
<phase duration="10" state="grrrgGGGrgrrgGGr"/>
<phase duration="2" state="grrrgGGGrgrrgGGr"/>
<phase duration="9" state="grrrgGGGrgrrgGGr"/>
<phase duration="4" state="grrrgyyyrgrrgGGr"/>
<phase duration="1" state="grrrgrrrrgrrgGGr"/>
<phase duration="38" state="grrrgrrrrgrrgGGG"/>
<phase duration="2" state="grrrgrrrrgrrgGGr"/>
<phase duration="37" state="grrrgrrrrgrrgGGG"/>
<phase duration="4" state="grrrgrrrrgrrgyyy"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="65" state="gGGGgrrrrgrrgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="64" state="gGGGgrrrrgrrgrrr"/>
<phase duration="4" state="gyyygrrrrgrrgrrr"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="19" state="grrrgrrrrgGGgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="18" state="grrrgrrrrgGGgrrr"/>
<phase duration="4" state="grrrgrrrrgyygrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgGGr"/>
<phase duration="10" state="grrrgGGGrgrrgGGr"/>
<phase duration="2" state="grrrgGGGrgrrgGGr"/>
<phase duration="9" state="grrrgGGGrgrrgGGr"/>
<phase duration="4" state="grrrgyyyrgrrgGGr"/>
<phase duration="1" state="grrrgrrrrgrrgGGr"/>
<phase duration="38" state="grrrgrrrrgrrgGGG"/>
<phase duration="2" state="grrrgrrrrgrrgGGr"/>
<phase duration="37" state="grrrgrrrrgrrgGGG"/>
<phase duration="4" state="grrrgrrrrgrrgyyy"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="65" state="gGGGgrrrrgrrgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="64" state="gGGGgrrrrgrrgrrr"/>
<phase duration="4" state="gyyygrrrrgrrgrrr"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="19" state="grrrgrrrrgGGgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="18" state="grrrgrrrrgGGgrrr"/>
<phase duration="4" state="grrrgrrrrgyygrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgGGr"/>
<phase duration="10" state="grrrgGGGrgrrgGGr"/>
<phase duration="2" state="grrrgGGGrgrrgGGr"/>
<phase duration="9" state="grrrgGGGrgrrgGGr"/>
<phase duration="4" state="grrrgyyyrgrrgGGr"/>
<phase duration="1" state="grrrgrrrrgrrgGGr"/>
<phase duration="38" state="grrrgrrrrgrrgGGG"/>
<phase duration="2" state="grrrgrrrrgrrgGGr"/>
<phase duration="37" state="grrrgrrrrgrrgGGG"/>
<phase duration="4" state="grrrgrrrrgrrgyyy"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="65" state="gGGGgrrrrgrrgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="64" state="gGGGgrrrrgrrgrrr"/>
</tlLogic>
<tlLogic id="i7" type="static" programID="i7_prog" offset="-140">
<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"/>
<tlLogic id="i7" type="static" programID="i7_prog" offset="-59">
<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="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="46" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="GGrggGG"/>
<phase duration="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="38" state="GGrggGG"/>
<phase duration="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="46" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="GGrggGG"/>
<phase duration="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="38" state="GGrggGG"/>
<phase duration="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="46" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="GGrggGG"/>
<phase duration="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="38" state="GGrggGG"/>
<phase duration="5" state="yyrggyy"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="46" state="rrrggrr"/>
<phase duration="5" state="rrrggrr"/>
<phase duration="2" state="rrrggrr"/>
<phase duration="19" state="GGrggGG"/>
</tlLogic>
<tlLogic id="i8" type="static" programID="i8_prog" offset="-80">
<tlLogic id="i8" type="static" programID="i8_prog" offset="-90">
<phase duration="29" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
@ -319,8 +299,8 @@
<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="13" state="gGGrrrrrgrrrgrrr"/>
<phase duration="4" state="gyyrrrrrgrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="28" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
@ -334,14 +314,23 @@
<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="13" state="gGGrrrrrgrrrgrrr"/>
<phase duration="4" state="gyyrrrrrgrrrgrrr"/>
<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="grrryyyrgrrrgyyr"/>
<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="gGGrrrrrgrrrgrrr"/>
<phase duration="4" state="gyyrrrrrgrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="28" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
@ -354,291 +343,279 @@
<phase duration="1" state="grrrGGGrgrrrgrrr"/>
<phase duration="53" state="grrrGGGGgrrrgrrr"/>
</tlLogic>
<tlLogic id="i9" type="static" programID="i9_prog" offset="-140">
<phase duration="42" state="GGGG"/>
<phase duration="4" state="yyyy"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<tlLogic id="i9" type="static" programID="i9_prog" offset="-40">
<phase duration="43" state="GGGG"/>
<phase duration="3" state="yyyy"/>
<phase duration="1" state="rrrr"/>
<phase duration="110" state="rrrr"/>
<phase duration="4" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrGG"/>
<phase duration="0" state="GGrr"/>
<phase duration="3" state="rrrr"/>
<phase duration="1" state="rrrr"/>
<phase duration="42" state="GGGG"/>
<phase duration="4" state="yyyy"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="3" state="yyyy"/>
<phase duration="1" state="rrrr"/>
<phase duration="110" state="rrrr"/>
<phase duration="4" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrGG"/>
<phase duration="0" state="GGrr"/>
<phase duration="3" state="rrrr"/>
<phase duration="1" state="rrrr"/>
<phase duration="42" state="GGGG"/>
<phase duration="4" state="yyyy"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrrr"/>
<phase duration="3" state="yyyy"/>
<phase duration="1" state="rrrr"/>
<phase duration="110" state="rrrr"/>
<phase duration="4" state="rrrr"/>
<phase duration="0" state="GGGG"/>
<phase duration="0" state="rrrr"/>
<phase duration="0" state="rrGG"/>
<phase duration="42" state="GGrr"/>
<phase duration="3" state="rrrr"/>
<phase duration="1" state="rrrr"/>
<phase duration="42" state="GGGG"/>
</tlLogic>
<tlLogic id="u00" type="static" programID="u00_prog" offset="-50">
<phase duration="38" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="39" state="ggggGgggg"/>
<phase duration="4" state="ggggygggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="28" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="16" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="32" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="38" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="40" state="ggggGgggg"/>
<phase duration="4" state="ggggygggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="28" state="ggggrgggg"/>
<phase duration="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="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="38" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="40" state="ggggGgggg"/>
<phase duration="4" state="ggggygggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="28" state="ggggrgggg"/>
<phase duration="22" state="ggggrgggg"/>
<tlLogic id="u00" type="static" programID="u00_prog" offset="-150">
<phase duration="39" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="40" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGyGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="28" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="17" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="32" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="38" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="40" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGyGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="28" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="17" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="32" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="38" state="GGGGrGGGG"/>
<phase duration="4" state="GGGGrGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="40" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGyGGGG"/>
<phase duration="1" state="GGGGrGGGG"/>
<phase duration="28" state="GGGGrGGGG"/>
<phase duration="22" state="GGGGrGGGG"/>
</tlLogic>
<tlLogic id="u20" type="static" programID="u20_prog" offset="-170">
<phase duration="40" state="ggrggg"/>
<phase duration="3" state="ggrggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="23" state="ggGggg"/>
<phase duration="3" state="ggyggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="39" state="ggrggg"/>
<phase duration="3" state="ggrggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="23" state="ggGggg"/>
<phase duration="3" state="ggyggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="39" state="ggrggg"/>
<phase duration="3" state="ggrggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="23" state="ggGggg"/>
<phase duration="3" state="ggyggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="39" state="ggrggg"/>
<tlLogic id="u20" type="static" programID="u20_prog" offset="-180">
<phase duration="38" state="GGrGGG"/>
<phase duration="5" state="GGrGGG"/>
<phase duration="1" state="GGrGGG"/>
<phase duration="21" state="GGGGGG"/>
<phase duration="5" state="GGyGGG"/>
<phase duration="1" state="GGrGGG"/>
<phase duration="37" state="GGrGGG"/>
<phase duration="5" state="GGrGGG"/>
<phase duration="1" state="GGrGGG"/>
<phase duration="21" state="GGGGGG"/>
<phase duration="5" state="GGyGGG"/>
<phase duration="1" state="GGrGGG"/>
<phase duration="37" state="GGrGGG"/>
<phase duration="5" state="GGrGGG"/>
<phase duration="1" state="GGrGGG"/>
<phase duration="21" state="GGGGGG"/>
<phase duration="5" state="GGyGGG"/>
<phase duration="1" state="GGrGGG"/>
<phase duration="37" state="GGrGGG"/>
</tlLogic>
<tlLogic id="u30" type="static" programID="u30_prog" offset="-80">
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<tlLogic id="u30" type="static" programID="u30_prog" offset="-121">
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="17" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="33" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="17" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="33" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="17" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="33" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
</tlLogic>
<tlLogic id="u31" type="static" programID="u31_prog" offset="-80">
<phase duration="34" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<tlLogic id="u31" type="static" programID="u31_prog" offset="-121">
<phase duration="34" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="17" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="33" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="17" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="33" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="17" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="33" state="GGGGGGGG"/>
<phase duration="4" state="GGGGyGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="34" state="GGGGrGGG"/>
<phase duration="4" state="GGGGrGGG"/>
<phase duration="1" state="GGGGrGGG"/>
<phase duration="38" state="GGGGrGGG"/>
</tlLogic>
<tlLogic id="u32" type="static" programID="u32_prog" offset="-80">
<phase duration="34" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="17" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="33" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="17" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="33" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="17" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="33" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<tlLogic id="u32" type="static" programID="u32_prog" offset="-121">
<phase duration="34" state="GGGGGGGG"/>
<phase duration="4" state="GGGGGGGy"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="34" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="38" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="17" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="33" state="GGGGGGGG"/>
<phase duration="4" state="GGGGGGGy"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="34" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="38" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="17" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="33" state="GGGGGGGG"/>
<phase duration="4" state="GGGGGGGy"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="34" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="38" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="17" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="33" state="GGGGGGGG"/>
<phase duration="4" state="GGGGGGGy"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="34" state="GGGGGGGr"/>
<phase duration="4" state="GGGGGGGr"/>
<phase duration="1" state="GGGGGGGr"/>
<phase duration="38" state="GGGGGGGr"/>
</tlLogic>
<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"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="19" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="23" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="19" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="23" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="19" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="23" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<tlLogic id="u60" type="static" programID="u60_prog" offset="-111">
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="22" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="9" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="37" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGGGGGy"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="64" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="18" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="22" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="9" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="37" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGGGGGy"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="64" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="18" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="22" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="9" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="37" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGGGGGy"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="64" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="18" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="22" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="9" state="GGGGGGGGr"/>
<phase duration="4" state="GGGGGGGGr"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="37" state="GGGGGGGGG"/>
<phase duration="4" state="GGGGGGGGy"/>
<phase duration="2" state="GGGGGGGGr"/>
<phase duration="64" state="GGGGGGGGr"/>
</tlLogic>
</additional>

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


+ 6
- 10
Scripts/preprocess_daily.py View File

@ -402,6 +402,9 @@ class DailyPreprocessor():
turn_type = self.n2io2turn[node_id][(inc_edge_id, out_edge_id)]
self.match5.at[i, 'turn_type'] = turn_type
self.p2PLindices = dict() # parent id to protected left index
# 2-1-6
def make_match6(self):
'''
@ -435,7 +438,7 @@ class DailyPreprocessor():
out_angle2edge = dict(zip(m5.out_angle.astype(int), m5.out_edge_id))
p2out_angle2edge[node_id] = out_angle2edge
self.uid2uindex = dict() # u_turn node id to u_turn index
self.u2uindex = dict() # u_turn node id to u_turn index
# 각 uturn node에 대하여 (inc_edge_id, out_edge_id) 부여
cmatches = []
@ -448,11 +451,11 @@ class DailyPreprocessor():
adj_inc_edge_id = row.adj_inc_edge_id
adj_out_edge_id = row.adj_out_edge_id
# self.uid2uindex 지정
# self.u2uindex 지정
inc_edge = self.net.getEdge(inc_edge_id)
out_edge = self.net.getEdge(out_edge_id)
u_turn_conn = inc_edge.getConnections(out_edge)[0]
self.uid2uindex[child_id] = u_turn_conn.getTLLinkIndex()
self.u2uindex[child_id] = u_turn_conn.getTLLinkIndex()
# match5에서 부모노드id에 해당하는 행들을 가져옴 (cmatch)
cmatch = self.match5.copy()[self.match5.node_id==parent_id] # match dataframe for a child node
@ -547,12 +550,6 @@ class DailyPreprocessor():
self.match6 = pd.concat([self.match5, cmatches, self.coord]).drop_duplicates().sort_values(by=['inter_no', 'node_id', 'phase_no', 'ring_type'])
self.match6 = self.match6.reset_index(drop=True)
# json 파일로 저장 # to be deprecated
with open(os.path.join(self.path_intermediates, 'uid2uindex.json'), 'w') as file:
json.dump(self.uid2uindex, file)
# 2-1-7
def make_matching(self):
'''
@ -734,7 +731,6 @@ class DailyPreprocessor():
# 신호가 부여되어 있는 경우에는 r을 부여 (우회전 : g, 그외 : r / 유턴x : G, 유턴 : r)
for _, row in self.match6.dropna(subset=['inc_edge_id', 'out_edge_id']).iterrows():
node_id = row.node_id
move_no = row.move_no
inc_edge_id = row.inc_edge_id
out_edge_id = row.out_edge_id
inc_edge = self.net.getEdge(inc_edge_id)

Write Preview
Loading…
Cancel
Save