rename previous angle file. make another csv file named turn_type.csv

Data/tables/angle.csv

@@ -1,9 +1,49 @@
-,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,,,
+inter_no,move_no,angle_code
+175,1,090180
+175,2,270090
+175,3,179270
+175,4,001180
+175,5,270000
+175,6,090270
+175,7,001090
+175,8,179000
+176,3,180270
+176,4,359180
+176,5,270356
+176,8,180356
+177,1,090180
+177,2,268090
+177,3,179270
+177,4,000180
+177,5,268000
+177,6,090270
+177,7,000090
+177,8,179000
+178,1,090180
+178,2,270090
+178,3,180270
+178,4,000180
+178,5,270000
+178,6,090270
+178,7,000090
+178,8,180000
+201,1,090180
+201,2,270090
+201,3,180270
+201,4,000180
+201,5,270000
+201,6,090270
+201,7,000090
+201,8,180000
+202,2,270090
+202,6,090270
+206,4,000180
+206,8,180000
+210,1,090180
+210,2,270090
+210,3,180270
+210,4,000180
+210,5,270000
+210,6,090270
+210,7,000090
+210,8,180000

Data/tables/angle_old.csv

@@ -0,0 +1,9 @@
+,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/plan.csv

@@ -1,32 +1,32 @@
 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-176,07,00,37,93,40,0,0,0,0,0,37,93,40,0,0,0,0,0,170,153,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-176,09,00,37,103,40,0,0,0,0,0,37,103,40,0,0,0,0,0,180,169,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-176,18,30,37,113,40,0,0,0,0,0,37,113,40,0,0,0,0,0,190,185,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-177,00,00,36,20,68,26,0,0,0,0,36,20,68,26,0,0,0,0,150,35,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,07,00,40,25,71,34,0,0,0,0,40,25,71,34,0,0,0,0,170,33,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,09,00,43,27,70,40,0,0,0,0,43,27,70,40,0,0,0,0,180,41,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-177,18,30,45,32,77,36,0,0,0,0,45,32,77,36,0,0,0,0,190,49,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-178,00,00,38,39,40,23,0,0,0,0,38,39,40,23,0,0,0,0,140,50,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-178,07,00,38,39,42,41,0,0,0,0,38,39,62,21,0,0,0,0,160,90,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-178,09,00,38,39,43,50,0,0,0,0,38,39,71,22,0,0,0,0,170,80,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-201,00,00,24,24,17,58,17,0,0,0,24,24,17,58,17,0,0,0,140,133,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,07,00,30,36,18,58,18,0,0,0,30,36,18,58,18,0,0,0,160,132,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-201,09,00,33,36,25,58,18,0,0,0,33,36,25,58,18,0,0,0,170,134,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-201,18,30,36,50,18,58,18,0,0,0,36,50,18,58,18,0,0,0,180,137,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-202,00,00,39,101,0,0,0,0,0,0,39,101,0,0,0,0,0,0,140,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-202,07,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-202,09,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-202,18,30,48,122,0,0,0,0,0,0,48,122,0,0,0,0,0,0,170,103,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,00,00,33,35,26,26,0,0,0,0,33,35,26,26,0,0,0,0,120,10,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,07,00,44,44,26,26,0,0,0,0,44,44,26,26,0,0,0,0,140,7,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,09,00,45,53,26,26,0,0,0,0,45,53,26,26,0,0,0,0,150,17,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-206,18,30,46,62,26,26,0,0,0,0,46,62,26,26,0,0,0,0,160,10,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,00,00,37,39,55,29,0,0,0,0,37,39,25,59,0,0,0,0,160,57,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,07,00,40,42,55,33,0,0,0,0,40,42,29,59,0,0,0,0,170,40,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,09,00,43,45,55,37,0,0,0,0,43,45,33,59,0,0,0,0,180,28,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+175,18,30,46,48,55,41,0,0,0,0,46,48,37,59,0,0,0,0,190,18,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+178,00,00,38,39,40,23,0,0,0,0,38,39,40,23,0,0,0,0,140,50,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+178,07,00,38,39,42,41,0,0,0,0,38,39,62,21,0,0,0,0,160,90,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+178,09,00,38,39,43,50,0,0,0,0,38,39,71,22,0,0,0,0,170,80,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+178,18,30,38,39,44,59,0,0,0,0,38,39,80,23,0,0,0,0,180,75,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+201,00,00,24,24,17,58,17,0,0,0,24,24,17,58,17,0,0,0,140,133,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
