modified newly defined tables : for example, angle_new.csv. Confer to table definition v0.8.5

Data/tables/angle_new.csv

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

Data/tables/angle_original.csv

@@ -1,9 +0,0 @@
-,inter_no,angle_A1,angle_A2,angle_A3,angle_A4,angle_A5,angle_A6,angle_A7,angle_A8,angle_B1,angle_B2,angle_B3,angle_B4,angle_B5,angle_B6,angle_B7,angle_B8
-0,175,179004,001095,090270,268000,NaN,,,,003176,179270,090180,270090,NaN,,,
-1,176,180000,180000,270356,NaN,NaN,,,,359180,180270,NaN,NaN,NaN,,,
-2,177,180000,000090,stop,268000,NaN,,,,001176,179270,NaN,090180,NaN,,,
-3,178,180000,000090,270000,090270,NaN,,,,000180,180270,270090,090180,NaN,,,
-4,201,180000,270000,090270,090270,000090,,,,180270,270090,270090,090180,000180,,,
-5,202,090270,stop,NaN,NaN,NaN,,,,270090,NaN,NaN,NaN,NaN,,,
-6,206,180000,stop,180000,stop,NaN,,,,000180,NaN,000180,NaN,NaN,,,
-7,210,090270,268000,359090,180000,NaN,,,,NaN,270090,000180,180270,NaN,,,

Data/tables/child_coord.csv

@@ -1,4 +1,4 @@
-parent_id,child_id,phase_no,ring_type,inc_edge,out_edge
+parent_id,child_id,phase_no,ring_type,inc_edge_id,out_edge_id
 i3,c30,1,A,,
 i3,c30,1,B,,
 i3,c30,2,A,571542116_01,-571542116_02.96

Data/tables/inter_info.csv

@@ -1,9 +1,9 @@
-,inter_no,inter_name,inter_lat,inter_lon,group_no,main_phase_no
-0,175,한솔삼거리(한솔마을3거리),37.36857,127.11478,3,2
-1,176,느티마을4단지,37.36724,127.1148,3,2
-2,177,한솔6단지(정자동사무소),37.36619,127.1148,3,2
-3,178,신기4거리,37.36346,127.1148,3,2
-4,201,느티마을4거리,37.36854,127.10984,3,2
-5,202,느티마을 안촌유치원,37.36855,127.11241,3,2
-6,206,상록마을 321동,37.36483,127.10981,3,2
-7,210,상록4거리(상록마을입구4거리),37.36347,127.10982,3,2
+inter_no,inter_name,inter_lat,inter_lon,group_no,main_phase_no
+175,한솔삼거리(한솔마을3거리),37.36857,127.11478,3,2
+176,느티마을4단지,37.36724,127.1148,3,2
+177,한솔6단지(정자동사무소),37.36619,127.1148,3,2
+178,신기4거리,37.36346,127.1148,3,2
+201,느티마을4거리,37.36854,127.10984,3,2
+202,느티마을 안촌유치원,37.36855,127.11241,3,2
+206,상록마을 321동,37.36483,127.10981,3,2
+210,상록4거리(상록마을입구4거리),37.36347,127.10982,3,2

Data/tables/inter_node.csv

@@ -1,16 +1,16 @@
-,inter_no,node_id,inter_type
-0,175,i0,parent
-1,175,u00,child
-2,176,i1,parent
-3,177,i2,parent
-4,177,u20,child
-5,178,i3,parent
-6,178,u30,child
-7,178,u31,child
-8,178,u32,child
-9,201,i8,parent
-10,202,i9,parent
-11,206,i7,parent
-12,210,i6,parent
-13,210,u60,child
-14,178,c30,child
+inter_no,node_id,inter_type
+175,i0,parent
+175,u00,child
+176,i1,parent
+177,i2,parent
+177,u20,child
+178,i3,parent
+178,u30,child
+178,u31,child
+178,u32,child
+201,i8,parent
+202,i9,parent
+206,i7,parent
+210,i6,parent
+210,u60,child
+178,c30,child

Data/tables/plan.csv

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

Intermediates/match6.csv

