VSAG/amadeus_26_fb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/anti-top' into anti-top

Browse Source
This commit is contained in:
sun
2019-07-19 23:27:42 +08:00
parent 39b32bf339 d0c49f43ad
commit 6e864cc52d
17 changed files with 26873 additions and 18291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
armor/include/armor_finder/armor_finder.h
View File

@@ -108,7 +108,7 @@ private:
Serial &serial; // 串口对象，引用外部变量，用于和能量机关共享同一个变量 Serial &serial; // 串口对象，引用外部变量，用于和能量机关共享同一个变量
const uint8_t &use_classifier; // 标记是否启用CNN分类器，引用外部变量，自动变化 const uint8_t &use_classifier; // 标记是否启用CNN分类器，引用外部变量，自动变化
ArmorBox::BoxOrientation last_orient; // 上一帧目标装甲板方向，用于反陀螺 ArmorBox::BoxOrientation last_orient; // 上一帧目标装甲板方向，用于反陀螺
timeval last_switch_time; // 上一次发生装甲板方向切换的时间 timeval last_front_time; // 上一次发生装甲板方向切换的时间
int anti_top_cnt; // 满足条件的装甲板方向切换持续次数，用于反陀螺 int anti_top_cnt; // 满足条件的装甲板方向切换持续次数，用于反陀螺
AntiTopState anti_top_state; // 当前是否识别到陀螺 AntiTopState anti_top_state; // 当前是否识别到陀螺
@@ -123,7 +123,7 @@ private:
public: public:
void run(cv::Mat &src); // 自瞄主函数 void run(cv::Mat &src); // 自瞄主函数
bool sendBoxPosition(); // 和主控板通讯 bool sendBoxPosition(bool shoot); // 和主控板通讯
}; };
#endif /* _ARMOR_FINDER_H_ */ #endif /* _ARMOR_FINDER_H_ */

55
armor/src/armor_finder/anti_top/anti_top.cpp
View File

