Another fix of measurer

1 files changed, 118 insertions, 118 deletions

diff --git a/src/adldata.cpp b/src/adldata.cpp
index e24d06c..eeb8186 100644
--- a/src/adldata.cpp
+++ b/src/adldata.cpp
@@ -8569,8 +8569,8 @@ const struct adlinsdata adlins[4920] =
     {3679,3679,  0, 0,   4633,   100,      0, 0 },
     {3680,3680,  0, 0,   2266,   133,      0, 0 },
     {3681,3681,  0, 0,   2346,    53,      0, 0 },
-    {3682,3682,  0, 0,  40000,    66,     50, 0 },
-    {3683,3683,  0, 0,   9686,   173,     20, 0 },
+    {3682,3682,  0, 0,  40000,    73,     50, 0 },
+    {3683,3683,  0, 0,   9693,   180,     20, 0 },
     {3684,3684,  0, 0,  14300,    66,      0, 0 },
     {3685,3685,  0, 0,  40000,     0,      0, 0 },
     {3686,3686,  0, 0,  40000,     0,      0, 0 },
@@ -8633,7 +8633,7 @@ const struct adlinsdata adlins[4920] =
     {3743,3743,  0, 0,  40000,     0,    -50, 0 },
     {3744,3744,  0, 0,  11486,   593,      0, 0 },
     {3745,3745,  0, 0,  40000,  1246,      0, 0 },
-    {3746,3746,  0, 0,  40000,   140,    -20, 0 },
+    {3746,3746,  0, 0,  40000,   146,    -20, 0 },
     {3747,3747,  0, 0,  14386,  2680,      0, 0 },
     {3748,3748,  0, 0,  40000,   653,      0, 0 },
     {3749,3749,  0, 0,   2286,   713,      0, 0 },
@@ -8667,76 +8667,76 @@ const struct adlinsdata adlins[4920] =
     {3777,3777,  0, 0,  40000,   200,      0, 0 },
     {3778,3778,  0, 0,    586,    20,      0, 0 },
     {3779,3779,  0, 2,      6,     0,     40, 0 },
-    { 738, 738, 44, 0,    840,   340,     33, 0 },
-    {3780,3780, 36, 0,   7366,   140,     33, 0 },
-    {3781,3781, 32, 0,    100,    40,     40, 0 },
-    {2030,2030, 60, 0,    293,   126,     50, 0 },
+    { 738, 738, 44, 0,    826,   346,     33, 0 },
+    {3780,3780, 36, 0,   7366,   146,     33, 0 },
+    {3781,3781, 32, 0,    100,    33,     40, 0 },
+    {2030,2030, 60, 0,    280,   126,     50, 0 },
     {3782,3782, 24, 0,    100,     0,     40, 0 },
-    {3783,3783, 60, 0,    126,    73,     50, 0 },
+    {3783,3783, 60, 0,    126,    66,     50, 0 },
     {3784,3784, 44, 0,    393,    93,     50, 0 },
-    { 132, 132, 44, 0,    173,   100,     40, 0 },
+    { 132, 132, 44, 0,    173,    93,     40, 0 },
     {3785,3785, 47, 0,    393,    93,     50, 0 },
-    { 152, 152, 44, 0,    213,    86,     40, 0 },
+    { 152, 152, 44, 0,    213,    80,     40, 0 },
     {3784,3784, 50, 0,    393,    93,     50, 0 },
-    { 139, 139, 44, 0,    293,   100,     40, 0 },
+    { 139, 139, 44, 0,    293,   133,     40, 0 },
     {3784,3784, 54, 0,    393,    93,     50, 0 },
     {3784,3784, 57, 0,    393,    93,     50, 0 },
-    {3786,3786, 60, 0,   1900,   666,     40, 0 },
+    {3786,3786, 60, 0,   1866,   660,     40, 0 },
     {3784,3784, 60, 0,    393,    93,     50, 0 },