@@ -39,12 +39,12 @@
 37,177,u20,4,B,1,ggrggg
 38,178,c30,1,A,20,rrrrrr
 39,178,c30,1,B,20,rrrrrr
-40,178,c30,2,A,20,GGGrrr
-41,178,c30,2,B,20,rrrGGG
-42,178,c30,3,A,20,GGGrrr
-43,178,c30,3,B,20,rrrGGG
-44,178,c30,4,A,20,GGGrrr
-45,178,c30,4,B,20,rrrGGG
+40,178,c30,2,A,20,rrrrrr
+41,178,c30,2,B,20,rrrrrr
+42,178,c30,3,A,20,rrrrrr
+43,178,c30,3,B,20,rrrrrr
+44,178,c30,4,A,20,rrrrrr
+45,178,c30,4,B,20,rrrrrr
 46,178,i3,1,A,8,grrrrgrrrrgGGGrgrrrr
 47,178,i3,1,B,4,gGGGrgrrrrgrrrrgrrrr
 48,178,i3,2,A,7,grrrGgrrrrgrrrrgrrrr

Results/sn_1704416700.add.xml

@@ -3,46 +3,46 @@
       <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="37" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="16" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
       <phase duration="32" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="37" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="16" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
       <phase duration="32" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="37" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="16" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
       <phase duration="32" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
       <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="2" state="rrrrrr"/>
+      <phase duration="37" state="rrrrrr"/>
     </tlLogic>
     <tlLogic id="i0" type="static" programID="i0_prog" offset="-42">
       <phase duration="39" state="gGGrgrrrgGGGGrgrr"/>

Results/sn_1704417000.add.xml

@@ -1,90 +1,90 @@
 <additional>
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-10">
+    <tlLogic id="c30" type="static" programID="c30_prog" offset="-130">
       <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="32" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="32" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="32" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
     </tlLogic>
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-160">
-      <phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-110">
+      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="41" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
+      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="5" state="grrygrrrgrrrrygrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="18" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="31" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="37" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
+      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="5" state="grrygrrrgrrrrygrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="5" state="grrrgGGygrrrrrgrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="17" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="16" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="5" state="grrrgyyrgrrrrrgGr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="31" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="5" state="grrrgrrrgrrrrrgyy"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="37" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="5" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
+      <phase duration="39" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="5" state="grrygrrrgrrrrygrr"/>
       <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="27" state="grrrgGGGgrrrrrgrr"/>
       <phase duration="22" state="grrrgGGygrrrrrgrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-160">
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-180">
       <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
       <phase duration="1" state="grrGGGrgrr"/>
@@ -117,7 +117,7 @@
       <phase duration="1" state="grrGGGrgrr"/>
       <phase duration="98" state="grrGGGGgrr"/>
     </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-180">
+    <tlLogic id="i2" type="static" programID="i2_prog" offset="-30">
       <phase duration="39" state="GGgrGGG"/>
       <phase duration="4" state="yygryyy"/>
       <phase duration="1" state="rrgrrrr"/>
@@ -162,110 +162,110 @@
       <phase duration="1" state="rrgrrrr"/>
       <phase duration="65" state="rrgrrrr"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-10">
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-130">
       <phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
     </tlLogic>
-    <tlLogic id="i6" type="static" programID="i6_prog" offset="-100">
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+    <tlLogic id="i6" type="static" programID="i6_prog" offset="-140">
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
       <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="18" state="grrrgrrrrgGGgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
       <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
       <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="18" state="grrrgrrrrgGGgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
       <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
       <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="18" state="grrrgrrrrgGGgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
       <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-90">
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-110">
       <phase duration="41" state="GGrggGG"/>
       <phase duration="4" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
@@ -310,61 +310,61 @@
       <phase duration="1" state="rrrggrr"/>
       <phase duration="21" state="GGrggGG"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-140">
-      <phase duration="30" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-60">
+      <phase duration="29" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="4" state="grrrrrrrgyyygrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
       <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
       <phase duration="53" state="grrrGGGGgrrrgrrr"/>
-      <phase duration="3" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="grrryyyygrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
-      <phase duration="3" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="28" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="grrrrrrrgyyygrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
       <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
       <phase duration="53" state="grrrGGGGgrrrgrrr"/>
