Merge branch 'master' of https://github.com/lloi7/RM_auto-aim

# Conflicts: # main.cpp
2019-07-12 16:00:21 +08:00
parent d494182740 1e9924be93
commit 7ac1f82769
14 changed files with 12528 additions and 12521 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/armor/include)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/others/include)

 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} ${OpenCV_LIBS})
--- a/armor/src/armor_finder/armor_finder.cpp
+++ b/armor/src/armor_finder/armor_finder.cpp
@@ -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);
-}
--- a/armor/src/armor_finder/searching_state/find_light_blobs.cpp
+++ b/armor/src/armor_finder/searching_state/find_light_blobs.cpp
@@ -21,7 +21,7 @@ bool rectangleContainPoint(cv::RotatedRect rectangle, cv::Point2f point) {
    return indicator >= 0;
 }

-/// Todo: 下面的函数可以有性能优化，暂时未做。
+// 下面的函数可以有性能优化，暂时未做。
 static double nonZeroRateOfRotateRect(const cv::Mat &bin, const cv::RotatedRect &rotrect) {
    auto rect = rotrect.boundingRect();
    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;
 }

-///Todo: 性能优化后的函数。(暂时还有点问题)
+// 性能优化后的函数
 static double nonZeroRateOfRotateRect_opt(const cv::Mat &bin, const cv::RotatedRect &rotrect) {
    int cnt = 0;
    cv::Point2f corners[4];
--- a/armor/src/armor_finder/send_target/send_target.cpp
+++ b/armor/src/armor_finder/send_target/send_target.cpp
@@ -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);
+}
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,7 @@ WrapperHead *video_gimble = nullptr;    // 云台摄像头视频源
 WrapperHead *video_chassis = nullptr;   // 底盘摄像头视频源

 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);
 // 能量机关主程序对象