-    {3514,3514, 60, 0,   1886,   646,     30, 0 },
-    {3787,3787, 60, 0,   1900,   666,     45, 0 },
-    {3788,3788, 60, 0,   1886,   666,     30, 0 },
+    {3514,3514, 60, 0,   1860,   653,     30, 0 },
+    {3787,3787, 60, 0,   1866,   660,     45, 0 },
+    {3788,3788, 60, 0,   1826,   646,     30, 0 },
     {3516,3516, 60, 0,    180,    93,     40, 0 },
-    {3789,3789, 60, 0,   1866,   653,     40, 0 },
-    {3517,3517, 58, 0,    213,   213,     40, 0 },
-    {3790,3790, 60, 0,   1873,   633,     40, 0 },
-    {3791,3791, 44, 0,    946,   333,     40, 0 },
-    {3519,3519, 60, 0,   1873,   653,     20, 0 },
+    {3789,3789, 60, 0,   1853,   660,     40, 0 },
+    {3517,3517, 58, 0,    193,   200,     40, 0 },
+    {3790,3790, 60, 0,   1860,   653,     40, 0 },
+    {3791,3791, 44, 0,    960,   346,     40, 0 },
+    {3519,3519, 60, 0,   1853,   660,     20, 0 },
     {2037,2037, 44, 0,    213,   126,     40, 0 },
     { 144, 144, 44, 0,    213,   126,     40, 0 },
-    {2038,2038, 44, 0,    106,    46,     40, 0 },
-    {3792,3792, 44, 0,    380,   360,     40, 0 },
+    {2038,2038, 44, 0,    100,    40,     40, 0 },
+    {3792,3792, 44, 0,    360,   353,     40, 0 },
     {3793,3793, 44, 0,    520,   206,     40, 0 },
-    {3794,3794, 45, 0,    273,   100,     40, 0 },
-    {3795,3795, 33, 0,    326,   106,     40, 0 },
+    {3794,3794, 45, 0,    266,    86,     40, 0 },
+    {3795,3795, 33, 0,    320,    93,     40, 0 },
     {3796,3796, 56, 0,    506,   200,     40, 0 },
     {3796,3796, 51, 0,    506,   200,     40, 0 },
-    {3530,3530, 55, 0,    220,    86,     40, 0 },
+    {3530,3530, 55, 0,    220,    80,     40, 0 },
     {3797,3797, 44, 0,    126,    66,     40, 0 },
-    {3798,3798, 44, 0,    553,   186,     40, 0 },
-    {3533,3533, 57, 0,    166,    80,     40, 0 },
-    {3534,3534, 56, 0,    240,   100,     40, 0 },
-    { 158, 158, 68, 0,    126,   140,     40, 0 },
-    {3799,3799, 51, 0,    513,   206,     40, 0 },
-    {3800,3800, 46, 0,    506,   200,     40, 0 },
-    {3537,3537, 64, 0,    346,    53,     40, 0 },
+    {3798,3798, 44, 0,    553,   180,     40, 0 },
+    {3533,3533, 57, 0,    166,    73,     40, 0 },
+    {3534,3534, 56, 0,    240,    93,     40, 0 },
+    { 158, 158, 68, 0,    120,   120,     40, 0 },
+    {3799,3799, 51, 0,    506,   200,     40, 0 },
+    {3800,3800, 46, 0,    513,   206,     40, 0 },
+    {3537,3537, 64, 0,    340,    53,     40, 0 },
     {3538,3538, 44, 0,   1080,   346,     40, 0 },
-    {3801,3801, 44, 0,    513,   206,     40, 0 },
-    {3802,3802, 44, 0,   3720,  1260,     40, 0 },
+    {3801,3801, 44, 0,    506,   200,     40, 0 },
+    {3802,3802, 44, 0,   3706,  1280,     40, 0 },
     { 152, 152, 45, 0,    220,    80,     20, 0 },
-    {3683,3683,  0, 0,   9686,   173,     50, 0 },
+    {3683,3683,  0, 0,   9693,   180,     50, 0 },
     {3803,3803,  0, 0,  40000,    86,     20, 0 },
     {3804,3804,  0, 0,  40000,   226,      0, 0 },