-      <phase duration="3" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="grrryyyygrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
-      <phase duration="3" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="28" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="grrrrrrrgyyygrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
       <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
       <phase duration="53" state="grrrGGGGgrrrgrrr"/>
-      <phase duration="3" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="grrryyyygrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
-      <phase duration="3" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="28" state="grrrrrrrgGGGgrrr"/>
-      <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="4" state="grrrrrrrgyyygrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
       <phase duration="31" state="grrrrrrrgrrrgGGG"/>
-      <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="4" state="grrrrrrrgrrrgGGy"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
       <phase duration="20" state="grrrGGGrgrrrgGGr"/>
-      <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="4" state="grrrGGGrgrrrgyyr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
       <phase duration="53" state="grrrGGGGgrrrgrrr"/>
     </tlLogic>
     <tlLogic id="i9" type="static" programID="i9_prog" offset="-130">
@@ -388,282 +388,282 @@
       <phase duration="1" state="rrrr"/>
       <phase duration="41" state="GGGG"/>
     </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-160">
-      <phase duration="39" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+    <tlLogic id="u00" type="static" programID="u00_prog" offset="-110">
+      <phase duration="38" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="41" state="ggggGgggg"/>
-      <phase duration="4" state="ggggygggg"/>
+      <phase duration="39" state="ggggGgggg"/>
+      <phase duration="5" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="28" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="27" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="18" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="16" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="32" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="31" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="38" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="37" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="40" state="ggggGgggg"/>
-      <phase duration="4" state="ggggygggg"/>
+      <phase duration="39" state="ggggGgggg"/>
+      <phase duration="5" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="28" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="27" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="17" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="16" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="32" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="31" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="38" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
+      <phase duration="37" state="ggggrgggg"/>
+      <phase duration="5" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="40" state="ggggGgggg"/>
-      <phase duration="4" state="ggggygggg"/>
+      <phase duration="39" state="ggggGgggg"/>
+      <phase duration="5" state="ggggygggg"/>
       <phase duration="1" state="ggggrgggg"/>
-      <phase duration="28" state="ggggrgggg"/>
+      <phase duration="27" state="ggggrgggg"/>
       <phase duration="22" state="ggggrgggg"/>
     </tlLogic>
-    <tlLogic id="u20" type="static" programID="u20_prog" offset="-180">
+    <tlLogic id="u20" type="static" programID="u20_prog" offset="-30">
       <phase duration="39" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="22" state="ggGggg"/>
       <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
+      <phase duration="65" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
+      <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
+      <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="22" state="ggGggg"/>
       <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
+      <phase duration="65" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
+      <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
+      <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="22" state="ggGggg"/>
       <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
+      <phase duration="65" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="1" state="ggrggg"/>
       <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
       <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="22" state="ggGggg"/>
+      <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="65" state="ggrggg"/>
     </tlLogic>
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-10">
+    <tlLogic id="u30" type="static" programID="u30_prog" offset="-130">
       <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
       <phase duration="33" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" 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="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" 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="2" state="ggggrggg"/>
-      <phase duration="37" 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="-10">
+    <tlLogic id="u31" type="static" programID="u31_prog" offset="-130">
       <phase duration="34" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="33" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="33" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="33" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
     </tlLogic>
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-10">
+    <tlLogic id="u32" type="static" programID="u32_prog" offset="-130">
       <phase duration="34" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="16" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="17" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="32" state="gggggggG"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="33" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="16" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="17" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="32" state="gggggggG"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="33" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="16" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="17" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="32" state="gggggggG"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="33" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
     </tlLogic>
-    <tlLogic id="u60" type="static" programID="u60_prog" offset="-100">
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+    <tlLogic id="u60" type="static" programID="u60_prog" offset="-140">
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="18" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="19" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="18" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="19" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="18" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="19" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
     </tlLogic>
 </additional>

Results/sn_1704417600.add.xml

@@ -1,123 +1,123 @@
 <additional>
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-100">
+    <tlLogic id="c30" type="static" programID="c30_prog" offset="-111">
       <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="32" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="32" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="16" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="32" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
       <phase duration="4" state="rrrrrr"/>
