This commit is contained in:
xinyang
2019-07-12 12:47:15 +08:00
parent 1c295e14ac
commit eefee82f18
14 changed files with 12531 additions and 12524 deletions

View File

@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/armor/include)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/others/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/others/include)
FILE(GLOB_RECURSE sourcefiles "others/src/*.cpp" "energy/src/*cpp" "armor/src/*.cpp") FILE(GLOB_RECURSE sourcefiles "others/src/*.cpp" "energy/src/*cpp" "armor/src/*.cpp")
ADD_EXECUTABLE(${BIN_NAME} main.cpp ${sourcefiles} others/include/constants.h armor/src/armor_finder/searching_state/find_light_blobs.cpp armor/src/armor_finder/searching_state/find_armor_boxes.cpp) ADD_EXECUTABLE(${BIN_NAME} main.cpp ${sourcefiles})
TARGET_LINK_LIBRARIES(${BIN_NAME} ${CMAKE_THREAD_LIBS_INIT}) TARGET_LINK_LIBRARIES(${BIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
TARGET_LINK_LIBRARIES(${BIN_NAME} ${OpenCV_LIBS}) TARGET_LINK_LIBRARIES(${BIN_NAME} ${OpenCV_LIBS})

View File

@@ -86,43 +86,3 @@ void ArmorFinder::run(cv::Mat &src) {
} }
} }
bool sendTarget(Serial &serial, double x, double y, double z) {
static short x_tmp, y_tmp, z_tmp;
static time_t last_time = time(nullptr);
static int fps;
uint8_t buff[8];
time_t t = time(nullptr);
if (last_time != t) {
last_time = t;
cout << "fps:" << fps << ", (" << x << "," << y << "," << z << ")" << endl;
fps = 0;
}
fps += 1;
x_tmp = static_cast<short>(x * (32768 - 1) / 100);
y_tmp = static_cast<short>(y * (32768 - 1) / 100);
z_tmp = static_cast<short>(z * (32768 - 1) / 1000);
buff[0] = 's';
buff[1] = static_cast<char>((x_tmp >> 8) & 0xFF);
buff[2] = static_cast<char>((x_tmp >> 0) & 0xFF);
buff[3] = static_cast<char>((y_tmp >> 8) & 0xFF);
buff[4] = static_cast<char>((y_tmp >> 0) & 0xFF);
buff[5] = static_cast<char>((z_tmp >> 8) & 0xFF);
buff[6] = static_cast<char>((z_tmp >> 0) & 0xFF);
buff[7] = 'e';
return serial.WriteData(buff, sizeof(buff));
}
bool ArmorFinder::sendBoxPosition() {
auto rect = armor_box;
double dx = rect.x + rect.width / 2 - 320;
double dy = rect.y + rect.height / 2 - 240 - 20;
double yaw = atan(dx / FOCUS_PIXAL) * 180 / PI;
double pitch = atan(dy / FOCUS_PIXAL) * 180 / PI;
double dist = DISTANCE_HEIGHT / armor_box.height;
// cout << yaw << endl;
return sendTarget(serial, yaw, -pitch, dist);
}

View File