+201,07,00,30,36,18,58,18,0,0,0,30,36,18,58,18,0,0,0,160,132,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,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
+201,18,30,36,50,18,58,18,0,0,0,36,50,18,58,18,0,0,0,180,137,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,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,07,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,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,09,00,46,114,0,0,0,0,0,0,46,114,0,0,0,0,0,0,160,103,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,18,30,48,122,0,0,0,0,0,0,48,122,0,0,0,0,0,0,170,103,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,00,00,33,35,26,26,0,0,0,0,33,35,26,26,0,0,0,0,120,10,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,07,00,44,44,26,26,0,0,0,0,44,44,26,26,0,0,0,0,140,7,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,09,00,45,53,26,26,0,0,0,0,45,53,26,26,0,0,0,0,150,17,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+206,18,30,46,62,26,26,0,0,0,0,46,62,26,26,0,0,0,0,160,10,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
 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

Data/tables/turn_type.csv

@@ -0,0 +1,51 @@
+node_id,inc_edge_id,out_edge_id,turn_type
+i0,-571542797_02,571500487_01,straight
+i0,-571500487_01,571542797_02,straight
+i0,-571500487_01,571545870_01,left
+i0,-571542797_02,571510153_01,left
+i0,571545870_02,571510153_01,straight
+i0,571545870_02,571542797_02,left
+i0,571510153_02,571500487_01,left
+i0,571510153_02,571545870_01,straight
+i1,-571542810_01,-571542797_02.99,straight
+i1,571542797_02.99,571542810_01,straight
+i1,-571542810_01,-571542797_02.99,straight
+i1,-571542810_01,571543469_01,left
+i1,571543469_02,-571542797_02.99,left
+i2,-571542809_01,571542811_01,straight
+i2,571542811_02,571542809_01,straight
+i2,571542811_02,571542107_01,left
+i2,-571542809_01,571542809_01,left
+i2,-571542809_01,571542811_01,left
+i2,571542107_02,571542809_01,left
+i3,571540304_02,571556450_01,straight
+i3,571556450_02,571540304_01,straight
+i3,571556450_02,571500475_01,left
+i3,571540304_02,571540303_01,left
+i3,571540303_02.21,571556450_01,left
+i3,571540303_02.21,571500475_01,straight
+i3,-571500475_01,571540303_01,straight
+i3,-571500475_01,571540304_01,left
+i8,-571500569_01,571500583_02,straight
+i8,-571500569_01,571500618_01,left
+i8,571500618_02,571500583_02,left
+i8,571500618_02,571500617_01,straight
+i8,571500617_02,571500618_01,straight
+i8,571500618_02,571500617_01,straight
+i8,571500617_02,571500618_01,straight
+i8,571500617_02,571500569_01,left
+i8,571500583_01,571500617_01,left
+i8,571500583_01,571500569_01,straight
+i9,571510152_02,-571510152_01,straight
+i9,571510152_01,571510152_01.65,straight
+i7,-571511538_02,571542073_02,straight
+i7,571542073_01,571511538_02,straight
+i7,-571511538_02,571542073_02,straight
+i7,571542073_01,571511538_02,straight
+i6,-571542115_01,571500535_01,straight
+i6,571500535_02.18,571511538_01,left
+i6,571500535_02.18,571542115_01,straight
+i6,571511538_02.121,571542115_01,left
+i6,571511538_02.121,571500585_01,straight
+i6,571500585_02,571511538_01,straight
+i6,571500585_02,571500535_01,left

Data/tables/uturn.csv

@@ -1,4 +1,4 @@
-parent_id,child_id,head_edge_id,inc_edge_id,out_edge_id
+parent_id,child_id,head_edge_id,from_edge_id,to_edge_id
 i0,u00,-571500487_01,571500487_02,571500487_01.32
 i2,u20,571542811_02,571542810_01.51,571542810_02
 i3,u30,571556450_02,571556452_01,571556452_02

Results/sn_1704418200.add.xml

