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

uturn allocation (make_match6) code is ready, but not applied yet.

master
김선중 1 year ago
parent
256fe330ea
commit
a67597c82b
9 changed files with 4565 additions and 848 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3816
    -2
      Analysis/0307_red_yellow/0307_red_yellow_2.ipynb
  2. BIN
      Analysis/0307_red_yellow/match5.png
  3. BIN
      Analysis/0307_red_yellow/match6.png
  4. BIN
      Analysis/0307_red_yellow/uturn.png
  5. +314
    -361
      Results/sn_1704416400.add.xml
  6. +425
    -472
      Results/sn_1704419100.add.xml
  7. BIN
      Scripts/__pycache__/generate_signals.cpython-38.pyc
  8. BIN
      Scripts/__pycache__/preprocess_daily.cpython-38.pyc
  9. +10
    -13
      Scripts/preprocess_daily.py

+ 3816
- 2
Analysis/0307_red_yellow/0307_red_yellow_2.ipynb
File diff suppressed because it is too large
View File


BIN
Analysis/0307_red_yellow/match5.png View File

Before After
Width: 937  |  Height: 448  |  Size: 45 KiB

BIN
Analysis/0307_red_yellow/match6.png View File

Before After
Width: 913  |  Height: 448  |  Size: 40 KiB

BIN
Analysis/0307_red_yellow/uturn.png View File

Before After
Width: 583  |  Height: 201  |  Size: 17 KiB

+ 314
- 361
Results/sn_1704416400.add.xml View File