-      <phase duration="2" state="rrrrrr"/>
-      <phase duration="33" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
-      <phase duration="2" state="GGGGGG"/>
-      <phase duration="37" state="GGGGGG"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="17" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="34" state="rrrrrr"/>
+      <phase duration="4" state="rrrrrr"/>
+      <phase duration="1" state="rrrrrr"/>
+      <phase duration="38" state="rrrrrr"/>
     </tlLogic>
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-40">
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-83">
+      <phase duration="44" state="gGGrgrrrgGGGGrgrr"/>
+      <phase duration="3" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="44" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="3" state="grrygrrrgrrrrygrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgrr"/>
+      <phase duration="31" state="grrrgGGGgrrrrrgrr"/>
+      <phase duration="3" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="19" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="3" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgGr"/>
+      <phase duration="36" state="grrrgrrrgrrrrrgGG"/>
+      <phase duration="3" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
       <phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
+      <phase duration="3" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="41" state="grrGgrrrgrrrrGgrr"/>
+      <phase duration="3" state="grrygrrrgrrrrygrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgrr"/>
       <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="17" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
+      <phase duration="3" state="grrrgGGygrrrrrgrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="18" state="grrrgGGrgrrrrrgGr"/>
+      <phase duration="3" state="grrrgyyrgrrrrrgGr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgGr"/>
       <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="3" state="grrrgrrrgrrrrrgyy"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
       <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
+      <phase duration="3" state="gyyrgrrrgyyyyrgrr"/>
+      <phase duration="2" state="grrrgrrrgrrrrrgrr"/>
       <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
-      <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
-      <phase duration="4" state="grrrgGGygrrrrrgrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="17" state="grrrgGGrgrrrrrgGr"/>
-      <phase duration="4" state="grrrgyyrgrrrrrgGr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgGr"/>
-      <phase duration="32" state="grrrgrrrgrrrrrgGG"/>
-      <phase duration="4" state="grrrgrrrgrrrrrgyy"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="38" state="gGGrgrrrgGGGGrgrr"/>
-      <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
-      <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
-      <phase duration="40" state="grrGgrrrgrrrrGgrr"/>
-      <phase duration="4" state="grrygrrrgrrrrygrr"/>
-      <phase duration="1" state="grrrgGGrgrrrrrgrr"/>
+      <phase duration="3" state="grrygrrrgrrrrygrr"/>
+      <phase duration="2" state="grrrgGGrgrrrrrgrr"/>
       <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
       <phase duration="22" state="grrrgGGygrrrrrgrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-41">
-      <phase duration="33" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-181">
+      <phase duration="32" state="gGGGGGrgrr"/>
+      <phase duration="5" state="gyyGGGrgrr"/>
       <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
-      <phase duration="4" state="grryyyygrr"/>
+      <phase duration="97" state="grrGGGGgrr"/>
+      <phase duration="5" state="grryyyygrr"/>
       <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
-      <phase duration="4" state="grrrrrrgyy"/>
+      <phase duration="34" state="grrrrrrgGG"/>
+      <phase duration="5" state="grrrrrrgyy"/>
       <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
+      <phase duration="31" state="gGGGGGrgrr"/>
+      <phase duration="5" state="gyyGGGrgrr"/>
       <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
-      <phase duration="4" state="grryyyygrr"/>
+      <phase duration="97" state="grrGGGGgrr"/>
+      <phase duration="5" state="grryyyygrr"/>
       <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
-      <phase duration="4" state="grrrrrrgyy"/>
+      <phase duration="34" state="grrrrrrgGG"/>
+      <phase duration="5" state="grrrrrrgyy"/>
       <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
+      <phase duration="31" state="gGGGGGrgrr"/>
+      <phase duration="5" state="gyyGGGrgrr"/>
       <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
-      <phase duration="4" state="grryyyygrr"/>
+      <phase duration="97" state="grrGGGGgrr"/>
+      <phase duration="5" state="grryyyygrr"/>
       <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="35" state="grrrrrrgGG"/>
-      <phase duration="4" state="grrrrrrgyy"/>
+      <phase duration="34" state="grrrrrrgGG"/>
+      <phase duration="5" state="grrrrrrgyy"/>
       <phase duration="1" state="grrrrrrgrr"/>