@@ -1,50 +1,50 @@
 <additional>
-    <tlLogic id="c30" type="static" programID="c30_prog" offset="-10">
-      <phase duration="34" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+    <tlLogic id="c30" type="static" programID="c30_prog" offset="-80">
+      <phase duration="33" state="rrrrrr"/>
+      <phase duration="5" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="33" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="16" state="GGGGGG"/>
+      <phase duration="5" state="yyyyyy"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="33" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+      <phase duration="32" state="rrrrrr"/>
+      <phase duration="5" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="33" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="16" state="GGGGGG"/>
+      <phase duration="5" state="yyyyyy"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="33" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+      <phase duration="32" state="rrrrrr"/>
+      <phase duration="5" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="33" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="17" state="GGGGGG"/>
-      <phase duration="4" state="yyyyyy"/>
+      <phase duration="16" state="GGGGGG"/>
+      <phase duration="5" state="yyyyyy"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="33" state="rrrrrr"/>
-      <phase duration="4" state="rrrrrr"/>
+      <phase duration="32" state="rrrrrr"/>
+      <phase duration="5" state="rrrrrr"/>
       <phase duration="1" state="rrrrrr"/>
-      <phase duration="34" state="GGGGGG"/>
-      <phase duration="4" state="GGGGGG"/>
+      <phase duration="33" state="GGGGGG"/>
+      <phase duration="5" state="GGGGGG"/>
       <phase duration="1" state="GGGGGG"/>
-      <phase duration="38" state="GGGGGG"/>
+      <phase duration="37" state="GGGGGG"/>
     </tlLogic>
-    <tlLogic id="i0" type="static" programID="i0_prog" offset="-40">
+    <tlLogic id="i0" type="static" programID="i0_prog" offset="-20">
       <phase duration="39" state="gGGrgrrrgGGGGrgrr"/>
       <phase duration="4" state="gyyrgrrrgyyyyrgrr"/>
       <phase duration="1" state="grrrgrrrgrrrrrgrr"/>
@@ -84,148 +84,128 @@
       <phase duration="28" state="grrrgGGGgrrrrrgrr"/>
       <phase duration="22" state="grrrgGGygrrrrrgrr"/>
     </tlLogic>
-    <tlLogic id="i1" type="static" programID="i1_prog" offset="-150">
+    <tlLogic id="i1" type="static" programID="i1_prog" offset="-39">
       <phase duration="33" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="99" state="grrGGGGgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="36" state="grrrrrrgGG"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="35" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="gGGrrrrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="33" state="gGGGGGrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="32" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="99" state="grrGGGGgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="36" state="grrrrrrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="35" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="gGGrrrrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="33" state="gGGGGGrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="32" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="99" state="grrGGGGgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
       <phase duration="4" state="grryyyygrr"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgGG"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="36" state="grrrrrrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="35" state="grrrrrrgGG"/>
       <phase duration="4" state="grrrrrrgyy"/>
-      <phase duration="0" state="grrrrrrgrr"/>
-      <phase duration="0" state="gGGrrrrgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="33" state="gGGGGGrgrr"/>
+      <phase duration="1" state="grrrrrrgrr"/>
+      <phase duration="32" state="gGGGGGrgrr"/>
       <phase duration="4" state="gyyGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="0" state="grrGGGrgrr"/>
-      <phase duration="0" state="grrGGGGgrr"/>
-      <phase duration="99" state="grrGGGrgrr"/>
+      <phase duration="1" state="grrGGGrgrr"/>
+      <phase duration="98" state="grrGGGGgrr"/>
     </tlLogic>
     <tlLogic id="i2" type="static" programID="i2_prog" offset="-60">
-      <phase duration="38" state="GGgrGGG"/>
-      <phase duration="5" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="39" state="GGgrGGG"/>
+      <phase duration="4" state="yygryyy"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="21" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="64" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="34" state="rrgrGGG"/>
-      <phase duration="5" state="rrgrGGG"/>
-      <phase duration="1" state="rrgrGGG"/>
+      <phase duration="4" state="rrgrGGG"/>
+      <phase duration="2" state="rrgrGGG"/>
       <phase duration="37" state="GGgrGGG"/>
