diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 40908e1f3e..3895f080f9 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -809,7 +809,7 @@ void proteusHarley() { // for now we need non wired camInput to keep TS field enable/disable logic happy engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_6; - engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN; + engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER; engineConfiguration->mapCamAveragingLength = 16; engineConfiguration->mapCamSkipFactor = 50; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 136312a976..82037d6a08 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -109,12 +109,7 @@ typedef enum __attribute__ ((__packed__)) { VVT_NISSAN_MR = 11, - /** - * MAP sensor gives us pressure drop corresponding to intake stroke of individual cylinder - * Due to uneven cylinder firing on a V-Twin this gives us a decodable virtual two tooth cam sensor. - * Most HD are 45 degrees with some 60 degree twin. - */ - VVT_MAP_V_TWIN = 12, + VVT_12 = 12, VVT_MAP_V_TWIN_ANOTHER = 13, diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp index 5813d27b55..0f076f1dd7 100644 --- a/firmware/controllers/engine_cycle/map_averaging.cpp +++ b/firmware/controllers/engine_cycle/map_averaging.cpp @@ -108,24 +108,6 @@ void mapAveragingAdcCallback(adcsample_t adcValue) { engine->outputChannels.instantMAPValue = instantMap; #endif // EFI_TUNER_STUDIO - if (engineConfiguration->vvtMode[0] == VVT_MAP_V_TWIN && - ((fastMapCounter++ % engineConfiguration->mapCamSkipFactor) == 0)) { - engine->triggerCentral.mapState.add(instantMap); - bool isPeak = engine->triggerCentral.mapState.isPeak(engineConfiguration->mapCamLookForLowPeaks); -#if EFI_TUNER_STUDIO - engine->outputChannels.TEMPLOG_map_length = MAP_CAM_BUFFER; - engine->outputChannels.TEMPLOG_MAP_INSTANT_AVERAGE = engine->triggerCentral.mapState.current; - if (isPeak) { - engine->outputChannels.TEMPLOG_map_peak++; - } -#endif //EFI_TUNER_STUDIO - if (isPeak) { - efitick_t stamp = getTimeNowNt(); - hwHandleVvtCamSignal(TV_RISE, stamp, /*index*/0); - hwHandleVvtCamSignal(TV_FALL, stamp, /*index*/0); - } - } - /* Calculates the average values from the ADC samples.*/ if (isAveraging) { // with locking we will have a consistent state diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h index 102c40b354..43d9c48346 100644 --- a/firmware/controllers/trigger/trigger_central.h +++ b/firmware/controllers/trigger/trigger_central.h @@ -34,32 +34,6 @@ public: efitick_t accumSignalPrevPeriods[HW_EVENT_TYPES]; }; -struct MapState { - float current, previous, prevPrevious; - cyclic_buffer mapBuffer; - - void add(float value) { - // rotate state - prevPrevious = previous; - previous = current; - - // add new value - mapBuffer.add(value); - current = mapBuffer.sum(engineConfiguration->mapCamAveragingLength); - } - - bool isPeak(bool lookForLowPeak) { - if (mapBuffer.getCount() < MAP_CAM_BUFFER + 3) - return false; - if (lookForLowPeak) { - return previous < prevPrevious && previous <= current; - } else { - return previous > prevPrevious && previous >= current; - } - } -}; - - /** * Maybe merge TriggerCentral and TriggerState classes into one class? * Probably not: we have an instance of TriggerState which is used for trigger initialization, diff --git a/unit_tests/tests/resources/instant_map.csv b/unit_tests/tests/resources/instant_map.csv deleted file mode 100644 index a02a909db1..0000000000 --- a/unit_tests/tests/resources/instant_map.csv +++ /dev/null @@ -1,2935 +0,0 @@ -Time,RPM,MAP Instant -1.735,0,86.5626 -1.736,0,86.1308 -1.738,0,85.6702 -1.74,0,85.3247 -1.742,0,85.0368 -1.744,0,84.7777 -1.746,0,84.4898 -1.748,0,84.202 -1.75,0,84.0004 -1.752,0,83.8853 -1.754,0,83.8277 -1.756,0,83.7126 -1.758,0,83.7126 -1.76,0,83.6838 -1.762,0,83.7413 -1.765,0,83.8853 -1.767,0,84.1156 -1.768,0,84.3747 -1.77,0,84.7202 -1.772,0,84.8929 -1.774,0,85.2383 -1.776,0,85.4111 -1.778,0,85.7278 -1.78,0,85.9293 -1.782,0,86.2172 -1.785,0,86.4475 -1.787,0,86.6778 -1.789,0,86.8793 -1.79,0,87.1096 -1.792,0,87.2248 -1.795,0,87.5414 -1.796,0,87.8293 -1.798,0,88.0021 -1.8,0,88.2324 -1.802,0,88.4339 -1.805,0,88.6354 -1.807,0,88.8657 -1.808,0,88.9809 -1.81,0,89.1248 -1.812,0,89.2975 -1.815,0,89.5278 -1.816,0,89.7006 -1.818,0,89.9021 -1.82,0,90.046 -1.822,0,90.2476 -1.824,0,90.4203 -1.826,0,90.5354 -1.828,0,90.593 -1.83,0,90.8521 -1.832,0,90.9961 -1.834,0,91.1112 -1.836,0,91.2552 -1.838,0,91.3991 -1.84,0,91.5143 -1.842,0,91.7734 -1.845,0,91.7734 -1.846,0,91.8597 -1.848,0,92.0612 -1.85,0,92.1188 -1.852,0,92.3203 -1.855,0,92.4067 -1.856,0,92.4643 -1.858,0,92.637 -1.861,0,92.7234 -1.863,0,92.8385 -1.865,0,93.0113 -1.867,0,93.0401 -1.869,0,93.0976 -1.871,0,93.2416 -1.873,0,93.3567 -1.875,0,93.4719 -1.876,0,93.5295 -1.879,0,93.5583 -1.88,0,93.6158 -1.882,0,93.7598 -1.885,0,93.7886 -1.886,0,93.8749 -1.888,0,93.9613 -1.89,0,93.9901 -1.892,0,94.134 -1.895,0,94.1628 -1.896,0,94.1916 -1.898,0,94.3067 -1.9,0,94.3067 -1.902,0,94.3931 -1.904,0,94.3931 -1.906,0,94.5371 -1.909,0,94.6234 -1.91,0,94.6234 -1.912,0,94.7386 -1.914,0,94.7962 -1.916,0,94.825 -1.918,0,94.8537 -1.92,0,94.825 -1.922,0,94.9689 -1.924,0,95.0265 -1.926,0,95.0265 -1.928,0,95.0265 -1.93,0,95.0265 -1.932,0,95.1128 -1.935,0,95.5734 -1.937,0,95.6022 -1.939,0,95.3431 -1.94,0,94.9689 -1.942,0,94.1916 -1.944,0,92.781 -1.947,0,90.5067 -1.948,0,87.5702 -1.95,0,84.202 -1.952,0,80.7185 -1.954,0,77.2063 -1.956,0,73.7229 -1.958,0,70.441 -1.961,0,67.3606 -1.963,0,64.3954 -1.965,0,61.9196 -1.966,0,59.3574 -1.968,0,57.1695 -1.97,0,55.1255 -1.973,0,53.2255 -1.975,0,51.383 -1.977,0,49.886 -1.978,0,48.5041 -1.981,0,47.4102 -1.982,0,46.4026 -1.985,0,45.4813 -1.986,0,44.9056 -1.988,0,44.3298 -1.99,0,43.9268 -1.993,0,43.6101 -1.995,0,43.4086 -1.996,0,43.2646 -1.998,0,43.2646 -2.001,0,43.1782 -2.002,0,43.351 -2.004,0,43.4086 -2.006,0,43.5813 -2.008,0,43.8116 -2.01,0,44.0995 -2.012,0,44.4737 -2.014,0,44.848 -2.016,0,45.2798 -2.018,0,45.7692 -2.02,0,46.345 -2.023,0,46.9783 -2.025,0,47.6405 -2.027,0,48.3314 -2.028,0,48.9647 -2.03,0,49.7133 -2.032,0,50.3178 -2.034,0,50.9799 -2.036,0,51.5269 -2.038,0,51.93 -2.04,0,52.4194 -2.042,0,52.7936 -2.044,0,53.283 -2.046,0,53.7437 -2.048,0,54.1755 -2.05,0,54.5497 -2.052,0,55.0967 -2.054,0,55.4134 -2.056,0,55.9028 -2.058,0,56.3922 -2.06,0,57.0543 -2.062,0,58.3498 -2.064,0,60.2211 -2.066,0,63.359 -2.068,0,67.1591 -2.07,0,72.3411 -2.073,0,78.2427 -2.075,0,83.8853 -2.076,0,88.4339 -2.078,0,91.543 -2.08,0,93.3855 -2.082,0,94.3931 -2.084,0,94.7674 -2.086,0,94.8825 -2.088,0,94.7098 -2.09,0,94.3931 -2.092,0,93.9325 -2.094,0,93.4719 -2.096,0,92.8385 -2.098,0,92.2052 -2.1,0,91.3991 -2.102,0,90.4203 -2.104,0,89.0672 -2.106,0,87.5414 -2.108,0,85.5262 -2.11,0,83.2807 -2.112,0,80.7473 -2.114,0,78.07 -2.116,0,75.1336 -2.118,0,72.0244 -2.12,0,68.944 -2.122,0,66.0364 -2.124,0,63.1863 -2.126,0,60.5665 -2.128,0,58.1195 -2.13,0,56.0179 -2.132,0,54.1755 -2.134,0,52.477 -2.136,0,51.239 -2.138,0,50.1163 -2.14,0,49.2526 -2.142,0,48.5041 -2.145,0,47.842 -2.147,0,47.295 -2.148,0,46.892 -2.15,0,46.5753 -2.152,0,46.3162 -2.154,0,46.1435 -2.156,0,46.0283 -2.158,0,45.942 -2.16,0,45.8556 -2.162,0,45.9707 -2.164,0,46.0571 -2.166,0,46.1723 -2.168,0,46.4026 -2.17,0,46.5753 -2.172,0,46.9783 -2.175,0,47.2086 -2.176,0,47.7268 -2.179,0,48.2162 -2.18,0,48.6769 -2.182,0,49.3678 -2.184,0,49.9148 -2.186,0,50.5481 -2.188,0,51.3254 -2.19,0,51.9875 -2.192,0,52.6209 -2.195,0,53.283 -2.196,0,53.8876 -2.199,0,54.4058 -2.2,0,54.8664 -2.202,0,55.2407 -2.204,0,55.7301 -2.206,0,56.0755 -2.208,0,56.5649 -2.21,0,56.8816 -2.212,0,57.371 -2.214,0,57.7453 -2.216,0,58.0619 -2.218,0,58.4938 -2.22,0,58.9256 -2.222,0,59.3574 -2.224,0,59.7893 -2.226,0,60.1347 -2.228,0,60.4802 -2.23,0,60.8256 -2.232,0,61.2575 -2.234,0,61.6317 -2.236,0,62.0348 -2.238,0,62.3802 -2.24,0,62.7257 -2.242,0,63.1575 -2.244,0,63.5318 -2.246,0,63.906 -2.248,0,64.2227 -2.25,0,64.5394 -2.252,0,64.9424 -2.255,0,65.3167 -2.256,0,65.6045 -2.258,0,66.0076 -2.26,0,66.2955 -2.262,0,66.6697 -2.265,0,67.0152 -2.266,0,67.3031 -2.268,0,67.6773 -2.27,0,67.994 -2.272,0,68.3107 -2.274,0,68.6273 -2.276,0,68.9152 -2.278,0,69.2319 -2.28,0,69.5774 -2.282,0,69.9804 -2.284,0,70.7289 -2.286,0,72.1108 -2.288,0,74.6442 -2.29,0,78.5306 -2.292,0,83.3959 -2.294,0,87.4839 -2.296,0,89.3839 -2.298,0,89.7294 -2.3,0,88.8945 -2.302,0,87.2823 -2.304,0,85.152 -2.306,0,82.6474 -2.308,0,79.97 -2.31,0,77.2351 -2.312,0,74.2987 -2.315,0,71.5638 -2.316,0,68.8001 -2.318,0,66.2379 -2.32,0,63.7621 -2.322,0,61.5166 -2.324,0,59.2998 -2.326,0,57.4286 -2.328,0,55.5861 -2.33,0,54.0315 -2.332,0,52.5345 -2.334,0,51.3542 -2.336,0,50.0875 -2.338,0,49.1375 -2.341,0,48.3026 -2.342,0,47.5253 -2.344,0,46.8344 -2.346,0,46.345 -2.348,331,45.7692 -2.35,331,45.4238 -2.353,331,45.0207 -2.355,331,44.848 -2.357,331,44.5889 -2.359,331,44.4162 -2.36,331,44.2434 -2.362,331,44.2146 -2.364,331,44.0995 -2.366,331,44.1571 -2.368,331,44.0995 -2.37,331,44.1283 -2.372,331,44.301 -2.374,331,44.3874 -2.376,331,44.5313 -2.378,331,44.704 -2.38,331,44.9343 -2.382,331,45.1647 -2.384,331,45.4238 -2.386,331,45.8268 -2.388,331,46.1147 -2.39,331,46.5465 -2.392,331,47.0071 -2.395,331,47.4965 -2.396,331,48.0147 -2.398,331,48.5905 -2.4,331,49.1951 -2.402,331,49.886 -2.404,331,50.4618 -2.406,331,51.1527 -2.408,331,51.786 -2.41,331,52.3618 -2.412,331,52.7936 -2.414,331,53.283 -2.416,331,53.5709 -2.418,331,54.0315 -2.42,331,54.5209 -2.422,331,54.8664 -2.425,331,55.2407 -2.426,331,55.6149 -2.428,331,56.1043 -2.43,331,56.4786 -2.432,331,56.824 -2.434,331,57.2271 -2.436,331,57.7165 -2.438,331,58.2922 -2.44,331,59.415 -2.442,331,61.0847 -2.444,331,63.4166 -2.446,331,66.7561 -2.449,331,71.132 -2.45,331,76.3139 -2.452,331,81.7549 -2.454,331,86.7354 -2.456,331,90.6218 -2.458,331,93.184 -2.46,331,94.681 -2.462,331,95.2856 -2.465,331,95.3431 -2.466,331,95.1416 -2.468,331,94.681 -2.47,331,93.8173 -2.472,331,93.0688 -2.474,331,92.09 -2.476,331,90.8521 -2.478,331,89.5566 -2.483,331,86.3035 -2.485,331,84.2883 -2.487,331,81.9852 -2.489,331,79.6534 -2.491,331,77.0336 -2.493,331,74.3563 -2.495,331,71.3623 -2.497,331,68.5122 -2.499,331,65.6621 -2.501,331,63.0136 -2.503,331,60.2211 -2.505,331,58.0619 -2.507,331,56.0179 -2.509,331,54.1755 -2.511,331,52.5633 -2.513,331,51.1527 -2.515,331,50.0587 -2.516,331,49.0511 -2.518,331,48.2738 -2.521,331,47.5541 -2.522,331,47.0071 -2.524,331,46.4314 -2.526,331,46.0283 -2.528,331,45.8556 -2.53,331,45.5677 -2.532,331,45.4238 -2.535,331,45.2798 -2.536,331,45.3086 -2.538,331,45.2222 -2.54,331,45.251 -2.542,331,45.3662 -2.545,331,45.4813 -2.547,331,45.7116 -2.548,331,45.942 -2.55,331,46.2586 -2.552,331,46.5753 -2.555,331,46.9783 -2.556,331,47.3814 -2.558,331,47.9284 -2.56,331,48.4178 -2.562,331,49.0511 -2.564,331,49.7133 -2.566,331,50.289 -2.568,331,50.9799 -2.57,331,51.6709 -2.572,331,52.2754 -2.574,331,52.9088 -2.576,331,53.4846 -2.578,331,53.9452 -2.58,331,54.4058 -2.582,331,54.8088 -2.584,331,55.2119 -2.586,331,55.6149 -2.588,331,56.0179 -2.59,331,56.421 -2.592,331,56.8528 -2.594,331,57.2559 -2.596,331,57.6301 -2.598,331,58.0619 -2.6,331,58.4938 -2.602,331,58.7817 -2.604,331,59.1559 -2.606,331,59.5877 -2.608,331,59.9908 -2.61,331,60.3362 -2.612,331,60.6241 -2.614,331,60.9696 -2.616,331,61.4014 -2.618,331,61.862 -2.62,331,62.1499 -2.622,331,62.5242 -2.624,331,62.8984 -2.626,331,63.2151 -2.628,331,63.5606 -2.63,331,63.9348 -2.632,331,64.2803 -2.634,331,64.5682 -2.636,331,64.8848 -2.638,331,65.2303 -2.64,331,65.6333 -2.642,331,65.9788 -2.644,331,66.3243 -2.646,331,66.6409 -2.648,331,66.9864 -2.65,331,67.2455 -2.652,331,67.6197 -2.655,331,67.9652 -2.656,331,68.2819 -2.658,331,68.5698 -2.66,331,68.944 -2.662,331,69.4334 -2.664,331,70.585 -2.666,331,72.6577 -2.668,331,75.9972 -2.67,331,80.661 -2.672,331,85.2959 -2.674,331,88.4339 -2.676,331,89.7294 -2.678,331,89.643 -2.68,331,88.4339 -2.682,331,86.7066 -2.684,331,84.4323 -2.687,331,81.9852 -2.688,331,79.3367 -2.69,331,76.6306 -2.692,331,73.7805 -2.694,331,71.0456 -2.696,331,68.3395 -2.698,331,65.7773 -2.7,331,63.4454 -2.702,331,61.1711 -2.704,331,59.0695 -2.706,331,57.2559 -2.708,331,55.5285 -2.71,331,54.0028 -2.712,331,52.5633 -2.715,331,51.4406 -2.716,331,50.3466 -2.718,331,49.3102 -2.72,331,48.4753 -2.723,331,47.7556 -2.724,331,47.1223 -2.726,331,46.5465 -2.728,315,46.0571 -2.73,315,45.6828 -2.733,315,45.395 -2.735,315,45.1359 -2.736,315,44.848 -2.738,315,44.6465 -2.74,315,44.5025 -2.742,315,44.4737 -2.744,315,44.3586 -2.746,315,44.3586 -2.748,315,44.3586 -2.75,315,44.301 -2.752,315,44.4162 -2.754,315,44.5313 -2.756,315,44.6753 -2.758,315,44.7904 -2.76,315,45.0207 -2.762,315,45.251 -2.764,315,45.5389 -2.766,315,45.798 -2.768,315,46.1147 -2.77,315,46.5465 -2.772,315,47.0359 -2.775,315,47.4677 -2.776,315,47.9859 -2.778,315,48.6481 -2.78,315,49.2526 -2.782,315,49.8572 -2.784,315,50.5481 -2.786,315,51.1527 -2.788,315,51.7572 -2.79,315,52.3906 -2.792,315,52.88 -2.794,315,53.3406 -2.796,315,53.7437 -2.798,315,54.1179 -2.8,315,54.5209 -2.802,315,54.924 -2.804,315,55.2982 -2.806,315,55.7013 -2.808,315,56.1043 -2.81,315,56.5074 -2.812,315,56.8528 -2.815,315,57.1983 -2.816,315,57.6877 -2.818,315,58.4362 -2.82,315,59.4726 -2.822,315,61.0847 -2.824,315,63.5606 -2.826,315,66.6985 -2.828,315,70.8441 -2.83,315,75.9972 -2.832,315,81.4095 -2.834,315,86.5338 -2.836,315,90.5354 -2.838,315,93.2416 -2.84,315,94.7962 -2.842,315,95.3719 -2.845,315,95.6022 -2.846,315,95.3719 -2.848,315,94.7962 -2.85,315,94.1628 -2.852,315,93.2416 -2.854,315,92.3203 -2.856,315,91.2552 -2.858,315,89.9885 -2.86,315,88.4339 -2.862,315,86.7641 -2.864,315,84.8353 -2.866,315,82.7625 -2.868,315,80.4882 -2.87,315,77.8973 -2.872,315,75.2487 -2.874,315,72.3123 -2.876,315,69.4334 -2.878,315,66.5258 -2.88,315,63.8772 -2.882,315,61.2287 -2.884,315,58.9256 -2.886,315,56.6225 -2.888,315,54.8376 -2.89,315,53.1103 -2.892,315,51.7572 -2.894,315,50.5481 -2.896,315,49.5405 -2.898,315,48.7057 -2.9,315,47.9859 -2.903,315,47.3526 -2.905,315,46.8344 -2.906,315,46.4889 -2.909,315,46.0859 -2.91,315,45.8556 -2.912,315,45.6253 -2.914,315,45.5677 -2.916,315,45.4813 -2.918,315,45.4525 -2.92,315,45.4525 -2.922,315,45.4813 -2.924,315,45.5965 -2.926,315,45.7692 -2.928,315,45.9707 -2.93,315,46.201 -2.932,315,46.5177 -2.934,315,46.892 -2.936,315,47.2374 -2.938,315,47.7268 -2.94,315,48.245 -2.942,315,48.8496 -2.944,315,49.3966 -2.946,315,50.0587 -2.948,315,50.7209 -2.95,315,51.4118 -2.952,315,52.0163 -2.954,315,52.7073 -2.956,315,53.3118 -2.958,315,53.83 -2.96,315,54.3194 -2.962,315,54.7513 -2.965,315,55.1831 -2.966,315,55.5861 -2.968,315,56.0467 -2.97,315,56.3634 -2.972,315,56.824 -2.974,315,57.1119 -2.976,315,57.5725 -2.978,315,58.0331 -2.98,315,58.3498 -2.982,315,58.7529 -2.984,315,59.1847 -2.986,315,59.4438 -2.989,315,59.9044 -2.991,315,60.2787 -2.993,315,60.6817 -2.995,315,60.9984 -2.996,315,61.4014 -2.998,315,61.7757 -3,315,62.1499 -3.002,315,62.4954 -3.004,315,62.8408 -3.006,315,63.1575 -3.008,315,63.5318 -3.01,315,63.906 -3.012,315,64.2515 -3.014,315,64.5394 -3.016,315,64.856 -3.018,315,65.2591 -3.02,315,65.5758 -3.022,315,65.8636 -3.024,315,66.2667 -3.026,315,66.5258 -3.028,315,66.9 -3.03,315,67.1879 -3.032,315,67.5046 -3.035,315,67.8213 -3.036,315,68.1667 -3.038,315,68.4546 -3.04,315,68.7713 -3.042,315,69.1167 -3.044,315,69.8077 -3.046,315,70.9016 -3.048,315,72.9168 -3.05,315,76.1412 -3.053,315,80.7761 -3.055,315,85.6702 -3.056,315,88.693 -3.058,315,90.046 -3.06,315,89.9885 -3.062,315,88.9233 -3.064,315,87.2248 -3.066,315,85.0944 -3.068,315,82.5898 -3.07,315,80.0276 -3.072,315,77.2639 -3.075,315,74.4714 -3.076,315,71.7653 -3.078,315,69.1167 -3.08,315,66.5546 -3.082,315,64.1075 -3.085,315,61.9196 -3.086,315,59.8468 -3.088,315,57.918 -3.09,315,56.2483 -3.092,315,54.6937 -3.094,315,53.1391 -3.096,315,51.9588 -3.098,315,50.8936 -3.1,315,49.886 -3.102,315,49.0223 -3.104,315,48.3026 -3.106,315,47.6405 -3.108,315,47.0359 -3.11,313,46.5753 -3.112,313,46.0571 -3.114,313,45.798 -3.116,313,45.5101 -3.118,313,45.251 -3.12,313,44.9631 -3.122,313,44.9056 -3.124,313,44.704 -3.126,313,44.5889 -3.128,313,44.5889 -3.13,313,44.5601 -3.132,313,44.5889 -3.134,313,44.6465 -3.136,313,44.6753 -3.138,313,44.8192 -3.14,313,44.9343 -3.142,313,45.1359 -3.144,313,45.3662 -3.147,313,45.5965 -3.148,313,45.8556 -3.15,313,46.2298 -3.152,313,46.5753 -3.154,313,47.0071 -3.156,313,47.4677 -3.158,313,48.0435 -3.16,313,48.6193 -3.162,313,49.1375 -3.164,313,49.7708 -3.166,313,50.3754 -3.168,313,51.0951 -3.17,313,51.6997 -3.172,313,52.2754 -3.175,313,52.88 -3.176,313,53.3406 -3.178,313,53.7437 -3.18,313,54.0891 -3.182,313,54.6073 -3.184,313,54.924 -3.186,313,55.3558 -3.188,313,55.7589 -3.19,313,56.1043 -3.192,313,56.5361 -3.195,313,56.8816 -3.196,313,57.2559 -3.198,313,57.7165 -3.2,313,58.2059 -3.202,313,58.9832 -3.205,313,60.1347 -3.206,313,61.9484 -3.208,313,64.5682 -3.21,313,68.1379 -3.212,313,72.6002 -3.214,313,77.8109 -3.216,313,83.2232 -3.218,313,88.0596 -3.22,313,91.6006 -3.222,313,93.9325 -3.224,313,95.1128 -3.226,313,95.6022 -3.228,313,95.6022 -3.23,313,95.3143 -3.232,313,94.7962 -3.235,313,94.0764 -3.236,313,93.2128 -3.238,313,92.2628 -3.24,313,91.1688 -3.242,313,89.8733 -3.244,313,88.4051 -3.246,313,86.7929 -3.248,313,84.8353 -3.25,313,82.7337 -3.252,313,80.4882 -3.254,313,77.9548 -3.257,313,75.1911 -3.258,313,72.2835 -3.26,313,69.3471 -3.262,313,66.5258 -3.264,313,63.7909 -3.266,313,61.1999 -3.268,313,58.8968 -3.27,313,56.6801 -3.272,313,54.8376 -3.274,313,53.1679 -3.276,313,51.8148 -3.278,313,50.6345 -3.28,313,49.5693 -3.282,313,48.7344 -3.285,313,48.0147 -3.286,313,47.4677 -3.288,313,46.9496 -3.29,313,46.4601 -3.292,313,46.2586 -3.294,313,45.942 -3.296,313,45.7692 -3.298,313,45.5965 -3.3,313,45.5101 -3.302,313,45.4525 -3.304,313,45.4525 -3.306,313,45.4813 -3.308,313,45.6541 -3.31,313,45.8268 -3.312,313,46.0283 -3.314,313,46.3162 -3.316,313,46.6041 -3.318,313,46.9783 -3.32,313,47.3238 -3.322,313,47.8132 -3.324,313,48.3314 -3.326,313,48.8496 -3.328,313,49.4829 -3.33,313,50.0299 -3.332,313,50.7209 -3.334,313,51.4118 -3.336,313,52.0451 -3.338,313,52.7073 -3.34,313,53.283 -3.342,313,53.9164 -3.345,313,54.377 -3.346,313,54.8088 -3.348,313,55.1543 -3.35,313,55.5573 -3.352,313,56.0467 -3.354,313,56.421 -3.356,313,56.8816 -3.358,313,57.2559 -3.36,313,57.515 -3.362,313,58.0044 -3.364,313,58.4074 -3.366,313,58.7529 -3.368,313,59.1271 -3.37,313,59.4726 -3.372,313,59.8468 -3.375,313,60.2499 -3.376,313,60.5953 -3.378,313,60.9984 -3.38,313,61.315 -3.382,313,61.8045 -3.384,313,62.0635 -3.386,313,62.4954 -3.388,313,62.7545 -3.39,313,63.1575 -3.392,313,63.4166 -3.394,313,63.7909 -3.396,313,64.1651 -3.398,313,64.5106 -3.4,313,64.856 -3.403,313,65.2015 -3.404,313,65.5182 -3.406,313,65.8061 -3.408,313,66.0939 -3.41,313,66.5258 -3.412,313,66.8425 -3.415,313,67.1591 -3.416,313,67.447 -3.418,313,67.8501 -3.42,313,68.0804 -3.422,313,68.4258 -3.424,313,68.6849 -3.426,313,69.088 -3.428,313,69.5486 -3.43,313,70.4122 -3.432,313,71.9956 -3.434,313,74.7305 -3.436,313,78.7897 -3.438,313,83.655 -3.44,313,87.5414 -3.442,313,89.6718 -3.444,313,90.2476 -3.446,313,89.5854 -3.448,313,88.0884 -3.45,313,86.1308 -3.452,313,83.8565 -3.454,313,81.4095 -3.456,313,78.7321 -3.458,313,75.9684 -3.46,313,73.2047 -3.462,313,70.585 -3.464,313,67.9364 -3.466,313,65.4606 -3.468,313,63.1863 -3.47,313,61.0272 -3.472,313,59.012 -3.474,313,57.1695 -3.476,313,55.5285 -3.478,313,54.0315 -3.48,313,52.6785 -3.482,313,51.5269 -3.484,313,50.4905 -3.486,313,49.5981 -3.488,313,48.792 -3.49,313,48.0435 -3.492,313,47.4102 -3.494,313,46.9496 -3.496,311,46.4889 -3.498,311,46.0571 -3.5,311,45.7404 -3.502,311,45.4525 -3.505,311,45.1935 -3.506,311,45.0207 -3.508,311,44.9056 -3.51,311,44.7616 -3.512,311,44.7328 -3.514,311,44.6753 -3.516,311,44.5889 -3.518,311,44.6753 -3.52,311,44.6753 -3.522,311,44.8192 -3.524,311,44.9056 -3.526,311,45.1359 -3.528,311,45.3086 -3.53,311,45.4238 -3.532,311,45.798 -3.534,311,45.9995 -3.536,311,46.345 -3.538,311,46.7768 -3.54,311,47.2374 -3.543,311,47.6981 -3.545,311,48.2738 -3.547,311,48.792 -3.549,311,49.3966 -3.551,311,50.0587 -3.552,311,50.6345 -3.554,311,51.383 -3.556,311,51.93 -3.558,311,52.5057 -3.56,311,53.0239 -3.562,311,53.5133 -3.564,311,53.974 -3.566,311,54.3482 -3.568,311,54.7225 -3.57,311,55.1543 -3.572,311,55.4998 -3.574,311,55.9028 -3.576,311,56.3058 -3.578,311,56.6801 -3.58,311,57.1983 -3.582,311,57.3998 -3.584,311,57.8892 -3.586,311,58.4938 -3.588,311,59.3862 -3.59,311,60.8256 -3.592,311,62.8696 -3.594,311,65.6909 -3.596,311,69.5198 -3.598,311,74.2699 -3.6,311,79.5958 -3.602,311,84.9793 -3.604,311,89.4415 -3.606,311,92.637 -3.608,311,94.5371 -3.61,311,95.4871 -3.612,311,95.6886 -3.614,311,95.5734 -3.616,311,95.1992 -3.618,311,94.6234 -3.62,311,93.7598 -3.622,311,92.8961 -3.624,311,91.8597 -3.626,311,90.6794 -3.628,311,89.2975 -3.63,311,87.599 -3.632,311,86.0444 -3.634,311,84.0868 -3.636,311,81.9564 -3.638,311,79.5958 -3.64,311,76.9472 -3.642,311,74.2987 -3.644,311,71.391 -3.646,311,68.5122 -3.648,311,65.7197 -3.651,311,63.0999 -3.652,311,60.5378 -3.654,311,58.2347 -3.656,311,56.1907 -3.658,311,54.4346 -3.66,311,52.8512 -3.662,311,51.4694 -3.665,311,50.4618 -3.666,311,49.5117 -3.668,311,48.6193 -3.67,311,47.9859 -3.672,311,47.3814 -3.674,311,46.892 -3.676,311,46.4889 -3.678,311,46.201 -3.68,311,45.942 -3.682,311,45.7404 -3.684,311,45.6541 -3.686,311,45.5389 -3.688,311,45.5965 -3.69,311,45.5389 -3.692,311,45.6828 -3.695,311,45.798 -3.696,311,45.942 -3.698,311,46.1435 -3.7,311,46.4314 -3.702,311,46.748 -3.704,311,47.1223 -3.706,311,47.5253 -3.708,311,47.9571 -3.71,311,48.4466 -3.712,311,49.0511 -3.714,311,49.6269 -3.716,311,50.2602 -3.718,311,50.9224 -3.72,311,51.5269 -3.722,311,52.2754 -3.724,311,52.88 -3.726,311,53.5133 -3.728,311,54.0891 -3.73,311,54.5785 -3.732,311,55.0391 -3.734,311,55.3846 -3.736,311,55.8164 -3.738,311,56.2195 -3.74,311,56.5937 -3.742,311,57.0256 -3.744,311,57.3422 -3.746,311,57.7165 -3.748,311,58.1483 -3.75,311,58.5226 -3.752,311,58.8968 -3.754,311,59.3574 -3.756,311,59.6741 -3.758,311,60.0484 -3.76,311,60.3938 -3.762,311,60.7969 -3.764,311,61.1423 -3.766,311,61.5741 -3.768,311,61.9196 -3.77,311,62.2363 -3.772,311,62.553 -3.774,311,62.956 -3.776,311,63.359 -3.778,311,63.6469 -3.78,311,63.9924 -3.782,311,64.3378 -3.784,311,64.6545 -3.786,311,65.0288 -3.788,311,65.3455 -3.79,311,65.6621 -3.792,311,66.0076 -3.794,311,66.3531 -3.796,311,66.6121 -3.798,311,67.0152 -3.8,311,67.3894 -3.802,311,67.591 -3.804,311,67.9652 -3.806,311,68.2531 -3.808,311,68.5986 -3.81,311,68.9152 -3.812,311,69.2031 -3.814,311,69.7213 -3.817,311,70.6713 -3.818,311,72.3411 -3.82,311,75.076 -3.822,311,79.0776 -3.824,311,84.058 -3.826,311,87.9157 -3.828,311,89.8733 -3.83,311,90.3915 -3.832,311,89.6142 -3.834,311,88.1748 -3.836,311,86.1884 -3.838,311,83.8853 -3.84,311,81.3807 -3.842,311,78.7321 -3.844,311,76.026 -3.846,311,73.2335 -3.848,311,70.5274 -3.85,311,67.994 -3.852,311,65.5758 -3.854,311,63.1863 -3.856,311,61.2863 -3.858,311,59.012 -3.86,311,57.3134 -3.862,311,55.6149 -3.864,311,54.0315 -3.866,311,52.8224 -3.868,311,51.6997 -3.87,311,50.5769 -3.872,311,49.6269 -3.875,311,48.9072 -3.876,311,48.1299 -3.878,311,47.5253 -3.88,311,47.0071 -3.882,310,46.6041 -3.884,310,46.0859 -3.886,310,45.8268 -3.888,310,45.5101 -3.89,310,45.3662 -3.892,310,45.1359 -3.894,310,45.0495 -3.896,310,44.848 -3.898,310,44.8192 -3.9,310,44.7904 -3.902,310,44.7616 -3.904,310,44.7328 -3.906,310,44.8768 -3.908,310,44.9919 -3.91,310,45.0207 -3.912,310,45.2798 -3.914,310,45.3086 -3.916,310,45.6253 -3.918,310,45.8556 -3.92,310,46.1435 -3.922,310,46.5177 -3.924,310,46.9208 -3.926,310,47.3526 -3.928,310,47.8708 -3.93,310,48.2738 -3.932,310,48.936 -3.934,310,49.4254 -3.936,310,50.2027 -3.938,310,50.7784 -3.94,310,51.4694 -3.942,310,52.1027 -3.944,310,52.6785 -3.946,310,53.1391 -3.948,310,53.7149 -3.95,310,54.0603 -3.952,310,54.4634 -3.954,310,54.8088 -3.956,310,55.2407 -3.958,310,55.6437 -3.96,310,56.0467 -3.962,310,56.4498 -3.964,310,56.7952 -3.966,310,57.1695 -3.968,310,57.5725 -3.97,310,57.9468 -3.972,310,58.5226 -3.974,310,59.3862 -3.976,310,60.7393 -3.978,310,62.812 -3.98,310,65.6621 -3.982,310,69.3758 -3.984,310,74.1548 -3.986,310,79.5958 -3.988,310,84.8353 -3.99,310,89.3551 -3.992,310,92.4643 -3.994,310,94.5083 -3.996,310,95.4295 -3.998,310,95.7462 -4,310,95.631 -4.002,310,95.3143 -4.004,310,94.7098 -4.006,310,93.8173 -4.008,310,93.0401 -4.01,310,92.1188 -4.012,310,90.8521 -4.014,310,89.7294 -4.016,310,88.2612 -4.018,310,86.505 -4.02,310,84.605 -4.022,310,82.561 -4.024,310,80.2579 -4.026,310,77.667 -4.028,310,74.9896 -4.03,310,72.082 -4.032,310,69.2319 -4.034,310,66.3531 -4.036,310,63.6757 -4.038,310,61.2287 -4.04,310,58.7817 -4.042,310,56.6225 -4.044,310,54.8952 -4.046,310,53.1391 -4.048,310,51.9012 -4.05,310,50.6345 -4.052,310,49.5981 -4.054,310,48.8496 -4.056,310,48.1011 -4.058,310,47.4677 -4.06,310,47.0071 -4.062,310,46.6041 -4.064,310,46.2586 -4.066,310,45.942 -4.068,310,45.798 -4.07,310,45.7116 -4.072,310,45.5389 -4.074,310,45.5677 -4.076,310,45.5677 -4.078,310,45.6541 -4.08,310,45.798 -4.082,310,45.9132 -4.084,310,46.1435 -4.086,310,46.4026 -4.088,310,46.6617 -4.09,310,47.0359 -4.092,310,47.4677 -4.094,310,47.9859 -4.096,310,48.4178 -4.098,310,49.0223 -4.1,310,49.5405 -4.102,310,50.1739 -4.104,310,50.8648 -4.106,310,51.5269 -4.108,310,52.1315 -4.11,310,52.7936 -4.112,310,53.4558 -4.114,310,54.0028 -4.116,310,54.4634 -4.118,310,54.9528 -4.12,310,55.327 -4.122,310,55.7301 -4.124,310,56.1331 -4.126,310,56.4498 -4.128,310,56.9104 -4.13,310,57.3134 -4.132,310,57.7453 -4.134,310,58.0907 -4.136,310,58.465 -4.138,310,58.8392 -4.14,310,59.2135 -4.142,310,59.5589 -4.145,310,59.9908 -4.146,310,60.3074 -4.148,310,60.6817 -4.15,310,61.0847 -4.152,310,61.4014 -4.154,310,61.7469 -4.156,310,62.1499 -4.158,310,62.4954 -4.16,310,62.8696 -4.162,310,63.2151 -4.164,310,63.5318 -4.166,310,63.8772 -4.168,310,64.2515 -4.17,310,64.5682 -4.172,310,64.9136 -4.174,310,65.2303 -4.176,310,65.6045 -4.178,310,65.95 -4.18,310,66.2379 -4.182,310,66.5258 -4.184,310,66.9288 -4.186,310,67.1879 -4.188,310,67.5622 -4.19,310,67.8788 -4.192,310,68.1379 -4.194,310,68.5122 -4.196,310,68.7713 -4.198,310,69.1455 -4.2,310,69.5486 -4.202,310,70.4122 -4.204,310,71.7653 -4.206,310,74.2987 -4.208,310,77.9548 -4.21,310,82.9928 -4.212,310,87.0808 -4.214,310,89.5278 -4.216,310,90.2764 -4.218,310,89.9885 -4.22,310,88.549 -4.222,310,86.6778 -4.225,310,84.5762 -4.226,310,82.1292 -4.228,310,79.6822 -4.23,310,76.8609 -4.232,310,74.126 -4.234,310,71.3623 -4.236,310,69.0016 -4.238,310,66.4394 -4.24,310,63.906 -4.242,310,61.7469 -4.244,310,59.6741 -4.246,310,57.8028 -4.248,310,56.1619 -4.25,310,54.6361 -4.252,310,53.2542 -4.254,310,52.0451 -4.256,310,50.9512 -4.258,310,49.9724 -4.26,310,49.1087 -4.262,310,48.4178 -4.264,310,47.8132 -4.266,310,47.2086 -4.268,310,46.6905 -4.27,310,46.345 -4.272,310,46.0283 -4.274,310,45.6541 -4.276,310,45.4238 -4.278,310,45.2222 -4.28,310,45.0783 -4.282,310,44.9631 -4.284,310,44.8768 -4.286,310,44.8192 -4.288,310,44.7904 -4.29,310,44.7904 -4.293,310,44.8192 -4.295,310,44.9056 -4.297,310,44.9919 -4.298,310,45.1359 -4.3,310,45.251 -4.302,310,45.5101 -4.304,310,45.7404 -4.306,310,46.0283 -4.308,310,46.4026 -4.31,310,46.8056 -4.312,310,47.1799 -4.314,310,47.6405 -4.316,310,48.0723 -4.318,310,48.7632 -4.32,310,49.3102 -4.322,310,49.886 -4.325,310,50.5769 -4.326,310,51.239 -4.328,310,51.8436 -4.33,310,52.4482 -4.332,310,53.0239 -4.335,310,53.5133 -4.336,310,53.8588 -4.338,310,54.3194 -4.34,310,54.7513 -4.342,310,55.0679 -4.344,310,55.5573 -4.346,310,55.9316 -4.348,310,56.3058 -4.35,310,56.6801 -4.352,310,57.0831 -4.354,310,57.4286 -4.356,310,57.8892 -4.358,310,58.3498 -4.36,310,59.0408 -4.362,310,60.1923 -4.364,310,62.006 -4.366,310,64.5394 -4.368,310,68.0228 -4.37,310,72.3123 -4.372,310,77.4942 -4.374,310,82.7049 -4.376,310,87.8293 -4.378,310,91.5718 -4.38,310,93.9037 -4.382,310,95.228 -4.384,310,95.6598 -4.386,310,95.775 -4.388,310,95.4871 -4.39,310,94.8825 -4.392,310,94.3067 -4.394,310,93.3855 -4.396,310,92.3491 -4.398,310,91.4279 -4.4,310,90.046 -4.402,310,88.5778 -4.404,310,87.0808 -4.406,310,85.0944 -4.408,310,83.0504 -4.41,310,80.8337 -4.412,310,78.3579 -4.414,310,75.8533 -4.416,310,72.8593 -4.418,310,70.1819 -4.42,310,67.1303 -4.422,310,64.3954 -4.424,310,61.9772 -4.426,310,59.3862 -4.428,310,57.1695 -4.43,310,55.2982 -4.432,310,53.6573 -4.434,310,52.1603 -4.436,310,50.9512 -4.438,310,49.886 -4.44,310,49.0511 -4.442,310,48.3026 -4.444,310,47.6693 -4.446,310,47.1511 -4.448,310,46.7768 -4.45,310,46.4026 -4.452,310,46.1435 -4.454,310,45.942 -4.456,310,45.7404 -4.458,310,45.6541 -4.46,310,45.5965 -4.462,310,45.5389 -4.464,310,45.6253 -4.466,310,45.7116 -4.468,310,45.8556 -4.47,310,46.0571 -4.472,310,46.3162 -4.474,310,46.5753 -4.476,310,46.9783 -4.478,310,47.3238 -4.48,310,47.7268 -4.482,310,48.2738 -4.485,310,48.7632 -4.486,310,49.3102 -4.488,310,49.9436 -4.49,310,50.5769 -4.492,310,51.2678 -4.494,310,51.8436 -4.496,310,52.5633 -4.498,310,53.0815 -4.5,310,53.7149 -4.502,310,54.3482 -4.504,310,54.7513 -4.506,310,55.2119 -4.508,310,55.6725 -4.51,310,56.0179 -4.512,310,56.3634 -4.514,310,56.7665 -4.516,310,57.0831 -4.518,310,57.5725 -4.52,310,57.8316 -4.522,310,58.2922 -4.524,310,58.6953 -4.526,310,59.0695 -4.528,310,59.4438 -4.53,310,59.7605 -4.532,310,60.2211 -4.534,310,60.5665 -4.536,310,60.8832 -4.538,310,61.2863 -4.54,310,61.7469 -4.542,310,61.9772 -4.544,310,62.3802 -4.546,310,62.7545 -4.548,310,63.0711 -4.55,310,63.3878 -4.552,310,63.8197 -4.554,310,64.1075 -4.556,310,64.453 -4.558,310,64.8273 -4.56,310,65.1439 -4.562,310,65.4894 -4.564,310,65.8636 -4.566,310,66.1515 -4.568,310,66.4394 -4.57,310,66.7849 -4.572,310,67.1015 -4.574,310,67.3606 -4.576,310,67.7061 -4.578,310,68.0804 -4.58,310,68.3107 -4.582,310,68.6273 -4.584,310,69.0016 -4.586,310,69.3758 -4.588,310,69.9804 -4.59,310,71.2471 -4.592,310,73.4063 -4.594,310,76.976 -4.596,310,81.467 -4.598,310,85.8429 -4.6,310,88.9233 -4.602,310,90.3051 -4.604,310,90.1324 -4.606,310,89.0384 -4.608,310,87.3975 -4.61,310,85.2671 -4.612,310,82.7913 -4.614,310,80.4594 -4.616,310,77.667 -4.618,310,75.076 -4.62,310,72.1683 -4.622,310,69.5774 -4.624,310,67.0152 -4.626,310,64.5682 -4.628,310,62.3802 -4.63,310,60.365 -4.632,310,58.4074 -4.635,310,56.7089 -4.636,310,55.0679 -4.638,310,53.7149 -4.64,310,52.4482 -4.642,310,51.2678 -4.644,310,50.3178 -4.646,310,49.4829 -4.648,310,48.6481 -4.65,310,47.9859 -4.652,310,47.4102 -4.654,310,46.8632 -4.656,310,46.5177 -4.658,310,46.1435 -4.66,310,45.7692 -4.662,310,45.5101 -4.664,310,45.2798 -4.666,310,45.1071 -4.668,310,45.0495 -4.67,310,44.848 -4.672,310,44.848 -4.675,310,44.7328 -4.676,310,44.7904 -4.678,310,44.7904 -4.68,310,44.8192 -4.682,310,44.9919 -4.684,310,45.0207 -4.686,310,45.1935 -4.688,310,45.395 -4.69,310,45.7116 -4.692,310,45.9995 -4.694,310,46.201 -4.696,310,46.6041 -4.698,310,47.0647 -4.701,310,47.439 -4.702,310,47.9859 -4.704,310,48.5329 -4.706,310,49.1375 -4.708,310,49.742 -4.71,310,50.4042 -4.712,310,51.0375 -4.714,310,51.6421 -4.716,310,52.3042 -4.718,310,52.8512 -4.72,310,53.3118 -4.722,310,53.8012 -4.724,310,54.1755 -4.726,310,54.6937 -4.728,310,54.9528 -4.73,310,55.3846 -4.732,310,55.7589 -4.734,310,56.1331 -4.736,310,56.5649 -4.738,310,56.9392 -4.74,310,57.2846 -4.742,310,57.6589 -4.744,310,58.1195 -4.746,310,58.7817 -4.748,310,59.7605 -4.75,310,61.3726 -4.752,310,63.5606 -4.754,310,66.7273 -4.756,310,70.7865 -4.758,310,75.6518 -4.76,310,81.0928 -4.762,310,86.2747 -4.764,310,90.3339 -4.766,310,93.2128 -4.768,310,94.9113 -4.77,310,95.5447 -4.772,310,95.7462 -4.774,310,95.5734 -4.776,310,95.1992 -4.778,310,94.4219 -4.78,310,93.7022 -4.782,310,92.781 -4.784,310,91.6582 -4.786,310,90.4779 -4.788,310,89.1536 -4.79,310,87.6278 -4.792,310,85.8141 -4.794,310,83.7701 -4.796,310,81.7549 -4.798,310,79.4231 -4.8,310,76.7169 -4.802,310,74.0972 -4.805,310,71.0456 -4.806,310,68.1379 -4.808,310,65.403 -4.81,310,62.812 -4.812,310,60.2787 -4.814,310,58.0619 -4.816,310,56.0179 -4.818,310,54.2043 -4.82,310,52.7361 -4.822,310,51.4118 -4.824,310,50.289 -4.826,310,49.3678 -4.828,310,48.5329 -4.83,310,47.9284 -4.832,310,47.3238 -4.834,310,46.9496 -4.836,310,46.5465 -4.838,310,46.2586 -4.84,310,45.942 -4.842,310,45.8556 -4.845,310,45.6828 -4.847,310,45.6541 -4.849,310,45.5965 -4.851,310,45.6253 -4.853,310,45.6541 -4.855,310,45.8268 -4.857,310,45.9995 -4.858,310,46.2298 -4.86,310,46.5177 -4.862,310,46.8056 -4.864,310,47.1799 -4.866,310,47.5253 -4.868,310,48.0723 -4.87,310,48.6193 -4.872,310,49.1951 -4.875,310,49.6845 -4.876,310,50.3466 -4.878,310,50.9224 -4.88,310,51.6133 -4.882,310,52.2754 -4.884,310,52.9088 -4.886,310,53.5709 -4.888,310,54.1179 -4.89,310,54.6361 -4.892,310,55.0967 -4.894,310,55.4422 -4.896,310,55.8452 -4.898,310,56.277 -4.9,310,56.5937 -4.902,310,57.0256 -4.904,310,57.371 -4.906,310,57.7165 -4.908,310,58.2059 -4.91,310,58.6089 -4.912,310,58.9832 -4.914,310,59.2998 -4.916,310,59.7605 -4.918,310,60.0484 -4.92,310,60.4514 -4.922,310,60.8544 -4.924,310,61.2287 -4.926,310,61.6029 -4.928,310,61.862 -4.93,310,62.3227 -4.932,310,62.6105 -4.934,310,62.8984 -4.936,310,63.3015 -4.938,310,63.6181 -4.94,310,63.9636 -4.942,310,64.3378 -4.944,310,64.6833 -4.946,310,65.0288 -4.948,310,65.403 -4.95,310,65.7197 -4.952,310,66.0364 -4.955,310,66.3243 -4.956,310,66.6697 -4.958,310,66.9864 -4.96,310,67.3606 -4.962,310,67.6197 -4.964,310,67.9652 -4.966,310,68.2531 -4.968,310,68.541 -4.97,310,68.9152 -4.972,310,69.2031 -4.974,310,69.8653 -4.976,310,70.7289 -4.978,310,72.4562 -4.98,310,75.1623 -4.982,310,79.567 -4.984,310,84.4611 -4.986,310,88.146 -4.988,310,90.046 -4.99,310,90.4779 -4.992,310,89.7294 -4.995,310,88.1172 -4.996,310,86.2747 -4.998,310,83.9141 -5,310,81.467 -5.002,310,78.8473 -5.004,310,75.9684 -5.006,310,73.3775 -5.008,310,70.8441 -5.01,310,68.0516 -5.012,310,65.6621 -5.014,310,63.3015 -5.016,310,61.2287 -5.018,310,59.3286 -5.02,310,57.3422 -5.022,310,55.7876 -5.025,310,54.3482 -5.026,310,52.9952 -5.028,310,51.8148 -5.03,310,50.7496 -5.032,310,49.8572 -5.034,310,48.9647 -5.036,310,48.3602 -5.038,310,47.6981 -5.04,310,47.1799 -5.042,310,46.6617 -5.044,310,46.2586 -5.046,310,45.9995 -5.048,310,45.6541 -5.05,310,45.3374 -5.052,310,45.2222 -5.054,310,45.0783 -5.056,310,44.9343 -5.058,310,44.8768 -5.06,310,44.848 -5.062,310,44.7616 -5.064,310,44.8192 -5.066,310,44.848 -5.068,310,44.9343 -5.07,310,45.1071 -5.072,310,45.251 -5.074,310,45.395 -5.076,310,45.6253 -5.078,310,45.8556 -5.08,310,46.201 -5.082,310,46.4601 -5.084,310,46.8344 -5.086,310,47.3238 -5.088,310,47.7844 -5.09,310,48.389 -5.092,310,48.936 -5.095,310,49.5405 -5.096,310,50.2027 -5.098,310,50.8648 -5.1,310,51.4406 -5.102,310,52.1315 -5.104,310,52.7361 -5.106,310,53.283 -5.108,310,53.6861 -5.11,310,54.0603 -5.112,310,54.4922 -5.114,310,54.8664 -5.116,310,55.2407 -5.118,310,55.7301 -5.12,310,56.1043 -5.122,310,56.4498 -5.125,310,56.8528 -5.126,310,57.2271 -5.128,310,57.6013 -5.13,310,58.0044 -5.132,310,58.6377 -5.134,310,59.4726 -5.136,310,60.8832 -5.138,310,62.8696 -5.14,310,65.7773 -5.142,310,69.6349 -5.144,310,74.0396 -5.146,310,79.3079 -5.148,310,85.0368 -5.15,310,89.5278 -5.152,310,92.5507 -5.154,310,94.4795 -5.159,310,95.8037 -5.16,310,95.7174 -5.162,310,95.3143 -5.164,310,94.7386 -5.166,310,93.9037 -5.168,310,92.9825 -5.17,310,91.9749 -5.172,310,90.8809 -5.174,310,89.4991 -5.176,310,88.0308 -5.178,310,86.3323 -5.18,310,84.4323 -5.182,310,82.2731 -5.184,310,80.1428 -5.186,310,77.6094 -5.188,310,74.8169 -5.19,310,71.8805 -5.192,310,68.944 -5.194,310,66.0652 -5.196,310,63.5893 -5.198,310,60.9696 -5.2,310,58.6953 -5.202,310,56.6225 -5.204,310,54.7513 -5.206,310,53.0239 -5.208,310,51.6997 -5.21,310,50.5193 -5.212,310,49.6269 -5.214,310,48.792 -5.216,310,48.1011 -5.218,310,47.4965 -5.22,310,47.0071 -5.222,310,46.6041 -5.224,310,46.3162 -5.226,310,46.0859 -5.228,310,45.8556 -5.23,310,45.6828 -5.232,310,45.6253 -5.234,310,45.6253 -5.236,310,45.5965 -5.238,310,45.6541 -5.24,310,45.7404 -5.242,310,45.9707 -5.244,310,46.0571 -5.246,310,46.4314 -5.248,310,46.6329 -5.25,310,47.0359 -5.252,310,47.5253 -5.254,310,47.9284 -5.256,310,48.389 -5.258,310,48.9935 -5.26,310,49.5693 -5.262,310,50.1739 -5.264,310,50.8072 -5.266,310,51.383 -5.268,310,52.1603 -5.27,310,52.7361 -5.272,310,53.3694 -5.275,310,54.0028 -5.276,310,54.5209 -5.278,310,54.8664 -5.28,310,55.3558 -5.282,310,55.7301 -5.284,310,56.1331 -5.286,310,56.5361 -5.288,310,56.8816 -5.29,310,57.2559 -5.292,310,57.6877 -5.294,310,58.0907 -5.296,310,58.465 -5.298,310,58.868 -5.3,310,59.1559 -5.302,310,59.5877 -5.304,310,59.9908 -5.306,310,60.3362 -5.308,310,60.7105 -5.31,310,60.9696 -5.312,310,61.3726 -5.315,310,61.8332 -5.316,310,62.1499 -5.318,310,62.4666 -5.32,310,62.8408 -5.322,310,63.1575 -5.324,310,63.503 -5.326,310,63.8772 -5.328,310,64.1363 -5.33,310,64.5394 -5.332,310,64.8848 -5.334,310,65.2015 -5.336,310,65.6045 -5.338,310,65.8924 -5.34,310,66.2091 -5.342,310,66.5546 -5.344,310,66.8712 -5.346,310,67.1879 -5.348,310,67.4758 -5.35,310,67.8501 -5.352,310,68.1955 -5.355,310,68.4546 -5.356,310,68.7713 -5.358,310,69.1455 -5.36,310,69.5198 -5.362,310,70.2971 -5.364,310,71.8517 -5.366,310,74.3563 -5.369,310,77.8973 -5.37,310,82.9065 -5.372,310,87.052 -5.374,310,89.4991 -5.376,310,90.2764 -5.378,310,89.9597 -5.38,310,88.4915 -5.382,310,86.8217 -5.384,310,84.4898 -5.386,310,82.0428 -5.388,310,79.4231 -5.39,310,76.7457 -5.392,310,74.0108 -5.394,310,71.4198 -5.396,310,68.8577 -5.398,310,66.2955 -5.4,310,63.9924 -5.402,310,61.7181 -5.404,310,59.7605 -5.406,310,58.0044 -5.408,310,56.277 -5.41,310,54.6937 -5.412,310,53.3982 -5.414,310,52.1603 -5.416,310,51.0087 -5.418,310,50.0299 -5.42,310,49.2239 -5.422,310,48.4753 -5.424,310,47.8708 -5.426,310,47.3238 -5.428,310,46.8344 -5.43,310,46.4026 -5.432,310,46.0571 -5.434,310,45.7692 -5.436,310,45.5101 -5.438,310,45.251 -5.44,310,45.1359 -5.442,310,45.0207 -5.444,310,44.9343 -5.446,310,44.7904 -5.448,310,44.848 -5.45,310,44.7616 -5.452,310,44.848 -5.454,310,44.9631 -5.456,310,45.0495 -5.458,310,45.1935 -5.46,310,45.3374 -5.462,310,45.5677 -5.464,310,45.798 -5.466,310,46.1147 -5.468,310,46.345 -5.47,310,46.8344 -5.472,310,47.2662 -5.474,310,47.6981 -5.476,310,48.2162 -5.478,310,48.8208 -5.48,310,49.3678 -5.482,310,50.0299 -5.485,310,50.6633 -5.486,310,51.3254 -5.488,310,51.9588 -5.49,310,52.5633 -5.492,310,53.0815 -5.494,310,53.5997 -5.496,310,54.0028 -5.498,310,54.377 -5.5,310,54.8088 -5.503,310,55.2119 -5.505,310,55.5573 -5.506,310,55.9892 -5.508,310,56.3634 -5.51,310,56.824 -5.512,310,57.1407 -5.514,310,57.4862 -5.516,310,57.9756 -5.518,310,58.3786 -5.52,310,59.1847 -5.522,310,60.4514 -5.524,310,62.2651 -5.526,310,64.8848 -5.528,310,68.3107 -5.53,310,72.888 -5.532,310,78.07 -5.534,310,83.3383 -5.536,310,88.3187 -5.538,310,91.8021 -5.54,310,94.1052 -5.542,310,95.2856 -5.544,310,95.7174 -5.546,310,95.6886 -5.548,310,95.4295 -5.55,310,94.9113 -5.552,310,94.134 -5.554,310,93.1264 -5.556,310,92.3203 -5.558,310,91.1976 -5.56,310,89.9597 -5.562,310,88.549 -5.564,310,86.7641 -5.566,310,84.9217 -5.568,310,83.108 -5.57,310,80.9489 -5.572,310,78.5594 -5.574,310,75.9109 -5.576,310,73.2911 -5.578,310,70.4986 -5.58,310,67.5622 -5.582,310,64.9136 -5.584,310,62.6105 -5.586,310,60.2499 -5.588,310,58.0331 -5.59,310,56.2195 -5.592,310,54.5497 -5.594,310,53.0815 -5.596,310,51.8148 -5.598,310,50.836 -5.6,310,49.9724 -5.602,310,49.2239 -5.604,310,48.5905 -5.606,310,48.1587 -5.608,310,47.6981 -5.61,310,47.3238 -5.612,310,47.0647 -5.614,310,46.9496 -5.616,310,46.748 -5.618,310,46.6617 -5.62,310,46.6329 -5.622,310,46.7192 -5.624,310,46.748 -5.626,310,46.892 -5.628,310,47.0647 -5.63,310,47.3238 -5.632,310,47.6405 -5.634,310,48.0435 -5.636,310,48.389 -5.638,310,48.8208 -5.64,310,49.2814 -5.642,310,49.7996 -5.644,310,50.3178 -5.646,310,50.8648 -5.648,310,51.5269 -5.65,310,52.1603 -5.652,310,52.8512 -5.654,310,53.5421 -5.656,310,54.3482 -5.658,310,55.0967 -5.66,310,55.9028 -5.662,310,56.6801 -5.664,310,57.4862 -5.666,310,58.2347 -5.668,310,58.9544 -5.67,310,59.5589 -5.672,310,60.1923 -5.674,310,60.7681 -5.676,310,61.315 -5.678,310,61.8045 -5.68,310,62.409 -5.682,310,62.8984 -5.684,310,63.4166 -5.686,310,64.0212 -5.688,310,64.5969 -5.69,310,65.0576 -5.692,310,65.7485 -5.694,310,66.497 -5.696,310,67.3894 -5.698,310,68.397 -5.7,310,69.491 -5.702,310,70.7577 -5.704,310,72.1971 -5.706,310,73.6366 -5.708,310,75.0472 -5.71,310,76.3715 -5.712,310,77.8685 -5.714,310,79.3367 -5.716,310,80.7473 -5.718,310,82.158 -5.72,310,83.5974 -5.722,310,84.8929 -5.724,310,86.1308 -5.726,310,87.2535 -5.728,310,88.1748 -5.73,310,89.096 -5.732,310,89.9021 -5.734,310,90.6794 -5.736,310,91.4279 -5.738,310,91.9749 -5.74,310,92.5507 -5.742,310,93.184 -5.744,310,93.6446 -5.746,310,94.0189 -5.748,310,94.3931 -5.75,310,94.7674 -5.752,310,95.084 -5.754,310,95.2856 -5.756,310,95.3719 -5.759,310,95.631 -5.76,310,95.775 -5.762,310,95.775 -5.764,310,95.9189 -5.766,310,96.0053 -5.768,310,96.0341 -5.77,310,96.0053 -5.772,310,96.0341 -5.774,310,96.0629 -5.776,310,96.0629 -5.778,310,96.0916 -5.78,310,96.0341 -5.782,310,96.178 -5.784,310,96.0916 -5.786,310,96.1204 -5.788,310,96.1204 -5.79,310,96.0341 -5.792,310,96.1492 -5.794,310,96.178 -5.796,310,96.1204 -5.798,310,96.0629 -5.8,310,96.1204 -5.802,310,96.0916 -5.804,310,96.1204 -5.806,310,96.1492 -5.808,310,96.1492 -5.81,310,96.1492 -5.812,310,96.0629 -5.814,310,96.1492 -5.816,310,96.1492 -5.818,310,96.1492 -5.82,310,96.0916 -5.822,310,96.1204 -5.824,310,96.1492 -5.826,310,96.178 -5.828,310,96.1204 -5.83,310,96.1204 -5.832,310,96.0341 -5.834,310,96.0916 -5.836,310,95.9189 -5.838,310,95.775 -5.84,310,95.5159 -5.842,310,95.1128 -5.844,310,94.7098 -5.846,310,94.3067 -5.848,310,93.8173 -5.85,310,93.1552 -5.852,310,92.4355 -5.854,310,91.9749 -5.856,310,91.2264 -5.858,310,90.5354 -5.86,310,89.6142 -5.862,310,88.9233 -5.864,310,87.9733 -5.866,310,87.1672 -5.868,310,86.3899 -5.87,310,85.5262 -5.872,310,84.8929 -5.874,310,84.0292 -5.876,310,83.4247 -5.878,310,82.8201 -5.88,310,82.3595 -5.882,310,81.9564 -5.885,310,81.611 -5.886,310,81.3519 -5.888,310,81.2655 -5.89,310,81.1216 -5.892,310,81.2079 -5.894,310,81.3807 -5.896,310,81.5534 -5.898,310,81.8125 -5.9,310,82.1292 -5.902,310,82.4459 -5.904,310,82.9353 -5.906,310,83.1656 -5.908,310,83.511 -5.91,310,83.8853 -5.912,310,84.3171 -5.914,310,84.6914 -5.916,310,85.0656 -5.918,310,85.3823 -5.92,310,85.699 -5.922,310,86.102 -5.924,310,86.505 -5.926,310,86.7641 -5.928,310,87.2248 -5.93,310,87.5414 -5.932,310,87.8293 -5.934,310,88.2324 -5.936,310,88.5778 -5.938,310,88.8369 -5.94,310,89.2112 -5.942,310,89.4703 -5.944,310,89.8445 -5.946,310,90.1324 -5.948,310,90.3915 -5.95,310,90.6794 -5.952,310,90.9673 -5.954,310,91.2552 -5.956,310,91.4567 -5.958,310,91.7446 -5.96,310,92.0324 -5.962,310,92.2628 -5.964,310,92.4643 -5.966,310,92.637 -5.968,310,92.8673 -5.97,310,93.0976 -5.972,310,93.3279 -5.974,310,93.5295 -5.976,310,93.731 -5.978,310,93.8749 -5.98,310,94.0189 -5.982,310,94.2492 -5.984,310,94.3643 -5.986,310,94.4219 -5.988,310,94.7098 -5.99,310,94.7386 -5.992,310,94.9401 -5.994,310,95.084 -5.996,310,95.1992 -5.998,310,95.1704 -6,310,95.3431 -6.002,310,95.4295 -6.004,310,95.4871 -6.006,310,95.5734 -6.008,310,95.631 -6.01,310,95.7174 -6.012,310,95.8037 -6.014,310,95.8325 -6.016,310,95.8325 -6.018,310,95.9477 -6.02,310,95.9477 -6.022,310,96.0341 -6.025,310,96.0629 -6.026,310,96.0341 -6.028,310,96.0341 -6.03,310,96.1204 -6.032,310,96.1204 -6.034,310,96.178 -6.036,310,96.0916 -6.038,310,96.0916 -6.04,310,96.1204 -6.042,310,96.178 -6.044,310,96.2068 -6.046,310,96.1492 -6.048,310,96.178 -6.05,310,96.1492 -6.052,310,96.2068 -6.055,310,96.1204 -6.056,310,96.1492 -6.058,310,96.2068 -6.06,310,96.178 -6.062,310,96.178 -6.064,310,96.1204 -6.066,310,96.178 -6.068,310,96.1492 -6.07,310,96.178 -6.072,310,96.178 -6.074,310,96.2068 -6.076,310,96.178 -6.078,310,96.178 -6.08,310,96.178 -6.082,310,96.2068 -6.084,310,96.1204 -6.086,310,96.1492 -6.088,310,96.2068 -6.09,310,96.2068 -6.092,310,96.178 -6.095,310,96.178 -6.096,310,96.1492 -6.098,310,96.178 -6.1,310,96.178 -6.102,310,96.1204 -6.104,310,96.1492 -6.106,310,96.178 -6.108,310,96.178 -6.11,310,96.178 -6.112,310,96.2068 -6.114,310,96.1492 -6.116,310,96.1204 -6.118,310,96.1492 -6.12,310,96.1204 -6.122,310,96.1492 -6.124,310,96.178 -6.126,310,96.2068 -6.128,310,96.178 -6.13,310,96.1492 -6.132,310,96.178 -6.134,310,96.178 -6.136,310,96.1204 -6.138,310,96.178 -6.14,310,96.0629 -6.142,310,96.0916 -6.144,310,96.2068 -6.146,310,96.2068 -6.148,310,96.1492 -6.15,310,96.178 -6.152,310,96.178 -6.154,310,96.2068 -6.156,310,96.178 -6.158,310,96.1204 -6.16,310,96.2068 -6.162,310,96.178 -6.164,310,96.1204 -6.166,310,96.0629 -6.168,310,96.178 -6.17,310,96.178 -6.172,310,96.2068 -6.174,310,96.2356 -6.176,310,96.2068 -6.178,310,96.1492 -6.18,310,96.178 -6.182,310,96.1492 -6.184,310,96.178 -6.186,310,96.1492 -6.188,310,96.178 -6.19,310,96.2068 -6.192,310,96.2068 -6.194,310,96.2068 -6.196,310,96.2068 -6.198,310,96.2356 -6.2,310,96.178 -6.202,310,96.1492 -6.204,310,96.1492 -6.206,310,96.2068 -6.208,310,96.2068 -6.21,310,96.178 -6.212,310,96.178 -6.214,310,96.2068 -6.216,310,96.1204 -6.218,310,96.178 -6.22,310,96.0916 -6.222,310,96.178 -6.224,310,96.0916 -6.226,310,96.1492 -6.228,310,96.2068 -6.23,310,96.2356 -6.232,310,96.2068 -6.234,310,96.1492 -6.236,310,96.2068 -6.238,310,96.2356 -6.24,310,96.2356 -6.242,310,96.1204 -6.245,310,96.178 -6.246,310,96.2356 -6.248,310,96.178 -6.25,310,96.2068 -6.252,310,96.2068 -6.254,310,96.178 -6.256,310,96.0629 -6.258,310,96.178 -6.26,310,96.1204 -6.262,310,96.1204 -6.264,310,96.2356 -6.266,310,96.178 -6.268,310,96.178 -6.27,310,96.1492 -6.272,310,96.3219 -6.275,310,96.178 -6.276,310,96.2068 -6.278,310,96.178 -6.28,310,96.178 -6.282,310,96.1204 -6.284,310,96.1204 -6.286,310,96.0916 -6.288,310,96.1492 -6.29,310,96.178 -6.292,310,96.2068 -6.294,310,96.2356 -6.296,310,96.2068 -6.298,310,96.1492 -6.3,310,96.178 -6.302,310,96.2068 -6.304,310,96.2068 -6.306,310,96.2068 -6.308,310,96.178 -6.31,310,96.2356 -6.312,310,96.2068 -6.314,310,96.1204 -6.316,310,96.2068 -6.318,310,96.178 -6.32,310,96.2068 -6.322,310,96.2068 -6.324,310,96.1204 -6.326,310,96.2356 -6.328,310,96.1492 -6.33,310,96.1492 -6.332,310,96.1492 -6.334,310,96.1204 -6.336,310,96.2356 -6.338,310,96.178 -6.34,310,96.178 -6.342,310,96.2068 -6.344,310,96.178 -6.346,310,96.1204 -6.348,310,96.1204 -6.35,310,96.1492 -6.352,310,96.2068 -6.354,310,96.1492 -6.356,310,96.0916 -6.358,310,96.1492 -6.361,310,96.1204 -6.362,310,96.2068 -6.364,310,96.2068 -6.366,310,96.178 -6.368,310,96.1204 -6.37,310,96.1492 -6.372,310,96.178 -6.374,310,96.2068 -6.376,310,96.1492 -6.378,310,96.2356 -6.38,310,96.178 -6.382,310,96.1492 -6.384,310,96.2068 -6.386,310,96.178 -6.388,310,96.178 -6.39,310,96.2068 -6.392,310,96.178 -6.394,310,96.2356 -6.396,310,96.2068 -6.398,310,96.2068 -6.4,310,96.2356 -6.402,310,96.2356 -6.404,310,96.2356 -6.406,310,96.0916 -6.408,310,96.178 -6.41,310,96.178 -6.412,310,96.1204 -6.414,310,96.178 -6.416,310,96.2068 -6.418,310,96.178 -6.42,310,96.1204 -6.422,310,96.1492 -6.424,310,96.178 -6.426,310,96.178 -6.428,310,96.2068 -6.43,310,96.178 -6.432,310,96.178 -6.434,310,96.2068 -6.436,310,96.0916 -6.438,310,96.2068 -6.44,310,96.2356 -6.442,310,96.2068 -6.444,310,96.2356 -6.446,310,96.2068 -6.448,310,96.1492 -6.45,310,96.2068 -6.452,310,96.0916 -6.454,310,96.2068 -6.456,310,96.2068 -6.458,310,96.2356 -6.46,310,96.178 -6.462,310,96.2068 -6.464,310,96.2068 -6.466,310,96.0629 -6.468,310,96.178 -6.47,310,96.2068 -6.472,310,96.2356 -6.474,310,96.1204 -6.476,310,96.178 -6.478,310,96.1204 -6.48,310,96.2356 -6.482,310,96.178 -6.484,310,96.1204 -6.486,310,96.2068 -6.488,310,96.2356 -6.49,310,96.2356 -6.492,310,96.178 -6.494,310,96.2068 -6.496,310,96.1204 -6.498,310,96.178 -6.5,310,96.0916 -6.502,310,96.2356 -6.504,310,96.1492 -6.506,310,96.2068 -6.508,310,96.178 -6.51,310,96.2068 -6.512,310,96.178 -6.514,310,96.2068 -6.516,310,96.2068 -6.518,310,96.178 -6.52,310,96.1492 -6.522,310,96.2068 -6.524,310,96.2356 -6.526,310,96.178 -6.528,310,96.178 -6.53,310,96.178 -6.532,310,96.2068 -6.535,310,96.178 -6.536,310,96.2068 -6.538,310,96.178 -6.54,310,96.1204 -6.542,310,96.1492 -6.544,310,96.178 -6.546,310,96.178 -6.548,310,96.2068 -6.55,310,96.178 -6.552,310,96.2068 -6.554,310,96.1492 -6.556,310,96.2356 -6.558,310,96.1492 -6.56,310,96.2356 -6.562,310,96.2068 -6.564,310,96.178 -6.566,310,96.1492 -6.568,310,96.0916 -6.57,310,96.178 -6.572,310,96.178 -6.574,310,96.1204 -6.576,310,96.178 -6.578,310,96.1492 -6.58,310,96.2644 -6.582,310,96.2356 -6.584,310,96.178 -6.586,310,96.2356 -6.588,310,96.1204 -6.59,310,96.178 -6.592,310,96.2644 -6.594,310,96.178 -6.596,310,96.2068 -6.598,310,96.2068 -6.6,310,96.1492 -6.602,310,96.1492 -6.604,310,96.178 -6.606,310,96.2068 -6.608,310,96.1492 -6.61,310,96.2644 -6.612,310,96.1204 -6.614,310,96.2068 -6.616,310,96.0629 -6.618,310,96.178 -6.62,310,96.2068 -6.622,310,96.178 -6.624,310,96.2356 -6.626,310,96.2068 -6.629,310,96.1492 -6.63,310,96.178 -6.632,310,96.2644 -6.634,310,96.2356 -6.636,310,96.1492 -6.638,310,96.2356 -6.64,310,96.2068 -6.642,310,96.1492 -6.644,310,96.2068 -6.646,310,96.2356 -6.648,310,96.2068 -6.65,310,96.178 -6.652,310,96.178 -6.654,310,96.2068 -6.656,310,96.2068 -6.658,310,96.178 -6.66,310,96.1492 -6.662,310,96.2068 -6.664,310,96.2356 -6.666,310,96.1204 -6.668,310,96.1204 -6.67,310,96.178 -6.672,310,96.178 -6.674,310,96.1492 -6.676,310,95.9765 -6.678,310,96.1204 -6.68,310,96.2068 -6.682,310,96.178 -6.684,310,96.2356 -6.686,310,96.1492 -6.688,310,96.178 -6.69,310,96.178 -6.692,310,96.178 -6.694,310,96.2356 -6.696,310,96.2068 -6.698,310,96.178 -6.7,310,96.1492 -6.702,310,96.2356 -6.704,310,96.1492 -6.706,310,96.0916 -6.708,310,96.0916 -6.71,310,96.0629 -6.712,310,96.1492 -6.714,310,96.2356 -6.716,310,96.178 -6.718,310,96.1492 -6.72,310,96.1492 -6.722,310,96.178 -6.724,310,96.2068 -6.726,310,96.2356 -6.728,310,96.178 -6.73,310,96.1492 -6.732,310,96.178 -6.734,310,96.2068 -6.736,310,96.0629 -6.738,310,96.2068 -6.74,310,96.1492 -6.742,310,96.1492 -6.744,310,96.178 -6.746,310,96.2068 -6.748,310,96.2356 -6.75,310,96.1204 -6.752,310,96.1492 -6.754,310,96.1204 -6.756,310,96.2068 -6.758,310,96.178 -6.76,310,96.178 -6.762,310,96.0629 -6.764,310,96.2356 -6.766,310,96.2356 -6.768,310,96.2068 -6.77,310,96.2068 -6.772,310,96.2068 -6.774,310,96.2356 -6.776,310,96.2068 -6.778,310,96.1204 -6.78,310,96.2068 -6.782,310,96.178 -6.784,310,96.2068 -6.786,310,96.2068 -6.788,310,96.2356 -6.79,310,96.178 -6.792,310,96.2068 -6.794,310,96.2356 -6.796,310,96.178 -6.798,310,96.2068 -6.8,310,96.2068 -6.802,310,96.1204 -6.804,310,96.1204 -6.806,310,96.2356 -6.808,310,96.1492 -6.81,310,96.1204 -6.812,310,96.1492 -6.814,310,96.178 -6.816,310,96.2356 -6.818,310,96.178 -6.82,310,96.178 -6.822,310,96.2068 -6.824,310,96.178 -6.826,310,96.1204 -6.828,310,96.1492 -6.83,310,96.0916 -6.832,310,96.2068 -6.834,310,96.1204 -6.836,310,96.178 -6.838,310,96.2356 -6.84,310,96.2068 -6.842,310,96.2068 -6.844,310,96.178 -6.846,310,96.2068 -6.848,310,96.178 -6.85,310,96.178 -6.852,310,96.1492 -6.854,310,96.178 -6.856,310,96.178 -6.858,310,96.2068 -6.86,310,96.178 -6.862,310,96.1492 -6.864,310,96.1204 -6.866,310,96.2068 -6.868,310,96.2068 -6.87,310,96.2068 -6.872,310,96.1204 -6.874,310,96.2068 -6.876,310,96.2068 -6.878,310,96.2068 -6.88,310,96.178 -6.882,310,96.2068 -6.884,310,96.2356 -6.886,310,96.1204 -6.888,310,96.2068 -6.89,310,96.2356 -6.892,310,96.2068 -6.894,310,96.1492 -6.896,310,96.2068 -6.898,310,96.2068 -6.9,310,96.2068 -6.902,310,96.2356 -6.904,310,96.2068 -6.906,310,96.2068 -6.908,310,96.1204 -6.91,310,96.178 -6.912,310,96.2068 -6.914,310,96.2356 -6.916,310,96.1204 -6.918,310,96.0629 -6.92,310,96.178 -6.922,310,96.2356 -6.924,310,96.1492 -6.926,310,96.178 -6.928,310,96.178 -6.93,310,96.2068 -6.932,310,96.2068 -6.934,310,96.1492 -6.936,310,96.2068 -6.938,310,96.178 -6.94,310,96.2068 -6.942,310,96.0916 -6.944,310,96.2356 -6.946,310,96.1492 -6.948,310,96.178 -6.95,310,96.178 -6.952,310,96.178 -6.954,310,96.2356 -6.956,310,96.178 -6.958,310,96.2356 -6.96,310,96.178 -6.962,310,96.0341 -6.964,310,96.2068 -6.966,310,96.178 -6.968,310,96.2356 -6.97,310,96.1492 -6.972,310,96.1492 -6.974,310,96.178 -6.976,310,96.2356 -6.978,310,96.0916 -6.98,310,96.178 -6.982,310,96.2356 -6.984,310,96.2356 -6.986,310,96.2356 -6.988,310,96.2356 -6.99,310,96.2356 -6.992,310,96.1204 -6.994,310,96.2068 -6.996,310,96.178 -6.998,310,96.2356 -7,310,96.1204 -7.002,310,96.1204 -7.004,310,96.2068 -7.006,310,96.2068 -7.008,310,96.2068 -7.01,310,96.2356 -7.012,310,96.2068 -7.014,310,96.2068 -7.016,310,96.2068 -7.018,310,96.1204 -7.02,310,96.178 -7.022,310,96.178 -7.024,310,96.178 -7.026,310,96.2068 -7.028,310,96.178 -7.03,310,96.178 -7.032,310,96.2068 -7.034,310,96.2068 -7.036,310,96.2068 -7.038,310,96.2068 -7.04,310,96.178 -7.042,310,96.2068 -7.044,310,96.178 -7.046,310,96.2068 -7.048,310,96.2068 -7.05,310,96.178 -7.052,310,96.178 -7.054,310,96.2068 -7.056,310,96.2356 -7.058,310,96.178 -7.06,310,96.178 -7.062,310,96.178 -7.064,310,96.2068 -7.066,310,96.2068 -7.068,310,96.178 -7.07,310,96.2068 -7.072,310,96.1492 -7.074,310,96.178 -7.076,310,96.178 -7.078,310,96.2356 -7.08,310,96.2068 -7.082,310,96.2068 -7.084,310,96.178 -7.086,310,96.178 -7.088,310,96.178 -7.09,310,96.1204 -7.092,310,96.178 -7.094,310,96.178 -7.096,310,96.2356 -7.098,310,96.1492 -7.1,310,96.2068 -7.102,310,96.178 -7.104,310,96.1492 -7.106,310,96.2068 -7.108,310,96.2068 -7.11,310,96.1492 -7.112,310,96.1492 -7.114,310,96.178 -7.116,310,96.2068 -7.118,310,96.178 -7.12,310,96.2068 -7.122,310,96.2068 -7.124,310,96.1204 -7.126,310,96.2068 -7.128,0,96.1492 -7.13,0,96.2068 -7.132,0,96.1204 -7.134,0,96.178 -7.136,0,96.2068 -7.138,0,96.2068 -7.14,0,96.2068 -7.142,0,96.178 -7.144,0,96.2356 -7.146,0,96.1204 -7.148,0,96.2068 -7.15,0,96.2068 -7.152,0,96.178 -7.154,0,96.2068 -7.156,0,96.178 -7.158,0,96.2356 -7.16,0,96.178 -7.162,0,96.178 -7.164,0,96.2068 -7.166,0,96.2356 -7.168,0,96.2068 -7.17,0,96.178 -7.172,0,96.0629 -7.174,0,96.178 -7.176,0,96.2356 -7.178,0,96.178 -7.18,0,96.178 -7.182,0,96.1492 -7.184,0,96.1204 -7.186,0,96.1204 -7.188,0,96.1204 -7.19,0,96.1492 -7.192,0,96.1204 -7.194,0,96.0916 -7.196,0,96.178 -7.198,0,96.1492 -7.2,0,96.1204 -7.202,0,96.1204 -7.204,0,96.1492 -7.206,0,96.1492 -7.208,0,96.1204 -7.21,0,96.1492 -7.212,0,96.1204 -7.214,0,96.1492 -7.216,0,96.1204 -7.218,0,96.0341 -7.22,0,96.1204 -7.222,0,96.178 -7.224,0,96.178 -7.226,0,96.1492 -7.228,0,96.178 -7.23,0,96.178 -7.232,0,96.0916 -7.234,0,96.2068 -7.236,0,96.1492 -7.238,0,96.0916 -7.24,0,96.178 -7.242,0,96.178 -7.244,0,96.1204 -7.246,0,96.178 -7.248,0,96.0916 -7.25,0,96.0629 -7.252,0,96.1492 -7.254,0,96.1204 -7.256,0,96.1492 -7.258,0,96.0916 -7.26,0,96.0629 -7.262,0,96.0916 -7.264,0,96.1204 -7.266,0,96.1204 -7.268,0,96.0629 -7.27,0,96.1204 -7.272,0,96.178 -7.274,0,96.1204 -7.276,0,96.0916 -7.278,0,96.1204 -7.28,0,96.0916 -7.282,0,96.1492 -7.284,0,96.1204 -7.286,0,96.1492 -7.288,0,96.0916 -7.29,0,96.0629 -7.292,0,96.1204 -7.294,0,96.0341 -7.296,0,96.1204 -7.298,0,96.0916 -7.3,0,96.1204 -7.302,0,96.1204 -7.304,0,96.1204 -7.306,0,96.1204 -7.308,0,96.1204 -7.31,0,96.0916 -7.312,0,96.1204 -7.314,0,96.0916 -7.316,0,96.0916 -7.318,0,96.0916 -7.32,0,96.1204 -7.322,0,96.0341 -7.324,0,96.0916 -7.326,0,96.178 -7.328,0,96.1492 -7.33,0,96.0916 -7.332,0,96.1204 -7.334,0,96.0341 -7.336,0,96.0916 -7.338,0,96.0629 -7.34,0,96.0916 -7.342,0,96.0341 -7.344,0,96.1204 -7.346,0,96.0341 -7.348,0,96.0916 -7.35,0,96.0629 -7.352,0,96.0053 -7.354,0,96.178 -7.356,0,96.1204 -7.358,0,96.0341 -7.36,0,96.1492 -7.362,0,96.1204 -7.364,0,96.0629 -7.366,0,96.1204 -7.368,0,96.0629 -7.37,0,96.0629 -7.372,0,96.1204 -7.374,0,96.0341 -7.376,0,96.0341 -7.378,0,96.0916 -7.38,0,96.0341 -7.382,0,96.0341 -7.384,0,96.0629 -7.386,0,96.1204 -7.388,0,96.0916 -7.39,0,96.0916 -7.392,0,96.1204 -7.394,0,96.1204 -7.396,0,96.0341 -7.398,0,96.0916 -7.4,0,96.0916 -7.402,0,96.0629 -7.404,0,96.1492 -7.406,0,96.0629 -7.408,0,96.0916 -7.41,0,96.0629 -7.412,0,95.9765 -7.414,0,96.0916 -7.416,0,96.1204 -7.418,0,96.0916 -7.42,0,96.0916 -7.422,0,96.1204 -7.424,0,96.1204 -7.426,0,96.1204 -7.428,0,96.1204 -7.43,0,96.0053 -7.432,0,96.1204 -7.434,0,96.0916 -7.436,0,96.0053 -7.438,0,96.0629 -7.44,0,96.1204 -7.442,0,96.0053 -7.444,0,96.0916 -7.446,0,96.0916 -7.448,0,96.0341 -7.45,0,96.0916 -7.452,0,96.0053 -7.454,0,96.0341 -7.456,0,96.1204 -7.458,0,96.0053 -7.46,0,96.0916 -7.462,0,96.1204 -7.465,0,96.1204 -7.466,0,96.0341 -7.468,0,96.0916 -7.47,0,96.0629 -7.472,0,96.0629 -7.474,0,96.0916 -7.476,0,96.1204 -7.478,0,96.0629 -7.48,0,96.0916 -7.482,0,96.1204 -7.484,0,96.0629 -7.486,0,96.1204 -7.488,0,96.1204 -7.49,0,96.0916 -7.492,0,96.0629 -7.494,0,96.1204 -7.496,0,96.1204 -7.498,0,96.0916 -7.5,0,95.9765 -7.502,0,95.9765 -7.504,0,96.1204 -7.506,0,96.1204 -7.508,0,96.0916 -7.51,0,96.0916 -7.512,0,96.0629 -7.514,0,96.1204 -7.516,0,96.0916 -7.518,0,96.0916 -7.52,0,96.0629 -7.522,0,96.0916 -7.524,0,96.1204 -7.526,0,96.1204 -7.528,0,96.1204 -7.53,0,96.0916 -7.532,0,96.0629 -7.534,0,96.0629 -7.536,0,96.1204 -7.538,0,96.0916 -7.54,0,96.0916 -7.542,0,96.0629 -7.544,0,96.0916 -7.546,0,96.1204 -7.548,0,96.0629 -7.55,0,96.0341 -7.552,0,96.0341 -7.554,0,96.1492 -7.556,0,96.1492 -7.558,0,96.1204 -7.56,0,96.1204 -7.562,0,96.0629 -7.564,0,96.0629 -7.566,0,96.1492 -7.568,0,96.0916 -7.57,0,96.0916 -7.572,0,96.1492 -7.574,0,96.1204 -7.576,0,96.1204 -7.578,0,96.0629 -7.58,0,96.0916 -7.582,0,96.1492 -7.584,0,96.1204 -7.586,0,96.178 -7.588,0,96.1492 -7.59,0,96.1492 -7.592,0,96.0341 -7.594,0,96.1204 -7.596,0,96.1492 -7.598,0,96.1492 -7.6,0,96.1492 -7.602,0,96.178 -MARK 000,, \ No newline at end of file diff --git a/unit_tests/tests/trigger/test_instant_map.cpp b/unit_tests/tests/trigger/test_instant_map.cpp deleted file mode 100644 index 755b92545f..0000000000 --- a/unit_tests/tests/trigger/test_instant_map.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * test_instant_map.cpp - * - * Created on: Nov 30, 2021 - * @author Andrey Belomutskiy, (c) 2012-2021 - */ - -#include "pch.h" - -static char buffer[255]; -static FILE *fp; -static int m_lineIndex = -1; - -bool haveMore() { - bool result = fgets(buffer, sizeof(buffer), fp) != nullptr; - m_lineIndex++; - if (m_lineIndex == 0) { - // skip header - return haveMore(); - } - - return result; -} - -TEST(trigger, instantMap) { - const char s[2] = ","; - - fp = fopen("tests/resources/instant_map.csv", "r"); - ASSERT_TRUE(fp != nullptr); - - MapState mapState; - EngineTestHelper eth(TEST_ENGINE); - - while (haveMore()) { - strtok(buffer, s); - strtok(NULL, s); - char *map = strtok(NULL, s); - if (map == nullptr) { - break; - } - double mapValue = std::stod(map); - printf("map %f\n", mapValue); - - if (m_lineIndex != 105 && m_lineIndex != 183 && m_lineIndex < 289) { - ASSERT_FALSE(mapState.isPeak(false)) << m_lineIndex << " " << mapValue; - } - - mapState.add(mapValue); - } - - ASSERT_TRUE(m_lineIndex > 10); - -} diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp index 0c8ad6a05d..1497a1ec9b 100644 --- a/unit_tests/tests/trigger/test_map_cam.cpp +++ b/unit_tests/tests/trigger/test_map_cam.cpp @@ -3,73 +3,6 @@ #include "pch.h" #include "trigger_central.h" -static int getZigZag(int index) { - index = index % 1000; - - if (index < 400) { - // going up from 0 to 400 - return index; - } - if (index < 500) { - // going down from 400 to 300 - return 800 - index; - } - if (index < 600) { - // going up from 300 to 400 - return index - 200; - } - // going down from 400 to 0 - return 1000 - index; -} - -TEST(trigger, map_cam) { - EngineTestHelper eth(TEST_ENGINE); - - engineConfiguration->mapCamAveragingLength = 8; - MapState state; - - int i = 0; - for (;i<403;i++) { - state.add(getZigZag(i)); - - if (state.mapBuffer.getCount() > engineConfiguration->mapCamAveragingLength) { - ASSERT_FALSE(state.isPeak(false)) << "high At " << i; - ASSERT_FALSE(state.isPeak(true)) << "low At " << i; - } - } - - state.add(getZigZag(i)); - ASSERT_FALSE(state.isPeak(false)) << "high At " << i; - ASSERT_FALSE(state.isPeak(true)) << "low At " << i; - i++; - - - state.add(getZigZag(i)); - ASSERT_TRUE(state.isPeak(false)) << "high At " << i; - ASSERT_FALSE(state.isPeak(true)) << "low At " << i; - - for (;i<504;i++) { - state.add(getZigZag(i)); - ASSERT_FALSE(state.isPeak(false)) << "high At " << i; - ASSERT_FALSE(state.isPeak(true)) << "low At " << i; - } - - state.add(getZigZag(i)); - ASSERT_FALSE(state.isPeak(false)) << "high At " << i; - ASSERT_TRUE(state.isPeak(true)) << "low At " << i; - i++; - - for (;i<604;i++) { - state.add(getZigZag(i)); - ASSERT_FALSE(state.isPeak(false)) << "high At " << i; - ASSERT_FALSE(state.isPeak(true)) << "low At " << i; - } - - state.add(getZigZag(i)); - ASSERT_TRUE(state.isPeak(false)) << "high At " << i; - ASSERT_TRUE(state.isPeak(false)) << "low At " << i; -} - TEST(trigger, map_cam_by_magic_point) { EngineTestHelper eth(TEST_CRANK_ENGINE);