@ -1,62 +1,59 @@
<additional>
<tlLogic id="c30" type="static" programID="c30_prog" offset="-90">
<phase duration="33" state="rrrrrr"/>
<phase duration="34" state="rrrrrr"/>
<phase duration="4" state="rrrrrr"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="34" state="GGGGGG"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="33" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="38" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="37" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="17" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="16" state="GGGGGG"/>
<phase duration="4" state="yyyyyy"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="33" state="rrrrrr"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="32" state="rrrrrr"/>
<phase duration="4" state="rrrrrr"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="34" state="GGGGGG"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="33" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="38" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="37" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="17" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="16" state="GGGGGG"/>
<phase duration="4" state="yyyyyy"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="33" state="rrrrrr"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="32" state="rrrrrr"/>
<phase duration="4" state="rrrrrr"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="34" state="GGGGGG"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="33" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="38" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="37" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="17" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="16" state="GGGGGG"/>
<phase duration="4" state="yyyyyy"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="33" state="rrrrrr"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="32" state="rrrrrr"/>
<phase duration="4" state="rrrrrr"/>
<phase duration="1" state="rrrrrr"/>
<phase duration="34" state="GGGGGG"/>
<phase duration="2" state="rrrrrr"/>
<phase duration="33" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="38" state="GGGGGG"/>
<phase duration="4" state="GGGGGG"/>
<phase duration="1" state="GGGGGG"/>
<phase duration="17" state="GGGGGG"/>
<phase duration="2" state="GGGGGG"/>
<phase duration="37" state="GGGGGG"/>
</tlLogic>
<tlLogic id="i0" type="static" programID="i0_prog" offset="-150">
<phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
<phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
<phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="40" state="grrGgrrrgrrrrGgrr"/>
<phase duration="4" state="grrygrrrgrrrrygrr"/>
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgrr"/>
<phase duration="28" state="grrrgGGGgrrrrrgrr"/>
<phase duration="4" state="grrrgGGygrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgGr"/>
<phase duration="17" state="grrrgGGrgrrrrrgGr"/>
<phase duration="4" state="grrrgyyrgrrrrrgGr"/>
<phase duration="1" state="grrrgrrrgrrrrrgGr"/>
@ -68,10 +65,10 @@
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="52" state="grrGgrrrgrrrrGgrr"/>
<phase duration="4" state="grrygrrrgrrrrygrr"/>
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgrr"/>
<phase duration="37" state="grrrgGGGgrrrrrgrr"/>
<phase duration="4" state="grrrgGGygrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgGr"/>
<phase duration="23" state="grrrgGGrgrrrrrgGr"/>
<phase duration="4" state="grrrgyyrgrrrrrgGr"/>
<phase duration="1" state="grrrgrrrgrrrrrgGr"/>
@ -83,17 +80,12 @@
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="40" state="grrGgrrrgrrrrGgrr"/>
<phase duration="4" state="grrygrrrgrrrrygrr"/>
<phase duration="1" state="grrrgrrrgrrrrrgrr"/>
<phase duration="28" state="grrrgGGGgrrrrrgrr"/>
<phase duration="4" state="grrrgGGygrrrrrgrr"/>
<phase duration="1" state="grrrgGGrgrrrrrgrr"/>
<phase duration="17" state="grrrgGGrgrrrrrgGr"/>
<phase duration="4" state="grrrgyyrgrrrrrgGr"/>
<phase duration="1" state="grrrgrrrgrrrrrgGr"/>
<phase duration="32" state="grrrgrrrgrrrrrgGG"/>
<phase duration="28" state="grrrgGGGgrrrrrgrr"/>
<phase duration="22" state="grrrgGGygrrrrrgrr"/>
</tlLogic>
<tlLogic id="i1" type="static" programID="i1_prog" offset="-101">
<phase duration="32" state="gGGGGGrgrr"/>
<phase duration="33" state="gGGGGGrgrr"/>
<phase duration="4" state="gyyGGGrgrr"/>
<phase duration="1" state="grrGGGrgrr"/>
<phase duration="98" state="grrGGGGgrr"/>
@ -124,168 +116,157 @@
<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"/>
</tlLogic>
<tlLogic id="i2" type="static" programID="i2_prog" offset="-121">
<phase duration="38" state="GGggGGG"/>
<phase duration="4" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="22" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="65" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="35" state="rrggGGG"/>
<phase duration="4" state="rrggGGG"/>
<phase duration="1" state="rrggGGG"/>
<phase duration="38" state="GGggGGG"/>
<phase duration="4" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="22" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="65" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="35" state="rrggGGG"/>
<phase duration="4" state="rrggGGG"/>
<phase duration="1" state="rrggGGG"/>
<phase duration="38" state="GGggGGG"/>
<phase duration="4" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="22" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="65" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="35" state="rrggGGG"/>
<phase duration="4" state="rrggGGG"/>
<phase duration="1" state="rrggGGG"/>
<phase duration="38" state="GGggGGG"/>
<phase duration="4" state="yyggyyy"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="22" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="65" state="rrggrrr"/>
<phase duration="4" state="rrggrrr"/>
<phase duration="1" state="rrggrrr"/>
<phase duration="35" state="rrggGGG"/>
<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>
<tlLogic id="i3" type="static" programID="i3_prog" offset="-90">
<phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
<phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
<phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
<phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
<phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
<phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
<phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
</tlLogic>
<tlLogic id="i6" type="static" programID="i6_prog" offset="-40">
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<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="grrrgrrrrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<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="grrrgrrrrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<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="grrrgrrrrgrrgrrr"/>
<phase duration="23" state="grrrgGGGrgrrgrrr"/>
<phase duration="2" state="grrrgGGGrgrrgrrr"/>
<phase duration="22" state="grrrgGGGrgrrgrrr"/>
<phase duration="4" state="grrrgGGGrgrrgrrr"/>
<phase duration="1" state="grrrgGGGrgrrgrrr"/>
<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="4" state="gyyygrrrrgrrgrrr"/>
<phase duration="1" state="grrrgrrrrgrrgrrr"/>
<phase duration="19" state="grrrgrrrrgGGgrrr"/>
<phase duration="2" state="grrrgrrrrgrrgrrr"/>
<phase duration="64" state="gGGGgrrrrgrrgrrr"/>
</tlLogic>
<tlLogic id="i7" type="static" programID="i7_prog" offset="-90">
<phase duration="40" state="GGrggGG"/>
<phase duration="41" state="GGrggGG"/>
<phase duration="4" state="yyrggyy"/>
<phase duration="1" state="rrrggrr"/>
<phase duration="48" state="rrrggrr"/>
@ -328,72 +309,66 @@
<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>
<tlLogic id="i8" type="static" programID="i8_prog" offset="-50">
<phase duration="28" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="30" state="grrrrrrrgGGGgrrr"/>
<phase duration="3" state="grrrrrrrgyyygrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="31" state="grrrrrrrgrrrgGGG"/>
<phase duration="4" state="grrrrrrrgrrrgGGy"/>
<phase duration="1" state="grrrrrrrgrrrgGGr"/>
<phase duration="3" state="grrrrrrrgrrrgGGy"/>
<phase duration="2" state="grrrrrrrgrrrgGGr"/>
<phase duration="20" state="grrrGGGrgrrrgGGr"/>
<phase duration="4" state="grrrGGGrgrrrgyyr"/>
<phase duration="1" state="grrrGGGrgrrrgrrr"/>
<phase duration="3" state="grrrGGGrgrrrgyyr"/>
<phase duration="2" state="grrrGGGrgrrrgrrr"/>
<phase duration="53" state="grrrGGGGgrrrgrrr"/>
<phase duration="4" state="grrryyyygrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="grrryyyygrrrgrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="13" state="gGGGrrrrgrrrgrrr"/>
<phase duration="4" state="gyyyrrrrgrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="gyyyrrrrgrrrgrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="28" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="grrrrrrrgyyygrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="31" state="grrrrrrrgrrrgGGG"/>
<phase duration="4" state="grrrrrrrgrrrgGGy"/>
<phase duration="1" state="grrrrrrrgrrrgGGr"/>
<phase duration="3" state="grrrrrrrgrrrgGGy"/>
<phase duration="2" state="grrrrrrrgrrrgGGr"/>
<phase duration="20" state="grrrGGGrgrrrgGGr"/>
<phase duration="4" state="grrrGGGrgrrrgyyr"/>
<phase duration="1" state="grrrGGGrgrrrgrrr"/>
<phase duration="3" state="grrrGGGrgrrrgyyr"/>
<phase duration="2" state="grrrGGGrgrrrgrrr"/>
<phase duration="53" state="grrrGGGGgrrrgrrr"/>
<phase duration="4" state="grrryyyygrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="grrryyyygrrrgrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="13" state="gGGGrrrrgrrrgrrr"/>
<phase duration="4" state="gyyyrrrrgrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="gyyyrrrrgrrrgrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="28" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="grrrrrrrgyyygrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="31" state="grrrrrrrgrrrgGGG"/>
<phase duration="4" state="grrrrrrrgrrrgGGy"/>
<phase duration="1" state="grrrrrrrgrrrgGGr"/>
<phase duration="3" state="grrrrrrrgrrrgGGy"/>
<phase duration="2" state="grrrrrrrgrrrgGGr"/>
<phase duration="20" state="grrrGGGrgrrrgGGr"/>
<phase duration="4" state="grrrGGGrgrrrgyyr"/>
<phase duration="1" state="grrrGGGrgrrrgrrr"/>
<phase duration="3" state="grrrGGGrgrrrgyyr"/>
<phase duration="2" state="grrrGGGrgrrrgrrr"/>
<phase duration="53" state="grrrGGGGgrrrgrrr"/>
<phase duration="4" state="grrryyyygrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="grrryyyygrrrgrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="13" state="gGGGrrrrgrrrgrrr"/>
<phase duration="4" state="gyyyrrrrgrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="gyyyrrrrgrrrgrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="28" state="grrrrrrrgGGGgrrr"/>
<phase duration="4" state="grrrrrrrgyyygrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="3" state="grrrrrrrgyyygrrr"/>
<phase duration="2" state="grrrrrrrgrrrgrrr"/>
<phase duration="31" state="grrrrrrrgrrrgGGG"/>
<phase duration="4" state="grrrrrrrgrrrgGGy"/>
<phase duration="1" state="grrrrrrrgrrrgGGr"/>
<phase duration="3" state="grrrrrrrgrrrgGGy"/>
<phase duration="2" state="grrrrrrrgrrrgGGr"/>
<phase duration="20" state="grrrGGGrgrrrgGGr"/>
<phase duration="4" state="grrrGGGrgrrrgyyr"/>
<phase duration="1" state="grrrGGGrgrrrgrrr"/>
<phase duration="3" state="grrrGGGrgrrrgyyr"/>
<phase duration="2" state="grrrGGGrgrrrgrrr"/>
<phase duration="53" state="grrrGGGGgrrrgrrr"/>
<phase duration="4" state="grrryyyygrrrgrrr"/>
<phase duration="1" state="grrrrrrrgrrrgrrr"/>
<phase duration="13" state="gGGGrrrrgrrrgrrr"/>
</tlLogic>
<tlLogic id="i9" type="static" programID="i9_prog" offset="-10">
<phase duration="41" state="GGGG"/>
<phase duration="42" state="GGGG"/>
<phase duration="4" state="yyyy"/>
<phase duration="1" state="rrrr"/>
<phase duration="109" state="rrrr"/>
@ -412,12 +387,9 @@
<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>
<tlLogic id="u00" type="static" programID="u00_prog" offset="-150">
<phase duration="38" state="ggggrgggg"/>
<phase duration="39" state="ggggrgggg"/>
<phase duration="4" state="ggggrgggg"/>
<phase duration="1" state="ggggrgggg"/>
<phase duration="40" state="ggggGgggg"/>
@ -454,15 +426,10 @@
<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="-121">
<phase duration="38" state="ggrggg"/>
<phase duration="39" state="ggrggg"/>
<phase duration="4" state="ggrggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="22" state="ggrggg"/>
@ -505,212 +472,198 @@
<phase duration="4" state="ggrggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="65" state="ggGggg"/>
<phase duration="4" state="ggyggg"/>
<phase duration="1" state="ggrggg"/>
<phase duration="35" state="ggrggg"/>
</tlLogic>
<tlLogic id="u30" type="static" programID="u30_prog" offset="-90">
<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="2" 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="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggGggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="16" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="32" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggGggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="16" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="32" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="16" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="32" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggGggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
</tlLogic>
<tlLogic id="u31" type="static" programID="u31_prog" offset="-90">
<phase duration="33" state="ggggGggg"/>
<phase duration="34" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="16" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggGggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="32" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="16" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggGggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="32" state="ggggGggg"/>
<phase duration="4" state="ggggyggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="34" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="38" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="16" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="33" state="ggggGggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="32" 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="2" state="ggggrggg"/>
<phase duration="33" state="ggggrggg"/>
<phase duration="4" state="ggggrggg"/>
<phase duration="1" state="ggggrggg"/>
<phase duration="17" state="ggggrggg"/>
<phase duration="2" state="ggggrggg"/>
<phase duration="37" state="ggggrggg"/>
</tlLogic>
<tlLogic id="u32" type="static" programID="u32_prog" offset="-90">
<phase duration="33" state="gggggggG"/>
<phase duration="34" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="33" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="37" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="17" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="16" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="33" state="gggggggG"/>
<phase duration="2" state="gggggggr"/>
<phase duration="32" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="33" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="37" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="17" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="16" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="33" state="gggggggG"/>
<phase duration="2" state="gggggggr"/>
<phase duration="32" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="33" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="38" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="37" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="17" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="16" state="gggggggr"/>
<phase duration="4" state="gggggggr"/>
<phase duration="1" state="gggggggr"/>
<phase duration="33" state="gggggggG"/>
<phase duration="2" state="gggggggr"/>
<phase duration="32" state="gggggggG"/>
<phase duration="4" state="gggggggy"/>
<phase duration="1" state="gggggggr"/>
<phase duration="34" state="gggggggr"/>
<phase duration="2" state="gggggggr"/>
<phase duration="33" 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="2" state="gggggggr"/>
<phase duration="37" state="gggggggr"/>
</tlLogic>
<tlLogic id="u60" type="static" programID="u60_prog" offset="-40">
<phase duration="23" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="22" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="9" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="37" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="64" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="19" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="18" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="23" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="22" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="9" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="37" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="64" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="19" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="18" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="23" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="22" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="9" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="37" state="ggggggggG"/>
<phase duration="4" state="ggggggggy"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="65" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="64" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="19" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="18" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="23" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="22" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="10" state="ggggggggr"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="9" state="ggggggggr"/>
<phase duration="4" state="ggggggggr"/>
<phase duration="1" state="ggggggggr"/>
<phase duration="38" state="ggggggggG"/>
<phase duration="2" state="ggggggggr"/>
<phase duration="37" 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="2" state="ggggggggr"/>
<phase duration="64" state="ggggggggr"/>
</tlLogic>
</additional>