-      <phase duration="5" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="yygryyy"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="21" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="64" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="34" state="rrgrGGG"/>
-      <phase duration="5" state="rrgrGGG"/>
-      <phase duration="1" state="rrgrGGG"/>
+      <phase duration="4" state="rrgrGGG"/>
+      <phase duration="2" state="rrgrGGG"/>
       <phase duration="37" state="GGgrGGG"/>
-      <phase duration="5" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="yygryyy"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="21" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="64" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="34" state="rrgrGGG"/>
-      <phase duration="5" state="rrgrGGG"/>
-      <phase duration="1" state="rrgrGGG"/>
+      <phase duration="4" state="rrgrGGG"/>
+      <phase duration="2" state="rrgrGGG"/>
       <phase duration="37" state="GGgrGGG"/>
-      <phase duration="5" state="yygryyy"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="yygryyy"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="21" state="rrgrrrr"/>
-      <phase duration="5" state="rrgrrrr"/>
-      <phase duration="1" state="rrgrrrr"/>
+      <phase duration="4" state="rrgrrrr"/>
+      <phase duration="2" state="rrgrrrr"/>
       <phase duration="64" state="rrgrrrr"/>
     </tlLogic>
-    <tlLogic id="i3" type="static" programID="i3_prog" offset="-10">
-      <phase duration="34" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
+    <tlLogic id="i3" type="static" programID="i3_prog" offset="-80">
+      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="5" state="gyyyrgrrrrgyyyrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="5" state="grrrygrrrrgrrrygrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
-      <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="5" state="grrrrgrrrrgrrrrgyyyy"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
-      <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
+      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="5" state="grrrrgyyyygrrrrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
+      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="5" state="gyyyrgrrrrgyyyrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="5" state="grrrygrrrrgrrrygrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
-      <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="5" state="grrrrgrrrrgrrrrgyyyy"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
-      <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
+      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="5" state="grrrrgyyyygrrrrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
+      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="5" state="gyyyrgrrrrgyyyrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="5" state="grrrygrrrrgrrrygrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
-      <phase duration="4" state="grrrrgrrrrgrrrrgyyyy"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="5" state="grrrrgrrrrgrrrrgyyyy"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="17" state="grrrrgGGGGgrrrrgrrrr"/>
-      <phase duration="4" state="grrrrgyyyygrrrrgrrrr"/>
+      <phase duration="16" state="grrrrgGGGGgrrrrgrrrr"/>
+      <phase duration="5" state="grrrrgyyyygrrrrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="33" state="gGGGrgrrrrgGGGrgrrrr"/>
-      <phase duration="4" state="gyyyrgrrrrgyyyrgrrrr"/>
+      <phase duration="32" state="gGGGrgrrrrgGGGrgrrrr"/>
+      <phase duration="5" state="gyyyrgrrrrgyyyrgrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="34" state="grrrGgrrrrgrrrGgrrrr"/>
-      <phase duration="4" state="grrrygrrrrgrrrygrrrr"/>
+      <phase duration="33" state="grrrGgrrrrgrrrGgrrrr"/>
+      <phase duration="5" state="grrrygrrrrgrrrygrrrr"/>
       <phase duration="1" state="grrrrgrrrrgrrrrgrrrr"/>
-      <phase duration="38" state="grrrrgrrrrgrrrrgGGGG"/>
+      <phase duration="37" state="grrrrgrrrrgrrrrgGGGG"/>
     </tlLogic>
     <tlLogic id="i6" type="static" programID="i6_prog" offset="-10">
       <phase duration="1" state="grrrgGGGrgrrgrrr"/>
@@ -285,130 +265,158 @@
       <phase duration="1" state="grrrgrrrrgrrgrrr"/>
       <phase duration="65" state="gGGGgrrrrgrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i7" type="static" programID="i7_prog" offset="-60">