@@ -21,7 +21,7 @@ bool rectangleContainPoint(cv::RotatedRect rectangle, cv::Point2f point) {
return indicator >= 0; return indicator >= 0;
} }
/// Todo: 下面的函数可以有性能优化,暂时未做。 // 下面的函数可以有性能优化,暂时未做。
static double nonZeroRateOfRotateRect(const cv::Mat &bin, const cv::RotatedRect &rotrect) { static double nonZeroRateOfRotateRect(const cv::Mat &bin, const cv::RotatedRect &rotrect) {
auto rect = rotrect.boundingRect(); auto rect = rotrect.boundingRect();
if (rect.x < 0 || rect.y < 0 || rect.x + rect.width > bin.cols || rect.y + rect.height > bin.rows) { if (rect.x < 0 || rect.y < 0 || rect.x + rect.width > bin.cols || rect.y + rect.height > bin.rows) {
@@ -45,7 +45,7 @@ int linePointX(const cv::Point2f &p1, const cv::Point2f &p2, int y) {
return (p2.x - p1.x) / (p2.y - p1.y) * (y - p1.y) + p1.x; return (p2.x - p1.x) / (p2.y - p1.y) * (y - p1.y) + p1.x;
} }
///Todo: 性能优化后的函数。(暂时还有点问题) // 性能优化后的函数
static double nonZeroRateOfRotateRect_opt(const cv::Mat &bin, const cv::RotatedRect &rotrect) { static double nonZeroRateOfRotateRect_opt(const cv::Mat &bin, const cv::RotatedRect &rotrect) {
int cnt = 0; int cnt = 0;
cv::Point2f corners[4]; cv::Point2f corners[4];

View File

@@ -0,0 +1,46 @@
//
// Created by xinyang on 19-7-11.
//
#include <armor_finder/armor_finder.h>
static bool sendTarget(Serial &serial, double x, double y, double z) {
static short x_tmp, y_tmp, z_tmp;
static time_t last_time = time(nullptr);
static int fps;
uint8_t buff[8];
time_t t = time(nullptr);
if (last_time != t) {
last_time = t;
cout << "fps:" << fps << ", (" << x << "," << y << "," << z << ")" << endl;
fps = 0;
}
fps += 1;
x_tmp = static_cast<short>(x * (32768 - 1) / 100);
y_tmp = static_cast<short>(y * (32768 - 1) / 100);
z_tmp = static_cast<short>(z * (32768 - 1) / 1000);
buff[0] = 's';
buff[1] = static_cast<char>((x_tmp >> 8) & 0xFF);
buff[2] = static_cast<char>((x_tmp >> 0) & 0xFF);
buff[3] = static_cast<char>((y_tmp >> 8) & 0xFF);
buff[4] = static_cast<char>((y_tmp >> 0) & 0xFF);
buff[5] = static_cast<char>((z_tmp >> 8) & 0xFF);
buff[6] = static_cast<char>((z_tmp >> 0) & 0xFF);
buff[7] = 'e';
return serial.WriteData(buff, sizeof(buff));
}
bool ArmorFinder::sendBoxPosition() {
auto rect = armor_box;
double dx = rect.x + rect.width / 2 - 320;
double dy = rect.y + rect.height / 2 - 240 - 20;
double yaw = atan(dx / FOCUS_PIXAL) * 180 / PI;
double pitch = atan(dy / FOCUS_PIXAL) * 180 / PI;
double dist = DISTANCE_HEIGHT / rect.height;
// cout << yaw << endl;
return sendTarget(serial, yaw, -pitch, dist);
}

View File

@@ -29,17 +29,17 @@ using namespace std;
mcu_data mcuData = { // 单片机端回传结构体 mcu_data mcuData = { // 单片机端回传结构体
0, // 当前云台yaw角 0, // 当前云台yaw角
0, // 当前云台pitch角 0, // 当前云台pitch角
SMALL_ENERGY_STATE, // 当前状态,自瞄-大符-小符 ARMOR_STATE, // 当前状态,自瞄-大符-小符
0, // 云台角度标记位 0, // 云台角度标记位
1, // 是否启用数字识别 1, // 是否启用数字识别
ENEMY_RED, // 敌方颜色 ENEMY_BLUE, // 敌方颜色
}; };
WrapperHead *video_gimble = nullptr; // 云台摄像头视频源 WrapperHead *video_gimble = nullptr; // 云台摄像头视频源
WrapperHead *video_chassis = nullptr; // 底盘摄像头视频源 WrapperHead *video_chassis = nullptr; // 底盘摄像头视频源
Serial serial(115200); // 串口对象 Serial serial(115200); // 串口对象
uint8_t last_state = ARMOR_STATE; // 上次状态,用于初始化 uint8_t last_state = INIT_STATE; // 上次状态,用于初始化
// 自瞄主程序对象 // 自瞄主程序对象
ArmorFinder armorFinder(mcuData.enemy_color, serial, PROJECT_DIR"/tools/para/", mcuData.use_classifier); ArmorFinder armorFinder(mcuData.enemy_color, serial, PROJECT_DIR"/tools/para/", mcuData.use_classifier);
// 能量机关主程序对象 // 能量机关主程序对象
@@ -123,7 +123,7 @@ int main(int argc, char *argv[]) {
// chassis_src = chassis_src(Rect(106, 0, 640, 480)); // chassis_src = chassis_src(Rect(106, 0, 640, 480));
} else { // 自瞄模式 } else { // 自瞄模式
if (last_state != ARMOR_STATE) { if (last_state != ARMOR_STATE) {
((CameraWrapper *) video_gimble)->changeBrightness(40); ((CameraWrapper *) video_gimble)->changeBrightness(30);
} }
last_state = mcuData.state; last_state = mcuData.state;
ok = checkReconnect(video_gimble->read(gimble_src)); ok = checkReconnect(video_gimble->read(gimble_src));

View File

@@ -16,6 +16,7 @@
#define BIG_ENERGY_STATE 'b' #define BIG_ENERGY_STATE 'b'
#define SMALL_ENERGY_STATE 's' #define SMALL_ENERGY_STATE 's'
#define ARMOR_STATE 'a' #define ARMOR_STATE 'a'
#define INIT_STATE 0
#define FOCUS_PIXAL_8MM (1488) #define FOCUS_PIXAL_8MM (1488)
#define FOCUS_PIXAL_5MM (917) #define FOCUS_PIXAL_5MM (917)

View File

@@ -1,7 +1,7 @@
6 6
-0.044632435 0.86523724
-0.02473628 -0.27715018
-0.0030768034 0.75527006
0.24577394 -0.075059906
0.74099255 0.34237406
0.83760846 0.44510886

View File

@@ -2,453 +2,453 @@
6 6
5 5
5 5
-0.26535293 -0.71426845
-0.7057052 -0.78910184
-1.0125909 -0.5399757
-1.3340354 -0.04282911
-1.495565 0.6023444
-0.17923793 -0.47612357
-0.44294497 -0.6062769
-0.727623 -0.25137585
-0.8330653 0.1711519
-1.1030264 0.8713141
0.22618154 -0.22192898
0.09645194 -0.2357453
0.007988933 -0.10055242
-0.06676202 0.16005284
0.04132599 0.6890322
0.32757846 0.41694206
0.40264332 0.34373376
0.43659902 0.35569474
0.19945726 0.41190708
0.17344357 0.5625421
0.47801965 1.0273445
0.38276014 1.1200858
0.09048866 0.7670812
-0.06334416 0.69272625
0.18430263 0.6298072
-0.0821216 -0.6777285
-0.014996407 -0.7893784
0.20701231 -0.7832862
0.488899 -0.46237308
0.58319753 -0.36774614
0.11771286 -0.044647332
0.1965253 -0.033169117
0.6358752 -0.116503894
0.64802784 -0.028114107
0.60001755 0.14470229
0.2554345 0.22178589
0.4315062 0.3903765
0.6018779 0.41056815
0.648897 0.50941557
0.49093586 0.37397966
0.4392625 0.5087217
0.47829357 0.68874615
0.5859732 0.5895347
0.40362874 0.5184655
0.5647167 0.43753108
0.37936094 0.48142084
0.38751897 0.49064797
0.33950707 0.37774232
0.26118782 0.15439425
0.24458277 0.40673077
-0.296597 -0.9322208
-0.05955656 -0.7130281
-0.08669927 -0.7948999
0.2948263 -0.59756064
0.21256281 -0.5360308
-0.21364267 -0.94923395
-0.11149765 -0.70971376
0.051804803 -0.4880414
0.30273178 -0.5524744
0.37230775 -0.22826928
-0.20215505 -0.9012607
0.0075573116 -0.42657292
0.0852658 -0.39974678
0.4057793 -0.25775903
0.43914732 -0.089752525
-0.19324225 -0.652063
-0.24100459 -0.11451883
0.05862832 -0.29857674
0.15438421 -0.20352073
0.16637161 -0.03813096
-0.30359998 -0.7394394
-0.25569716 -0.29090282
-0.27166495 -0.18491635
-0.105328314 -0.3375849
-0.22731523 -0.21737641
-0.49984613 -0.06331601
-0.48510763 0.23076378
-0.61559784 0.64787745
-0.455915 0.814247
-0.5008321 0.711681
-0.2473407 -0.11237266
-0.5829683 0.2339835
-0.31992865 0.5982465
-0.4633471 0.75691354
-0.4102413 0.8937416
-0.37923393 -0.40250772
-0.53175026 0.017243713
-0.37793508 0.27052206
-0.22095646 0.41105437
-0.311128 0.70966357
-0.3536778 -0.6356781
-0.35127252 -0.47894162
-0.3305521 -0.38424912
-0.3529858 0.1542638
-0.4037293 0.4863095
-0.04839398 -1.2593673
-0.22108248 -1.1728226
-0.33264476 -0.88074636
-0.48446456 -0.20179018
-0.3995877 0.499351
-0.13429332 -0.3386704
0.010297872 -0.72948843
0.011609504 -0.6517269
0.31906354 -0.59930724
0.37465036 -0.44620585
-0.29219627 -0.34179407
0.14352046 -0.3989299
0.20362744 -0.64948344
0.50884646 -0.61383384
0.5390908 -0.1940541
-0.33872694 -0.253537
0.20858169 -0.3097453
0.43735874 -0.5346087
0.8135085 -0.5078143
0.883336 -0.5057771
-0.5109052 -0.35087797
0.12871116 -0.32393566
0.5575856 -0.32478297
0.7935451 -0.5195118
0.9575268 -0.58599657
-0.23053701 -0.2469826
0.27344263 -0.46790168
0.7943212 -0.3481219
1.1113379 -0.5312011
1.2588514 -0.37381303
-0.33160424 -0.42296624
-0.44694212 -0.5400541
-0.6180945 -0.57279116
-0.50343496 -0.70291847
-0.49336222 -0.5125593
-0.35408464 -0.37271905
-0.28353223 -0.46977413
-0.30269137 -0.58843505
-0.4561699 -0.61919516
-0.29882556 -0.42944196
-0.34760386 -0.4177595
-0.37878114 -0.3359632
-0.26912686 -0.41857186
-0.35775197 -0.47130904
-0.30568978 -0.50313944
-0.20146766 -0.19135681
-0.19798744 -0.24496605
-0.114498556 -0.3094193
-0.19717412 -0.46274003
-0.3251374 -0.34697565
-0.26690894 -0.38827848
-0.22016314 -0.3427244
-0.11541117 -0.44327536
-0.4957958 -0.3332074
-0.26541355 -0.42524108
-0.15326017 -3.422764
-0.70882344 -2.7104778
-0.96359867 -1.2596887
-1.3611866 -0.05179698
-1.605483 0.783713
-0.17858846 -2.9307501
-0.54938656 -2.1650062
-0.7686302 -0.9215995
-0.93810904 0.10760005
-0.9051225 1.02092
0.4606456 -2.1281867
0.20901297 -1.2840378
0.08945545 -0.258977
0.038989723 0.536884
-0.115543194 1.1714638
0.6883734 -1.0040573
0.61636794 -0.10041873
0.32829562 0.35033342
0.20456453 0.8677282
0.20381331 1.215876
0.7490181 0.39188448
0.39298984 1.0426209
0.15692492 1.1319323
0.24636583 1.0390822
0.059405174 1.1007291
0.20725746 0.19994265
0.07551979 -0.067568175
0.17064182 -0.45557436
0.2592053 -0.59871054
0.037809186 -0.76059633
0.5007032 1.1201746
0.5921481 0.9045101
0.46789166 0.6245849
0.44644225 -0.06108844
-0.16052496 -0.51214194
0.76230866 1.5312295
1.1162679 1.4279265
0.8799321 1.1567965
0.6447877 0.4014685
-0.12332682 -0.16501354
0.96165085 1.6789169
1.0181384 1.6246078
0.7748322 1.0192724
0.40093315 0.3212016
-0.17099509 0.11746103
0.99313635 1.5061753
0.86373013 1.2130413
0.5271114 0.5041217
0.19454676 -0.14901754
-0.3509476 -0.16515893
-0.1295465 -0.17387243
0.040321454 0.13431022
0.3640776 0.45995724
0.64294934 0.24971415
0.6150852 0.62846255
-0.13365914 -0.01186514
0.37921637 0.70143116
0.58487916 0.7579231
0.8379385 0.6627537
0.80104876 0.899324
0.08945268 0.4322363
0.5208987 1.0366384
0.6399664 1.008036
0.9313748 0.9939136
0.727166 1.2712504
0.32375735 0.34886196
0.34653613 0.96095294
0.47853357 1.2503823
0.70951927 1.1479113
0.43087223 1.2307383
-0.06955103 0.6292999
0.25875103 1.2136114
0.33873367 1.3594606
0.30608082 1.0189344
-0.13635787 0.8884027
0.13803233 1.8180844
0.28747115 1.7383928
0.09032165 1.6832845
0.23143204 1.2724646
0.15198255 0.6512855
0.33351222 1.4569309
0.29324102 1.6274965
0.2810298 1.3394119
0.2014299 0.72383183
0.15906747 0.6232314
0.16468719 1.0016307
0.14636204 1.1474043
0.21616192 0.5575883
-0.07501595 0.2495671
0.051478628 0.23881866
0.19850366 0.16843978
0.22271842 -0.11351782
0.18884134 -0.5596944
0.15053163 -0.6159231
0.24925515 -0.13964032
0.4595929 -0.7384886
0.38655618 -1.4416406
0.33695856 -1.5697623
-0.0036128734 -1.1866862
0.27201694 -0.4107657
-1.6174891 -0.046567924
-1.9922305 -0.13308515
-2.3272042 -0.07681442
-1.9256268 -0.1801334
-1.0908865 0.22376467
-1.7973217 0.23921403
-1.6579907 0.0573684
-1.2995247 0.20510264
-1.1465281 0.20132746
-0.48869833 0.20273377
-1.5161873 0.33418807
-1.1474293 0.4330129
-0.77356946 0.46210653
-0.31425732 0.37227178
-0.0842949 0.19890042
-1.421809 0.5185552
-0.97220546 0.2026279
-0.22721007 0.5327272
0.32407415 0.4221246
0.78474 0.21664584
-1.1922634 0.56530637
-0.2569034 0.32561338
0.26291567 0.45438763
0.8414706 -0.06525482
1.0613292 -0.092074156
0.26537752 0.18300109
0.28515804 -0.10568834
0.49493128 -0.042791046
0.2746711 -0.08454057
0.4618041 0.17873202
0.18835413 0.17243907
0.48679847 0.30921477
0.40990183 0.05596758
0.40310138 0.11497455
0.5737828 0.24177524
0.314077 0.3087704
0.45565963 0.25246477
0.67614084 0.36321107
0.58846754 0.40186214
0.5533275 0.4115613
0.26463762 0.40588316
0.58933157 0.37837785
0.4422484 0.40448833
0.72205955 0.21154824
0.6562793 0.3359257
0.38016358 0.4416927
0.5109702 0.29157946
0.6050644 0.20745075
0.51327455 0.22265097
0.62387556 0.3122888
-0.20957199 -2.2565198
-0.26713985 -2.117011
-0.28107443 -1.2475563
-0.21876617 -0.10156634
-0.35003185 0.75291634
-0.021499274 -2.0806742
-0.0388137 -1.7167614
0.08301973 -0.62060875
-0.16515742 0.48282665
-0.019640207 1.048744
0.48126337 -1.6407278
0.35784498 -0.96018875
0.6316221 -0.18676949
0.60507864 0.70766246
0.56277966 1.1801564
0.72748935 -0.54665786
0.68196446 0.3049036
0.7725131 0.7189425
0.9470406 0.9474147
0.8038939 1.3016515
0.66260797 0.7693569
0.6362943 1.4798383
0.5626031 1.5872835
0.63324505 1.4610587
0.72245634 1.0418869
-0.21365394 -0.28422618
-0.050509058 -0.18444313
0.18727057 -0.21885583
0.3795752 -0.23822702
0.08598284 -0.44744912
0.18318965 0.18654571
0.41517955 0.6603408
0.5451678 0.75202066
0.4539975 0.40091667
0.14336124 0.25561303
0.47360942 0.51763034
0.6023904 1.1983035
0.8907177 1.1643196
0.6135433 0.7401815
-0.083363906 0.36781573
0.520175 0.5156441
0.7762996 1.0766882
0.78594536 1.05782
0.1535025 0.6659601
-0.12464853 0.33096266
0.55197346 0.07519537
0.6019034 0.3098728
0.43728784 0.25259358
0.22015835 0.22451894
-0.10016391 0.25234476
-0.37234303 -0.38015687
-0.21788402 -0.407303
-0.069026746 -0.43442774
0.38284898 -0.26299605
0.46291703 -0.053656343
-0.18933883 -0.4371252
-0.0055836956 -0.31644627
0.17120112 0.10022255
0.67414814 0.08365523
0.36604956 0.23482747
-0.21642251 -0.5331944
-0.0020923675 -0.07590682
0.29437903 0.12413075
0.655453 0.21150239
0.15999483 0.20651287
-0.20707773 -0.6467677
0.093115255 0.06355204
0.039280005 0.42664206
0.38063106 0.22981435
-0.08487721 0.2368281
-0.2464354 -0.4014155
-0.15109244 0.044435676
0.008156065 0.13705187
-0.098950535 0.16656949
-0.25589183 -0.014540774
0.34116971 0.67340374
0.49442118 1.2834436
0.3288226 1.8237197
0.4230213 1.3779792
0.5274078 0.8821434
0.38836172 0.4638753
0.60774535 1.2882969
0.48195976 1.5491889
0.45634 1.2316536
0.51337606 0.8068603
0.37289608 0.34117267
0.59142894 0.7351605
0.5145212 0.6340931
0.5743503 0.71979487
0.3382855 0.5740648
0.2915532 -0.40974945
0.5126788 -0.2595312
0.6693436 -0.4776515
0.47435033 -0.10139411
0.36676422 0.3829219
0.5540745 -1.1637934
0.47298318 -1.1825596
0.43606922 -1.1163042
0.55755913 -0.6178536
0.42405662 0.3241619
0.19024207 0.30130073
-0.24330424 0.22093888
-0.8413141 0.2283365
-1.3050599 0.29091156
-0.9353443 0.7173971
-0.04821775 0.5676003
-0.020758992 0.473527
-0.23648737 0.4559076
-0.8334299 0.503292
-0.3288347 0.7400803
-0.101417385 0.39142933
0.4130533 0.5932587
0.09203318 0.6765203
-0.33096743 0.70969296
0.120293826 0.7482452
0.40757722 0.30993643
0.60691446 0.47631878
0.5142748 0.75331384
0.4240398 0.38711125
0.6308685 0.6585226
0.47334412 0.23694952
0.95910263 0.52173156
1.2020584 0.43673223
1.0166252 0.31916896
1.2008622 0.26997963
-0.07017936 0.4245873
-0.28324926 0.13149616
-0.12652548 0.25212672
-0.06534151 0.3671651
0.02374597 0.5726495
-0.04692783 0.38050961
-0.0799945 0.26375824
-0.158656 0.58392465
0.11941808 0.46101236
0.15835033 0.6604323
-0.20685264 0.5446466
0.012674191 0.527272
0.13336684 0.4010787
0.12745433 0.6354779
0.13254702 0.6284386
-0.15907513 0.37840283
-0.059560474 0.566409
0.19050983 0.6597071
0.34929165 0.42088386
0.23619038 0.5180164
-0.38507864 0.26744962
0.04556722 0.5339058
-0.15311493 0.5481419
0.22623715 0.37635487
0.15412743 0.35898283

View File

@@ -1,11 +1,11 @@
10 10
0.25584885 -1.0020492
-0.027994525 -0.22538999
-0.037440807 1.2093251
0.9338683 0.7973608
-0.03670198 -0.08985192
0.3839173 1.0057418
0.24677922 1.3244941
-0.053136256 0.25439656
0.13250303 1.073939
-0.34382173 1.2317921

File diff suppressed because it is too large Load Diff

View File

@@ -1,17 +1,17 @@
16 16
0.41653347 0.43871203
0.51872575 1.4422549
0.33438778 -0.028363146
-0.80387104 2.3322427
-0.45116505 -0.43967363
-0.4066231 -0.012609171
0.4157174 -1.4543151
0.1406135 0.4923065
0.077455126 -0.055347778
0.4869977 -0.8003575
-0.054409754 -0.062283885
1.3223877 2.3221917
0.6638544 0.2421253
0.5473232 -0.09614809
-0.37075064 -0.046122104
0.106434464 0.2131941

File diff suppressed because it is too large Load Diff

View File

@@ -1,16 +1,16 @@
15 15
1.2299714 2.8855803
0.52228546 0.57012975
-0.054097723 -0.8038268
-0.03168516 -0.2859339
-1.4363378 -1.7467319
-0.418729 0.030259037
0.08757081 0.2976414
0.07111051 0.29063535
-0.23180878 -0.63553566
-0.26251948 -1.297071
-0.38850868 -1.118044
0.24825566 -0.04169021
-0.5820692 -1.1098527
0.17491941 -0.22998855
-0.17262118 0.25471497

View File

@@ -1,242 +1,242 @@
16 16
15 15
0.06848485 0.064771876
-0.1205382 -0.23870541
0.05659599 -0.30297896
-0.1198935 -0.13622254
0.30640158 -0.20446835
0.05018961 -0.19680233
-0.09606579 -0.3187552
-0.03249446 -0.27668214
-0.07550278 0.2145342
0.033637468 0.16276164
-0.028482905 0.28417346
0.3187486 0.18858738
-0.07612031 0.23035511
-0.051758178 0.18279056
-0.04251964 0.22673096
0.017287323 0.05307947
0.083228625 0.16055423
0.0190767 -0.1578904
-0.020379473 -0.01958585
-0.0315905 -0.053572476
-0.00048407013 -0.033947118
0.09054485 0.22329533
-0.010240303 -0.0055844793
0.016670013 0.08675107
0.0036291913 -0.13661118
0.009885405 -0.07600463
-0.0056112455 -0.10086873
-0.0007828792 -0.096145965
0.07570129 0.17322199
-0.010771771 -0.042320307
-0.058594886 -1.2502239e-25
-0.008092952 -2.2672158e-35
0.0027567474 -1.5270715e-35
-0.026515951 -1.1728059e-34
0.043092027 1.461516e-35
-0.125233 1.2133933e-34
-0.0005410857 -1.9235133e-34
0.22648305 -2.3408422e-35
0.0029436627 4.7075116e-35
-0.016050348 6.62546e-36
-0.11576312 -1.4553528e-34
-0.0902263 -1.2524999e-34
-0.07349928 -6.1330947e-35
0.0016258185 -1.1688556e-34
0.23451011 7.1616735e-35
-0.04832964 0.07169864
-0.12333799 -0.29384986
0.0020637014 0.26843333
0.010213136 -0.15313219
-0.11413979 -0.009023525
0.33165357 -0.042861246
-0.12051369 0.2773866
0.0034787229 -0.11085892
-0.11606434 -0.20328496
-0.007870939 0.29833207
0.0695873 -0.0603481
-0.11914301 -0.109879784
0.26085612 -0.04075959
-0.08313314 0.32141978
-0.0005710702 -0.11579256
-0.015122628 -0.10135845
-0.018007172 0.04183484
-0.1235083 0.18301715
-0.16890174 -0.1370239
-0.008040978 0.09443726
-0.10031251 -0.11750478
-0.11334684 -0.11156043
0.13460128 0.21654421
0.09495544 0.06529297
0.047906466 0.16023669
0.10289513 -0.09740121
0.11960255 0.0817928
0.056172628 -0.10806728
-0.071275584 -0.25101787
0.16940516 0.115740284
0.04583691 -8.6467677e-35
-0.15900084 6.216435e-35
0.08604079 4.923154e-35
0.23008905 -3.5106363e-35
0.06410888 7.9802027e-35
0.012403747 2.8790764e-35
-0.27156368 5.404422e-35
-0.0070743295 2.425884e-35
-0.19504271 -6.204062e-35
0.07004608 -1.0160365e-34
0.13711111 6.774824e-35
0.11130735 -4.8421585e-35
0.0049834913 -2.252876e-34
-0.25697705 -8.0298645e-35
-0.06555731 -1.4299301e-34
0.109665066 -0.02381013
-0.166455 0.058271654
-0.19186278 0.15880631
-0.19342792 0.30479077
-0.07677503 0.12067381
-0.23737621 0.06308186
-0.17676963 0.07411057
-0.2537368 0.09143798
0.25060114 -0.19618918
0.06314146 -0.0037042315
0.11107369 0.14577247
0.10176969 -0.086805165
0.1814894 -0.20268285
0.09466277 -0.21429168
0.12650885 -0.22272763
0.017758295 0.020810451
-0.032581564 -0.08086104
-0.15479378 -0.08099931
0.22360481 -0.02821272
-0.06571055 -0.009766383
-0.14287175 0.33485138
0.16189161 -0.006003055
-0.06278065 0.08058685
-0.05938156 -0.0954851
0.009023414 -0.1107848
0.27827597 -0.07939053
-0.115009665 -0.056145087
-0.14662306 0.2306627
0.15521672 -0.057650056
-0.04527563 0.014017071
0.020374492 -0.026415508
0.051145118 -0.06256976
-0.04421289 -0.111515656
-0.014813983 0.07700557
-0.016044024 0.010704479
0.096724905 -0.020841708
0.009182883 -0.064233445
-0.033773147 0.19584101
-0.022611074 -0.03297729
-0.095029436 -0.06640114
0.013587231 -0.047923718
-0.028680224 -0.0660689
0.13118911 -0.04797669
0.03520234 0.0037743694
0.013633234 0.20588458
0.009445649 1.8690485e-05
0.2610173 1.933747e-06
0.09995884 1.4135021e-05
0.12850226 0.00029463012
0.13758309 4.768572e-05
0.06050716 0.0003295316
0.12285141 -3.7735876e-07
0.12392998 0.003336015
-0.0043378808 -4.5797682e-05
-0.23181352 -4.656686e-06
-0.20070644 0.00048956356
-0.14143142 -2.5796491e-05
-0.16679154 3.4811845e-05
-0.24327031 -4.3314294e-06
-0.23277378 0.0054398794
-6.760882e-33 3.187222e-35
1.5657735e-34 -1.05712e-34
1.0721702e-34 1.0044255e-34
-1.7367731e-21 8.414291e-35
-3.2353512e-10 -7.7335946e-35
9.632541e-35 4.3593007e-35
8.653687e-35 1.5140826e-34
-8.844616e-25 9.52221e-35
-9.459162e-35 2.243737e-34
-1.4299339e-34 -9.376537e-35
2.104274e-36 -3.596425e-35
4.3546756e-35 -2.3563833e-34
2.9894274e-19 7.2113795e-35
3.9450314e-35 2.1442496e-34
-2.637824e-36 1.5488823e-34
0.45582697 0.34111863
-0.09199296 0.11851891
0.030132826 0.057855643
0.0079908315 -0.06703572
-0.016203053 -0.0006400665
0.084482715 0.020112237
-0.13553432 -0.17867965
-0.0370493 0.046941366
-0.1506419 0.04621418
-0.078976385 -0.061508007
-0.016706916 0.03878031
-0.071021125 -0.035033308
-0.020966802 -0.04293188
-0.032668043 -0.13609046
-0.041946366 -0.03776225
0.03279952 0.0036873047
-0.31379986 0.083974056
0.3821142 -0.03614792
-0.11431359 -0.077775106
-0.0990971 0.35419527
-0.13750747 -0.00644817
0.28293163 -0.12978327
-0.043488335 -0.05198072
-0.20946114 -0.0025236686
0.40087134 -0.053736515
-0.030007226 -0.09676974
-0.14469379 0.32433757
-0.12546782 0.01567053
0.27385822 -0.04562113
-0.08413422 -0.13323885
0.07185824 -4.4557535e-35
-0.024898782 9.4045007e-35
-0.022647554 -1.2557717e-34
0.016366411 2.0056353e-34
0.028040772 -8.0568067e-35
0.11689805 6.5767233e-35
0.14100341 8.6038604e-35
0.14502956 -2.8134573e-35
-0.07877178 8.04341e-36
-0.08354321 5.5440704e-35
-0.14139661 -1.55116e-34
-0.07142018 2.1355651e-34
0.01063927 1.0010231e-34
-0.0010698467 1.2974238e-35
0.058082126 -5.0169163e-35
-0.0594544 -2.6124863e-35
0.008123557 1.219186e-34
0.05472646 -1.1402444e-34
0.04626421 -1.2255615e-34
0.124584116 -5.579927e-35
0.09011361 9.728755e-35
-0.0806682 -1.344218e-34
-0.084414266 -1.7666352e-34
-0.02768993 -2.0402546e-34
-0.0011701073 -2.1496015e-34
-0.0020251372 4.0855758e-35
-0.0048691197 5.1892715e-35
-3.377666e-05 -9.4801174e-35
-0.01488334 -9.5559035e-35
-0.01129906 -1.2722331e-34
0.0018393932 -0.085341744
0.15046112 0.3030072
-0.15440601 -0.047444403
-0.09502266 -0.051059257
-0.008596554 -0.11326349
-0.09307285 -0.0013065785
0.16033137 0.13215132
-0.14228557 -0.058540583
0.22326827 0.26974812
-0.15338267 -0.07212832
-0.01796669 -0.1542111
-0.033436365 -0.11544282
0.023526033 -0.02338169
0.2423883 0.113572136
-0.13035965 -0.10995229