-      <phase duration="32" state="gGGGGGrgrr"/>
-      <phase duration="4" state="gyyGGGrgrr"/>
+      <phase duration="31" state="gGGGGGrgrr"/>
+      <phase duration="5" state="gyyGGGrgrr"/>
       <phase duration="1" state="grrGGGrgrr"/>
-      <phase duration="98" state="grrGGGGgrr"/>
+      <phase duration="97" state="grrGGGGgrr"/>
     </tlLogic>
-    <tlLogic id="i2" type="static" programID="i2_prog" offset="-60">
+    <tlLogic id="i2" type="static" programID="i2_prog" offset="-90">
       <phase duration="39" state="GGgrGGG"/>
       <phase duration="4" state="yygryyy"/>
       <phase duration="1" state="rrgrrrr"/>
@@ -143,14 +143,8 @@
       <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="4" state="yygrGGG"/>
+      <phase duration="1" state="rrgrGGG"/>
       <phase duration="35" state="rrgrGGG"/>
       <phase duration="4" state="rrgrGGG"/>
       <phase duration="1" state="rrgrGGG"/>
@@ -162,212 +156,212 @@
       <phase duration="1" state="rrgrrrr"/>
       <phase duration="65" state="rrgrrrr"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-100">
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-111">
       <phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
       <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
       <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
       <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
       <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
-      <phase duration="2" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
+      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
     </tlLogic>
     <tlLogic id="i6" type="static" programID="i6_prog" offset="-160">
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
       <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="18" state="grrrgrrrrgGGgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
       <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
       <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="18" state="grrrgrrrrgGGgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
       <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
       <phase duration="4" state="gyyygrrrrgrrgrrr"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="18" state="grrrgrrrrgGGgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="19" state="grrrgrrrrgGGgrrr"/>
       <phase duration="4" state="grrrgrrrrgyygrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="22" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="1" state="grrrgGGGrgrrgrrr"/>
+      <phase duration="23" state="grrrgGGGrgrrgrrr"/>
       <phase duration="4" state="grrrgGGGrgrrgrrr"/>
-      <phase duration="2" state="grrrgGGGrgrrgGGr"/>
-      <phase duration="9" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="1" state="grrrgGGGrgrrgGGr"/>
+      <phase duration="10" state="grrrgGGGrgrrgGGr"/>
       <phase duration="4" state="grrrgyyyrgrrgGGr"/>
-      <phase duration="2" state="grrrgrrrrgrrgGGr"/>
-      <phase duration="37" state="grrrgrrrrgrrgGGG"/>
+      <phase duration="1" state="grrrgrrrrgrrgGGr"/>
+      <phase duration="38" state="grrrgrrrrgrrgGGG"/>
       <phase duration="4" state="grrrgrrrrgrrgyyy"/>
-      <phase duration="2" state="grrrgrrrrgrrgrrr"/>
-      <phase duration="64" state="gGGGgrrrrgrrgrrr"/>
+      <phase duration="1" state="grrrgrrrrgrrgrrr"/>
+      <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-90">
-      <phase duration="41" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-19">
+      <phase duration="42" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="22" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="22" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="22" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="22" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="22" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="22" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="4" state="yyrggyy"/>
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="3" state="yyrggyy"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="48" state="rrrggrr"/>
-      <phase duration="4" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="3" state="rrrggrr"/>
       <phase duration="1" state="rrrggrr"/>
-      <phase duration="21" state="GGrggGG"/>
+      <phase duration="22" state="GGrggGG"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-59">
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-20">
       <phase duration="30" state="grrrrrrrgGGGgrrr"/>
       <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="32" state="grrrrrrrgrrrgGGG"/>
       <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="21" state="grrrGGGrgrrrgGGr"/>
       <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="54" state="grrrGGGGgrrrgrrr"/>
       <phase duration="3" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="14" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="3" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="29" state="grrrrrrrgGGGgrrr"/>
       <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="32" state="grrrrrrrgrrrgGGG"/>
       <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="21" state="grrrGGGrgrrrgGGr"/>
       <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="54" state="grrrGGGGgrrrgrrr"/>
       <phase duration="3" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="14" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="3" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="29" state="grrrrrrrgGGGgrrr"/>
       <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="32" state="grrrrrrrgrrrgGGG"/>
       <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="21" state="grrrGGGrgrrrgGGr"/>
       <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="54" state="grrrGGGGgrrrgrrr"/>
       <phase duration="3" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="14" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="3" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="29" state="grrrrrrrgGGGgrrr"/>
       <phase duration="3" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="32" state="grrrrrrrgrrrgGGG"/>
       <phase duration="3" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="21" state="grrrGGGrgrrrgGGr"/>
       <phase duration="3" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="54" state="grrrGGGGgrrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-90">