+ 425
- 472
Results/sn_1704419100.add.xml
File diff suppressed because it is too large
View File


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


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


+ 10
- 13
Scripts/preprocess_daily.py View File

@ -378,7 +378,7 @@ class DailyPreprocessor():
'''
진입엣지id, 진출엣지id, 노드id를 추가함 (부교차로).
- match6의 컬럼 : inter_no, phase_no, ring_type, move_no, inc_dir, out_dir, inc_angle, out_angle, inc_edge, out_edge, node_id
사용된 데이터 :
(1) inter_node
- 교차로번호와 노드id를 매칭시키는 테이블.
@ -410,10 +410,10 @@ class DailyPreprocessor():
* 서 : directions[(ind - 2) % len(directions)]
- uturn의 각 행을 순회하면서 아래 과정을 반복함
- match5에서 parent_id에 해당하는 행들을 가져옴(cmatch).
- condition 별로 진입방향, 진출방향A, 진출방향B 정함.
- condition 별로 진입방향, 진출방향을 정함.
- 상술한 directions를 활용하여 정함.
- (진입방향, 진출방향A, 진출방향B)을 고려하여 (현시, 링) 별로 진입엣지id, 진출엣지id를 정함.
- ex) cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire_A), ['inc_edge', 'out_edge']] = [inc_edge_id, out_edge_id]
- (진입방향, 진출방향)을 고려하여 (현시, 링) 별로 진입엣지id, 진출엣지id를 정함.
- ex) cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire), ['inc_edge', 'out_edge']] = [inc_edge_id, out_edge_id]
- 순회하면서 만든 cmatch를 cmatchs라는 리스트에 저장함.
연동교차로 :
@ -454,25 +454,22 @@ class DailyPreprocessor():
cmatch['node_id'] = child_id
cmatch[['inc_edge', 'out_edge']] = np.nan
# condition 별로 inc_dire, out_dire_A, out_dire_B를 정함
# condition 별로 inc_dire, out_dire를 정함
ind = directions.index(direction)
if condition == "좌회전시":
inc_dire = direction
out_dire_A = out_dire_B = directions[(ind + 2) % len(directions)]
out_dire = directions[(ind + 2) % len(directions)]
elif condition == "보행신호시":
inc_dire = directions[(ind + 2) % len(directions)]
out_dire_A = directions[(ind - 2) % len(directions)]
out_dire_B = directions[(ind - 2) % len(directions)]
out_dire = directions[(ind - 2) % len(directions)]
# (inc_dire, out_dire_A, out_dire_B) 별로 inc_edge_id, out_edge_id를 정함
cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire_A), ['inc_edge', 'out_edge']] = [inc_edge_id, out_edge_id]
cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire_B), ['inc_edge', 'out_edge']] = [inc_edge_id, out_edge_id]
# (inc_dire, out_dire) 별로 inc_edge_id, out_edge_id를 정함
cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire), ['inc_edge', 'out_edge']] = [inc_edge_id, out_edge_id]
if condition == '보행신호시':
# 이동류번호가 17(보행신호)이면서 유턴노드방향으로 가는 신호가 없으면 (inc_edge_id, out_edge_id)를 부여한다.
cmatch.loc[(cmatch.move_no==17) & (cmatch.out_dir!=direction), ['inc_edge', 'out_edge']] = [inc_edge_id, out_edge_id]
# 유턴신호의 이동류번호를 19로 부여한다.
cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire_A), 'move_no'] = 19
cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire_B), 'move_no'] = 19
cmatch.loc[(cmatch.inc_dir==inc_dire) & (cmatch.out_dir==out_dire), 'move_no'] = 19
cmatches.append(cmatch)
# 각 연등교차로(coordination node)에 대하여 (inc_edge_id, out_edge_id) 부여

Write Preview
Loading…
Cancel
Save