@@ -3,43 +3,60 @@
// //
#include <armor_finder/armor_finder.h> #include <armor_finder/armor_finder.h>
#include <log.h>
static double getTimeIntervalms(const timeval& now, const timeval &last){ static double getTimeIntervalms(const timeval& now, const timeval &last){
return (now.tv_sec-last.tv_sec)*1000.0 + (now.tv_usec-last.tv_usec)/1000.0; return (now.tv_sec-last.tv_sec)*1000.0 + (now.tv_usec-last.tv_usec)/1000.0;
} }
void ArmorFinder::antiTop() { void ArmorFinder::antiTop() {
if(anti_top_state == ANTI_TOP){ static double top_periodms = 0;
static double last_top_periodms = 0;
timeval curr_time;
bool shoot = 0;
/*if(anti_top_state == ANTI_TOP){
cout << "anti top" << endl; cout << "anti top" << endl;
}else if(anti_top_state == NORMAL){ }else if(anti_top_state == NORMAL){
cout << "Normal" << endl; cout << "Normal" << endl;
} }*/
ArmorBox::BoxOrientation orientation = armor_box.getOrientation(); ArmorBox::BoxOrientation orientation = armor_box.getOrientation();
if(orientation == ArmorBox::UNKNOWN){ if(orientation == ArmorBox::UNKNOWN){
if(anti_top_state == NORMAL){ if(anti_top_state == NORMAL){
sendBoxPosition(); sendBoxPosition(shoot);
return; return;
}else{ }else{
return; return;
} }
} }
if(orientation!=last_orient){ gettimeofday(&curr_time, nullptr);
timeval curr_time; auto interval = getTimeIntervalms(curr_time, last_front_time);
gettimeofday(&curr_time, nullptr); LOGM("interval:%.1lf", interval);
auto interval = getTimeIntervalms(curr_time, last_switch_time); if(anti_top_state == ANTI_TOP && (top_periodms+last_top_periodms)/2.0-130<interval&&interval<(top_periodms+last_top_periodms)/2.0-70){
cout << interval << endl; shoot = 1;
if(50 < interval && interval < 700){ // LOGM(STR_CTR(WORD_RED,"Shoot!!!"));
anti_top_cnt++; }else if(interval > 700){
}else{ anti_top_state = NORMAL;
anti_top_cnt = 0;
}
if(orientation != last_orient){
if(interval > 700){
anti_top_cnt = 0; anti_top_cnt = 0;
}
last_switch_time = curr_time;
}else{
timeval curr_time;
gettimeofday(&curr_time, nullptr);
if(getTimeIntervalms(curr_time, last_switch_time) > 700) {
anti_top_state = NORMAL; anti_top_state = NORMAL;
if(orientation == ArmorBox::FRONT){
last_front_time = curr_time;
}
}else if(interval > 150){
if(orientation == ArmorBox::FRONT){
anti_top_cnt++;
if(anti_top_state == ANTI_TOP){
last_top_periodms = top_periodms;
top_periodms = interval;
LOGM(STR_CTR(WORD_LIGHT_GREEN, "top period: %.1lf ms"), top_periodms);
}
last_front_time = curr_time;
}
} }
last_orient = orientation;
} }
if(anti_top_cnt > 4){ if(anti_top_cnt > 4){
anti_top_state = ANTI_TOP; anti_top_state = ANTI_TOP;
@@ -47,10 +64,10 @@ void ArmorFinder::antiTop() {
if(anti_top_state == ANTI_TOP){ if(anti_top_state == ANTI_TOP){
if(orientation == ArmorBox::FRONT){ if(orientation == ArmorBox::FRONT){
sendBoxPosition(); sendBoxPosition(shoot);
} }
}else if(anti_top_state == NORMAL){ }else if(anti_top_state == NORMAL){
sendBoxPosition(); sendBoxPosition(shoot);
} }

6
armor/src/armor_finder/armor_box/armor_box.cpp
View File

@@ -53,9 +53,11 @@ ArmorBox::BoxOrientation ArmorBox::getOrientation() const{
switch (id) { switch (id) {
case R1: case R1:
case R7: case R7:
case R8:
case B1: case B1:
case B7: case B7:
if(lengthDistanceRatio() < 0.3){ case B8:
if(lengthDistanceRatio() < 0.30){
return FRONT; return FRONT;
}else{ }else{
return SIDE; return SIDE;
@@ -68,7 +70,7 @@ ArmorBox::BoxOrientation ArmorBox::getOrientation() const{
case B3: case B3:
case B4: case B4:
case B5: case B5:
if (lengthDistanceRatio() < 0.43) { if (lengthDistanceRatio() < 0.45) {
return FRONT; return FRONT;
}else{ }else{
return SIDE; return SIDE;

3
armor/src/armor_finder/find/find_light_blobs.cpp
View File

@@ -3,6 +3,7 @@
// //
#include <armor_finder/armor_finder.h> #include <armor_finder/armor_finder.h>
#include <options/options.h>
#include <opencv2/highgui.hpp> #include <opencv2/highgui.hpp>
static double lw_rate(const cv::RotatedRect &rect) { static double lw_rate(const cv::RotatedRect &rect) {
@@ -124,7 +125,7 @@ bool ArmorFinder::findLightBlobs(const cv::Mat &src, LightBlobs &light_blobs) {
cv::threshold(color_channel, src_bin, 170, 255, CV_THRESH_BINARY); // 二值化对应通道 cv::threshold(color_channel, src_bin, 170, 255, CV_THRESH_BINARY); // 二值化对应通道
imagePreProcess(src_bin); // 开闭运算 imagePreProcess(src_bin); // 开闭运算
if(src_bin.size() == cv::Size(640, 480)) if(src_bin.size() == cv::Size(640, 480) && show_light_blobs)
imshow("bin", src_bin); imshow("bin", src_bin);
std::vector<std::vector<cv::Point> > light_contours; std::vector<std::vector<cv::Point> > light_contours;

12
armor/src/armor_finder/send_target/send_target.cpp
View File

@@ -4,11 +4,11 @@
#include <armor_finder/armor_finder.h> #include <armor_finder/armor_finder.h>
static bool sendTarget(Serial &serial, double x, double y, double z) { static bool sendTarget(Serial &serial, double x, double y, double z, uint8_t shoot) {
static short x_tmp, y_tmp, z_tmp; static short x_tmp, y_tmp, z_tmp;
static time_t last_time = time(nullptr); static time_t last_time = time(nullptr);
static int fps; static int fps;
uint8_t buff[8]; uint8_t buff[9];
time_t t = time(nullptr); time_t t = time(nullptr);
if (last_time != t) { if (last_time != t) {
@@ -29,12 +29,14 @@ static bool sendTarget(Serial &serial, double x, double y, double z) {
buff[4] = static_cast<char>((y_tmp >> 0) & 0xFF); buff[4] = static_cast<char>((y_tmp >> 0) & 0xFF);
buff[5] = static_cast<char>((z_tmp >> 8) & 0xFF); buff[5] = static_cast<char>((z_tmp >> 8) & 0xFF);
buff[6] = static_cast<char>((z_tmp >> 0) & 0xFF); buff[6] = static_cast<char>((z_tmp >> 0) & 0xFF);
buff[7] = 'e'; buff[7] = shoot;
buff[8] = 'e';
return serial.WriteData(buff, sizeof(buff)); return serial.WriteData(buff, sizeof(buff));
} }
bool ArmorFinder::sendBoxPosition() { bool ArmorFinder::sendBoxPosition(bool shoot) {
if(armor_box.rect == cv::Rect2d()) return false;
auto rect = armor_box.rect; auto rect = armor_box.rect;
double dx = rect.x + rect.width / 2 - 320; double dx = rect.x + rect.width / 2 - 320;
double dy = rect.y + rect.height / 2 - 240 - 20; double dy = rect.y + rect.height / 2 - 240 - 20;
@@ -42,5 +44,5 @@ bool ArmorFinder::sendBoxPosition() {
double pitch = atan(dy / FOCUS_PIXAL) * 180 / PI; double pitch = atan(dy / FOCUS_PIXAL) * 180 / PI;
double dist = DISTANCE_HEIGHT / rect.height; double dist = DISTANCE_HEIGHT / rect.height;
// cout << yaw << endl; // cout << yaw << endl;
return sendTarget(serial, yaw, -pitch, dist); return sendTarget(serial, yaw, -pitch, dist, shoot);
} }

2
main.cpp
View File

@@ -30,7 +30,7 @@ using namespace std;
mcu_data mcuData = { // 单片机端回传结构体 mcu_data mcuData = { // 单片机端回传结构体
0, // 当前云台yaw角 0, // 当前云台yaw角
0, // 当前云台pitch角 0, // 当前云台pitch角
BIG_ENERGY_STATE, // 当前状态，自瞄-大符-小符 ARMOR_STATE, // 当前状态，自瞄-大符-小符
0, // 云台角度标记位 0, // 云台角度标记位
1, // 是否启用数字识别 1, // 是否启用数字识别
ENEMY_RED, // 敌方颜色 ENEMY_RED, // 敌方颜色

2
others/src/camera/camera_wrapper.cpp
View File

@@ -83,7 +83,7 @@ bool CameraWrapper::init() {
CameraSetGain(h_camera, CAMERA_BLUE_GAIN, CAMERA_GREEN_GAIN, CAMERA_RED_GAIN); CameraSetGain(h_camera, CAMERA_BLUE_GAIN, CAMERA_GREEN_GAIN, CAMERA_RED_GAIN);
CameraSetLutMode(h_camera, LUTMODE_PRESET); CameraSetLutMode(h_camera, LUTMODE_PRESET);
} }
CameraSetOnceWB(h_camera); // CameraSetOnceWB(h_camera);
#endif #endif
double t; double t;
CameraGetExposureTime(h_camera, &t); CameraGetExposureTime(h_camera, &t);

12
tools/TrainCNN/backward.py
View File

@@ -54,9 +54,9 @@ def save_para(folder, paras):
save_bias(fp, paras[7]) save_bias(fp, paras[7])
STEPS = 20000 STEPS = 100000
BATCH = 50 BATCH = 50
LEARNING_RATE_BASE = 0.005 LEARNING_RATE_BASE = 0.001
LEARNING_RATE_DECAY = 0.99 LEARNING_RATE_DECAY = 0.99
MOVING_AVERAGE_DECAY = 0.99 MOVING_AVERAGE_DECAY = 0.99
@@ -101,7 +101,7 @@ def train(dataset, show_bar=False):
_, loss_value, step = sess.run( _, loss_value, step = sess.run(
[train_op, loss, global_step], [train_op, loss, global_step],
feed_dict={x: images_samples, y_: labels_samples, keep_rate:0.5} feed_dict={x: images_samples, y_: labels_samples, keep_rate:0.3}
) )
if i % 100 == 0: if i % 100 == 0:
@@ -206,9 +206,9 @@ def train(dataset, show_bar=False):
if __name__ == "__main__": if __name__ == "__main__":
# import os import os
# os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID" os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
# os.environ["CUDA_VISIBLE_DEVICES"] = "-1" os.environ["CUDA_VISIBLE_DEVICES"] = "-1"
dataset = generate.DataSet("/home/xinyang/Workspace/box_cut") dataset = generate.DataSet("/home/xinyang/Workspace/box_cut")
train(dataset, show_bar=True) train(dataset, show_bar=True)
input("press enter to continue...") input("press enter to continue...")

2
tools/TrainCNN/forward.py
View File

@@ -38,7 +38,7 @@ CONV2_KERNAL_SIZE = 3
CONV2_OUTPUT_CHANNELS = 12 CONV2_OUTPUT_CHANNELS = 12
# 第一层全连接宽度 # 第一层全连接宽度
FC1_OUTPUT_NODES = 20 FC1_OUTPUT_NODES = 30
# 第二层全连接宽度（输出标签类型数） # 第二层全连接宽度（输出标签类型数）
FC2_OUTPUT_NODES = 15 FC2_OUTPUT_NODES = 15

12
tools/para/conv1_b
View File

@@ -1,7 +1,7 @@
6 6
0.71588296 0.3149763
0.11027224 -0.014892017
0.5223108 2.3465085
2.472485 0.00036684246
0.27160552 -0.15470123
2.29277 1.5563219

900
tools/para/conv1_w
View File

@@ -2,453 +2,453 @@
6 6
5 5
5 5
-0.88012725 -0.5122181
-1.0834439 -0.3304208
-1.3267924 -0.47017148
-1.1549424 -0.6901335
-1.0650164 -0.68305564
-0.556848 -0.43056425
-0.96584696 -0.33415276
-0.92094207 -0.21182333
-0.8122867 -0.26035476
-0.6862978 -0.43455258
-0.45814085 -0.17478752
-0.72940165 -0.07353879
-0.5661026 -0.0066796755
-0.3622125 -0.2842649
-0.22462772 -0.26983324
-0.38875562 -0.38600275
-0.4397983 -0.5225027
-0.36654872 -0.2477209
-0.20731705 -0.6150436
-0.03394899 -0.50670964
-0.45235923 -0.6390075
-0.6464031 -0.785963
-0.41129747 -0.84885865
-0.05619224 -0.7428759
-0.10460437 -0.6850384
-0.19211882 -0.29873657
-0.7301527 -0.39940876
-0.33149132 -0.3651188
0.198266 -0.4757807
0.7046016 -0.24000579
0.37492985 -0.22654222
-0.20615123 -0.26803666
0.031133946 -0.17029491
0.51563126 -0.2708922
0.5250833 -0.16619048
0.53731644 -0.18574618
-0.098048255 -0.18789688
0.08348564 -0.18732283
-0.021599947 -0.24658786
-0.24505879 -0.10995354
0.22221932 -0.16952607
-0.24253948 -0.27286267
-0.32930574 -0.28464758
-0.7114027 -0.22815232
-1.2710199 -0.07585772
0.045749612 -0.32570714
-0.807872 -0.22287326
-1.0033796 -0.22649616
-1.6865261 -0.3235379
-2.0497494 -0.33799627
-1.9287797 -0.29735592
-2.1446464 -0.33019853
-1.7040968 -0.3843473
-1.4303613 -0.5227346
-1.2351265 -0.4683479
-0.6758041 -0.33797947
-0.71685314 -0.22064787
-0.21431081 -0.24119645
0.07991056 -0.40467957
-0.3487312 -0.36958367
0.17201507 -0.23530425
0.6606464 -0.48722762
0.79005384 -0.46800253
0.5726958 -0.53155917
-0.20626955 -0.46939301
0.67691 -0.45583007
1.0496907 -0.28574285
1.0913255 -0.36617565
0.48710188 -0.6556442
-0.4968 -0.42358845
0.9180211 -0.27466717
0.7865262 -0.61312884
0.6951502 -0.62094223
-0.2679864 -0.5795923
-1.0100036 -0.58728904
-0.6549106 0.68368846
-0.7277044 0.8958975
-0.6865319 0.7278497
-0.6717992 0.68379235
-0.50691587 0.58865863
-0.3242441 0.8949641
-0.2603625 1.044341
-0.20068945 1.2053595
-0.28516608 1.0916591
-0.4555812 0.7328324
-0.11707577 1.1020528
-0.39915577 1.2463291
-0.4174412 1.1158316
-0.40552583 1.0167897
-0.32087803 1.0295683
-0.078136295 0.89226794
-0.35391638 0.96291864
-0.520493 1.102302
-0.52106434 1.0435898
-0.42825955 0.90618485
-0.03405384 0.7019989
-0.45503956 0.77003574
-0.54937404 0.67740715
-0.39296526 0.664701
-0.27851546 0.7401788
0.4076081 -0.84534293
0.48703498 -0.47904256
0.24596901 -0.4366259
0.052479118 -0.6555481
-0.11822296 -1.0296663
0.34343225 -0.21678755
0.73309004 0.45600086
0.51623255 0.463124
0.30654356 0.33925074
0.24352127 -0.23879766
0.60910547 0.23904026
0.7742304 0.7763754
0.77255154 1.0296348
0.70245695 0.69617057
0.3654784 0.21466275
0.5132427 0.23907422
0.97475594 0.64965016
0.8458663 0.48717323
0.8264121 0.34349623
0.5510292 -0.04588733
0.58496714 -0.6112947
0.8284266 -0.36519527
0.975897 -0.19992064
1.17892 -0.37989593
0.591301 -0.7226311
1.1138518 0.9469519
0.20256059 0.88321126
-0.71471 0.9223745
-1.5062889 0.6566543
-1.8032609 0.46329772
1.0235786 1.1555251
0.007276212 1.1917908
-0.6360013 1.1479716
-1.2706653 0.9543253
-1.7817974 0.79193896
1.0436956 1.2978923
0.20097604 1.4997654
-0.2987995 1.39902
-0.56377083 1.1015791
-0.8813779 1.0758426
0.98090833 1.2769203
0.37666252 1.4642966
0.20098194 1.5963178
-0.095219366 1.2945237
-0.054543417 1.0054451
0.8959234 1.3111552
0.57586765 1.6097692
0.5812942 1.4733039
0.7652194 1.2075291
0.79247415 0.89110684
-1.085829 1.8012196
-1.8046223 2.4435925
-2.003757 2.5440128
-1.8771393 2.1426733
-1.3204845 1.6078053
-0.4507941 2.5206072
-0.9565954 2.8588843
-0.7566931 3.0311077
-0.6415545 2.704625
-0.7355338 2.1049035
0.12221917 2.5578685
0.12962714 2.890365
0.21181518 3.1050663
0.12851173 2.4879482
0.16504385 2.045063
0.54737926 1.8096005
0.6203841 2.120189
0.60023224 2.1945705
0.6481109 2.1331306
0.65906626 1.6283106
0.6013462 0.8514621
0.28479722 1.2092026
0.5672894 1.3033422
0.5267723 1.2066857
0.6083729 1.1448364
0.5649867 0.73725975
0.60430235 0.9546802
1.5300179 0.97507584
2.4085896 0.66971153
3.1521795 0.59116304
1.3312007 1.0519987
1.5702604 1.1914521
2.339582 1.2175999
2.8835678 1.2283436
3.0516002 0.95731866
1.8068197 1.1040916
1.8284152 1.2935854
2.76448 1.2896016
2.7162426 1.3029085
2.4563086 1.107106
1.7156839 1.0182807
1.8515067 1.0675256
2.155838 1.251373
2.0362217 1.0915134
1.2552027 0.92420894
1.1692859 0.7278918
1.1990427 0.62697303
0.9825375 0.6396168
0.64745605 0.7657539
0.035192925 0.65353876
-2.4190683 0.498041
-2.6218698 0.4638572
-1.7210245 0.52972424
-0.59167504 0.42200166
-0.2248943 0.26322883
-0.7396114 0.40672594
-0.33055 0.61811805
0.65298605 0.51347226
1.3416215 0.3917843
1.0957731 0.27834943
0.7281771 0.43966493
1.5008746 0.5522092
2.6411202 0.39821044
2.3255975 0.40372777
1.5528944 0.21843211
1.3773445 0.3667185
2.3360834 0.27014878
2.8816288 0.21852346
2.3304975 0.41306666
1.2286245 0.20170563
1.4434187 0.03395945
1.7744198 0.1434882
1.9265875 -0.10101415
1.2489811 -0.08412548
0.2797401 -0.19225624
-0.09615959 0.6564742
0.16094038 0.8515412
0.3554371 1.0424643
0.23911111 0.9035196
-0.06330284 0.8831942
0.5609407 0.89890224
0.8231102 1.4549115
0.9812489 1.5574793
0.9308894 1.4012674
0.68197936 1.3011783
0.85066247 1.1087692
1.0460051 1.6270466
1.084312 1.8930573
1.1126771 1.6943029
0.74939555 1.5548522
0.8017988 1.095543
0.7592088 1.4603993
0.8252279 1.6675422
0.79122925 1.5643684
0.5297534 1.3244627
0.6613406 0.7057293
0.44538468 1.0123242
0.5151108 1.2347305
0.6671852 1.2775078
0.7874201 1.1633652
-0.4186904 1.7397907
-0.3242715 3.179668
-0.5268131 3.7055767
-0.18947162 3.0984879
-0.2694565 1.9764525
-0.15294357 3.1683843
-0.1322854 5.2915235
-0.2539519 6.037039
-0.15333539 5.308505
0.05965038 3.4893284
0.2450266 3.8721342
0.120711945 6.087489
0.15696979 6.994477
0.3281986 6.2794065
0.31796503 4.6240034
0.40242982 3.6394677
0.5733415 5.4709225
0.49882093 6.380118
0.60947615 5.719932
0.334392 4.4402404
0.6618857 2.6205702
0.8864793 3.8763673
1.0756456 4.234028
0.9072118 4.1675415
0.7288261 3.3484511
1.6306185 0.06990746
-0.17470317 -0.115926296
-2.2861571 -0.41687268
-3.243416 -0.6514532
-3.8216188 -0.8585004
1.298335 0.5086532
-0.3161169 0.49625224
-1.9428326 0.37948334
-2.924675 0.048941854
-3.4508967 -0.27606216
1.4310157 0.8580623
0.29793683 1.0750562
-0.95937806 0.83841854
-1.8052684 0.6379626
-2.306103 0.12191046
1.4935204 1.3217849
0.7772036 1.3648862
0.13935064 1.3776011
-0.24669245 1.0617224
-0.15737781 0.58652717
1.7619401 1.4052356
1.245751 1.5046815
1.3405502 1.7024798
1.0143193 1.1991823
1.3876462 0.8251704
0.41608283 0.66112787
-0.0019760344 1.0387679
-0.1893673 0.9745576
0.09514666 0.8372969
0.54823136 0.31366217
0.964588 0.9730549
0.7129088 1.4635785
0.57392573 1.6587266
0.7456952 1.295196
0.77417094 0.75578976
1.5659263 1.19028
1.4913323 1.5565666
1.3906319 1.528534
1.3289422 1.1576073
1.3123989 0.7579256
1.873557 0.53262025
1.6543763 0.9756648
1.5637997 0.87179863
1.4798887 0.8447151
1.5663011 0.465067
1.279134 -0.19753419
1.3002201 -0.09716505
1.2334508 0.0488932
1.3779926 0.010757586
1.2066296 -0.16236092
-1.6879292 1.1874503
-1.2416688 1.4478239
-0.37319517 1.561198
0.41894484 1.2666211
0.8655407 0.8692644
-0.83897734 1.5617329
-0.13220531 1.695196
0.73035866 1.6963016
0.99015117 1.5598705
0.8889001 1.1356069
-0.27788094 1.7686192
0.43835258 1.9396306
1.1142663 2.0075228
1.2273054 1.7980667
0.46670702 1.4236753
-0.10278471 1.5051324
0.3053077 1.7243544
0.63106036 1.7012758
0.32803783 1.5655004
-0.031589434 1.207983
-0.7163978 1.0855519
-0.3427183 0.9998559
-0.51233417 1.1102537
-0.78456146 0.9900168
-1.0866679 0.8938147
-3.8261662 1.1506987
-3.7541032 1.1853988
-2.61236 1.3051438
-1.6549827 0.9928555
-1.3225579 0.87968653
-2.0429566 1.3359145
-1.5835449 1.2454771
-0.32761127 1.3238487
0.08814101 1.0035286
-0.18790397 1.1127417
-0.4660247 1.5130773
0.3267658 1.2445521
1.3274832 1.1315267
1.0225959 1.1119169
0.34919935 1.0120134
0.13662326 1.0682882
0.9643171 1.1985056
1.5944754 1.0001463
0.88023806 0.750059
-0.21318172 0.7630973
0.026309159 1.0361183
0.6345419 0.7325272
0.5887162 0.65717363
-0.3010577 0.47050563
-1.1375724 0.5706506
-0.8718964 -0.9104096
-0.82920974 -0.60306823
-0.6232904 -0.2908051
-0.74801314 -0.27746367
-0.87020314 -0.4795224
-0.12218699 -0.5066679
-0.16813752 -0.13847744
-0.20974346 0.17386274
-0.065411456 0.050798584
-0.5438282 -0.03534979
0.25449827 -0.39398232
0.09498743 0.22129086
0.16415021 0.37720454
-0.09611701 0.28152806
-0.23606166 0.04997919
0.024526453 -0.24730659
0.03917652 0.022508586
-0.16637869 0.3273061
-0.41614 0.3062466
-0.2787596 0.103650205
-0.038930748 -0.33495817
-0.33195582 -0.10975503
-0.59900284 -0.013566348
-0.6113101 -0.05696764
-0.4237758 -0.049704503
-1.8987347 -0.11123053
-2.0578907 0.74688494
-2.0330722 1.1001183
-1.9274229 0.7633611
-1.4714608 -0.12488958
-1.5901667 1.069808
-1.6496544 2.1522613
-1.674033 2.874394
-1.5349553 2.4043176
-1.386249 1.3204521
-0.99938065 1.351723
-1.0959543 2.921919
-1.0847377 3.6087956
-0.92340446 3.0920472
-0.9949902 1.8288097
-0.6592509 1.2379777
-0.42724258 2.3464508
-0.34276384 3.0301187
-0.3720277 2.6960068
-0.39551106 1.7385584
0.021055123 0.2523459
-0.05688377 0.9858051
-0.042158354 1.6996905
-0.12772384 1.4946578
-0.040917125 1.0741637
1.6949501 -0.43977898
0.47236556 -0.4012377
-0.9547053 -0.5103086
-1.4116721 -0.6115385
-1.7465404 -0.8566328
1.5048041 0.12200335
0.34429762 0.24156119
-0.80934155 -0.012940409
-1.3507533 -0.2271813
-1.5732571 -0.3880937
1.2798805 0.48769447
0.3696374 0.7069632
-0.42060608 0.5918804
-0.9014883 0.29068273
-1.0100555 -0.011846471
1.4363178 0.66635966
0.74688774 1.0811349
0.22157043 1.0028406
-0.034964394 0.68654966
0.1653901 0.4831082
1.5520315 0.8895568
1.3167152 1.214797
1.1333643 1.2914155
1.2378848 1.1088845
1.5101963 0.7787844

24
tools/para/conv2_b
View File

@@ -1,13 +1,13 @@
12 12
1.5451434 2.401031
0.5222038 0.6887112
2.0963469 -0.06606437
-0.57179046 1.7921708
-0.2855711 1.9974723
-0.032694478 -0.08090778
1.832644 0.9626187
1.2115502 -0.13635999
-0.027030528 -0.028531248
0.17428438 3.9720752
1.168477 -0.022059036
-0.2180474 1.916512

1296
tools/para/conv2_w
View File

File diff suppressed because it is too large Load Diff

52
tools/para/fc1_b
View File

@@ -1,21 +1,31 @@
20 30
-0.70642257 0.5121221
-0.056150615 1.7437341
2.415955 0.3404303
4.7507133 -0.83107656
-1.4209929 -0.9706646
1.0922831 -0.923102
-1.694851 -0.11461781
-0.5906952 1.1645736
-2.1798584 -0.024246976
-0.08606467 -0.60454994
-0.22582765 -0.8895438
-0.4746353 -0.0105532715
-0.13185214 -0.02571041
-0.035128176 -0.011791097
1.2385731 0.5320501
-0.20468248 0.4657829
0.74708694 -0.023691285
-0.022125142 0.85059583
-0.26213062 -0.7372365
-0.017111544 -0.03175516
-0.016520165
0.533517
0.1736231
1.5739771
0.046957575
-0.4371953
0.69216055
0.059352867
0.8764035
0.027819056

42000
tools/para/fc1_w
View File

File diff suppressed because it is too large Load Diff

30
tools/para/fc2_b
View File

@@ -1,16 +1,16 @@
15 15
4.195475 0.8416871
0.61133766 -0.0066978373
-1.1685454 0.058132347
-1.5834343 -0.47453415
-0.6064409 -0.40970197
-0.9403711 -0.25041896
0.90569496 0.70951504
-0.21881863 -0.14939463
-1.448064 -0.65368223
-0.8449567 -0.29617292
-1.7948693 -0.6423868
-0.27719417 0.40220585
-1.2483711 -0.67507774
-0.8139322 0.52330655
-0.2559766 0.3125663

752
tools/para/fc2_w
View File

@@ -1,302 +1,452 @@
20 30
15 15
9.5176764e-35 0.0034152665
2.6973015e-35 0.003649285
-1.0265361e-34 -8.40595e-05
4.8646514e-35 -0.000524435
-6.1254127e-35 -0.00079028297
-1.6196579e-34 0.0017292813
-1.8820483e-34 -0.0018632945
-2.584517e-35 -0.0027877367
-4.927594e-35 0.00088291423
-3.488553e-35 -0.0002792626
-2.9690036e-36 0.0026320333
1.5346769e-34 0.00092073565
1.6494082e-34 -0.00030767982
1.3472117e-34 -0.008513325
-2.5107618e-34 -0.0044346275
2.268937e-34 0.17413643
9.398538e-35 -0.024397751
1.644702e-35 0.005179296
-1.6242308e-34 -0.032278195
8.513796e-35 -0.02032728
3.0014082e-35 -0.009024919
-1.0057763e-34 -0.025950849
-1.3751538e-34 -0.005535791
6.8052886e-35 0.0019900887
1.9979714e-34 0.003217421
-1.7513593e-34 -0.0025021387
-1.03661325e-35 -0.0030122418
-1.413942e-34 -0.010992714
-1.7989849e-34 -0.032093443
1.1580782e-34 -0.023065915
0.0218359 0.001369726
-0.15200815 0.04747016
-0.1530447 -0.08725031
-0.11596871 0.030968025
-0.120887555 -0.011902005
-0.12549017 -0.01673289
-0.2251816 0.03516813
-0.1637355 -0.047623754
0.18958397 0.054999962
0.14058124 -0.079866104
0.16278608 0.07831017
0.13417986 -0.046831954
0.17509618 -0.014863988
0.123550944 0.08573488
0.20413227 -0.012856261
0.3238295 -0.014926202
-0.041693848 -0.017586267
0.037450343 -0.02836976
-0.012114005 -0.0104906615
0.01018214 -0.011631833
0.02646931 0.016860094
-0.07791344 -0.032736104
-0.027645374 0.044211324
-0.013312955 -0.028792553
-0.0074518123 -0.0055252262
-0.003935848 0.0078020217
-0.09201503 0.05800864
-0.03893186 0.048239432
0.01961441 -0.0076096104
-0.05324372 -0.014821155
-0.012457668 -0.10054462
-0.062585026 0.055572163
-0.008908539 0.024642795
-0.0629493 -0.009731107
0.24958569 -0.019545076
-0.03930332 0.024334429
-0.043610368 -0.018554432
-0.12702048 -0.0036578926
-0.000797345 0.054392945
0.02613423 0.012350258
-0.09447535 -0.005556592
0.2817806 -0.00791055
-0.06397205 0.01805653
-0.07081673 -0.02467989
-0.09150827 -0.008940417
-0.016954083 -0.04473423
0.02051717 0.054204386
0.022037832 -0.033501327
0.017766865 -0.03394925
0.029039811 0.09376965
0.012314047 -0.022045642
-0.0077047157 -0.029370172
-0.015749076 -0.007948221
0.05030162 0.06890623
-0.031626157 -0.0029373935
-0.05287401 -0.013021859
0.014365553 0.086747356
-0.01407179 -0.022566097
-0.021317631 -0.08143319
-0.05706852 -0.004192377
-0.02678457 0.036684804
-0.105518445 -0.05462022
0.27412787 0.056187328
0.04771162 -0.013896968
-0.1086562 0.053737663
-0.099820994 -0.0074704196
0.0973671 -0.046475943
-0.06100566 -0.031264126
-0.03766413 -0.05389245
0.2596975 0.052170556
0.038008798 0.01729854
-0.0740367 0.05450569
-0.091172025 -0.018491212
0.026401479 -0.013245502
-0.12918255 -0.01343573
0.014127405 -0.041722953
0.068192564 -0.0063616624
0.11106736 -0.051248763
0.1292755 -0.02581037
0.15436788 -0.009302054
0.10970291 -0.0043625194
0.053550284 0.1331308
0.08892467 -0.030347241
-0.104417644 0.025843486
-0.14925948 -0.031912796
-0.09724801 -0.03596982
-0.13138048 -0.0018217121
-0.12574866 -0.024523592
-0.16883968 0.10469095
0.00016213852 -0.010683278
-0.09524724 -8.408675e-34
0.052638154 -1.1874764e-33
-0.028680086 -1.1450674e-34
-0.022195095 -1.7270264e-33
0.033073273 -1.23930505e-33
-0.028824894 -1.8040929e-33
-0.029216787 8.856474e-34
0.2449274 9.662658e-34
-0.024783885 -1.1333362e-33
-0.07764256 -3.893882e-34
-0.061912637 -4.1919937e-35
-0.016075077 1.3305179e-33
-0.02446794 1.4149031e-33
-0.04687931 -9.084565e-34
0.17324682 -1.2586747e-33
-1.3664915e-34 0.010415874
1.7117406e-34 -0.05681164
-9.564682e-35 -0.026402045
-1.4027299e-34 0.08882527
1.4579916e-34 -0.0030151191
-1.5181731e-34 0.02110404
-5.093483e-36 -0.008964796
-1.3727128e-34 -0.013694619
6.642354e-35 -0.036846247
1.1984039e-34 -0.011614889
1.9791884e-35 0.053009134
-5.4484714e-35 -0.010075947
-6.4366914e-35 0.04943306
1.1018957e-34 -0.016312955
-1.0511991e-34 -0.02125939
1.3135222e-34 0.0070466967
-8.0284806e-35 -0.061894204
-1.4709747e-34 0.016598905
1.0851237e-34 0.10213654
8.875944e-35 -0.03128968
-2.134088e-34 0.041721907
2.476544e-34 -0.03825948
5.107793e-35 -0.030661209
-7.8870063e-35 -0.03703703
-1.2691251e-34 0.052919175
3.553694e-35 0.09680515
-2.838257e-35 0.006596139
1.7464395e-34 0.011434166
-1.1272938e-34 -0.049220778
-1.1091627e-34 -0.04301381
-1.3049241e-35 1.6182676e-33
1.1383583e-34 -1.5577554e-33
1.7742291e-34 6.8721517e-34
-5.4422295e-35 -1.7338529e-33
-1.2520755e-34 -1.6116557e-33
1.1593796e-34 1.6711933e-33
-1.3331117e-34 -1.5180868e-33
-1.0903274e-34 -1.2450815e-33
1.0538526e-34 1.1672379e-34
7.9193657e-35 1.6292256e-33
1.1578206e-34 1.8148233e-33
1.546746e-34 -1.3254387e-33
9.3627936e-35 -9.530396e-34
-7.405613e-35 -1.237727e-33
-1.4241364e-34 -1.4815319e-33
-1.6654584e-34 -2.0221853e-33
-1.4364477e-34 1.219532e-33
6.825994e-35 6.427007e-34
-1.3888286e-34 1.6457097e-33
-1.5188911e-34 -1.05241715e-33
8.7407935e-35 1.606983e-33
2.1660504e-34 2.0551076e-34
7.709884e-35 2.1642673e-33
1.1298119e-34 1.2877599e-33
-1.2047787e-34 -1.5219243e-33
1.1614278e-34 -2.0061398e-33
4.7399006e-35 1.8653244e-33
-1.2590873e-34 3.707797e-33
-1.918393e-34 -5.268272e-34
-1.7949879e-34 4.5863088e-34
-6.1133507e-35 -1.9293181e-33
-1.7124091e-34 1.6390684e-33
1.0027753e-34 -1.6552817e-33
-1.4256245e-34 -1.656662e-33
-9.5877e-35 1.7562646e-33
1.3339576e-34 1.5434094e-33
1.7497148e-34 1.2054267e-33
-1.1125746e-34 1.4718116e-33
7.0308837e-35 -1.9997392e-33
2.0289246e-34 -1.84039e-33
7.613218e-35 -1.9090137e-33
1.3593351e-34 1.730716e-33
-1.4274189e-34 -2.0052664e-33
1.768648e-35 -1.6624484e-33
-1.3698061e-34 -1.871164e-33
0.04678968 0.046358828
0.37355593 0.05589418
-0.09611428 0.033887997
-0.054369465 0.071817435
-0.015629357 0.09159781
-0.05580367 0.060905408
-0.15901911 0.05718763
-0.05126771 0.05913311
0.29752824 -0.08707496
-0.051793195 -0.060159396
-0.05781779 -0.036453832
-0.005978182 -0.018078813
-0.0062369592 -0.044052076
-0.17817976 -0.069057725
-0.0695161 -0.074705265
0.01831622 0.146223
0.0074989474 0.14408672
-0.11100493 -0.039597638
0.24856003 -0.011591911
-0.09703029 -0.0067730322
0.07897827 -0.030137451
-0.04009854 -0.09608979
0.0011075956 -0.026929773
-0.05595696 0.112636395
-0.09211669 -0.018036542
0.22572945 -0.03665213
0.0075836987 -0.029564237
-0.009474817 0.019004347
-0.06432295 -0.04666401
-0.06951075 -0.05890662
-0.05645414 7.9869395e-34
0.071479894 5.6205243e-34
-0.11390204 4.172559e-34
-0.012603015 -6.649337e-34
-0.043284483 -6.1429663e-34
-0.04052057 6.5659997e-34
0.28288093 -4.7743497e-34
-0.030568892 5.3661037e-34
0.09779256 3.773748e-34
-0.13973251 6.80733e-34
-0.040824693 4.718315e-34
-0.027763024 3.987196e-34
-0.03966024 -4.524473e-34
0.28015924 -5.916522e-34
-0.09235123 7.1393264e-34
2.280181e-35 0.1490446
1.653167e-34 -0.043016892
-1.005274e-34 0.05949148
-3.4991933e-35 -0.027257131
-1.4336594e-34 0.0061883563
-8.870093e-35 -0.032005128
1.6485537e-34 -0.049095806
-5.371398e-35 -0.0146032525
7.8157064e-35 -0.020047812
1.1268512e-34 0.03097978
1.166938e-34 -0.040236536
8.906015e-35 -0.028138328
-1.324139e-34 0.008607312
-8.3128986e-35 0.0066572726
1.9132389e-34 -0.013528337
-0.02137251 -1.5580897e-33
-0.031748243 -1.3089999e-33
-0.03333544 1.4302933e-33
-0.17488997 -1.46973115e-33
-0.0012877738 1.4366498e-33
0.2770376 1.3865603e-33
-0.045211032 -1.1899452e-33
-0.049781293 1.2150077e-33
0.012432407 1.657508e-33
-0.027718045 -1.4693958e-33
-0.11303352 -1.6266871e-33
0.0018709565 -1.1186588e-33
0.260287 1.5483797e-33
-0.03933455 1.4798796e-33
-0.06063989 1.5132945e-33
1.5933611e-34 -7.1982783e-34
-1.5264233e-34 6.0295885e-34
-3.1662806e-36 5.125287e-34
9.1825354e-35 -6.2615613e-34
-2.950698e-35 -6.458672e-34
-1.924178e-35 5.923125e-34
1.084847e-34 -3.1058414e-34
-1.0707888e-34 7.2329696e-34
1.8103465e-34 4.2881524e-34
-9.76697e-35 6.47594e-34
-1.7214133e-34 5.497351e-34
-4.1789677e-35 4.667774e-34
-1.9926278e-34 -5.5005945e-34
1.846652e-35 -5.5857453e-34
-1.3287502e-34 6.6010974e-34
-1.9439768e-34
-6.872281e-34
8.242207e-34
-1.041398e-33
1.1157725e-33
-6.4912593e-34
1.1085566e-33
5.138185e-34
-6.0612043e-34
-5.6534124e-34
7.610282e-34
2.2359204e-34
-1.10299225e-33
-1.02209555e-33
-5.6183473e-34
-0.043570198
0.027663855
0.11579668
0.032536376
-0.10409985
-0.06275908
0.040307663
0.028841147
0.022972602
0.10092661
0.0059195673
-0.073125795
-0.07713138
0.041405555
-0.021710817
-0.0018300688
0.014495549
-0.035608746
-0.020383734
-0.015159242
-0.0159029
-0.020377412
0.07936301
0.0011146776
-0.030493852
0.00025573524
-0.0235968
-0.024292614
-0.0009075906
0.095763914
0.0649991
-0.08286683
0.061058756
-0.05405634
0.027316453
-0.038882807
0.10814716
-0.027102249
-0.0636424
0.07697825
-0.050571233
0.004651308
-0.04470059
0.063670315
-0.03711425
0.0028611969
0.006708823
-0.004545086
-0.004419681
0.0017412378
-0.004478072
0.00015557403
0.0029322389
-0.0016326373
0.0037750136
0.003624702
0.00015704783
-0.00073731446
-0.0036947539
-0.0045431885
1.7391132e-33
1.7248818e-33
1.49758e-33
1.5752434e-33
1.6034689e-33
-1.2482134e-33
-1.4839971e-33
-1.2511603e-34
1.5611252e-33
1.5706781e-33
-1.5471467e-33
1.5316936e-33
1.7199165e-33
-1.3264283e-33
1.6446786e-33
0.06340726
-0.07176871
-0.071557626
-0.032480866
-0.027412396
-0.03567386
-0.066558905
-0.09352277
0.056176722
0.041748106
0.06789391
0.061096612
0.075589485
0.03998172
0.09150624
-0.011106953
0.008472727
-0.03229095
0.016960036
-0.0011652267
0.017443279
-0.008782237
-0.011023398
0.00428393
-0.041711174
0.03956882
-0.027897028
0.043548007
0.00789369
-0.0035863246
0.055271614
0.075494304
-0.030956237
-0.06436277
-0.031139856
0.110986985
-0.019215168
-0.020083314
-0.008346283
-0.0060173464
-0.056024935
-0.021611506
0.060159773
-0.0065580984
-0.04133887
-0.012069139
-0.045319714
-0.020410143
-0.015465538
0.0068130614
0.03166102
-0.047326192
0.05658314
0.011626952
-0.050366756
-0.013718878
0.01086092
0.08241616
-0.024000518
0.055948514