-      <phase duration="40" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="47" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="39" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="47" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="39" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="47" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="39" state="GGrggGG"/>
-      <phase duration="5" state="yyrggyy"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="47" state="rrrggrr"/>
-      <phase duration="5" state="rrrggrr"/>
-      <phase duration="1" state="rrrggrr"/>
-      <phase duration="20" state="GGrggGG"/>
+    <tlLogic id="i7" type="static" programID="i7_prog" offset="-10">
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="GGrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="22" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="22" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="GGrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="GGrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="22" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="22" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="GGrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="GGrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="22" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="22" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="GGrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="41" state="GGrggGG"/>
+      <phase duration="4" state="yyrggyy"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="49" state="rrrggrr"/>
+      <phase duration="4" state="rrrggrr"/>
+      <phase duration="0" state="rrrggGG"/>
+      <phase duration="0" state="GGrggGG"/>
+      <phase duration="0" state="rrrggrr"/>
+      <phase duration="22" state="GGrggrr"/>
     </tlLogic>
-    <tlLogic id="i8" type="static" programID="i8_prog" offset="-20">
+    <tlLogic id="i8" type="static" programID="i8_prog" offset="-49">
       <phase duration="29" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
       <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="12" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="27" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
       <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="12" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="27" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
       <phase duration="4" state="grrryyyygrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="12" state="gGGGrrrrgrrrgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="13" state="gGGGrrrrgrrrgrrr"/>
       <phase duration="4" state="gyyyrrrrgrrrgrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="27" state="grrrrrrrgGGGgrrr"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="28" state="grrrrrrrgGGGgrrr"/>
       <phase duration="4" state="grrrrrrrgyyygrrr"/>
-      <phase duration="2" state="grrrrrrrgrrrgrrr"/>
-      <phase duration="30" state="grrrrrrrgrrrgGGG"/>
+      <phase duration="1" state="grrrrrrrgrrrgrrr"/>
+      <phase duration="31" state="grrrrrrrgrrrgGGG"/>
       <phase duration="4" state="grrrrrrrgrrrgGGy"/>
-      <phase duration="2" state="grrrrrrrgrrrgGGr"/>
-      <phase duration="19" state="grrrGGGrgrrrgGGr"/>
+      <phase duration="1" state="grrrrrrrgrrrgGGr"/>
+      <phase duration="20" state="grrrGGGrgrrrgGGr"/>
       <phase duration="4" state="grrrGGGrgrrrgyyr"/>
-      <phase duration="2" state="grrrGGGrgrrrgrrr"/>
-      <phase duration="52" state="grrrGGGGgrrrgrrr"/>
+      <phase duration="1" state="grrrGGGrgrrrgrrr"/>
+      <phase duration="53" state="grrrGGGGgrrrgrrr"/>
     </tlLogic>
-    <tlLogic id="i9" type="static" programID="i9_prog" offset="-130">
-      <phase duration="42" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
+    <tlLogic id="i9" type="static" programID="i9_prog" offset="-160">
+      <phase duration="41" state="GGGG"/>
+      <phase duration="5" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
+      <phase duration="108" state="rrrr"/>
+      <phase duration="5" state="rrrr"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
+      <phase duration="40" state="GGGG"/>
+      <phase duration="5" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
+      <phase duration="108" state="rrrr"/>
+      <phase duration="5" state="rrrr"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
-      <phase duration="4" state="yyyy"/>
+      <phase duration="40" state="GGGG"/>
+      <phase duration="5" state="yyyy"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="109" state="rrrr"/>
-      <phase duration="4" state="rrrr"/>
+      <phase duration="108" state="rrrr"/>
+      <phase duration="5" state="rrrr"/>
       <phase duration="1" state="rrrr"/>
-      <phase duration="41" state="GGGG"/>
+      <phase duration="40" state="GGGG"/>
     </tlLogic>
-    <tlLogic id="u00" type="static" programID="u00_prog" offset="-40">
+    <tlLogic id="u00" type="static" programID="u00_prog" offset="-20">
       <phase duration="39" state="ggggrgggg"/>
       <phase duration="4" state="ggggrgggg"/>
       <phase duration="1" state="ggggrgggg"/>
@@ -449,184 +457,184 @@
       <phase duration="22" state="ggggrgggg"/>
     </tlLogic>
     <tlLogic id="u20" type="static" programID="u20_prog" offset="-60">