@@ -122,7 +122,7 @@ int main(int argc, char *argv[]) {
                    last_state = mcuData.state;//更新上一帧状态
                } else {                                         // 自瞄模式
                    if (last_state != ARMOR_STATE) {
-                        ((CameraWrapper *) video_gimble)->changeBrightness(40);
+                        ((CameraWrapper *) video_gimble)->changeBrightness(30);
                    }
                    last_state = mcuData.state;
                    ok = checkReconnect(video_gimble->read(gimble_src));
--- a/others/include/constants.h
+++ b/others/include/constants.h
@@ -16,6 +16,7 @@
 #define BIG_ENERGY_STATE   'b'
 #define SMALL_ENERGY_STATE 's'
 #define ARMOR_STATE        'a'
+#define INIT_STATE          0

 #define FOCUS_PIXAL_8MM  (1488)
 #define FOCUS_PIXAL_5MM  (917)
--- a/tools/para/conv1_b
+++ b/tools/para/conv1_b
@@ -1,7 +1,7 @@
 6
-0.044632435
-0.02473628
-0.0030768034
-0.24577394
-0.74099255
-0.83760846
+1.9400308
+0.15539157
+0.25510743
+0.026115384
+0.86461335
+0.39774314
--- a/tools/para/conv1_w
+++ b/tools/para/conv1_w
@@ -2,453 +2,453 @@
 6
 5
 5
-0.26535293
-0.7057052
-1.0125909
-1.3340354
-1.495565
-0.17923793
-0.44294497
-0.727623
-0.8330653
-1.1030264
-0.22618154
-0.09645194
-0.007988933
-0.06676202
-0.04132599
-0.32757846
-0.40264332
-0.43659902
-0.19945726
-0.17344357
-0.47801965
-0.38276014
-0.09048866
-0.06334416
-0.18430263
-0.0821216
-0.014996407
-0.20701231
-0.488899
-0.58319753
-0.11771286
-0.1965253
-0.6358752
-0.64802784
-0.60001755
-0.2554345
-0.4315062
-0.6018779
-0.648897
-0.49093586
-0.4392625
-0.47829357
-0.5859732
-0.40362874
-0.5647167
-0.37936094
-0.38751897
-0.33950707
-0.26118782
-0.24458277
-0.296597
-0.05955656
-0.08669927
-0.2948263
-0.21256281
-0.21364267
-0.11149765
-0.051804803
-0.30273178
-0.37230775
-0.20215505
-0.0075573116
-0.0852658
-0.4057793
-0.43914732
-0.19324225
-0.24100459
-0.05862832
-0.15438421
-0.16637161
-0.30359998
-0.25569716
-0.27166495
-0.105328314
-0.22731523
-0.49984613
-0.48510763
-0.61559784
-0.455915
-0.5008321
-0.2473407
-0.5829683
-0.31992865
-0.4633471
-0.4102413
-0.37923393
-0.53175026
-0.37793508
-0.22095646
-0.311128
-0.3536778
-0.35127252
-0.3305521
-0.3529858
-0.4037293
-0.04839398
-0.22108248
-0.33264476
-0.48446456
-0.3995877
-0.13429332
-0.010297872
-0.011609504
-0.31906354
-0.37465036
-0.29219627
-0.14352046
-0.20362744
-0.50884646
-0.5390908
-0.33872694
-0.20858169
-0.43735874
-0.8135085
-0.883336
-0.5109052
-0.12871116
-0.5575856
-0.7935451
-0.9575268
-0.23053701
-0.27344263
-0.7943212
-1.1113379
-1.2588514
-0.33160424
-0.44694212
-0.6180945
-0.50343496
-0.49336222
-0.35408464
-0.28353223
-0.30269137
-0.4561699
-0.29882556
-0.34760386
-0.37878114
-0.26912686
-0.35775197
-0.30568978
-0.20146766
-0.19798744
-0.114498556
-0.19717412
-0.3251374
-0.26690894
-0.22016314
-0.11541117
-0.4957958
-0.26541355
-0.15326017
-0.70882344
-0.96359867
-1.3611866
-1.605483
-0.17858846
-0.54938656
-0.7686302
-0.93810904
-0.9051225
-0.4606456
-0.20901297
-0.08945545
-0.038989723
-0.115543194
-0.6883734
-0.61636794
-0.32829562
-0.20456453
-0.20381331
-0.7490181
-0.39298984
-0.15692492
-0.24636583
-0.059405174
-0.20725746
-0.07551979
-0.17064182
-0.2592053
-0.037809186
-0.5007032
-0.5921481
-0.46789166
-0.44644225
-0.16052496
-0.76230866
-1.1162679
-0.8799321
-0.6447877
-0.12332682
-0.96165085
-1.0181384
-0.7748322
-0.40093315
-0.17099509
-0.99313635
-0.86373013
-0.5271114
-0.19454676
-0.3509476
-0.1295465
-0.040321454
-0.3640776
-0.64294934
-0.6150852
-0.13365914
-0.37921637
-0.58487916
-0.8379385
-0.80104876
-0.08945268
-0.5208987
-0.6399664
-0.9313748
-0.727166
-0.32375735
-0.34653613
-0.47853357
-0.70951927
-0.43087223
-0.06955103
-0.25875103
-0.33873367
-0.30608082
-0.13635787
-0.13803233
-0.28747115
-0.09032165
-0.23143204
-0.15198255
-0.33351222
-0.29324102
-0.2810298
-0.2014299
-0.15906747
-0.16468719
-0.14636204
-0.21616192
-0.07501595
-0.051478628
-0.19850366
-0.22271842
-0.18884134
-0.15053163
-0.24925515
-0.4595929
-0.38655618
-0.33695856
-0.0036128734
-0.27201694
-1.6174891
-1.9922305
-2.3272042
-1.9256268
-1.0908865
-1.7973217
-1.6579907
-1.2995247
-1.1465281
-0.48869833
-1.5161873
-1.1474293
-0.77356946
-0.31425732
-0.0842949
-1.421809
-0.97220546
-0.22721007
-0.32407415
-0.78474
-1.1922634
-0.2569034
-0.26291567
-0.8414706
-1.0613292
-0.26537752
-0.28515804
-0.49493128
-0.2746711
-0.4618041
-0.18835413
-0.48679847
-0.40990183
-0.40310138
-0.5737828
-0.314077
-0.45565963
-0.67614084
-0.58846754
-0.5533275
-0.26463762
-0.58933157
-0.4422484
-0.72205955
-0.6562793
-0.38016358
-0.5109702
-0.6050644
-0.51327455
-0.62387556
-0.20957199
-0.26713985
-0.28107443
-0.21876617
-0.35003185
-0.021499274
-0.0388137
-0.08301973
-0.16515742
-0.019640207
-0.48126337
-0.35784498
-0.6316221
-0.60507864
-0.56277966
-0.72748935
-0.68196446
-0.7725131
-0.9470406
-0.8038939
-0.66260797
-0.6362943
-0.5626031
-0.63324505
-0.72245634
-0.21365394
-0.050509058
-0.18727057
-0.3795752
-0.08598284
-0.18318965
-0.41517955
-0.5451678
-0.4539975
-0.14336124
-0.47360942
-0.6023904
-0.8907177
-0.6135433
-0.083363906
-0.520175
-0.7762996
-0.78594536
-0.1535025
-0.12464853
-0.55197346
-0.6019034
-0.43728784
-0.22015835
-0.10016391
-0.37234303
-0.21788402
-0.069026746
-0.38284898
-0.46291703
-0.18933883
-0.0055836956
-0.17120112
-0.67414814
-0.36604956
-0.21642251
-0.0020923675
-0.29437903
-0.655453
-0.15999483
-0.20707773
-0.093115255
-0.039280005
-0.38063106
-0.08487721
-0.2464354
-0.15109244
-0.008156065
-0.098950535
-0.25589183
-0.34116971
-0.49442118
-0.3288226
-0.4230213
-0.5274078
-0.38836172
-0.60774535
-0.48195976
-0.45634
-0.51337606
-0.37289608
-0.59142894
-0.5145212
-0.5743503
-0.3382855
-0.2915532
-0.5126788
-0.6693436
-0.47435033
-0.36676422
-0.5540745
-0.47298318
-0.43606922
-0.55755913
-0.42405662
-0.19024207
-0.24330424
-0.8413141
-1.3050599
-0.9353443
-0.04821775
-0.020758992
-0.23648737
-0.8334299
-0.3288347
-0.101417385
-0.4130533
-0.09203318
-0.33096743
-0.120293826
-0.40757722
-0.60691446
-0.5142748
-0.4240398
-0.6308685
-0.47334412
-0.95910263
-1.2020584
-1.0166252
-1.2008622
-0.07017936
-0.28324926
-0.12652548
-0.06534151
-0.02374597
-0.04692783
-0.0799945
-0.158656
-0.11941808
-0.15835033
-0.20685264
-0.012674191
-0.13336684
-0.12745433
-0.13254702
-0.15907513
-0.059560474
-0.19050983
-0.34929165
-0.23619038
-0.38507864
-0.04556722
-0.15311493
-0.22623715
-0.15412743
+0.10841741
+0.11967212
+0.04716594
+-0.25527775
+-0.81324536
+-0.0013792622
+0.3237811
+0.16140552
+-0.23718892
+-0.45995098
+0.15728939
+0.20299207
+0.22265936
+-0.11112914
+-0.36970714
+0.38181773
+0.3148946
+0.38573033
+0.035096783
+-0.046858847
+0.6187773
+0.6915057
+0.7804421
+0.76586276
+0.334662
+-0.84913975
+-0.91256016
+-0.8585244
+-0.48125038
+-0.65941215
+-0.63570124
+-0.71755564
+-0.47276703
+-0.430963
+-0.47008553
+-0.4541871
+-0.46900645
+-0.44746342
+-0.49634156
+-0.5533509
+-0.27883908
+-0.17233735
+-0.3041217
+-0.48419148
+-0.61301845
+0.059397016
+-0.11201468
+-0.35212496
+-0.520603
+-0.8102906
+0.6256469
+0.6784687
+0.72567284
+0.8046146
+0.6029808
+0.83996475
+0.8164589
+0.92538255
+0.7218928
+0.44690672
+0.65773356
+0.7733458
+0.76552105
+0.59823346
+0.5898604
+0.5417267
+0.4214064
+0.76047087
+0.4767656
+0.29736707
+0.11812207
+0.23008063
+-0.008274395
+-0.027977359
+-0.047098726
+-1.1751629
+-0.9825178
+-0.96338594
+-0.9331518
+-1.7957546
+-0.54252845
+-0.31322026
+-0.22636217
+-0.6049777
+-1.2032436
+-0.12428355
+0.21481177
+-0.001247252
+-0.29541147
+-0.9125995
+0.18477228
+-0.06685131
+-0.09750518
+-0.30287454
+-1.1516305
+-0.2998708
+-0.65194666
+-0.7058136
+-1.0029417
+-1.4359505
+-0.5552089
+-0.70760125
+-0.52469593
+-0.5321618
+-0.56087285
+-0.47734395
+-0.508133
+-0.47672886
+-0.5115346
+-0.22865686
+-0.46259302
+-0.35373315
+-0.41358304
+-0.39475742
+-0.36364892
+-0.3660822
+-0.7362799
+-0.78521603
+-0.42777812
+-0.503742
+-0.71745044
+-0.6983278
+-0.7952644
+-0.7502313
+-0.6844699
+-0.677051
+-0.43423843
+-0.41684592
+0.1094402
+0.1281675
+-0.72982126
+-0.48355135
+0.03436868
+0.40496165
+0.2648661
+-0.70158166
+-0.46734637
+-0.113836624
+0.17756869
+0.2659701
+-1.2668252
+-0.8117731
+-0.5864879
+-0.33608136
+-0.045770176
+-1.533036
+-1.3349019
+-1.0710247
+-0.887364
+-0.85939753
+-3.4118898
+-3.75347
+-3.4005227
+-3.5479705
+-2.3863714
+-3.258695
+-3.1261232
+-2.6472356
+-2.721141
+-1.0734519
+-2.2561524
+-1.9264671
+-1.684594
+-1.6792498
+-0.49788082
+-0.8760027
+-0.70769536
+-0.49690917
+-0.4405903
+0.4359968
+-0.16243324
+0.014613238
+0.57152116
+0.8411268
+1.3721623
+-0.8194556
+-0.61574596
+-0.5238653
+-0.4331406
+-0.29540786
+-0.43082944
+-0.3888652
+-0.20858654
+-0.23118454
+-0.23924421
+0.07956186
+-0.142595
+-0.028637642
+-0.18673353
+-0.14357804
+0.13618115
+0.18741474
+0.099634215
+-0.13001801
+-0.35861146
+0.21620771
+0.28037935
+-0.058607057
+-0.22186561
+-0.5257271
+0.64194703
+0.18907306
+0.010088105
+-0.20147789
+-0.57345915
+0.67025036
+0.32531977
+0.25170588
+0.03200792
+-0.54240197
+0.8746213
+0.6102627
+0.21770035
+0.06572825
+-0.5442023
+0.4630569
+0.48362857
+0.0033583886
+-0.32452023
+-0.7843862
+0.26592502
+-0.027674561
+-0.3177493
+-0.5110126
+-1.0365204
+0.07766554
+0.21963337
+0.09985403
+-0.200318
+-1.180955
+1.1838828
+1.4100245
+1.2561709
+0.6541849
+-0.6492664
+1.9878281
+1.924232
+1.8408897
+0.9620441
+-0.1312087
+2.0586233
+1.9651768
+1.5661417
+1.0970968
+0.06096104
+1.4534022
+1.1982656
+0.8108593
+0.31973642
+-0.63751316
+0.41474745
+0.49554208
+0.42934665
+0.5539405
+0.64447314
+0.7065573
+0.77043945
+0.85161847
+0.7204902
+0.9544375
+0.5657043
+0.5018967
+0.7367483
+0.8036344
+0.8193139
+0.48103747
+0.4064169
+0.55895036
+0.6311307
+0.50099397
+0.36971837
+0.14545648
+0.17882185
+0.19498381
+0.4283742
+0.5474707
+1.0615067
+1.246145
+1.3390367
+1.0132886
+1.0730008
+1.6158105
+1.6812404
+1.744839
+1.6863936
+0.84810966
+1.4239141
+1.6825808
+1.8660802
+1.4315809
+0.2889238
+0.957628
+1.095625
+1.1112146
+0.7435144
+-0.47195476
+0.15148005
+-0.10733095
+0.05309127
+-0.0054449853
+-0.14926411
+-1.0034213
+-1.6827573
+-2.2970002
+-1.4313265
+0.03147119
+-0.64021444
+-1.3899658
+-1.9032643
+-0.48709768
+0.42928377
+-0.29894802
+-1.179976
+-1.5900682
+-0.12580381
+0.8716212
+0.27338207
+-0.40235615
+-0.6471868
+0.2760824
+1.2521877
+0.8944762
+0.572829
+0.60991377
+1.1899539
+0.3580373
+0.44512457
+0.75690585
+0.9598378
+1.1432595
+0.5008889
+0.729499
+0.93486726
+0.9345201
+1.1185106
+0.83710766
+0.7644658
+1.0162354
+0.98039263
+1.0213342
+0.8862734
+0.87665874
+1.0696371
+0.8938284
+0.7766994
+0.8106122
+0.7149303
+0.6684064
+0.5023533
+0.46207976
+-0.031662248
+-0.13240837
+-0.4106251
+-0.7503278
+-1.1779855
+0.4071209
+0.235479
+0.025922919
+-0.58825374
+-1.0815285
+0.4143997
+0.2209184
+0.112840235
+-0.397647
+-0.75407976
+0.10694343
+-0.2279734
+-0.28636107
+-0.47263947
+-1.0070765
+-0.47209644
+-0.57271695
+-0.66937375
+-0.9575283
+-1.4234641
+-0.7693006
+-0.61202806
+-0.36446017
+-0.69743615
+-1.1350638
+0.32829794
+0.7659949
+0.728534
+0.29503962
+-0.6234081
+1.0335059
+1.2327062
+1.374574
+0.7088094
+-0.1689911
+1.2253006
+1.1635264
+1.1006608
+0.9000601
+-0.10091374
+0.77320606
+0.75465435
+0.3032813
+0.007960887
+-0.53371745
+0.07523519
+-0.023032939
+0.14513698
+0.13198888
+-0.075748764
+0.47682172
+0.29189166
+0.41667387
+0.43038929
+0.1989943
+0.36776745
+0.25901765
+0.38843507
+0.28818518
+0.09420468
+0.23712271
+0.16372736
+0.10684013
+0.12999712
+0.12425974
+0.11139477
+0.122650065
+-0.24878664
+-0.21205436
+-0.36720583
+-0.36286497
+-0.043674953
+0.2192443
+0.12173948
+-0.16327748
+-0.09071405
+0.23869643
+0.5579858
+0.785817
+0.13191205
+-0.30406383
+0.12695965
+0.60188425
+0.5195538
+0.12171839
+-0.5844922
+-0.25742108
+-0.18379982
+-0.41198018
+-0.50582
+-1.1211188
+-1.0386754
+-1.0551363
+-1.1062351
+-1.3315132
--- a/tools/para/conv2_b
+++ b/tools/para/conv2_b
@@ -1,11 +1,11 @@
 10
-0.25584885
-0.027994525
-0.037440807
-0.9338683
-0.03670198
-0.3839173
-0.24677922
-0.053136256
-0.13250303
-0.34382173
+-0.5453174
+0.5325228
+-0.2855727
+0.37329528
+0.80571985
+-0.06544808
+0.889609
+0.6670209
+0.017825617
+0.62321734
--- a/tools/para/conv2_w
+++ b/tools/para/conv2_w
--- a/tools/para/fc1_b
+++ b/tools/para/fc1_b
@@ -1,17 +1,17 @@
 16
-0.41653347
-0.51872575
-0.33438778
-0.80387104
-0.45116505
-0.4066231
-0.4157174
-0.1406135
-0.077455126
-0.4869977
-0.054409754
-1.3223877
-0.6638544
-0.5473232
-0.37075064
-0.106434464
+-0.92897904
+-0.35217842
+-0.0014487552
+-0.0043067397
+0.1521841
+0.57248235
+0.456419
+-0.00092885044
+0.68315464
+3.3582873
+-1.2884939
+1.2344757
+-0.21843779
+-0.00922128
+0.7979052
+-0.26892635
--- a/tools/para/fc1_w
+++ b/tools/para/fc1_w
--- a/tools/para/fc2_b
+++ b/tools/para/fc2_b
@@ -1,16 +1,16 @@
 15
-1.2299714
-0.52228546
-0.054097723
-0.03168516
-1.4363378
-0.418729
-0.08757081
-0.07111051
-0.23180878
-0.26251948
-0.38850868
-0.24825566
-0.5820692
-0.17491941
-0.17262118
+3.2805884
+0.61866415
+-0.7599902
+-0.12964848
+-1.2403007
+-1.4102304
+0.31298143
+-0.2664016
+-0.5089407
+-0.65169007
+-1.205961
+0.058631483
+-1.2611808
+-0.5120497
+-0.06845268
--- a/tools/para/fc2_w
+++ b/tools/para/fc2_w
@@ -1,242 +1,242 @@
 16
 15
-0.06848485
-0.1205382
-0.05659599
-0.1198935
-0.30640158
-0.05018961
-0.09606579
-0.03249446
-0.07550278
-0.033637468
-0.028482905
-0.3187486
-0.07612031
-0.051758178
-0.04251964
-0.017287323
-0.083228625
-0.0190767
-0.020379473
-0.0315905
-0.00048407013
-0.09054485
-0.010240303
-0.016670013
-0.0036291913
-0.009885405
-0.0056112455
-0.0007828792
-0.07570129
-0.010771771
-0.058594886
-0.008092952
-0.0027567474
-0.026515951
-0.043092027
-0.125233
-0.0005410857
-0.22648305
-0.0029436627
-0.016050348
-0.11576312
-0.0902263
-0.07349928
-0.0016258185
-0.23451011
-0.04832964
-0.12333799
-0.0020637014
-0.010213136
-0.11413979
-0.33165357
-0.12051369
-0.0034787229
-0.11606434
-0.007870939
-0.0695873
-0.11914301
-0.26085612
-0.08313314
-0.0005710702
-0.015122628
-0.018007172
-0.1235083
-0.16890174
-0.008040978
-0.10031251
-0.11334684
-0.13460128
-0.09495544
-0.047906466
-0.10289513
-0.11960255
-0.056172628
-0.071275584
-0.16940516
-0.04583691
-0.15900084
-0.08604079
-0.23008905
-0.06410888
-0.012403747
-0.27156368
-0.0070743295
-0.19504271
-0.07004608
-0.13711111
-0.11130735
-0.0049834913
-0.25697705
-0.06555731
-0.109665066
-0.166455
-0.19186278
-0.19342792
-0.07677503
-0.23737621
-0.17676963
-0.2537368
-0.25060114
-0.06314146
-0.11107369
-0.10176969
-0.1814894
-0.09466277
-0.12650885
-0.017758295
-0.032581564
-0.15479378
-0.22360481
-0.06571055
-0.14287175
-0.16189161
-0.06278065
-0.05938156
-0.009023414
-0.27827597
-0.115009665
-0.14662306
-0.15521672
-0.04527563
-0.020374492
-0.051145118
-0.04421289
-0.014813983
-0.016044024
-0.096724905
-0.009182883
-0.033773147
-0.022611074
-0.095029436
-0.013587231
-0.028680224
-0.13118911
-0.03520234
-0.013633234
-0.009445649
-0.2610173
-0.09995884
-0.12850226
-0.13758309
-0.06050716
-0.12285141
-0.12392998
-0.0043378808
-0.23181352
-0.20070644
-0.14143142
-0.16679154
-0.24327031
-0.23277378
-6.760882e-33
-1.5657735e-34
-1.0721702e-34
-1.7367731e-21
-3.2353512e-10
-9.632541e-35
-8.653687e-35
-8.844616e-25
-9.459162e-35
-1.4299339e-34
-2.104274e-36
-4.3546756e-35
-2.9894274e-19
-3.9450314e-35
-2.637824e-36
-0.45582697
-0.09199296
-0.030132826
-0.0079908315
-0.016203053
-0.084482715
-0.13553432
-0.0370493
-0.1506419
-0.078976385
-0.016706916
-0.071021125
-0.020966802
-0.032668043
-0.041946366
-0.03279952
-0.31379986
-0.3821142
-0.11431359
-0.0990971
-0.13750747
-0.28293163
-0.043488335
-0.20946114
-0.40087134
-0.030007226
-0.14469379
-0.12546782
-0.27385822
-0.08413422
-0.07185824
-0.024898782
-0.022647554
-0.016366411
-0.028040772
-0.11689805
-0.14100341
-0.14502956
-0.07877178
-0.08354321
-0.14139661
-0.07142018
-0.01063927
-0.0010698467
-0.058082126
-0.0594544
-0.008123557
-0.05472646
-0.04626421
-0.124584116
-0.09011361
-0.0806682
-0.084414266
-0.02768993
-0.0011701073
-0.0020251372
-0.0048691197
-3.377666e-05
-0.01488334
-0.01129906
-0.0018393932
-0.15046112
-0.15440601
-0.09502266
-0.008596554
-0.09307285
-0.16033137
-0.14228557
-0.22326827
-0.15338267
-0.01796669
-0.033436365
-0.023526033
-0.2423883
-0.13035965
+-0.04055948
+-0.0899297
+-0.116463214
+0.27776718
+0.020770457
+0.17840198
+-0.10469558
+-0.10548094
+-0.07940782
+-0.10039006
+0.2609884
+-0.06669101
+0.19761078
+-0.028724754
+-0.05853252
+-0.085758634
+-0.104837306
+-0.06026916
+-0.031351026
+0.0193268
+0.027177943
+-0.031575106
+0.32257012
+0.009708496
+-0.12874384
+-0.06572211
+-0.10292614
+0.006554822
+-0.09204582
+0.2606515
+-6.0489465e-25
+-1.5294317e-26
+1.2962579e-34
+1.7596429e-28
+2.2324908e-36
+9.769916e-35
+2.142249e-34
+2.0140252e-34
+-2.6631002e-35
+-6.747224e-14
+1.3325025e-14
+-4.4121328e-35
+-1.5060335e-34
+-7.388422e-35
+-1.4717945e-34
+-0.0011108516
+-0.00043268947
+-7.8196354e-07
+1.590539e-06
+-1.1753587e-09
+1.7755347e-14
+0.0023029593
+3.546536e-14
+1.9655734e-11
+7.920384e-06
+4.01855e-08
+1.7105192e-10
+-4.9853744e-34
+5.654454e-11
+-1.7755886e-34
+-0.059194833
+0.25711882
+-0.022496557
+0.04334022
+-0.15643325
+-0.1200202
+0.1653704
+-0.034774587
+0.2485161
+-0.11586556
+0.015630765
+-0.120615095
+-0.016666126
+0.09555584
+-0.0865063
+0.061755348
+-0.19227546
+-0.14753869
+-0.1755486
+-0.07869579
+-0.20227447
+-0.21172984
+-0.19084227
+0.21141978
+0.19351348
+0.21836193
+0.18422957
+0.094084285
+0.15138763
+0.15852937
+-0.012218844
+0.0050686398
+-0.04197183
+-0.029452274
+0.3454143
+-0.057734195
+-0.12412055
+-0.08551893
+-0.049470823
+-0.14276567
+-0.057413865
+0.3105577
+-0.07283938
+-0.05446109
+-0.043245558
+-2.3276645e-08
+-7.683913e-10
+6.939076e-19
+-2.168769e-13
+2.0091559e-25
+8.407229e-35
+5.931484e-11
+1.1133449e-20
+-3.681161e-09
+4.8643035e-14
+-2.6593423e-16
+-5.515722e-15
+1.6257941e-24
+2.9973974e-09
+-3.6573383e-35
+0.092943765
+0.026833052
+-0.041498978
+-0.22402109
+-0.04895312
+0.2550738
+-0.06876654
+0.08826017
+0.013569759
+-0.11500274
+-0.1292877
+0.05450189
+0.24228293
+-0.060830787
+0.014448528
+0.41359606
+-0.0001894197
+-0.01955021
+0.0094626425
+0.0014078337
+0.07797131
+-0.08700014
+-0.018127501
+-0.05433242
+-0.018250398
+-0.09780573
+-0.09894524
+-0.055121373
+-0.047204096
+-0.06551965
+0.0316711
+-0.03834733
+0.3242851
+0.03849145
+-0.09479166
+-0.09084238
+-0.20754653
+-0.0043242224
+-0.06629326
+0.29329702
+0.104063146
+0.049163576
+-0.09206838
+-0.24338146
+-0.10112556
+0.09978308
+0.15473309
+0.15995573
+0.15965714
+0.23098047
+0.16435096
+0.06907303
+0.14578992
+-0.15218158
+-0.14378822
+-0.12298345
+-0.16666684
+-0.17883879
+-0.1885288
+-0.22457297
+2.000404e-12
+4.642234e-14
+-3.2424367e-35
+3.3515016e-24
+-1.8441883e-27
+-5.3595917e-15
+-6.9021866e-35
+4.662623e-09
+3.1630867e-10
+-1.2969493e-22
+-3.425322e-17
+-8.2255436e-17
+1.6280324e-11
+-1.1481724e-14
+9.178784e-08
+4.2778625e-10
+1.990599e-09
+5.136605e-13
+-3.4330006e-15
+-2.4504647e-19
+-2.2471945e-21
+-8.512346e-13
+-1.3177264e-11
+-4.311315e-13
+-2.6667527e-12
+-7.765994e-13
+-6.6160796e-18
+3.2336799e-24
+1.7989337e-16
+4.4971717e-18
+0.033371855
+-0.23923391
+0.14517447
+-0.10633802
+-0.06809501
+-0.04406864
+0.33172694
+-0.07503456
+-0.202407
+0.18849899
+-0.1625628
+-0.07222842
+-0.027115922
+0.30561703
+-0.07867472
+1.2983236e-22
+9.005672e-35
+7.144905e-35
+1.3765054e-22
+1.9032135e-24
+1.6090231e-34
+1.6841103e-34
+1.0666537e-34
+1.4291648e-34
+-1.9198494e-34
+8.0634533e-35
+-1.7394437e-34
+1.774158e-34
+1.4883797e-34
+7.861655e-35