-    {3712,3712,  0, 0,  40000,   226,     50, 0 },
+    {3712,3712,  0, 0,  40000,   240,     50, 0 },
     {3805,3805,  0, 0,  40000,    73,      0, 0 },
     {3806,3806,  0, 0,  40000,    73,      0, 0 },
     {3807,3807,  0, 0,  40000,    93,      0, 0 },
-    {3808,3808,  0, 0,   4653,   660,    -18, 0 },
-    {3809,3809,  0, 0,   6686,  2246,     10, 0 },
+    {3808,3808,  0, 0,   4653,   666,    -18, 0 },
+    {3809,3809,  0, 0,   6826,  2393,     10, 0 },
     {3810,3810,  0, 0,   1180,   413,      0, 0 },
-    {3811,3811,  0, 0,    966,   293,     30, 0 },
+    {3811,3811,  0, 0,   1006,   340,     30, 0 },
     {3812,3812,  0, 0,   1780,    66,      0, 0 },
-    {3780,3780, 45, 0,   5900,   113,     20, 0 },
+    {3780,3780, 45, 0,   5906,   126,     20, 0 },
     {3061,3061, 45, 0,  40000,     0,     40, 0 },
-    {3813,3813, 60, 0,    126,   226,     60, 0 },
-    {3781,3781, 60, 0,     93,    33,     60, 0 },
-    {3814,3814, 44, 0,    393,    86,     50, 0 },
-    {3815,3815, 57, 0,    166,    80,    127, 0 },
-    {3816,3816, 56, 0,    240,   100,    127, 0 },
-    {3817,3817, 60, 0,    113,    26,     60, 0 },
-    {3818,3818, 60, 0,    113,    26,     60, 0 },
+    {3813,3813, 60, 0,    120,   186,     60, 0 },
+    {3781,3781, 60, 0,     86,    26,     60, 0 },
+    {3814,3814, 44, 0,    386,    93,     50, 0 },
+    {3815,3815, 57, 0,    166,    73,    127, 0 },
+    {3816,3816, 56, 0,    240,    93,    127, 0 },
+    {3817,3817, 60, 0,    106,    26,     60, 0 },
+    {3818,3818, 60, 0,    106,    26,     60, 0 },
     {3061,3061, 45, 0,  40000,     0,     20, 0 },
-    {3517,3517, 45, 0,    213,   213,     20, 0 },
+    {3517,3517, 45, 0,    193,   193,     20, 0 },
     {3819,3819,  0, 0,   4033,   100,      0, 0 },
     {3820,3820,  0, 0,   5200,   873,      0, 0 },
     {3821,3821,  0, 0,  40000,     0,      0, 0 },
@@ -8843,49 +8843,49 @@ const struct adlinsdata adlins[4920] =
     {3923,3923,  0, 0,    613,   226,      0, 0 },
     { 352, 352, 44, 2,      6,     0,      0, 0 },
     {3924,3924, 34, 8,    386,   160,      0, 0 },