+    <tlLogic id="i9" type="static" programID="i9_prog" offset="-20">
       <phase duration="42" state="GGGG"/>
       <phase duration="4" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
@@ -388,47 +382,47 @@
       <phase duration="1" state="rrrr"/>
       <phase duration="41" state="GGGG"/>
     </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-40">
+    <tlLogic id="u00" type="static" programID="u00_prog" offset="-83">
+      <phase duration="44" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
+      <phase duration="44" state="ggggGgggg"/>
+      <phase duration="3" state="ggggygggg"/>
+      <phase duration="2" state="ggggrgggg"/>
+      <phase duration="31" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
+      <phase duration="19" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
+      <phase duration="36" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
       <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="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
+      <phase duration="41" state="ggggGgggg"/>
+      <phase duration="3" state="ggggygggg"/>
+      <phase duration="2" 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="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
+      <phase duration="18" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
       <phase duration="32" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" state="ggggrgggg"/>
       <phase duration="38" state="ggggrgggg"/>
-      <phase duration="4" state="ggggrgggg"/>
-      <phase duration="1" state="ggggrgggg"/>
+      <phase duration="3" state="ggggrgggg"/>
+      <phase duration="2" 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="3" state="ggggygggg"/>
+      <phase duration="2" state="ggggrgggg"/>
       <phase duration="28" state="ggggrgggg"/>
       <phase duration="22" state="ggggrgggg"/>
     </tlLogic>
-    <tlLogic id="u20" type="static" programID="u20_prog" offset="-60">
+    <tlLogic id="u20" type="static" programID="u20_prog" offset="-90">
       <phase duration="39" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
@@ -456,12 +450,6 @@
       <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggGggg"/>
-      <phase duration="4" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
       <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
@@ -473,197 +461,197 @@
       <phase duration="1" state="ggrggg"/>
       <phase duration="65" state="ggrggg"/>
     </tlLogic>
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-100">
+    <tlLogic id="u30" type="static" programID="u30_prog" offset="-111">
       <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
       <phase duration="33" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" 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="2" state="ggggrggg"/>
-      <phase duration="37" 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="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
       <phase duration="33" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" 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="-100">
+    <tlLogic id="u31" type="static" programID="u31_prog" offset="-111">
       <phase duration="34" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="33" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="33" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="16" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="17" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="32" state="ggggGggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="33" state="ggggGggg"/>
       <phase duration="4" state="ggggyggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="33" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="34" state="ggggrggg"/>
       <phase duration="4" state="ggggrggg"/>
-      <phase duration="2" state="ggggrggg"/>
-      <phase duration="37" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="38" state="ggggrggg"/>
     </tlLogic>
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-100">
+    <tlLogic id="u32" type="static" programID="u32_prog" offset="-111">
       <phase duration="34" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="16" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="17" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="32" state="gggggggG"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="33" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="16" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="17" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="32" state="gggggggG"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="33" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="16" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="17" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="32" state="gggggggG"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="33" state="gggggggG"/>
       <phase duration="4" state="gggggggy"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="33" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="34" state="gggggggr"/>
       <phase duration="4" state="gggggggr"/>
-      <phase duration="2" state="gggggggr"/>
-      <phase duration="37" state="gggggggr"/>
+      <phase duration="1" state="gggggggr"/>
+      <phase duration="38" state="gggggggr"/>
     </tlLogic>
     <tlLogic id="u60" type="static" programID="u60_prog" offset="-160">
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="18" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="19" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="18" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="19" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="18" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="19" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="22" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="23" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="9" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="10" state="ggggggggr"/>
       <phase duration="4" state="ggggggggr"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="37" state="ggggggggG"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="38" state="ggggggggG"/>
       <phase duration="4" state="ggggggggy"/>