-      <phase duration="38" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="39" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="21" state="ggGggg"/>
-      <phase duration="5" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggyggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="64" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="34" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="37" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="21" state="ggGggg"/>
-      <phase duration="5" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggyggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="64" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="34" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="37" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="21" state="ggGggg"/>
-      <phase duration="5" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggyggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="64" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="34" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="37" state="ggrggg"/>
-      <phase duration="5" state="ggrggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggrggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="21" state="ggGggg"/>
-      <phase duration="5" state="ggyggg"/>
-      <phase duration="1" state="ggrggg"/>
+      <phase duration="4" state="ggyggg"/>
+      <phase duration="2" state="ggrggg"/>
       <phase duration="64" state="ggrggg"/>
     </tlLogic>
-    <tlLogic id="u30" type="static" programID="u30_prog" offset="-10">
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+    <tlLogic id="u30" type="static" programID="u30_prog" offset="-80">
+      <phase duration="33" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="33" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
+      <phase duration="1" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="16" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+      <phase duration="32" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
       <phase duration="33" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="16" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+      <phase duration="32" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
       <phase duration="33" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="16" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+      <phase duration="32" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
       <phase duration="33" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="5" 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="37" state="ggggrggg"/>
     </tlLogic>
-    <tlLogic id="u31" type="static" programID="u31_prog" offset="-10">
-      <phase duration="34" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+    <tlLogic id="u31" type="static" programID="u31_prog" offset="-80">
+      <phase duration="33" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="33" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="16" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+      <phase duration="32" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="33" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="16" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+      <phase duration="32" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="33" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="17" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="16" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="33" state="ggggGggg"/>
-      <phase duration="4" state="ggggyggg"/>
+      <phase duration="32" state="ggggGggg"/>
+      <phase duration="5" state="ggggyggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="34" state="ggggrggg"/>
-      <phase duration="4" state="ggggrggg"/>
+      <phase duration="33" state="ggggrggg"/>
+      <phase duration="5" state="ggggrggg"/>
       <phase duration="1" state="ggggrggg"/>
-      <phase duration="38" state="ggggrggg"/>
+      <phase duration="37" state="ggggrggg"/>
     </tlLogic>
-    <tlLogic id="u32" type="static" programID="u32_prog" offset="-10">
-      <phase duration="34" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
+    <tlLogic id="u32" type="static" programID="u32_prog" offset="-80">
+      <phase duration="33" state="gggggggG"/>
+      <phase duration="5" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="33" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="37" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="17" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="16" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="33" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
+      <phase duration="32" state="gggggggG"/>
+      <phase duration="5" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="33" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="37" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="17" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="16" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="33" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
+      <phase duration="32" state="gggggggG"/>
+      <phase duration="5" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="33" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="37" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="17" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="16" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="33" state="gggggggG"/>
-      <phase duration="4" state="gggggggy"/>
+      <phase duration="32" state="gggggggG"/>
+      <phase duration="5" state="gggggggy"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="34" state="gggggggr"/>
-      <phase duration="4" state="gggggggr"/>
+      <phase duration="33" state="gggggggr"/>
+      <phase duration="5" state="gggggggr"/>
       <phase duration="1" state="gggggggr"/>
-      <phase duration="38" state="gggggggr"/>
+      <phase duration="37" state="gggggggr"/>
     </tlLogic>
     <tlLogic id="u60" type="static" programID="u60_prog" offset="-10">
       <phase duration="1" state="ggggggggr"/>

Scripts/preprocess_daily.py

@@ -56,7 +56,7 @@ class DailyPreprocessor():
         # 테이블 불러오기
         self.inter_info = pd.read_csv(os.path.join(self.path_tables, 'inter_info.csv'), dtype=loading_dtype)
         # self.angle      = pd.read_csv(os.path.join(self.path_tables, 'angle.csv'), dtype=loading_dtype)
-        self.angle  = pd.read_csv(os.path.join(self.path_tables, 'angle_new.csv'), dtype=loading_dtype)
+        self.angle      = pd.read_csv(os.path.join(self.path_tables, 'angle.csv'), dtype=loading_dtype)
         self.plan       = pd.read_csv(os.path.join(self.path_tables, 'plan.csv'), dtype=loading_dtype)
         self.inter_node = pd.read_csv(os.path.join(self.path_tables, 'inter_node.csv'), dtype=loading_dtype)
         self.uturn      = pd.read_csv(os.path.join(self.path_tables, 'child_uturn.csv'), dtype=loading_dtype)