-    {3502,3502, 64, 8,    126,    66,      0, 0 },
-    {3925,3925, 19, 16,    300,   146,      0, 0 },
-    {3926,3926, 74, 16,    186,   173,      0, 0 },
-    {3927,3927, 29, 16,    340,   153,      0, 0 },
-    {3928,3928, 46, 24,    280,   126,      0, 0 },
-    {3929,3929, 48, 40,    946,   333,      0, 0 },
-    {3930,3930, 49, 24,    280,   126,      0, 0 },
-    {3931,3931, 48, 40,    946,   333,      0, 0 },
-    {3932,3932, 52, 24,    506,   200,      0, 0 },
-    {3933,3933, 48, 40,    953,   346,      0, 0 },
-    {3932,3932, 54, 24,    513,   200,      0, 0 },
-    {3934,3934, 57, 24,    973,   306,      0, 0 },
-    {3935,3935, 13, 40,   2186,   640,      0, 0 },
-    {3932,3932, 60, 24,    513,   200,      0, 0 },
-    {3936,3936, 56, 40,    960,   346,      0, 0 },
-    {3937,3937, 13, 40,   2186,   640,      0, 0 },
-    {3938,3938,113, 8,   1046,   513,      0, 0 },
-    {3939,3939, 91, 16,    186,   100,      0, 0 },
-    {3940,3940, 13, 40,   2186,   640,      0, 0 },
-    {3941,3941, 83, 8,    220,   106,      0, 0 },
-    {3942,3942, 19, 8,   2286,   813,      0, 0 },
-    {3936,3936, 54, 40,    966,   353,      0, 0 },
+    {3502,3502, 64, 8,    120,    60,      0, 0 },
+    {3925,3925, 19, 16,    300,   140,      0, 0 },
+    {3926,3926, 74, 16,    180,   153,      0, 0 },
+    {3927,3927, 29, 16,    333,   146,      0, 0 },
+    {3928,3928, 46, 24,    286,   133,      0, 0 },
+    {3929,3929, 48, 40,    946,   340,      0, 0 },
+    {3930,3930, 49, 24,    280,   133,      0, 0 },
+    {3931,3931, 48, 40,    946,   340,      0, 0 },
+    {3932,3932, 52, 24,    513,   200,      0, 0 },
+    {3933,3933, 48, 40,    946,   340,      0, 0 },
+    {3932,3932, 54, 24,    513,   206,      0, 0 },
+    {3934,3934, 57, 24,    953,   300,      0, 0 },
+    {3935,3935, 13, 40,   2133,   633,      0, 0 },
+    {3932,3932, 60, 24,    506,   200,      0, 0 },
+    {3936,3936, 56, 40,    966,   360,      0, 0 },
+    {3937,3937, 13, 40,   2133,   633,      0, 0 },
+    {3938,3938,113, 8,    933,   446,      0, 0 },
+    {3939,3939, 91, 16,    186,   106,      0, 0 },
+    {3940,3940, 13, 40,   2133,   633,      0, 0 },
+    {3941,3941, 83, 8,    213,   106,      0, 0 },
+    {3942,3942, 19, 8,   2346,   806,      0, 0 },
+    {3936,3936, 54, 40,    966,   360,      0, 0 },
     {3520,3520, 72, 8,    260,    93,      0, 0 },
     {3521,3521, 77, 8,    253,    93,      0, 0 },
     {3522,3522, 70, 8,    206,    93,      0, 0 },
     {3523,3523, 75, 8,    173,    93,      0, 0 },
-    {3524,3524, 69, 8,    406,   113,      0, 0 },
+    {3524,3524, 69, 8,    406,   120,      0, 0 },
     {3525,3525, 59, 8,    380,   160,      0, 0 },
     {3526,3526, 48, 8,    373,    40,      0, 0 },
-    {3527,3527, 89, 8,    433,   180,      0, 0 },
-    {3528,3528, 84, 8,    813,   180,      0, 0 },
+    {3527,3527, 89, 8,    433,   173,      0, 0 },
+    {3528,3528, 84, 8,    806,   180,      0, 0 },
     {3529,3529, 33, 8,    240,    53,      0, 0 },
-    {3943,3943, 78, 16,    280,   113,      0, 0 },
-    {3531,3531, 58, 8,    526,   200,      0, 0 },
-    {3532,3532, 52, 8,    526,   193,      0, 0 },
-    {3944,3944, 49, 40,    286,    60,      0, 0 },
-    {3945,3945, 49, 40,    286,    60,      0, 0 },
-    {3535,3535, 85, 8,    220,   113,      0, 0 },
+    {3943,3943, 78, 16,    280,   106,      0, 0 },
+    {3531,3531, 58, 8,    520,   200,      0, 0 },
+    {3532,3532, 52, 8,    520,   193,      0, 0 },
+    {3944,3944, 49, 40,    286,    66,      0, 0 },
+    {3945,3945, 49, 40,    286,    66,      0, 0 },
+    {3535,3535, 85, 8,    220,   106,      0, 0 },
     {3536,3536, 68, 8,    173,    93,      0, 0 },