-      <phase duration="2" state="ggggggggr"/>
-      <phase duration="64" state="ggggggggr"/>
+      <phase duration="1" state="ggggggggr"/>
+      <phase duration="65" state="ggggggggr"/>
     </tlLogic>
 </additional>

Results/sn_1704419700.add.xml

@@ -432,46 +432,46 @@
       <phase duration="39" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="22" state="ggGggg"/>
       <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
+      <phase duration="65" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
+      <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
+      <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="22" state="ggGggg"/>
       <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="35" state="ggrggg"/>
+      <phase duration="65" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="38" state="ggrggg"/>
+      <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
+      <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="22" state="ggGggg"/>
       <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
+      <phase duration="65" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="1" state="ggrggg"/>
       <phase duration="35" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
       <phase duration="38" state="ggrggg"/>
       <phase duration="4" state="ggrggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="22" state="ggrggg"/>
-      <phase duration="4" state="ggrggg"/>
+      <phase duration="22" state="ggGggg"/>
+      <phase duration="4" state="ggyggg"/>
       <phase duration="1" state="ggrggg"/>
-      <phase duration="65" state="ggGggg"/>
+      <phase duration="65" state="ggrggg"/>
     </tlLogic>
     <tlLogic id="u30" type="static" programID="u30_prog" offset="-160">
       <phase duration="34" state="ggggrggg"/>

Scripts/generate_signals.py

@@ -538,6 +538,8 @@ class SignalGenerator():
         self.histid = self.histid[self.histid.start_unix > histid_start]
 
         mapping_dict = self.matching.set_index(['node_id', 'move_no'])['state'].to_dict()
+        # matching : 가능한 모든 (노드id, 이동류번호)에 대한 신호 * 시차제와 연관 有
+
 
         for i, row in self.histid.iterrows():
             node_id = row.node_id
@@ -569,6 +571,8 @@ class SignalGenerator():
                     phas_A = row.phas_A
                     phas_B = row.phas_B
                     new_match = self.match6[self.match6.node_id==child_id]
+                    # match6 : (노드id, 현시, 링)에 대한 (이동류번호, 신호)
+
                     Arow = new_match[(new_match.phase_no==phas_A) & (new_match.ring_type=='A')]
 
                     # A링의 state 지정

Scripts/preprocess_daily.py

@@ -511,7 +511,7 @@ class DailyPreprocessor():
         self.coord = self.coord.rename(columns={'child_id':'node_id'})
         self.coord[['inc_dir', 'out_dir', 'inc_angle','out_angle']] = np.nan
         self.coord['move_no'] = 20
-        self.coord = self.coord[['inter_no', 'phase_no', 'ring_type', 'move_no', 'inc_dir', 'out_dir', 'inc_angle','out_angle', 'inc_edge', 'out_edge', 'node_id']]
+        self.coord = self.coord[['inter_no', 'phase_no', 'ring_type', 'move_no', 'inc_dir', 'out_dir', 'inc_angle','out_angle', 'inc_edge_id', 'out_edge_id', 'node_id']]
 
         # display(coord)
         cmatches = pd.concat(cmatches)
@@ -667,11 +667,11 @@ class DailyPreprocessor():
         # 연등교차로
         for _, row in self.coord.iterrows():
             node_id = row.node_id
-            inc_edge = row.inc_edge
-            out_edge = row.out_edge
-            if not (pd.isna(inc_edge) and pd.isna(out_edge)):
-                inc_edge = self.net.getEdge(inc_edge)
-                out_edge = self.net.getEdge(out_edge)
+            inc_edge_id = row.inc_edge_id
+            out_edge_id = row.out_edge_id
+            if not (pd.isna(inc_edge_id) and pd.isna(out_edge_id)):
+                inc_edge = self.net.getEdge(inc_edge_id)
+                out_edge = self.net.getEdge(out_edge_id)
                 for conn in inc_edge.getConnections(out_edge):
                     index = conn.getTLLinkIndex()
                     if index >= 0: