Merge branch 'new'

# Conflicts:
#	main.cpp
#	tools/TrainCNN/forward.py
This commit is contained in:
xinyang
2019-05-04 14:10:45 +08:00
17 changed files with 12441 additions and 12400 deletions

View File

@@ -13,8 +13,7 @@
void showArmorBoxVector(std::string windows_name, const cv::Mat &src, const std::vector<cv::Rect2d> &armor_box);
void showArmorBox(std::string windows_name, const cv::Mat &src, cv::Rect2d armor_box);
void showContours(std::string windows_name, const cv::Mat &src, const std::vector<LightBlob> &light_blobs);
void showArmorBoxClass(std::string window_names, const cv::Mat &src, vector<cv::Rect2d> boxes_one,
vector<cv::Rect2d> boxes_two, vector<cv::Rect2d> boxes_three);
void showArmorBoxClass(std::string window_names, const cv::Mat &src, vector<cv::Rect2d> boxes[10]);
#endif /* _SHOW_IMAGES_H_ */

View File

@@ -1,6 +1,7 @@
//
// Created by xinyang on 19-3-27.
//
#define LOG_LEVEL LOG_NONE
#include <log.h>
#include <options/options.h>
#include <show_images/show_images.h>
@@ -40,14 +41,14 @@ void ArmorFinder::run(cv::Mat &src) {
tracker = TrackerToUse::create();
tracker->init(src_use, armor_box);
state = TRACKING_STATE;
LOGW("into track");
LOGM(STR_CTR(WORD_LIGHT_CYAN, "into track"));
}
}
break;
case TRACKING_STATE:
if(!stateTrackingTarget(src_use)){
state = SEARCHING_STATE;
//std::cout << "into search!" << std::endl;
LOGM(STR_CTR(WORD_LIGHT_YELLOW ,"into search!"));
}
break;
case STANDBY_STATE:
@@ -59,11 +60,14 @@ void ArmorFinder::run(cv::Mat &src) {
#define FOCUS_PIXAL (0.36/0.48*640)
bool ArmorFinder::sendBoxPosition() {
static int dx_add = 0;
auto rect = armor_box;
double dx = rect.x + rect.width/2 - 320;
double dy = rect.y + rect.height/2 - 240;
double dx = rect.x + rect.width/2 - 320 - 8;
dx_add += dx;
dx = dx + dx_add * 0;
double dy = rect.y + rect.height/2 - 240 - 30;
double yaw = atan(dx / FOCUS_PIXAL) * 180 / 3.14159265459;
double pitch = atan(dy / FOCUS_PIXAL) * 180 / 3.14159265459;
uart.sendTarget(yaw, pitch, 0);
uart.sendTarget(yaw, -pitch, 0);
return true;
}

View File

@@ -92,7 +92,7 @@ MatrixXd Classifier::softmax(const MatrixXd &input){
return tmp.array().exp() / tmp.array().exp().sum();
}
vector<vector<MatrixXd>> max_pool(const vector<vector<MatrixXd>> &input, int size){
vector<vector<MatrixXd>> Classifier::max_pool(const vector<vector<MatrixXd>> &input, int size){
vector<vector<MatrixXd>> output;
for(int sample=0; sample<input.size(); sample++) {
vector<MatrixXd> sub;

View File

@@ -31,10 +31,15 @@ static void pipelineLightBlobPreprocess(cv::Mat &src) {
}
static bool findLightBlobs(const cv::Mat &src, LightBlobs &light_blobs) {
// static cv::Mat src_bin;
static cv::Mat src_gray, src_bin;
if(src.type() == CV_8UC3){
cvtColor(src, src_gray, CV_BGR2GRAY);
}else if(src.type() == CV_8UC1){
src_gray = src.clone();
}
std::vector<std::vector<cv::Point> > light_contours;
cv::findContours(src, light_contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
cv::findContours(src_gray, light_contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
for (auto &light_contour : light_contours) {
cv::RotatedRect rect = cv::minAreaRect(light_contour);
if(isValidLightBlob(rect)){
@@ -114,8 +119,8 @@ static bool findArmorBoxes(LightBlobs &light_blobs, std::vector<cv::Rect2d> &arm
double min_x, min_y, max_x, max_y;
min_x = fmin(rect_left.x, rect_right.x);
max_x = fmax(rect_left.x + rect_left.width, rect_right.x + rect_right.width);
min_y = fmin(rect_left.y, rect_right.y) - 5;
max_y = fmax(rect_left.y + rect_left.height, rect_right.y + rect_right.height);
min_y = fmin(rect_left.y, rect_right.y) - 3;
max_y = fmax(rect_left.y + rect_left.height, rect_right.y + rect_right.height) + 3;
if (min_x < 0 || max_x > 640 || min_y < 0 || max_y > 480) {
continue;
}
@@ -147,31 +152,42 @@ bool judge_light_color(std::vector<LightBlob> &light, std::vector<LightBlob> &co
}
bool ArmorFinder::stateSearchingTarget(cv::Mat &src) {
cv::Mat split, pmsrc=src.clone(), src_bin;
LightBlobs light_blobs, pm_light_blobs, light_blobs_real;
std::vector<cv::Rect2d> armor_boxes, boxes_one, boxes_two, boxes_three;
cv::Mat split, src_bin;
LightBlobs light_blobs, light_blobs_, light_blobs_real;
std::vector<cv::Rect2d> armor_boxes, boxes_number[10];
armor_box = cv::Rect2d(0,0,0,0);
// cv::resize(src, pmsrc, cv::Size(320, 240));
imageColorSplit(src, split, enemy_color);
cv::threshold(split, src_bin, 130, 255, CV_THRESH_BINARY);
imagePreProcess(src_bin);
// cv::imshow("bin", src_bin);
// cv::resize(split, split, cv::Size(640, 480));
// pipelineLightBlobPreprocess(pmsrc);
// if(!findLightBlobs(pmsrc, pm_light_blobs)){
// return false;
// }
cv::cvtColor(src, src_gray, CV_BGR2GRAY);
// pipelineLightBlobPreprocess(src_gray);
cv::threshold(src_gray, src_bin, 120, 255, CV_THRESH_BINARY);
if(!findLightBlobs(src_bin, light_blobs)){
return false;
}
// if(!judge_light_color(light_blobs, pm_light_blobs, light_blobs_real)){
// return false;
// }
if(show_light_blobs){
showContours("blobs", split, light_blobs);
showContours("blobs", src_bin, light_blobs);
cv::waitKey(1);
}
if(!findArmorBoxes(light_blobs, armor_boxes)){
imageColorSplit(src, split, enemy_color);
imagePreProcess(split);
cv::threshold(split, src_bin, 120, 255, CV_THRESH_BINARY);
if(!findLightBlobs(src_bin, light_blobs_)){
return false;
}
if(show_light_blobs){
showContours("blobs_", src_bin, light_blobs_);
cv::waitKey(1);
}
if(!judge_light_color(light_blobs, light_blobs_, light_blobs_real)){
return false;
}
if(show_light_blobs){
showContours("blobs_real", src, light_blobs_real);
cv::waitKey(1);
}
if(!findArmorBoxes(light_blobs_real, armor_boxes)){
return false;
}
if(show_armor_boxes){
@@ -183,29 +199,21 @@ bool ArmorFinder::stateSearchingTarget(cv::Mat &src) {
cv::Mat roi = src(box).clone();
cv::resize(roi, roi, cv::Size(48, 36));
int c = classifier(roi);
switch(c){
case 1:
boxes_one.emplace_back(box);
break;
case 2:
boxes_two.emplace_back(box);
break;
case 3:
boxes_three.emplace_back(box);
break;
if(c){
boxes_number[c-1].emplace_back(box);
}
}
if(!boxes_one.empty()){
armor_box = boxes_one[0];
}else if(!boxes_two.empty()){
armor_box = boxes_two[0];
}else if(!boxes_three.empty()){
armor_box = boxes_three[0];
} else{
for(auto box : boxes_number){
if(!box.empty()){
armor_box = box[0];
}
}
if(armor_box == cv::Rect2d(0,0,0,0)){
return false;
}
if(show_armor_box){
showArmorBoxClass("class", src, boxes_one, boxes_two, boxes_three);
if(show_armor_boxes){
showArmorBoxClass("class", src, boxes_number);
}
}else{
armor_box = armor_boxes[0];

View File

@@ -18,8 +18,7 @@ void showArmorBoxVector(std::string windows_name, const cv::Mat &src, const std:
imshow(windows_name, image2show);
}
void showArmorBoxClass(std::string windows_name, const cv::Mat &src, vector<cv::Rect2d> boxes_one,
vector<cv::Rect2d> boxes_two, vector<cv::Rect2d> boxes_three){
void showArmorBoxClass(std::string window_names, const cv::Mat &src, vector<cv::Rect2d> boxes[10]){
static Mat image2show;
if (src.type() == CV_8UC1) // 黑白图像
{
@@ -28,16 +27,17 @@ void showArmorBoxClass(std::string windows_name, const cv::Mat &src, vector<cv::
{
image2show = src.clone();
}
for (auto &box:boxes_one) {
rectangle(image2show, box, Scalar(255, 0, 0), 1);
}
for (auto &box:boxes_two) {
for(int i=0; i<10; i++){
if(!boxes[i].empty()){
for(auto box : boxes[i]){
char buff[2] = {0};
buff[0] = i + '0';
rectangle(image2show, box, Scalar(0, 255, 0), 1);
putText(image2show, buff, Point(box.x+2, box.y+2), cv::FONT_HERSHEY_TRIPLEX, 1, Scalar(255,0,0));
}
for (auto &box:boxes_three) {
rectangle(image2show, box, Scalar(0, 0, 255), 1);
}
imshow(windows_name, image2show);
}
imshow(window_names, image2show);
}
void showArmorBox(std::string windows_name, const cv::Mat &src, cv::Rect2d armor_box) {

View File

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
WrapperHead *video_energy;
if(from_camera) {
video_armor = new CameraWrapper(0);
video_energy = new CameraWrapper(1);
// video_energy = new CameraWrapper(1);
}else {
video_armor = new VideoWrapper("/home/xinyang/Desktop/Video.mp4");
video_energy = new VideoWrapper("/home/xinyang/Desktop/Video.mp4");
@@ -74,20 +74,17 @@ int main(int argc, char *argv[]) {
while (ok){
CNT_TIME(WORD_LIGHT_CYAN, "Total", {
if (state == ENERGY_STATE) {
ok = video_energy->read(energy_src);
ok = video_armor->read(energy_src) && video_armor->read(armor_src);
if (show_origin) {
imshow("energy src", energy_src);
imshow("enery src", energy_src);
imshow("armor src", armor_src);
}
if (state == ENERGY_STATE) {
if (from_camera == 0) {
energy.extract(energy_src);
}
energy.run(energy_src);
} else {
ok = video_armor->read(armor_src);
if (show_origin) {
imshow("armor src", armor_src);
}
CNT_TIME(WORD_LIGHT_BLUE, "Armor Time", {
armorFinder.run(armor_src);
});

View File

@@ -65,11 +65,14 @@ stop:
tCapability.sResolutionRange.iWidthMax * 3);
if(mode == 0){
// 不使用自动曝光
CameraSetAeState(h_camera, true);
CameraSetAeState(h_camera, false);
// 曝光时间10ms
// CameraSetExposureTime(h_camera, 10000);
CameraSetExposureTime(h_camera, 10000);
double t;
CameraGetExposureTime(h_camera, &t);
LOGM("Exposure time: %lfms", t/1000.0);
// 模拟增益4
CameraSetAnalogGain(h_camera, 64);
CameraSetAnalogGain(h_camera, 55);
// 使用预设LUT表
CameraSetLutMode(h_camera, LUTMODE_PRESET);
// 抗频闪
@@ -90,7 +93,7 @@ stop:
/*其他的相机参数设置
例如 CameraSetExposureTime CameraGetExposureTime 设置/读取曝光时间
CameraSetImageResolution CameraGetImageResolution 设置/读取分辨率
CameraSetGamma、CameraSetConrast、CameraSetGain等设置图像伽马、对比度、RGB数字增益等等。
CameraSetGamma、CameraSetContrast、CameraSetGain等设置图像伽马、对比度、RGB数字增益等等。
CameraGetFriendlyName CameraSetFriendlyName 获取/设置相机名称(该名称可写入相机硬件)
*/

View File

@@ -4,6 +4,7 @@
#include <uart/uart.h>
#include <energy/param_struct_define.h>
#include <log.h>
using std::cout;
using std::cerr;
@@ -16,7 +17,6 @@ GMAngle_t aim;
Uart::Uart(){
fd = open("/dev/ttyUSB0", O_RDWR);
if(fd < 0)
{
@@ -150,12 +150,8 @@ void Uart::sendTarget(float x, float y, float z) {
}
// 's' + (x) ( 8bit + 8bit ) + (y) ( 8bit + 8bit ) + (z) ( 8bit + 8bit ) + 'e'
uint8_t Uart::receive() {
uint8_t data;
while(read(fd, &data, 1) < 1);
return data;
}

View File

@@ -41,7 +41,7 @@ CONV2_OUTPUT_CHANNELS = 10
FC1_OUTPUT_NODES = 16
# 第二层全连接宽度(输出标签类型数)
FC2_OUTPUT_NODES = 8
FC2_OUTPUT_NODES = 6
# 输出标签类型数
OUTPUT_NODES = FC2_OUTPUT_NODES

View File

@@ -1,7 +1,7 @@
6
0.6241298
1.1128483
0.92715627
2.6803706
-2.4037633
1.6914424
0.25190517
-0.064696774
-1.1652193
-1.3264673
2.689583
-1.1748564

View File

@@ -2,453 +2,453 @@
6
5
5
-1.8745673
-1.4418055
-0.68810487
-0.42730802
-0.019043377
-2.2401865
-1.5337001
-0.5666739
0.1119876
0.24716255
-2.2945662
-1.4734446
-0.298631
0.19550888
0.45057848
-2.4559898
-1.097164
-0.035884537
0.23402216
0.3693794
-1.7285618
-0.8927671
0.026205042
0.19274746
0.029146997
-1.3690577
-1.2756748
-0.32751036
0.3233031
0.55376107
-1.4835969
-1.3036382
-0.75256515
-0.13608748
0.2254278
-1.6409502
-1.4188147
-1.1627024
-0.62049645
-0.20085949
-2.2059698
-1.7030506
-1.5584862
-1.2325822
-0.6749467
-2.8320985
-2.3289032
-1.811129
-1.6702974
-1.0760157
-1.3135052
-0.90016854
-0.47004116
-0.17118637
-0.2732028
-1.3109291
-0.36519817
-0.10975292
-0.06533194
-0.559026
-0.8616304
-0.06857806
0.19276045
-0.14059812
-0.7283358
-0.57705516
0.20748538
0.26281402
-0.112977654
-0.6980696
-0.44812128
0.40235195
0.26663
-0.10336824
-0.5741328
-0.70127535
-1.1506568
-1.3301972
-1.4370873
-0.9951577
-0.3111034
-0.5350495
-0.78488415
-1.3619742
-1.2252145
0.10870424
-0.044690743
-0.33280057
-1.180621
-1.5130968
0.32003295
0.6245109
0.3391734
-0.45662346
-1.2023503
0.66186905
0.6943321
0.753682
-0.05385303
-0.69504744
-0.86241025
0.05611875
0.7984623
1.4339544
2.0078037
-0.6121641
0.3216552
0.7244501
1.4381241
1.9696213
-0.29659018
0.13415621
0.61756736
1.0113128
1.3834459
0.12413465
0.3135587
0.32853445
0.7981063
0.83142936
-0.004516094
0.32636595
0.55108666
0.6248727
0.60938156
-0.38326544
-1.2629062
-0.385575
0.11398253
0.40000448
-1.0602297
-1.1948771
-0.6945023
-0.4127804
0.029964926
-1.4086407
-1.3599807
-1.3076004
-1.1330422
-0.38810351
-2.1059783
-1.8239182
-1.7029382
-1.4902409
-0.91088384
-3.230572
-2.4590926
-1.9471443
-1.860621
-1.3370123
-0.5690341
-0.33530146
0.31661218
0.8375982
1.1338086
-1.3648574
-0.8348736
0.36666754
1.1275568
1.1844105
-1.8321881
-0.78104144
0.59508055
1.2501543
1.2034286
-1.6087818
-0.6121007
0.693586
1.2163337
1.1292332
-0.6255259
0.0911698
0.78314143
0.9095932
0.5689121
-3.2688649
-1.2751737
0.7530108
1.5721122
2.11933
-2.9633296
-1.3632398
0.11986004
1.1412225
1.8641368
-1.9467463
-0.9146176
-0.10545669
0.49356145
1.3669914
-1.7783622
-0.99905616
-0.28957212
0.13239379
0.9921155
-2.1976538
-1.0333587
-0.3801185
0.021550074
0.5849712
-0.7216267
-0.36925313
-0.5770921
-0.89754397
-0.9315221
-0.17996566
0.5721206
0.46629494
-0.11679081
-0.8407021
0.14923953
1.1722741
1.0859729
-0.08064234
-1.1707838
0.527985
1.556374
1.3262485
0.052869447
-1.0933924
0.8913072
1.8925939
1.1744183
-0.16056827
-0.96226853
-2.0482447
-2.1394062
-2.3160622
-1.5373954
-1.0280651
-1.0137186
-1.1347228
-1.2650911
-1.3904438
-1.4724954
-0.6152145
-0.38191465
-0.6525277
-1.2026839
-1.574993
-0.14897716
0.40652698
0.22212738
-0.7051095
-1.6179065
0.12883945
0.92052716
0.71651196
-0.1521632
-1.3601139
-1.3278087
0.091166034
0.70035547
0.85970676
1.4728521
-0.4685758
0.67533374
1.2041222
0.91583323
1.3638756
-0.21221842
0.46413553
0.6931065
0.5078553
1.0690873
-0.2822384
-0.18992352
-0.30851105
-0.48985106
-0.112165235
-0.6343776
-0.97740346
-1.2637299
-1.1870348
-0.65784734
-2.275478
-1.5841419
0.59182155
1.7027438
2.2658849
-2.0428355
-0.9335362
0.25750664
1.0987146
1.5473177
-0.8157582
-0.23004234
0.3001771
0.6583938
1.0895797
-0.093778014
0.08269198
0.17656319
0.3352879
1.0185977
-0.6558476
0.4106111
0.3651244
0.3434926
0.78885883
0.9312759
0.45665312
0.87845147
1.4286675
1.9387178
0.0055226237
-0.11264928
0.69314396
1.5066721
1.5526584
-0.15990084
0.10977341
0.7288155
1.5179793
1.5454628
0.42554915
0.6133954
1.1112447
1.4276886
1.3272578
1.5569048
1.5756388
1.9869299
1.8189707
1.3973557
-4.249913
-1.9120424
-0.0061387075
0.80639493
1.4316615
-3.410931
-1.7743304
-0.18588163
0.5619047
1.2757853
-2.25766
-1.1736825
-0.47299188
0.38950402
1.098909
-2.850165
-1.7250451
-0.7260333
-0.055943523
0.9642611
-4.005538
-2.295592
-1.041572
-0.24684854
0.6455168
1.1459881
1.4573389
1.4954526
1.2473075
1.0846232
1.2540116
1.9666128
1.9739157
1.2105061
0.7538055
1.2492738
2.14189
1.7544507
0.96942043
0.31504372
1.7381212
2.490894
1.6445026
0.26533163
-0.3193328
2.0120225
2.0718558
0.8759794
0.04767526
-0.41645908
1.2511733
0.5724159
0.37694663
1.2807285
1.8684267
1.8152616
1.280423
1.101077
1.197118
1.5331124
1.7447906
1.6138377
1.4156343
1.0536009
0.8561865
1.9363236
2.2086453
1.6627563
1.021228
0.60839254
2.1018016
2.1533952
1.9573407
1.29546
0.57359654
-0.29376534
0.9012422
1.1789744
0.710556
0.8737443
0.095544085
1.045074
0.9252817
0.471885
0.6031909
-0.2500516
0.14211257
-0.27518043
-1.0673013
-0.845284
-0.7930444
-1.1906688
-2.2155006
-2.8370302
-2.2175434
-0.9103819
-2.3526044
-3.3939815
-3.9634273
-2.9982874
-3.0668538
-1.9301875
0.46062958
1.1481701
1.6189759
-2.693133
-1.3168526
0.39946663
0.777253
1.2958935
-1.7610679
-0.87182975
0.015992796
0.35228586
0.825145
-2.3087604
-1.4618046
-0.49614725
-0.12511182
0.5606166
-3.9921951
-2.422155
-0.9274944
-0.43651518
0.110710315
0.11777049
-0.5483178
-1.5183663
-1.955216
-2.2450504
0.32459745
-0.12860261
-0.6772694
-1.1496266
-1.407309
0.3899166
0.04115204
-0.24398778
-0.64736384
-0.6999237
0.20561443
0.5234183
0.23787054
-0.00951052
-0.17350924
0.34422565
0.777099
0.72901505
0.6422372
0.06915906
-0.12754185
-0.07318786
-0.096245185
-0.08512626
-0.0075299093
-0.0027510952
-0.23676533
-0.083034575
0.029986175
-0.026513737
-0.09559005
-0.0024623247
0.0054135886
0.0006651991
0.01763169
-0.014942897
-0.014311972
-0.0002753004
0.03573563
0.021622038
-0.1374828
-0.12651409
-0.16061573
-0.223415
-0.10300647
0.15447244
0.07344577
0.049101837
0.16945939
0.30799115
-0.09038234
0.074387975
-0.14628443
0.012496472
0.10561814
-0.06538503
0.24966498
0.07688923
0.0063741454
0.0680113
-0.0591892
0.08900544
0.08578229
-0.045412317
0.17189993
-0.23383571
0.14361341
0.14279735
0.108869225
0.29616848
0.88802135
0.9322744
0.6169363
0.053218577
-0.4893802
1.1701009
1.309293
0.7900595
0.13494617
-0.53572536
1.7119668
1.5477047
1.2634932
0.5294498
-0.26089707
1.8120517
2.0142252
1.6433445
0.6699045
0.025381207
2.2189493
2.2740376
1.7443526
1.200576
0.6334228
0.15523954
-0.01665401
-0.118368655
-0.35727102
-0.42292374
0.32598874
-0.21099696
-0.20522207
-0.25549328
-0.17338459
0.10133018
-0.13074248
-0.11154948
-0.15071136
-0.22535364
0.33406344
-0.036810637
0.099401385
-0.20969932
-0.13488947
0.16889526
0.074462764
-0.16236131
-0.046184797
0.023801776
-0.9323588
-0.58124906
0.18694697
0.2679367
0.33944207
-0.79266095
-0.17053536
0.114198804
0.4833294
0.37498808
-0.90027314
-0.49293894
0.01712811
0.31062165
0.3294721
-1.3969829
-0.9609437
-0.4146537
-0.12628987
0.09289634
-2.01327
-1.6878839
-1.020883
-0.51367843
-0.25005263
0.3150389
-1.0783674
-2.7555757
-3.983991
-4.5347676
0.6119982
-0.41981643
-1.6696591
-2.7729795
-3.2745647
0.9486962
0.14917418
-0.67725325
-1.3731288
-1.9631144
0.853969
0.54386574
0.1226466
-0.43811196
-0.99324924
1.1727126
0.92385554
0.9976169
0.50470996
-0.16251346
0.111192286
-0.0311233
-0.06703233
-0.0056416607
-0.13427663
-0.0059515433
-0.10615259
-0.09087167
0.072213285
-0.09585085
-0.12161211
0.05298058
-0.04786352
-0.05641162
0.073793665
-0.05133933
0.0063234954
-0.11314615
-0.075407416
-0.16874631
0.0452455
0.047273546
0.022022702
-0.1461922
-0.07056173
-0.0926505
-0.2730682
-0.26554346
-0.34648055
-0.11837572
0.05535075
-0.15645643
-0.34763718
-0.551588
-0.3841269
0.1616999
-0.067517325
-0.44082755
-0.5951961
-0.48410118
-0.017882127
-0.20971838
-0.4876452
-0.5433759
-0.66698676
0.076961294
-0.16057712
-0.32178354
-0.4739331
-0.43045306
-0.7695584
0.120984636
0.562472
0.41816708
0.17464462
-0.54170316
0.21317379
0.24528086
0.26707074
0.13246953
-0.44595376
0.21264245
0.2402921
0.1721093
0.008216559
-0.20339474
0.14848676
0.37409306
0.17518179
-0.11521746
0.3209798
0.60100836
0.44183603
0.33679137
0.15469958
-0.5839434
-0.4227066
-0.49117723
-0.48467872
-0.56445146
-1.1456538
-0.6834423
-0.654748
-0.22800747
-0.022758592
-1.0613276
-0.6385294
-0.05707361
0.16950387
0.20175189
-0.9398203
-0.15568656
0.3859468
0.39794713
0.36458206
-0.69859344
-0.17326379
0.20072784
0.390084
0.555071
-0.04178154
0.21562038
0.37848094
0.14019106
0.14371184
0.47437635
0.90888536
1.168888
0.60219216
0.3251563
0.7930082
1.2972649
1.0530943
0.77613246
0.5001188
0.5152648
0.978894
0.94284105
0.45030168
0.2261107
-0.022718275
0.28039193
0.34578055
0.21017691
0.1464505
1.2343447
0.18821116
-0.71521515
-1.3032252
-1.9630777
1.4947205
0.9587029
0.24647994
-0.097875305
-0.1934879
1.7100966
1.5319225
1.3799523
1.1618152
1.0889668
1.7062534
1.7905279
1.8558458
2.0603085
1.8906013
2.0001564
2.1912053
2.3792198
2.7369244
2.4438667
-0.2246463
-0.00516572
-0.14353351
0.010834271
0.035946842
-0.09643716
0.07274415
-0.10339336
-0.24220358
-0.10307691
-0.079659574
-0.016755452
-0.10323182
-0.008980153
-0.13084923
-0.1536615
0.029471084
-0.18607274
-0.10420174
0.008845984
-0.15205318
0.0593492
-0.12890756
-0.032627933
-0.0911684
-0.008783043
-0.16778614
-0.29719573
-0.41922522
-0.18285862
0.036619943
-0.05505202
-0.21583575
-0.6781076
-0.47871277
0.12350094
-0.12206157
-0.41703764
-0.58151656
-0.5163836
0.30518386
-0.07088575
-0.24859065
-0.6786162
-0.5492481
0.11020481
0.15241854
-0.19148083
-0.22238904
-0.5883373
-1.9134296
-1.3091345
-1.1205245
-0.9423058
-0.9971371
-2.0924008
-1.5225571
-1.4351251
-1.181539
-1.1995114
-1.6696789
-1.6131642
-1.4193718
-1.2528512
-1.3836057
-1.4543215
-1.1393946
-1.1318659
-1.3406729
-1.4267716
-0.56939834
-0.8572612
-0.86178756
-0.86870027
-1.1124083
-0.030429596
-0.015162346
-0.23064966
-0.63212466
-0.8233778
-0.6971651
-0.89806795
-1.1291697
-1.1876353
-1.0566497
-1.141609
-1.0472245
-0.9446792
-1.2598085
-1.1849722
-0.7953462
-0.4807137
-0.74657875
-1.1390802
-1.1091293
-0.30506095
-0.086611256
-0.50039047
-0.92477053
-0.7466115
0.7484353
1.099887
1.0560677
1.0539607
0.80640066
1.355793
1.6745459
1.5189409
1.397477
1.011761
1.5243987
1.8741314
1.7208973
1.2180593
0.8020791
1.3893685
1.6558268
1.5869464
1.0812482
0.817395
1.0296667
1.2454413
1.027977
0.6484715
0.5705967

View File

@@ -1,11 +1,11 @@
10
2.4876857
-0.2729608
-2.472103
1.4380744
0.13707557
-0.38399124
-0.10049698
-0.44721037
-0.24111606
-0.05031827
2.339627
1.8759418
-0.70012397
-0.13009475
0.17396869
2.766548
-1.4850869
-2.6339962
-0.12728444
0.14405365

File diff suppressed because it is too large Load Diff

View File

@@ -1,17 +1,17 @@
16
6.674671
-0.4621555
-0.35395312
-6.140842
-0.6383096
-0.0026992396
-0.105528705
-0.12171911
-0.039757866
-4.064281
-0.36199543
-0.06976157
-0.042993866
0.0015301058
-0.06826296
-0.0050806464
-1.0079371
-0.21348575
-0.047885668
1.3191578
-0.18780966
7.9113836
-0.07285687
-4.019421
-0.9552737
-0.41599488
-0.13497822
-1.286887
1.954279
-0.377049
-0.2319671
-5.739259

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,7 @@
4
6.171619
-1.5262855
-4.09489
-2.3815227
6
7.672486
-2.1727772
-1.6976244
-0.39480045
-4.701963
-4.060234

View File

@@ -1,66 +1,98 @@
16
4
0.70240104
-0.058500186
-0.23156737
-0.33127818
-3.6112761e-34
-3.3890292e-34
9.363116e-34
4.0197816e-34
-0.2575022
0.69736814
-0.2684227
-0.08991088
-0.3760809
-0.065089576
0.45981047
0.008204719
-4.8556375e-34
4.816393e-34
3.872484e-34
5.096778e-34
1.7445673e-19
1.2270845e-33
-2.260416e-25
1.0369542e-20
4.00948e-34
-5.999333e-34
3.7143163e-34
-4.228372e-34
-1.0954501e-34
-2.7085206e-34
8.016929e-34
9.2079354e-35
-3.945864e-34
1.98814e-34
2.3972646e-34
3.942207e-34
-0.14058167
-0.07198931
-0.38025984
0.5981627
4.3956684e-34
3.1032594e-34
3.4351758e-34
5.5414507e-34
-1.248324e-34
8.8546844e-35
6.8084945e-34
-1.1866068e-34
-3.865728e-34
1.8786859e-34
3.3450276e-34
-2.8077459e-34
0.0013890187
0.026067872
0.0082543865
-0.02225164
2.0089658e-34
-6.1273506e-34
-6.228039e-34
-5.0242814e-34
-4.3343494e-34
3.0939117e-34
1.2827092e-34
-4.305108e-34
6
5.294904e-34
4.1071474e-34
3.5979983e-34
-4.8111744e-34
3.0298388e-34
4.727617e-34
4.2841314e-34
-7.448757e-34
-1.3280983e-34
-3.4998216e-34
1.1480016e-34
2.4329347e-34
-3.8421887e-34
6.131607e-34
3.2127673e-35
4.036833e-34
-4.4449285e-34
-1.3033124e-34
-0.0063951695
0.006757953
0.026418086
-0.014205176
0.04418388
0.062677905
-5.2201886e-34
1.1684014e-33
-4.5119606e-34
5.0112353e-34
7.1335205e-34
3.8090283e-34
0.61706346
0.12671919
-0.05489751
-0.03665739
-0.2387121
-0.19392832
4.400894e-34
3.3940071e-34
-3.2267908e-34
4.2374877e-34
3.7673267e-34
-4.2796806e-34
0.09789613
-0.37246978
-0.09926232
0.054989994
0.5217698
-0.020826261
4.7286482e-15
-1.3830426e-15
5.8647296e-35
1.1566057e-33
1.2851214e-33
-4.4416296e-33
2.4679793e-34
-8.546679e-34
-6.019269e-34
-4.7928078e-34
-2.6198876e-35
-1.5769217e-36
-1.0960844e-33
-1.1464184e-33
-4.9895474e-34
-1.2327797e-33
6.3556863e-34
3.949529e-36
-0.44523916
-0.048138373
0.49848852
0.67901206
-0.035957992
-0.36799058
0.07924421
-0.23662093
0.409469
-0.60837746
-0.14665303
0.685228
-2.1080804e-34
8.089918e-34
-3.8773814e-34
-1.2162282e-34
3.8192135e-34
5.806797e-34
1.9141679e-34
5.46885e-34
-9.801028e-34
8.670833e-34
2.838885e-34
1.2663823e-34
-0.21810062
0.7242532
-0.07114903
-0.066113256
-0.054350372
-0.18786566