-    {3536,3536, 61, 8,    220,   113,      0, 0 },
+    {3536,3536, 61, 8,    220,   106,      0, 0 },
     { 352, 352, 60, 2,      6,     0,      0, 0 },
-    {3539,3539,100, 8,    193,    20,      0, 0 },
-    {3946,3946,100, 8,    973,   353,      0, 0 },
+    {3539,3539,100, 8,    193,    26,      0, 0 },
+    {3946,3946,100, 8,    960,   353,      0, 0 },
     {3947,3947,  0, 0,   9073,  2946,      0, 0 },
     {3948,3948,  0, 0,  40000,    73,      0, 0 },
     {3949,3949,  0, 0,  40000,     0,      0, 0 },
@@ -8897,50 +8897,50 @@ const struct adlinsdata adlins[4920] =
     { 523, 523,  0, 0,    200,   260,      0, 0 },
     {3955,3955,  0, 0,    340,   146,      0, 0 },
     {3956,3956,  0, 0,    366,   260,      0, 0 },
-    { 738, 738, 47, 8,    846,   353,      0, 0 },
+    { 738, 738, 47, 8,    826,   340,      0, 0 },
     {3957,3957, 36, 8,   7373,   146,      0, 0 },
-    {3958,3958, 67, 8,    153,   120,      0, 0 },
-    {3959,3959, 60, 16,    146,   160,      0, 0 },
+    {3958,3958, 67, 8,    133,   100,      0, 0 },
+    {3959,3959, 60, 16,    146,   153,      0, 0 },
     {3960,3960, 60, 16,    113,   240,      0, 0 },
-    {3961,3961, 60, 16,    220,   106,      0, 0 },
+    {3961,3961, 60, 16,    220,   113,      0, 0 },
     {3784,3784, 48, 24,    393,    93,      0, 0 },
-    {3962,3962, 60, 40,    413,   413,      0, 0 },
+    {3962,3962, 60, 40,    406,   406,      0, 0 },
     {3785,3785, 52, 24,    393,    93,      0, 0 },
     {3963,3963, 60, 40,    433,   326,      0, 0 },
     {3784,3784, 55, 24,    393,    93,      0, 0 },
-    {3964,3964, 60, 40,    666,   346,      0, 0 },
+    {3964,3964, 60, 40,    660,   326,      0, 0 },
     {3784,3784, 60, 24,    393,    93,      0, 0 },
     {3784,3784, 64, 24,    393,    93,      0, 0 },
-    {3965,3965, 60, 32,    973,   206,      0, 0 },
-    {3784,3784, 67, 24,    340,    86,      0, 0 },
-    {3966,3966, 60, 40,    553,   366,      0, 0 },
-    {3967,3967, 60, 32,    593,   100,      0, 0 },
-    {3968,3968, 60, 40,    993,   380,      0, 0 },
-    {3969,3969, 60, 40,   2226,  1160,      0, 0 },
-    {3970,3970, 60, 32,    586,    93,      0, 0 },
-    {3971,3971, 48, 32,    220,    93,      0, 0 },
-    {3972,3972, 60, 32,    413,   400,      0, 0 },
-    {3973,3973, 60, 32,    306,   173,      0, 0 },
-    {3974,3974, 67, 24,    766,   573,      0, 0 },
-    {3975,3975, 62, 24,    980,   753,      0, 0 },
-    {3976,3976, 67, 24,    333,   113,      0, 0 },
-    {3977,3977, 67, 24,    600,   173,      0, 0 },
-    {3977,3977, 60, 24,    713,   206,      0, 0 },
-    {3971,3971, 53, 32,    220,    93,      0, 0 },
-    {3978,3978, 48, 32,    226,    93,      0, 0 },
+    {3965,3965, 60, 32,    966,   206,      0, 0 },
+    {3784,3784, 67, 24,    340,    93,      0, 0 },
+    {3966,3966, 60, 40,    546,   360,      0, 0 },
+    {3967,3967, 60, 32,    586,   100,      0, 0 },
+    {3968,3968, 60, 40,    993,   386,      0, 0 },
+    {3969,3969, 60, 40,   2200,   986,      0, 0 },
+    {3970,3970, 60, 32,    580,    93,      0, 0 },
+    {3971,3971, 48, 32,    226,    93,      0, 0 },
+    {3972,3972, 60, 32,    340,   340,      0, 0 },
+    {3973,3973, 60, 32,    306,   180,      0, 0 },
+    {3974,3974, 67, 24,    733,   546,      0, 0 },
+    {3975,3975, 62, 24,    973,   753,      0, 0 },
+    {3976,3976, 67, 24,    333,   120,      0, 0 },
+    {3977,3977, 67, 24,    600,   180,      0, 0 },
+    {3977,3977, 60, 24,    706,   206,      0, 0 },
+    {3971,3971, 53, 32,    226,   100,      0, 0 },
+    {3978,3978, 48, 32,    226,   100,      0, 0 },
     {3979,3979, 60, 16,    313,    60,      0, 0 },
-    {3980,3980, 60, 16,    253,    53,      0, 0 },
-    {3981,3981, 79, 24,    453,   133,      0, 0 },
-    {3982,3982, 79, 24,   1473,   500,      0, 0 },
-    {3983,3983, 60, 16,    286,    53,      0, 0 },
+    {3980,3980, 60, 16,    246,    46,      0, 0 },
+    {3981,3981, 79, 24,    446,   140,      0, 0 },
+    {3982,3982, 79, 24,   1466,   500,      0, 0 },
+    {3983,3983, 60, 16,    266,    53,      0, 0 },
     {3984,3984, 60, 16,    980,    66,      0, 0 },
-    {3985,3985, 91, 24,    173,   100,      0, 0 },
-    {3986,3986, 60, 24,    266,   213,      0, 0 },
-    {3987,3987, 53, 24,    206,   133,      0, 0 },
-    {3988,3988, 60, 16,    233,    60,      0, 0 },
-    {3989,3989, 60, 16,    240,    60,      0, 0 },
+    {3985,3985, 91, 24,    173,    93,      0, 0 },
+    {3986,3986, 60, 24,    246,   200,      0, 0 },
+    {3987,3987, 53, 24,    193,   126,      0, 0 },
+    {3988,3988, 60, 16,    233,    53,      0, 0 },
+    {3989,3989, 60, 16,    240,    53,      0, 0 },
     {3990,3990, 79, 8,    246,    26,      0, 0 },
-    {3991,3991, 79, 8,   1413,   480,      0, 0 },
+    {3991,3991, 79, 8,   1380,   486,      0, 0 },
     { 129, 129, 52, 0,    293,   126,      0, 0 },
     { 130, 130, 48, 0,    173,    93,      0, 0 },
     { 129, 129, 58, 0,    286,   126,      0, 0 },
@@ -9309,12 +9309,12 @@ const struct adlinsdata adlins[4920] =
     {4395,4396, 61, 1,    153,    93,      0, 0 },
     {4397,4398, 38, 1,    340,   133,      0, 0 },
     {4399,4400, 37, 1,    206,    93,      0, 0 },
-    {4401,4402, 15, 1,    346,   153,     10, 0 },
+    {4401,4402, 15, 1,    346,   146,     10, 0 },
     {4403,4404,100, 1,    146,    80,      0, 0.140625 },
     {4405,4406, 19, 1,    553,   200,     10, 0 },
-    {4407,4408, 15, 1,    333,   153,     20, 0 },
+    {4407,4408, 15, 1,    340,   153,     20, 0 },
     {4409,4410, 12, 1,    340,   146,     20, 0 },
-    {4411,4412, 11, 1,    346,   146,     20, 0 },
+    {4411,4412, 11, 1,    340,   146,     20, 0 },
     {4413,4414, 61, 1,   2706,  1033,      0, 0.09375 },
     {4415,4412,  8, 1,    340,   146,     20, 0 },
     {4416,4417, 91, 1,   1166,   366,      0, -0.046875 },